rev184

build.gradle

@@ -87,10 +87,10 @@ allprojects {
     if (this.name != 'rs-client') apply plugin: 'checkstyle'
 
     group = 'us.runelitepl'
-    version = '1.5.34-SNAPSHOT'
+    version = '1.5.35-SNAPSHOT'
 
     ext {
-        rsversion = 183
+        rsversion = 184
         cacheversion = 165
         plusVersion = '2.1.6.0'
 

cache/src/main/java/net/runelite/cache/script/Instructions.java

@@ -458,6 +458,7 @@ public class Instructions
 		add(DOCHEAT, "docheat");
 		add(CHAT_SETMESSAGEFILTER, "chat_setmessagefilter");
 		add(CHAT_GETMESSAGEFILTER, "chat_getmessagefilter");
+		add(DEBUGMES, "debugmes");
 		add(GETWINDOWMODE, "getwindowmode");
 		add(SETWINDOWMODE, "setwindowmode");
 		add(GETDEFAULTWINDOWMODE, "getdefaultwindowmode");

cache/src/main/java/net/runelite/cache/script/Opcodes.java

@@ -449,6 +449,7 @@ public class Opcodes
 	public static final int DOCHEAT = 5020;
 	public static final int CHAT_SETMESSAGEFILTER = 5021;
 	public static final int CHAT_GETMESSAGEFILTER = 5022;
+	public static final int DEBUGMES = 5023;
 	public static final int GETWINDOWMODE = 5306;
 	public static final int SETWINDOWMODE = 5307;
 	public static final int GETDEFAULTWINDOWMODE = 5308;

deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java

@@ -434,6 +434,7 @@ public enum ScriptOpcode
 	DOCHEAT(5020),
 	CHAT_SETMESSAGEFILTER(5021),
 	CHAT_GETMESSAGEFILTER(5022),
+	DEBUGMES(5023),
 	GETWINDOWMODE(5306),
 	SETWINDOWMODE(5307),
 	GETDEFAULTWINDOWMODE(5308),

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

@@ -1726,7 +1726,7 @@ public abstract class RSClientMixin implements RSClient
 	}
 
 	@Inject
-	BigInteger modulus = new BigInteger("f8a2c48a898ebf7a2a5069193f0c6798757879d298af09a6fa94e569d45b09f67aeef8e6bb8a61650d597c743104fdef7d07b24af92df6be995877e9a7dd6a630d3e62c14e70427b959ff70735f96135d73434e73aabbd6aa8cf0b97dae7e2b6b70e646ff550b0ad8a4d8d18675714e5228b026d85e8f2f24607ba69d7404571", 16);
+	BigInteger modulus = new BigInteger("a8cda33f9c45f0b9d1675c38ec69da6be4143320190060c229bb35ed91677a4447e09e77031e824aed13bfab51ba180bbda7e279a128f3eb016e9b0dd752a948431798626fc36ac10e036d945f2752d0d874c65a86d3e001a17bf9d63d8bc263b07be4ebc613d01781023a07de698e75248b582e682f1751395f61b9ec1bcbb3", 16);
 
 	@Inject
 	@Override

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

@@ -4,81 +4,87 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hz")
+@ObfuscatedName("hp")
 @Implements("AbstractArchive")
 public abstract class AbstractArchive {
-	@ObfuscatedName("s")
+	@ObfuscatedName("so")
 	@ObfuscatedSignature(
-		signature = "Llu;"
+		signature = "Lbl;"
+	)
+	@Export("clientPreferences")
+	static ClientPreferences clientPreferences;
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		signature = "Llr;"
 	)
 	@Export("gzipDecompressor")
 	static GZipDecompressor gzipDecompressor;
-	@ObfuscatedName("q")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1302035663
+		intValue = 949229889
 	)
-	static int field3120;
+	static int field3122;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -163352815
+		intValue = -2001153217
 	)
 	@Export("groupCount")
 	int groupCount;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@Export("groupIds")
 	int[] groupIds;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("groupNameHashes")
 	int[] groupNameHashes;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Llv;"
+		signature = "Llk;"
 	)
 	@Export("groupNameHashTable")
 	IntHashTable groupNameHashTable;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("groupCrcs")
 	int[] groupCrcs;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("groupVersions")
 	int[] groupVersions;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("fileCounts")
 	int[] fileCounts;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@Export("fileIds")
 	int[][] fileIds;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@Export("fileNameHashes")
 	int[][] fileNameHashes;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "[Llv;"
+		signature = "[Llk;"
 	)
 	@Export("fileNameHashTables")
 	IntHashTable[] fileNameHashTables;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@Export("groups")
 	Object[] groups;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@Export("files")
 	Object[][] files;
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1161826923
+		intValue = 194523033
 	)
 	@Export("hash")
 	public int hash;
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@Export("releaseGroups")
 	boolean releaseGroups;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("shallowFiles")
 	boolean shallowFiles;
 
 	static {
 		gzipDecompressor = new GZipDecompressor();
-		field3120 = 0;
+		field3122 = 0;
 	}
 
 	AbstractArchive(boolean var1, boolean var2) {
@@ -86,140 +92,131 @@ public abstract class AbstractArchive {
 		this.shallowFiles = var2;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "([BS)V",
-		garbageValue = "-1572277747"
+		garbageValue = "4095"
 	)
 	@Export("decodeIndex")
 	void decodeIndex(byte[] var1) {
-		int var3 = var1.length;
+		this.hash = Username.method5132(var1, var1.length);
-		int var5 = -1;
+		Buffer var2 = new Buffer(MusicPatch.decompressBytes(var1));
-
+		int var3 = var2.readUnsignedByte();
-		int var6;
+		if (var3 >= 5 && var3 <= 7) {
-		for (var6 = 0; var6 < var3; ++var6) {
+			if (var3 >= 6) {
-			var5 = var5 >>> 8 ^ Buffer.crc32Table[(var5 ^ var1[var6]) & 255];
+				var2.readInt();
 			}
 
-		var5 = ~var5;
+			int var4 = var2.readUnsignedByte();
-		this.hash = var5;
+			if (var3 >= 7) {
-		Buffer var15 = new Buffer(TaskHandler.decompressBytes(var1));
+				this.groupCount = var2.method5443();
-		var5 = var15.readUnsignedByte();
-		if (var5 >= 5 && var5 <= 7) {
-			if (var5 >= 6) {
-				var15.readInt();
-			}
-
-			var6 = var15.readUnsignedByte();
-			if (var5 >= 7) {
-				this.groupCount = var15.method5481();
 			} else {
-				this.groupCount = var15.readUnsignedShort();
+				this.groupCount = var2.readUnsignedShort();
 			}
 
-			int var7 = 0;
+			int var5 = 0;
-			int var8 = -1;
+			int var6 = -1;
 			this.groupIds = new int[this.groupCount];
-			int var9;
+			int var7;
-			if (var5 >= 7) {
+			if (var3 >= 7) {
-				for (var9 = 0; var9 < this.groupCount; ++var9) {
+				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					this.groupIds[var9] = var7 += var15.method5481();
+					this.groupIds[var7] = var5 += var2.method5443();
-					if (this.groupIds[var9] > var8) {
+					if (this.groupIds[var7] > var6) {
-						var8 = this.groupIds[var9];
+						var6 = this.groupIds[var7];
 					}
 				}
 			} else {
-				for (var9 = 0; var9 < this.groupCount; ++var9) {
+				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					this.groupIds[var9] = var7 += var15.readUnsignedShort();
+					this.groupIds[var7] = var5 += var2.readUnsignedShort();
-					if (this.groupIds[var9] > var8) {
+					if (this.groupIds[var7] > var6) {
-						var8 = this.groupIds[var9];
+						var6 = this.groupIds[var7];
 					}
 				}
 			}
 
-			this.groupCrcs = new int[var8 + 1];
+			this.groupCrcs = new int[var6 + 1];
-			this.groupVersions = new int[var8 + 1];
+			this.groupVersions = new int[var6 + 1];
-			this.fileCounts = new int[var8 + 1];
+			this.fileCounts = new int[var6 + 1];
-			this.fileIds = new int[var8 + 1][];
+			this.fileIds = new int[var6 + 1][];
-			this.groups = new Object[var8 + 1];
+			this.groups = new Object[var6 + 1];
-			this.files = new Object[var8 + 1][];
+			this.files = new Object[var6 + 1][];
-			if (var6 != 0) {
+			if (var4 != 0) {
-				this.groupNameHashes = new int[var8 + 1];
+				this.groupNameHashes = new int[var6 + 1];
 
-				for (var9 = 0; var9 < this.groupCount; ++var9) {
+				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					this.groupNameHashes[this.groupIds[var9]] = var15.readInt();
+					this.groupNameHashes[this.groupIds[var7]] = var2.readInt();
 				}
 
 				this.groupNameHashTable = new IntHashTable(this.groupNameHashes);
 			}
 
-			for (var9 = 0; var9 < this.groupCount; ++var9) {
+			for (var7 = 0; var7 < this.groupCount; ++var7) {
-				this.groupCrcs[this.groupIds[var9]] = var15.readInt();
+				this.groupCrcs[this.groupIds[var7]] = var2.readInt();
 			}
 
-			for (var9 = 0; var9 < this.groupCount; ++var9) {
+			for (var7 = 0; var7 < this.groupCount; ++var7) {
-				this.groupVersions[this.groupIds[var9]] = var15.readInt();
+				this.groupVersions[this.groupIds[var7]] = var2.readInt();
 			}
 
-			for (var9 = 0; var9 < this.groupCount; ++var9) {
+			for (var7 = 0; var7 < this.groupCount; ++var7) {
-				this.fileCounts[this.groupIds[var9]] = var15.readUnsignedShort();
+				this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort();
 			}
 
+			int var8;
+			int var9;
 			int var10;
 			int var11;
 			int var12;
-			int var13;
+			if (var3 >= 7) {
-			int var14;
+				for (var7 = 0; var7 < this.groupCount; ++var7) {
-			if (var5 >= 7) {
+					var8 = this.groupIds[var7];
-				for (var9 = 0; var9 < this.groupCount; ++var9) {
+					var9 = this.fileCounts[var8];
-					var10 = this.groupIds[var9];
+					var5 = 0;
-					var11 = this.fileCounts[var10];
+					var10 = -1;
-					var7 = 0;
+					this.fileIds[var8] = new int[var9];
-					var12 = -1;
-					this.fileIds[var10] = new int[var11];
 
-					for (var13 = 0; var13 < var11; ++var13) {
+					for (var11 = 0; var11 < var9; ++var11) {
-						var14 = this.fileIds[var10][var13] = var7 += var15.method5481();
+						var12 = this.fileIds[var8][var11] = var5 += var2.method5443();
-						if (var14 > var12) {
+						if (var12 > var10) {
-							var12 = var14;
+							var10 = var12;
 						}
 					}
 
-					this.files[var10] = new Object[var12 + 1];
+					this.files[var8] = new Object[var10 + 1];
 				}
 			} else {
-				for (var9 = 0; var9 < this.groupCount; ++var9) {
+				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					var10 = this.groupIds[var9];
+					var8 = this.groupIds[var7];
-					var11 = this.fileCounts[var10];
+					var9 = this.fileCounts[var8];
-					var7 = 0;
+					var5 = 0;
-					var12 = -1;
+					var10 = -1;
-					this.fileIds[var10] = new int[var11];
+					this.fileIds[var8] = new int[var9];
 
-					for (var13 = 0; var13 < var11; ++var13) {
+					for (var11 = 0; var11 < var9; ++var11) {
-						var14 = this.fileIds[var10][var13] = var7 += var15.readUnsignedShort();
+						var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort();
-						if (var14 > var12) {
+						if (var12 > var10) {
-							var12 = var14;
+							var10 = var12;
 						}
 					}
 
-					this.files[var10] = new Object[var12 + 1];
+					this.files[var8] = new Object[var10 + 1];
 				}
 			}
 
-			if (var6 != 0) {
+			if (var4 != 0) {
-				this.fileNameHashes = new int[var8 + 1][];
+				this.fileNameHashes = new int[var6 + 1][];
-				this.fileNameHashTables = new IntHashTable[var8 + 1];
+				this.fileNameHashTables = new IntHashTable[var6 + 1];
 
-				for (var9 = 0; var9 < this.groupCount; ++var9) {
+				for (var7 = 0; var7 < this.groupCount; ++var7) {
-					var10 = this.groupIds[var9];
+					var8 = this.groupIds[var7];
-					var11 = this.fileCounts[var10];
+					var9 = this.fileCounts[var8];
-					this.fileNameHashes[var10] = new int[this.files[var10].length];
+					this.fileNameHashes[var8] = new int[this.files[var8].length];
 
-					for (var12 = 0; var12 < var11; ++var12) {
+					for (var10 = 0; var10 < var9; ++var10) {
-						this.fileNameHashes[var10][this.fileIds[var10][var12]] = var15.readInt();
+						this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt();
 					}
 
-					this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]);
+					this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]);
 				}
 			}
 
@@ -228,29 +225,29 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-2104600002"
+		garbageValue = "15"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(III)[B",
+		signature = "(IIS)[B",
-		garbageValue = "-852709847"
+		garbageValue = "3526"
 	)
 	@Export("takeFile")
 	public byte[] takeFile(int var1, int var2) {
 		return this.takeFileEncrypted(var1, var2, (int[])null);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(II[II)[B",
-		garbageValue = "1856075294"
+		garbageValue = "726476664"
 	)
 	@Export("takeFileEncrypted")
 	public byte[] takeFileEncrypted(int var1, int var2, int[] var3) {
@@ -266,7 +263,7 @@ public abstract class AbstractArchive {
 				}
 			}
 
-			byte[] var5 = MilliClock.serialize(this.files[var1][var2], false);
+			byte[] var5 = GrandExchangeOfferUnitPriceComparator.serialize(this.files[var1][var2], false);
 			if (this.shallowFiles) {
 				this.files[var1][var2] = null;
 			}
@@ -277,10 +274,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(IIB)Z",
+		signature = "(III)Z",
-		garbageValue = "0"
+		garbageValue = "1834518299"
 	)
 	@Export("tryLoadFile")
 	public boolean tryLoadFile(int var1, int var2) {
@@ -298,12 +295,12 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
+		signature = "(II)Z",
-		garbageValue = "-49"
+		garbageValue = "-812316387"
 	)
-	public boolean method4142(int var1) {
+	public boolean method4115(int var1) {
 		if (this.files.length == 1) {
 			return this.tryLoadFile(0, var1);
 		} else if (this.files[var1].length == 1) {
@@ -313,10 +310,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "1935370160"
+		garbageValue = "-1731378181"
 	)
 	@Export("tryLoadGroup")
 	public boolean tryLoadGroup(int var1) {
@@ -328,10 +325,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "8"
+		garbageValue = "304263263"
 	)
 	@Export("isFullyLoaded")
 	public boolean isFullyLoaded() {
@@ -350,20 +347,20 @@ public abstract class AbstractArchive {
 		return var1;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "780456172"
+		garbageValue = "-2030453035"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		return this.groups[var1] != null ? 100 : 0;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(II)[B",
-		garbageValue = "-455222981"
+		garbageValue = "1500956982"
 	)
 	@Export("takeFileFlat")
 	public byte[] takeFileFlat(int var1) {
@@ -376,10 +373,10 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(III)[B",
-		garbageValue = "-518164691"
+		garbageValue = "1923776823"
 	)
 	@Export("getFile")
 	public byte[] getFile(int var1, int var2) {
@@ -395,17 +392,17 @@ public abstract class AbstractArchive {
 				}
 			}
 
-			byte[] var4 = MilliClock.serialize(this.files[var1][var2], false);
+			byte[] var4 = GrandExchangeOfferUnitPriceComparator.serialize(this.files[var1][var2], false);
 			return var4;
 		} else {
 			return null;
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(II)[B",
+		signature = "(IB)[B",
-		garbageValue = "-465347237"
+		garbageValue = "96"
 	)
 	@Export("getFileFlat")
 	public byte[] getFileFlat(int var1) {
@@ -418,49 +415,49 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "2123503233"
+		garbageValue = "848617854"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(IB)[I",
-		garbageValue = "20"
+		garbageValue = "-61"
 	)
 	@Export("getGroupFileIds")
 	public int[] getGroupFileIds(int var1) {
 		return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "1117618578"
+		garbageValue = "-1937840631"
 	)
 	@Export("getGroupFileCount")
 	public int getGroupFileCount(int var1) {
 		return this.files[var1].length;
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-57"
+		garbageValue = "-101"
 	)
 	@Export("getGroupCount")
 	public int getGroupCount() {
 		return this.files.length;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-460868159"
+		garbageValue = "1193777199"
 	)
 	@Export("clearGroups")
 	public void clearGroups() {
@@ -470,10 +467,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "1"
+		garbageValue = "1926198322"
 	)
 	@Export("clearFilesGroup")
 	public void clearFilesGroup(int var1) {
@@ -483,10 +480,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "232551112"
+		garbageValue = "-1263344370"
 	)
 	@Export("clearFiles")
 	public void clearFiles() {
@@ -500,10 +497,10 @@ public abstract class AbstractArchive {
 
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(I[II)Z",
-		garbageValue = "-1481397744"
+		garbageValue = "1408640769"
 	)
 	@Export("buildFiles")
 	boolean buildFiles(int var1, int[] var2) {
@@ -527,14 +524,14 @@ public abstract class AbstractArchive {
 			} else {
 				byte[] var18;
 				if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
-					var18 = MilliClock.serialize(this.groups[var1], false);
+					var18 = GrandExchangeOfferUnitPriceComparator.serialize(this.groups[var1], false);
 				} else {
-					var18 = MilliClock.serialize(this.groups[var1], true);
+					var18 = GrandExchangeOfferUnitPriceComparator.serialize(this.groups[var1], true);
 					Buffer var8 = new Buffer(var18);
 					var8.xteaDecrypt(var2, 5, var8.array.length);
 				}
 
-				byte[] var20 = TaskHandler.decompressBytes(var18);
+				byte[] var20 = MusicPatch.decompressBytes(var18);
 				if (this.releaseGroups) {
 					this.groups[var1] = null;
 				}
@@ -582,13 +579,13 @@ public abstract class AbstractArchive {
 
 					for (var15 = 0; var15 < var3; ++var15) {
 						if (!this.shallowFiles) {
-							var5[var4[var15]] = UserComparator8.method3365(var19[var15], false);
+							var5[var4[var15]] = GrandExchangeEvents.method76(var19[var15], false);
 						} else {
 							var5[var4[var15]] = var19[var15];
 						}
 					}
 				} else if (!this.shallowFiles) {
-					var5[var4[0]] = UserComparator8.method3365(var20, false);
+					var5[var4[0]] = GrandExchangeEvents.method76(var20, false);
 				} else {
 					var5[var4[0]] = var20;
 				}
@@ -598,109 +595,119 @@ public abstract class AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)I",
-		garbageValue = "-1601715751"
+		garbageValue = "-276996300"
 	)
 	@Export("getGroupId")
 	public int getGroupId(String var1) {
 		var1 = var1.toLowerCase();
-		return this.groupNameHashTable.get(Archive.hashString(var1));
+		return this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(ILjava/lang/String;I)I",
-		garbageValue = "-1748128959"
+		garbageValue = "-1445606076"
 	)
 	@Export("getFileId")
 	public int getFileId(int var1, String var2) {
 		var2 = var2.toLowerCase();
-		return this.fileNameHashTables[var1].get(Archive.hashString(var2));
+		return this.fileNameHashTables[var1].get(WorldMapData_0.hashString(var2));
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;I)Z",
+		signature = "(Ljava/lang/String;Ljava/lang/String;S)Z",
-		garbageValue = "632147771"
+		garbageValue = "8717"
 	)
 	@Export("isValidFileName")
 	public boolean isValidFileName(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(Archive.hashString(var1));
+		int var3 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
 		if (var3 < 0) {
 			return false;
 		} else {
-			int var4 = this.fileNameHashTables[var3].get(Archive.hashString(var2));
+			int var4 = this.fileNameHashTables[var3].get(WorldMapData_0.hashString(var2));
 			return var4 >= 0;
 		}
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;I)[B",
+		signature = "(Ljava/lang/String;Ljava/lang/String;B)[B",
-		garbageValue = "-977549436"
+		garbageValue = "0"
 	)
 	@Export("takeFileByNames")
 	public byte[] takeFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(Archive.hashString(var1));
+		int var3 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(Archive.hashString(var2));
+		int var4 = this.fileNameHashTables[var3].get(WorldMapData_0.hashString(var2));
 		return this.takeFile(var3, var4);
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;I)Z",
+		signature = "(Ljava/lang/String;Ljava/lang/String;B)Z",
-		garbageValue = "1445366174"
+		garbageValue = "-68"
 	)
 	@Export("tryLoadFileByNames")
 	public boolean tryLoadFileByNames(String var1, String var2) {
 		var1 = var1.toLowerCase();
 		var2 = var2.toLowerCase();
-		int var3 = this.groupNameHashTable.get(Archive.hashString(var1));
+		int var3 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
-		int var4 = this.fileNameHashTables[var3].get(Archive.hashString(var2));
+		int var4 = this.fileNameHashTables[var3].get(WorldMapData_0.hashString(var2));
 		return this.tryLoadFile(var3, var4);
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)Z",
+		signature = "(Ljava/lang/String;I)Z",
-		garbageValue = "-63"
+		garbageValue = "1601927711"
 	)
 	@Export("tryLoadGroupByName")
 	public boolean tryLoadGroupByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(Archive.hashString(var1));
+		int var2 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
 		return this.tryLoadGroup(var2);
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-1117702662"
+		garbageValue = "-63"
 	)
 	@Export("loadRegionFromName")
 	public void loadRegionFromName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(Archive.hashString(var1));
+		int var2 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
 		if (var2 >= 0) {
 			this.loadRegionFromGroup(var2);
 		}
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)I",
-		garbageValue = "-1439788030"
+		garbageValue = "-2026426136"
 	)
 	@Export("groupLoadPercentByName")
 	public int groupLoadPercentByName(String var1) {
 		var1 = var1.toLowerCase();
-		int var2 = this.groupNameHashTable.get(Archive.hashString(var1));
+		int var2 = this.groupNameHashTable.get(WorldMapData_0.hashString(var1));
 		return this.groupLoadPercent(var2);
 	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		signature = "(CI)Z",
+		garbageValue = "-715141816"
+	)
+	@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/AbstractByteArrayCopier.java

@@ -1,48 +1,111 @@
 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("gb")
+@ObfuscatedName("gx")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
-	@ObfuscatedName("hw")
-	@ObfuscatedGetter(
-		intValue = -996347373
-	)
-	@Export("oculusOrbFocalPointY")
-	static int oculusOrbFocalPointY;
-
 	AbstractByteArrayCopier() {
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(B)[B",
-		garbageValue = "49"
+		garbageValue = "-37"
 	)
 	@Export("get")
 	abstract byte[] get();
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "-1981176877"
+		garbageValue = "-793496359"
 	)
 	@Export("set")
 	abstract void set(byte[] var1);
 
-	@ObfuscatedName("fj")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(I)Lbo;",
-		garbageValue = "-1334289648"
+		garbageValue = "1470103686"
 	)
-	static void method3922() {
+	@Export("getNextWorldListWorld")
-		if (GrandExchangeOfferUnitPriceComparator.worldMap != null) {
+	static World getNextWorldListWorld() {
-			GrandExchangeOfferUnitPriceComparator.worldMap.method6275(MouseRecorder.plane, class4.baseX * 64 + (Varps.localPlayer.x * -78439701 >> 7), (Varps.localPlayer.y >> 7) + ScriptEvent.baseY, false);
+		return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null;
-			GrandExchangeOfferUnitPriceComparator.worldMap.loadCache();
 	}
 
+	@ObfuscatedName("gv")
+	@ObfuscatedSignature(
+		signature = "(IIIIZI)V",
+		garbageValue = "949599509"
+	)
+	@Export("setViewportShape")
+	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+		if (var2 < 1) {
+			var2 = 1;
+		}
+
+		if (var3 < 1) {
+			var3 = 1;
+		}
+
+		int var5 = var3 - 334;
+		int var6;
+		if (var5 < 0) {
+			var6 = Client.field880;
+		} else if (var5 >= 100) {
+			var6 = Client.field887;
+		} else {
+			var6 = (Client.field887 - Client.field880) * var5 / 100 + Client.field880;
+		}
+
+		int var7 = var3 * var6 * 512 / (var2 * 334);
+		int var8;
+		int var9;
+		short var10;
+		if (var7 < Client.field892) {
+			var10 = Client.field892;
+			var6 = var10 * var2 * 334 / (var3 * 512);
+			if (var6 > Client.field891) {
+				var6 = Client.field891;
+				var8 = var3 * var6 * 512 / (var10 * 334);
+				var9 = (var2 - var8) / 2;
+				if (var4) {
+					Rasterizer2D.Rasterizer2D_resetClip();
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
+				}
+
+				var0 += var9;
+				var2 -= var9 * 2;
+			}
+		} else if (var7 > Client.field893) {
+			var10 = Client.field893;
+			var6 = var10 * var2 * 334 / (var3 * 512);
+			if (var6 < Client.field686) {
+				var6 = Client.field686;
+				var8 = var10 * var2 * 334 / (var6 * 512);
+				var9 = (var3 - var8) / 2;
+				if (var4) {
+					Rasterizer2D.Rasterizer2D_resetClip();
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
+				}
+
+				var1 += var9;
+				var3 -= var9 * 2;
+			}
+		}
+
+		Client.viewportZoom = var3 * var6 / 334;
+		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
+			GrandExchangeOfferTotalQuantityComparator.method91(var2, var3);
+		}
+
+		Client.viewportOffsetX = var0;
+		Client.viewportOffsetY = var1;
+		Client.viewportWidth = var2;
+		Client.viewportHeight = var3;
 	}
 }

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

@@ -4,76 +4,76 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ko")
+@ObfuscatedName("kh")
 @Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "[Llt;"
+		signature = "[Llp;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("s")
+	@ObfuscatedName("a")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("q")
+	@ObfuscatedName("g")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("r")
+	@ObfuscatedName("h")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("k")
+	@ObfuscatedName("s")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
-	@ObfuscatedName("w")
+	@ObfuscatedName("f")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@Export("widths")
 	int[] widths;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@Export("kerning")
 	byte[] kerning;
 
@@ -91,12 +91,6 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_lines = new String[100];
 	}
 
-	AbstractFont(byte[] var1) {
-		this.pixels = new byte[256][];
-		this.ascent = 0;
-		this.readMetrics(var1);
-	}
-
 	AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
 		this.pixels = new byte[256][];
 		this.ascent = 0;
@@ -123,15 +117,21 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.maxDescent = var9 - this.ascent;
 	}
 
-	@ObfuscatedName("c")
+	AbstractFont(byte[] var1) {
+		this.pixels = new byte[256][];
+		this.ascent = 0;
+		this.readMetrics(var1);
+	}
+
+	@ObfuscatedName("z")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("y")
 	@Export("readMetrics")
 	void readMetrics(byte[] var1) {
 		this.advances = new int[256];
@@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 				if (var13 != 32 && var13 != 160) {
 					for (var8 = 0; var8 < 256; ++var8) {
 						if (var8 != 32 && var8 != 160) {
-							this.kerning[var8 + (var13 << 8)] = (byte)method5336(var11, var12, var4, this.advances, var10, var13, var8);
+							this.kerning[var8 + (var13 << 8)] = (byte)method5275(var11, var12, var4, this.advances, var10, var13, var8);
 						}
 					}
 				}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("c")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) {
 			var1 = ' ';
 		}
 
-		return this.advances[MenuAction.charToByteCp1252(var1) & 255];
+		return this.advances[Entity.charToByteCp1252(var1) & 255];
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("b")
 	@Export("stringWidth")
 	public int stringWidth(String var1) {
 		if (var1 == null) {
@@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var7.equals("gt")) {
 								if (var7.startsWith("img=")) {
 									try {
-										int var8 = IgnoreList.parseInt(var7.substring(4));
+										int var8 = TilePaint.parseInt(var7.substring(4));
 										var4 += AbstractFont_modIconSprites[var8].width;
 										var3 = -1;
 									} catch (Exception var10) {
@@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 					}
 
 					if (var2 == -1) {
-						var4 += this.advances[(char)(MenuAction.charToByteCp1252(var6) & 255)];
+						var4 += this.advances[(char)(Entity.charToByteCp1252(var6) & 255)];
 						if (this.kerning != null && var3 != -1) {
 							var4 += this.kerning[var6 + (var3 << 8)];
 						}
@@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("o")
 	@Export("breakLines")
 	public int breakLines(String var1, int[] var2, String[] var3) {
 		if (var1 == null) {
@@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							var11 = '>';
 						} else if (var16.startsWith("img=")) {
 							try {
-								int var17 = IgnoreList.parseInt(var16.substring(4));
+								int var17 = TilePaint.parseInt(var16.substring(4));
 								var4 += AbstractFont_modIconSprites[var17].width;
 								var11 = 0;
 							} catch (Exception var20) {
@@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("a")
 	@Export("lineWidth")
 	public int lineWidth(String var1, int var2) {
 		int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
@@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var4;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@Export("lineCount")
 	public int lineCount(String var1, int var2) {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("h")
 	@Export("draw")
 	public void draw(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("drawAlpha")
 	public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@Export("drawRightAligned")
 	public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("j")
 	@Export("drawCentered")
 	public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("d")
 	@Export("drawLines")
 	public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
 		if (var1 == null) {
@@ -495,7 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("l")
 	@Export("drawCenteredWave")
 	public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@Export("drawCenteredWave2")
 	public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("ac")
 	@Export("drawCenteredShake")
 	public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var1 != null) {
@@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("aa")
 	@Export("drawRandomAlphaAndSpacing")
 	public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ap")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1;
@@ -582,28 +582,28 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_justificationCurrent = 0;
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("ar")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
 			if (var1.startsWith("col=")) {
-				AbstractFont_color = GrandExchangeEvent.method74(var1.substring(4), 16);
+				AbstractFont_color = class2.method29(var1.substring(4), 16);
 			} else if (var1.equals("/col")) {
 				AbstractFont_color = AbstractFont_previousColor;
 			} else if (var1.startsWith("str=")) {
-				AbstractFont_strike = GrandExchangeEvent.method74(var1.substring(4), 16);
+				AbstractFont_strike = class2.method29(var1.substring(4), 16);
 			} else if (var1.equals("str")) {
 				AbstractFont_strike = 8388608;
 			} else if (var1.equals("/str")) {
 				AbstractFont_strike = -1;
 			} else if (var1.startsWith("u=")) {
-				AbstractFont_underline = GrandExchangeEvent.method74(var1.substring(2), 16);
+				AbstractFont_underline = class2.method29(var1.substring(2), 16);
 			} else if (var1.equals("u")) {
 				AbstractFont_underline = 0;
 			} else if (var1.equals("/u")) {
 				AbstractFont_underline = -1;
 			} else if (var1.startsWith("shad=")) {
-				AbstractFont_shadow = GrandExchangeEvent.method74(var1.substring(5), 16);
+				AbstractFont_shadow = class2.method29(var1.substring(5), 16);
 			} else if (var1.equals("shad")) {
 				AbstractFont_shadow = 0;
 			} else if (var1.equals("/shad")) {
@@ -616,7 +616,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ab")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
 		int var3 = 0;
@@ -639,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("ax")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
 		var3 -= this.ascent;
@@ -648,7 +648,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var6 = 0; var6 < var1.length(); ++var6) {
 			if (var1.charAt(var6) != 0) {
-				char var7 = (char)(MenuAction.charToByteCp1252(var1.charAt(var6)) & 255);
+				char var7 = (char)(Entity.charToByteCp1252(var1.charAt(var6)) & 255);
 				if (var7 == '<') {
 					var4 = var6;
 				} else {
@@ -662,7 +662,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var8.equals("gt")) {
 								if (var8.startsWith("img=")) {
 									try {
-										var9 = IgnoreList.parseInt(var8.substring(4));
+										var9 = TilePaint.parseInt(var8.substring(4));
 										IndexedSprite var10 = AbstractFont_modIconSprites[var9];
 										var10.drawAt(var2, var3 + this.ascent - var10.height);
 										var2 += var10.width;
@@ -728,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("as")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
 		var3 -= this.ascent;
@@ -738,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var9 = 0; var9 < var1.length(); ++var9) {
 			if (var1.charAt(var9) != 0) {
-				char var10 = (char)(MenuAction.charToByteCp1252(var1.charAt(var9)) & 255);
+				char var10 = (char)(Entity.charToByteCp1252(var1.charAt(var9)) & 255);
 				if (var10 == '<') {
 					var6 = var9;
 				} else {
@@ -767,7 +767,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 										}
 
 										++var8;
-										var14 = IgnoreList.parseInt(var11.substring(4));
+										var14 = TilePaint.parseInt(var11.substring(4));
 										IndexedSprite var15 = AbstractFont_modIconSprites[var14];
 										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height));
 										var2 += var15.width;
@@ -846,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("i")
-	static int method5336(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	static int method5275(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
 		int var7 = var2[var5];
 		int var8 = var7 + var4[var5];
 		int var9 = var2[var6];
@@ -882,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return -var13;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("x")
 	@Export("escapeBrackets")
 	public static String escapeBrackets(String var0) {
 		int var1 = var0.length();
@@ -911,7 +911,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var6.toString();
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ao")
 	@Export("AbstractFont_drawGlyph")
 	static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) {
 		int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -953,7 +953,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("al")
 	@Export("AbstractFont_placeGlyph")
 	static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2);
@@ -1043,7 +1043,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("an")
 	@Export("AbstractFont_placeGlyphAlpha")
 	static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
 		var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8;

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

@@ -4,21 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lf")
+@ObfuscatedName("lm")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("t")
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "Llp;"
+	)
+	@Export("titlebuttonSprite")
+	static IndexedSprite titlebuttonSprite;
+	@ObfuscatedName("v")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1812732741
+		intValue = 1221954905
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -828006161
+		intValue = 809652275
 	)
 	@Export("height")
 	public int height;
@@ -26,26 +32,26 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-978411495"
+		garbageValue = "-1952064900"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "-2009002566"
+		garbageValue = "-67564732"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-934160158"
+		garbageValue = "-997992638"
 	)
 	@Export("apply")
 	public final void apply() {

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

@@ -4,56 +4,56 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ks")
+@ObfuscatedName("ky")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
 	protected AbstractSocket() {
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "-75"
+		garbageValue = "-119"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1827163357"
+		garbageValue = "1784126558"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1354053248"
+		garbageValue = "3"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-377412375"
+		garbageValue = "-336706705"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "2063129771"
+		garbageValue = "-2035668362"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "([BIIB)V",
-		garbageValue = "9"
+		garbageValue = "-68"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;

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

@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("di")
+@ObfuscatedName("dx")
 @Implements("AbstractSound")
 public abstract class AbstractSound extends Node {
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("position")
 	int position;
 

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

@@ -1,23 +1,27 @@
+import java.lang.management.GarbageCollectorMXBean;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jq")
+@ObfuscatedName("jr")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("x")
+	@ObfuscatedName("ag")
+	@Export("garbageCollector")
+	static GarbageCollectorMXBean garbageCollector;
+	@ObfuscatedName("n")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Ljava/util/Comparator;I)V",
+		signature = "(Ljava/util/Comparator;B)V",
-		garbageValue = "-821671314"
+		garbageValue = "0"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -29,10 +33,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Ljw;Ljw;B)I",
+		signature = "(Ljh;Ljh;B)I",
-		garbageValue = "-62"
+		garbageValue = "-78"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
@@ -42,23 +46,4 @@ public abstract class AbstractUserComparator implements Comparator {
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		signature = "(B)Z",
-		garbageValue = "0"
-	)
-	@Export("isKeyDown")
-	public static final boolean isKeyDown() {
-		synchronized(KeyHandler.KeyHandler_instance) {
-			if (KeyHandler.field383 == KeyHandler.field381) {
-				return false;
-			} else {
-				class43.field361 = KeyHandler.field378[KeyHandler.field381];
-				WorldMapIcon_0.field126 = KeyHandler.field377[KeyHandler.field381];
-				KeyHandler.field381 = KeyHandler.field381 + 1 & 127;
-				return true;
-			}
-		}
-	}
 }

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

@@ -4,109 +4,116 @@ 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("w")
+@ObfuscatedName("f")
 @Implements("AbstractWorldMapData")
 public abstract class AbstractWorldMapData {
-	@ObfuscatedName("c")
+	@ObfuscatedName("iz")
 	@ObfuscatedGetter(
-		intValue = 1748127744
+		intValue = 742897815
+	)
+	@Export("selectedItemId")
+	static int selectedItemId;
+	@ObfuscatedName("z")
+	@ObfuscatedGetter(
+		intValue = 461674944
 	)
 	@Export("regionXLow")
 	int regionXLow;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1366642688
+		intValue = 278884352
 	)
 	@Export("regionYLow")
 	int regionYLow;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -59240115
+		intValue = -317022193
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1519130577
+		intValue = 796055175
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -101530507
+		intValue = 804294653
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1450874669
+		intValue = 593055761
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 460144759
+		intValue = -1864196889
 	)
 	@Export("groupId")
 	int groupId;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 977185489
+		intValue = -644572197
 	)
 	@Export("fileId")
 	int fileId;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@Export("floorUnderlayIds")
 	short[][][] floorUnderlayIds;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@Export("floorOverlayIds")
 	short[][][] floorOverlayIds;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
-	byte[][][] field163;
+	byte[][][] field164;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
-	byte[][][] field159;
+	byte[][][] field152;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "[[[[Lb;"
+		signature = "[[[[Lk;"
 	)
 	@Export("decorations")
 	WorldMapDecoration[][][][] decorations;
-	@ObfuscatedName("s")
+	@ObfuscatedName("a")
+	boolean field165;
+	@ObfuscatedName("e")
 	boolean field166;
-	@ObfuscatedName("p")
-	boolean field167;
 
 	AbstractWorldMapData() {
 		this.groupId = -1;
 		this.fileId = -1;
 		new LinkedList();
+		this.field165 = false;
 		this.field166 = false;
-		this.field167 = false;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkz;I)V",
+		signature = "(Lkl;I)V",
-		garbageValue = "-1969615810"
+		garbageValue = "1549979331"
 	)
 	@Export("readGeography")
 	abstract void readGeography(Buffer var1);
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(S)Z",
+		signature = "(I)Z",
-		garbageValue = "2950"
+		garbageValue = "1858482709"
 	)
 	@Export("isFullyLoaded")
 	boolean isFullyLoaded() {
-		return this.field166 && this.field167;
+		return this.field165 && this.field166;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lhz;B)V",
+		signature = "(Lhp;I)V",
-		garbageValue = "20"
+		garbageValue = "-1207518623"
 	)
 	@Export("loadGeography")
 	void loadGeography(AbstractArchive var1) {
@@ -114,53 +121,53 @@ public abstract class AbstractWorldMapData {
 			byte[] var2 = var1.takeFile(this.groupId, this.fileId);
 			if (var2 != null) {
 				this.readGeography(new Buffer(var2));
+				this.field165 = true;
 				this.field166 = true;
-				this.field167 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-266968977"
+		garbageValue = "-1757437769"
 	)
 	@Export("reset")
 	void reset() {
 		this.floorUnderlayIds = null;
 		this.floorOverlayIds = null;
-		this.field163 = null;
+		this.field164 = null;
-		this.field159 = null;
+		this.field152 = null;
 		this.decorations = null;
+		this.field165 = false;
 		this.field166 = false;
-		this.field167 = false;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(IILkz;I)V",
+		signature = "(IILkl;B)V",
-		garbageValue = "1782766503"
+		garbageValue = "10"
 	)
 	@Export("readTile")
 	void readTile(int var1, int var2, Buffer var3) {
 		int var4 = var3.readUnsignedByte();
 		if (var4 != 0) {
 			if ((var4 & 1) != 0) {
-				this.method245(var1, var2, var3, var4);
+				this.method262(var1, var2, var3, var4);
 			} else {
-				this.method240(var1, var2, var3, var4);
+				this.method268(var1, var2, var3, var4);
 			}
 
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(IILkz;II)V",
+		signature = "(IILkl;II)V",
-		garbageValue = "-1638058411"
+		garbageValue = "2059676399"
 	)
-	void method245(int var1, int var2, Buffer var3, int var4) {
+	void method262(int var1, int var2, Buffer var3, int var4) {
 		boolean var5 = (var4 & 2) != 0;
 		if (var5) {
 			this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
@@ -169,12 +176,12 @@ public abstract class AbstractWorldMapData {
 		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(IILkz;II)V",
+		signature = "(IILkl;IB)V",
-		garbageValue = "-1194656986"
+		garbageValue = "-56"
 	)
-	void method240(int var1, int var2, Buffer var3, int var4) {
+	void method268(int var1, int var2, Buffer var3, int var4) {
 		int var5 = ((var4 & 24) >> 3) + 1;
 		boolean var6 = (var4 & 2) != 0;
 		boolean var7 = (var4 & 4) != 0;
@@ -190,8 +197,8 @@ public abstract class AbstractWorldMapData {
 				if (var10 != 0) {
 					this.floorOverlayIds[var9][var1][var2] = (short)var10;
 					var11 = var3.readUnsignedByte();
-					this.field163[var9][var1][var2] = (byte)(var11 >> 2);
+					this.field164[var9][var1][var2] = (byte)(var11 >> 2);
-					this.field159[var9][var1][var2] = (byte)(var11 & 3);
+					this.field152[var9][var1][var2] = (byte)(var11 & 3);
 				}
 			}
 		}
@@ -203,7 +210,7 @@ public abstract class AbstractWorldMapData {
 					WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9];
 
 					for (var11 = 0; var11 < var9; ++var11) {
-						int var12 = var3.method5623();
+						int var12 = var3.method5438();
 						int var13 = var3.readUnsignedByte();
 						var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3);
 					}
@@ -213,156 +220,232 @@ public abstract class AbstractWorldMapData {
 
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "35"
+		garbageValue = "-929324026"
 	)
 	@Export("getRegionX")
 	int getRegionX() {
 		return this.regionX;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "-13"
+		garbageValue = "-2009466013"
 	)
 	@Export("getRegionY")
 	int getRegionY() {
 		return this.regionY;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(IB)Liq;",
-		garbageValue = "79"
+		garbageValue = "1"
 	)
-	static void method254() {
+	public static VarpDefinition method288(int var0) {
-		Tiles.Tiles_minPlane = 99;
+		VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0);
-		Tiles.field476 = new byte[4][104][104];
+		if (var1 != null) {
-		class30.field257 = new byte[4][104][104];
+			return var1;
-		Tiles.field477 = new byte[4][104][104];
+		} else {
-		HealthBar.field1089 = new byte[4][104][104];
+			byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0);
-		UserComparator3.field1961 = new int[4][105][105];
+			var1 = new VarpDefinition();
-		Tiles.field473 = new byte[4][105][105];
+			if (var2 != null) {
-		class160.field1977 = new int[105][105];
+				var1.decode(new Buffer(var2));
-		UserComparator7.Tiles_hue = new int[104];
-		TileItem.Tiles_saturation = new int[104];
-		class1.Tiles_lightness = new int[104];
-		class42.Tiles_hueMultiplier = new int[104];
-		Tiles.field488 = new int[104];
 			}
 
-	@ObfuscatedName("t")
+			VarpDefinition.VarpDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "([Lbb;II[I[IB)V",
+		signature = "(IIIZIZI)V",
-		garbageValue = "-40"
+		garbageValue = "-1516072397"
 	)
-	@Export("sortWorlds")
+	@Export("doWorldSorting")
-	static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
+	static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
-		if (var1 < var2) {
+		if (var0 < var1) {
-			int var5 = var1 - 1;
+			int var6 = (var0 + var1) / 2;
-			int var6 = var2 + 1;
+			int var7 = var0;
-			int var7 = (var2 + var1) / 2;
+			World var8 = World.World_worlds[var6];
-			World var8 = var0[var7];
+			World.World_worlds[var6] = World.World_worlds[var1];
-			var0[var7] = var0[var1];
+			World.World_worlds[var1] = var8;
-			var0[var1] = var8;
 
-			while (var5 < var6) {
+			for (int var9 = var0; var9 < var1; ++var9) {
-				boolean var9 = true;
+				if (ArchiveLoader.method1174(World.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) {
+					World var10 = World.World_worlds[var9];
+					World.World_worlds[var9] = World.World_worlds[var7];
+					World.World_worlds[var7++] = var10;
+				}
+			}
 
-				int var10;
+			World.World_worlds[var1] = World.World_worlds[var7];
-				int var11;
+			World.World_worlds[var7] = var8;
+			doWorldSorting(var0, var7 - 1, var2, var3, var4, var5);
+			doWorldSorting(var7 + 1, var1, var2, var3, var4, var5);
+		}
+
+	}
+
+	@ObfuscatedName("ar")
+	@ObfuscatedSignature(
+		signature = "(ILcu;ZI)I",
+		garbageValue = "-1561238800"
+	)
+	static int method289(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) {
+			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
+			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
+			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
+			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
+			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
+			return 1;
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
+			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
+			return 1;
+		} else {
 			int var12;
-				do {
+			if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
-					--var6;
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-
+				var12 = Client.grandExchangeOffers[var3].status();
-					for (var10 = 0; var10 < 4; ++var10) {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
-						if (var3[var10] == 2) {
+				return 1;
-							var11 = var0[var6].index;
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
-							var12 = var8.index;
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						} else if (var3[var10] == 1) {
+				var12 = Client.grandExchangeOffers[var3].status();
-							var11 = var0[var6].population;
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
-							var12 = var8.population;
+				return 1;
-							if (var11 == -1 && var4[var10] == 1) {
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
-								var11 = 2001;
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-							}
+				var12 = Client.grandExchangeOffers[var3].status();
-
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
-							if (var12 == -1 && var4[var10] == 1) {
+				return 1;
-								var12 = 2001;
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
-							}
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-						} else if (var3[var10] == 3) {
+				var12 = Client.grandExchangeOffers[var3].status();
-							var11 = var0[var6].isMembersOnly() ? 1 : 0;
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
-							var12 = var8.isMembersOnly() ? 1 : 0;
+				return 1;
 			} else {
-							var11 = var0[var6].id;
+				boolean var13;
-							var12 = var8.id;
+				if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
+					var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+					if (TileItem.grandExchangeEvents != null) {
+						TileItem.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13);
 					}
 
-						if (var11 != var12) {
+					return 1;
-							if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
-								var9 = false;
+					var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
-							}
+					if (TileItem.grandExchangeEvents != null) {
-							break;
+						TileItem.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
 					}
 
-						if (var10 == 3) {
+					return 1;
-							var9 = false;
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
-						}
+					Interpreter.Interpreter_intStackSize -= 2;
-					}
+					var13 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1;
-				} while(var9);
+					boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1;
-
+					if (TileItem.grandExchangeEvents != null) {
-				var9 = true;
+						Client.GrandExchangeEvents_worldComparator.filterWorlds = var4;
-
+						TileItem.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13);
-				do {
-					++var5;
-
-					for (var10 = 0; var10 < 4; ++var10) {
-						if (var3[var10] == 2) {
-							var11 = var0[var5].index;
-							var12 = var8.index;
-						} else if (var3[var10] == 1) {
-							var11 = var0[var5].population;
-							var12 = var8.population;
-							if (var11 == -1 && var4[var10] == 1) {
-								var11 = 2001;
 					}
 
-							if (var12 == -1 && var4[var10] == 1) {
+					return 1;
-								var12 = 2001;
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
+					var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+					if (TileItem.grandExchangeEvents != null) {
+						TileItem.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
 					}
-						} else if (var3[var10] == 3) {
+
-							var11 = var0[var5].isMembersOnly() ? 1 : 0;
+					return 1;
-							var12 = var8.isMembersOnly() ? 1 : 0;
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
+					var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+					if (TileItem.grandExchangeEvents != null) {
+						TileItem.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TileItem.grandExchangeEvents == null ? 0 : TileItem.grandExchangeEvents.events.size();
+					return 1;
 				} else {
-							var11 = var0[var5].id;
+					GrandExchangeEvent var11;
-							var12 = var8.id;
+					if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
-						}
+						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-
+						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
-						if (var11 != var12) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.world;
-							if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
+						return 1;
-								var9 = false;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
-							}
+						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-							break;
+						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
-						}
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getOfferName();
-
+						return 1;
-						if (var10 == 3) {
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
-							var9 = false;
+						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
+						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
+						long var5 = class30.method566() - class81.field1135 - 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[++Interpreter.Interpreter_stringStackSize - 1] = var10;
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
+						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
+						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
+						return 1;
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
+						var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						var11 = (GrandExchangeEvent)TileItem.grandExchangeEvents.events.get(var3);
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
+						return 1;
+					} else {
+						return 2;
+					}
 				}
 			}
-				} while(var9);
-
-				if (var5 < var6) {
-					World var13 = var0[var5];
-					var0[var5] = var0[var6];
-					var0[var6] = var13;
 		}
 	}
 
-			sortWorlds(var0, var1, var6, var3, var4);
+	@ObfuscatedName("ii")
-			sortWorlds(var0, var6 + 1, var2, var3, var4);
+	@ObfuscatedSignature(
-		}
+		signature = "(IIIIIIIB)V",
-
+		garbageValue = "35"
+	)
+	@Export("updateRootInterface")
+	static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (WorldMapData_0.loadInterface(var0)) {
+			MusicPatchNode.updateInterface(UserComparator5.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6);
+		}
 	}
 }

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

@@ -3,85 +3,85 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ap")
+@ObfuscatedName("as")
 @Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("la")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "Lhy;"
+		signature = "Lkl;"
 	)
-	static Widget field292;
+	@Export("NetCache_reference")
-	@ObfuscatedName("j")
+	static Buffer NetCache_reference;
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lhj;"
+		signature = "Lhb;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lhj;"
+		signature = "Lhb;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 870912939
+		intValue = -744946711
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1786217753
+		intValue = 1215104535
 	)
 	@Export("screenY")
 	int screenY;
 
 	@ObfuscatedSignature(
-		signature = "(Lhj;Lhj;)V"
+		signature = "(Lhb;Lhb;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1;
 		this.coord2 = var2;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "861849893"
+		garbageValue = "16"
 	)
 	@Export("getElement")
 	public abstract int getElement();
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)Lao;",
+		signature = "(I)Law;",
-		garbageValue = "1066707711"
+		garbageValue = "13348956"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1386026878"
+		garbageValue = "-175699296"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "174908718"
+		garbageValue = "806304417"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(IIB)Z",
+		signature = "(III)Z",
-		garbageValue = "1"
+		garbageValue = "1521252994"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
@@ -92,55 +92,56 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "1217113364"
+		garbageValue = "36"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
 		return this.getElement() >= 0;
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "682818721"
+		garbageValue = "-2112119378"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) {
 			return false;
 		} else {
-			WorldMapElement var3 = WorldMapSection1.WorldMapElement_get(this.getElement());
+			WorldMapElement var3 = Decimator.WorldMapElement_get(this.getElement());
 			int var4 = this.getSubWidth();
 			int var5 = this.getSubHeight();
 			switch(var3.horizontalAlignment.value) {
 			case 0:
-				if (var1 < this.screenX || var1 >= var4 + this.screenX) {
+				if (var1 >= this.screenX && var1 < var4 + this.screenX) {
-					return false;
-				}
 					break;
+				}
+
+				return false;
 			case 1:
-				if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
+				if (var1 > this.screenX - var4 && var1 <= this.screenX) {
 					break;
 				}
 
 				return false;
 			case 2:
-				if (var1 <= this.screenX - var4 || var1 > this.screenX) {
+				if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) {
 					return false;
 				}
 			}
 
 			switch(var3.verticalAlignment.value) {
 			case 0:
-				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
+				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
 					return false;
 				}
 				break;
 			case 1:
-				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
+				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
 					return false;
 				}
 				break;
@@ -154,10 +155,10 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		signature = "(IIS)Z",
+		signature = "(IIB)Z",
-		garbageValue = "3172"
+		garbageValue = "122"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
@@ -171,91 +172,73 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		signature = "([BILjava/lang/CharSequence;I)I",
+		garbageValue = "1746697865"
+	)
+	public static int method640(byte[] var0, int var1, CharSequence var2) {
+		int var3 = var2.length();
+		int var4 = var1;
+
+		for (int var5 = 0; var5 < var3; ++var5) {
+			char var6 = var2.charAt(var5);
+			if (var6 <= 127) {
+				var0[var4++] = (byte)var6;
+			} else if (var6 <= 2047) {
+				var0[var4++] = (byte)(192 | var6 >> 6);
+				var0[var4++] = (byte)(128 | var6 & '?');
+			} else {
+				var0[var4++] = (byte)(224 | var6 >> '\f');
+				var0[var4++] = (byte)(128 | var6 >> 6 & 63);
+				var0[var4++] = (byte)(128 | var6 & '?');
+			}
+		}
+
+		return var4 - var1;
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(I)[Llf;",
+		garbageValue = "-1750401163"
+	)
+	static Sprite[] method642() {
+		Sprite[] var0 = new Sprite[class325.SpriteBuffer_spriteCount];
+
+		for (int var1 = 0; var1 < class325.SpriteBuffer_spriteCount; ++var1) {
+			Sprite var2 = var0[var1] = new Sprite();
+			var2.width = class325.SpriteBuffer_spriteWidth;
+			var2.height = Frames.SpriteBuffer_spriteHeight;
+			var2.xOffset = class325.SpriteBuffer_xOffsets[var1];
+			var2.yOffset = MusicPatchPcmStream.SpriteBuffer_yOffsets[var1];
+			var2.subWidth = class325.SpriteBuffer_spriteWidths[var1];
+			var2.subHeight = RunException.SpriteBuffer_spriteHeights[var1];
+			int var3 = var2.subHeight * var2.subWidth;
+			byte[] var4 = PacketBufferNode.SpriteBuffer_pixels[var1];
+			var2.pixels = new int[var3];
+
+			for (int var5 = 0; var5 < var3; ++var5) {
+				var2.pixels[var5] = class325.SpriteBuffer_spritePalette[var4[var5] & 255];
+			}
+		}
+
+		class325.SpriteBuffer_xOffsets = null;
+		MusicPatchPcmStream.SpriteBuffer_yOffsets = null;
+		class325.SpriteBuffer_spriteWidths = null;
+		RunException.SpriteBuffer_spriteHeights = null;
+		class325.SpriteBuffer_spritePalette = null;
+		PacketBufferNode.SpriteBuffer_pixels = null;
+		return var0;
+	}
+
 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(CI)Z",
-		garbageValue = "6"
+		garbageValue = "431385014"
 	)
-	static int method587() {
+	@Export("isDigit")
-		return 11;
+	public static boolean isDigit(char var0) {
-	}
+		return var0 >= '0' && var0 <= '9';
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		signature = "(ILcu;ZI)I",
-		garbageValue = "131093374"
-	)
-	static int method576(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410;
-		if (var0 == ScriptOpcodes.CC_GETTARGETMASK) {
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapElement.method4390(class60.getWidgetClickMask(var3));
-			return 1;
-		} else if (var0 != ScriptOpcodes.CC_GETOP) {
-			if (var0 == ScriptOpcodes.CC_GETOPBASE) {
-				if (var3.dataText == null) {
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-				} else {
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.dataText;
-				}
-
-				return 1;
-			} else {
-				return 2;
-			}
-		} else {
-			int var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-			--var4;
-			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
-				Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.actions[var4];
-			} else {
-				Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-			}
-
-			return 1;
-		}
-	}
-
-	@ObfuscatedName("he")
-	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "-1120874637"
-	)
-	static final void method572(int var0) {
-		if (var0 >= 0) {
-			int var1 = Client.menuArguments1[var0];
-			int var2 = Client.menuArguments2[var0];
-			int var3 = Client.menuOpcodes[var0];
-			int var4 = Client.menuIdentifiers[var0];
-			String var5 = Client.menuActions[var0];
-			String var6 = Client.menuTargets[var0];
-			EnumDefinition.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
-		}
-	}
-
-	@ObfuscatedName("ii")
-	@ObfuscatedSignature(
-		signature = "(IIIIIIIIB)V",
-		garbageValue = "-109"
-	)
-	@Export("drawWidgets")
-	static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		if (TaskHandler.loadInterface(var0)) {
-			SoundCache.field1410 = null;
-			MusicPatchPcmStream.drawInterface(class289.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7);
-			if (SoundCache.field1410 != null) {
-				MusicPatchPcmStream.drawInterface(SoundCache.field1410, -1412584499, var1, var2, var3, var4, WorldMapSection0.field138, GrandExchangeOfferNameComparator.field79, var7);
-				SoundCache.field1410 = null;
-			}
-
-		} else {
-			if (var7 != -1) {
-				Client.field827[var7] = true;
-			} else {
-				for (int var8 = 0; var8 < 100; ++var8) {
-					Client.field827[var8] = true;
-				}
-			}
-
-		}
 	}
 }

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

@@ -9,21 +9,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mr")
+@ObfuscatedName("mh")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		longValue = -7378543884552627951L
+		longValue = 4557235660739599375L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = 8243536028903450769L
+		longValue = 2697348286360897637L
 	)
 	@Export("offset")
 	long offset;
@@ -49,21 +49,21 @@ public final class AccessFile {
 		this.file.seek(0L);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1);
 		this.offset = var1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "1256704695"
+		garbageValue = "988503907"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
-		if (this.offset + (long)var3 > this.maxSize) {
+		if ((long)var3 + this.offset > this.maxSize) {
 			this.file.seek(this.maxSize);
 			this.file.write(1);
 			throw new EOFException();
@@ -73,20 +73,20 @@ public final class AccessFile {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-69"
+		garbageValue = "546615303"
 	)
 	@Export("close")
 	public final void close() throws IOException {
 		this.closeSync(false);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(ZI)V",
-		garbageValue = "2108341373"
+		garbageValue = "1331216421"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -104,20 +104,20 @@ public final class AccessFile {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(S)J",
+		signature = "(I)J",
-		garbageValue = "-3662"
+		garbageValue = "773958711"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "-2055107083"
+		garbageValue = "-26512267"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {
@@ -137,7 +137,15 @@ public final class AccessFile {
 
 	}
 
-	protected void aaj() throws Throwable {
+	protected void aav() throws Throwable {
+		if (this.file != null) {
+			System.out.println("");
+			this.close();
+		}
+
+	}
+
+	protected void aao() throws Throwable {
 		if (this.file != null) {
 			System.out.println("");
 			this.close();

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

@@ -4,328 +4,315 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("be")
+@ObfuscatedName("by")
 @Implements("Actor")
 public abstract class Actor extends Entity {
-	@ObfuscatedName("sy")
+	@ObfuscatedName("aa")
-	@ObfuscatedSignature(
-		signature = "Lbz;"
-	)
-	@Export("clientPreferences")
-	static ClientPreferences clientPreferences;
-	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = -78439701
+		intValue = -1124819045
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ap")
-	@Export("isWalking")
-	boolean isWalking;
-	@ObfuscatedName("al")
-	@ObfuscatedGetter(
-		intValue = 2024233319
-	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = -1344698339
+		intValue = -1546716831
 	)
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ab")
+	@Export("isWalking")
+	boolean isWalking;
+	@ObfuscatedName("ax")
+	int field932;
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 326208199
+		intValue = -334562759
-	)
-	@Export("size")
-	int size;
-	@ObfuscatedName("ap")
-	@ObfuscatedGetter(
-		intValue = 1320061547
 	)
 	@Export("playerCycle")
 	int playerCycle;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 1628814929
+		intValue = 1344678569
 	)
 	@Export("readySequence")
 	int readySequence;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = -1587131503
+		intValue = 1716804711
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = 38036755
+		intValue = 1564906087
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
-	@ObfuscatedName("af")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 195654645
+		intValue = 1786260681
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = 654548911
+		intValue = 864493635
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = 2066786939
+		intValue = 632813703
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 1924266197
+		intValue = -67215047
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = 146870157
+		intValue = 1501032191
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ae")
 	@Export("overheadText")
 	String overheadText;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("av")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ah")
-	boolean field956;
+	boolean field944;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = -1539638005
+		intValue = -1435944093
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("az")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 291511261
+		intValue = 402893763
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = -2008458145
+		intValue = 2008647289
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("af")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("au")
+	@ObfuscatedName("at")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bx")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("bh")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("bk")
+	@ObfuscatedName("bd")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bm")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
-		signature = "Ljd;"
+		signature = "Ljs;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = 366180583
+		intValue = -173770189
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("bv")
+	@ObfuscatedName("bs")
 	@Export("false0")
 	boolean false0;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = 1358121837
+		intValue = -708767615
 	)
-	int field945;
+	int field957;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = 566824475
+		intValue = 592854061
 	)
 	@Export("movementSequence")
 	int movementSequence;
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bk")
 	@ObfuscatedGetter(
-		intValue = 1646709317
+		intValue = 1334696243
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = -2010447121
+		intValue = -1979514767
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = -836151055
+		intValue = -1879648645
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("be")
 	@ObfuscatedGetter(
-		intValue = -1593302173
+		intValue = -1726927213
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = -1376532773
+		intValue = 1584241957
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
-	@ObfuscatedName("by")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = -63500945
+		intValue = 1536092043
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bb")
 	@ObfuscatedGetter(
-		intValue = -303610771
+		intValue = -807055771
 	)
-	int field924;
+	int field965;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = -244355827
+		intValue = -759724979
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("be")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = -1682160085
+		intValue = 1088352163
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = 377223135
+		intValue = -340493791
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
-	@ObfuscatedName("bb")
+	@ObfuscatedName("bo")
 	@ObfuscatedGetter(
-		intValue = 249618635
+		intValue = 2083696993
 	)
-	int field957;
+	int field969;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = -324063411
+		intValue = 2099588065
 	)
 	@Export("heightOffset")
 	int heightOffset;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = -1424150703
+		intValue = 337038295
 	)
-	int field959;
+	int field971;
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bf")
 	@ObfuscatedGetter(
-		intValue = 1789167897
+		intValue = -1218021367
 	)
-	int field960;
+	int field972;
-	@ObfuscatedName("br")
+	@ObfuscatedName("bg")
 	@ObfuscatedGetter(
-		intValue = 1809872347
+		intValue = -1028826911
 	)
-	int field961;
+	int field973;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = -196012985
+		intValue = 682547279
 	)
-	int field962;
+	int field974;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bp")
 	@ObfuscatedGetter(
-		intValue = -854056355
+		intValue = 647023113
 	)
-	int field963;
+	int field948;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("cz")
 	@ObfuscatedGetter(
-		intValue = 1429248265
+		intValue = -521720929
 	)
-	int field964;
+	int field976;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("ck")
 	@ObfuscatedGetter(
-		intValue = 152429931
+		intValue = 2050032535
 	)
-	int field965;
+	int field977;
-	@ObfuscatedName("ch")
+	@ObfuscatedName("cv")
 	@ObfuscatedGetter(
-		intValue = 766274575
+		intValue = 1347834439
 	)
 	@Export("npcCycle")
 	int npcCycle;
-	@ObfuscatedName("cc")
+	@ObfuscatedName("co")
 	@ObfuscatedGetter(
-		intValue = -1552779633
+		intValue = -1864995671
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("cv")
+	@ObfuscatedName("cs")
 	@ObfuscatedGetter(
-		intValue = -565463509
+		intValue = -459931913
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("cr")
+	@ObfuscatedName("cg")
 	@ObfuscatedGetter(
-		intValue = 715669973
+		intValue = -1988821201
 	)
-	int field976;
+	int field981;
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cn")
 	@ObfuscatedGetter(
-		intValue = -1597126945
+		intValue = -1277282795
 	)
-	int field953;
+	int field982;
-	@ObfuscatedName("ca")
+	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		intValue = 12984639
+		intValue = -948674291
 	)
 	@Export("pathLength")
 	int pathLength;
-	@ObfuscatedName("ck")
+	@ObfuscatedName("cy")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("cm")
+	@ObfuscatedName("cj")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("ce")
+	@ObfuscatedName("cb")
 	@Export("pathTraversed")
 	byte[] pathTraversed;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cr")
 	@ObfuscatedGetter(
-		intValue = 1459296501
+		intValue = 2121676837
 	)
-	int field975;
+	int field949;
-	@ObfuscatedName("cj")
+	@ObfuscatedName("ct")
 	@ObfuscatedGetter(
-		intValue = 1855180457
+		intValue = -207338457
 	)
-	int field969;
+	int field988;
 
 	Actor() {
 		this.isWalking = false;
-		this.size = 1;
+		this.field932 = 772175475;
 		this.readySequence = -1;
 		this.turnLeftSequence = -1;
 		this.turnRightSequence = -1;
@@ -335,7 +322,7 @@ public abstract class Actor extends Entity {
 		this.walkRightSequence = -1;
 		this.runSequence = -1;
 		this.overheadText = null;
-		this.field956 = false;
+		this.field944 = false;
 		this.overheadTextCyclesRemaining = 100;
 		this.overheadTextColor = 0;
 		this.overheadTextEffect = 0;
@@ -348,7 +335,7 @@ public abstract class Actor extends Entity {
 		this.healthBars = new IterableNodeDeque();
 		this.targetIndex = -1;
 		this.false0 = false;
-		this.field945 = -1;
+		this.field957 = -1;
 		this.movementSequence = -1;
 		this.movementFrame = 0;
 		this.movementFrameCycle = 0;
@@ -356,46 +343,46 @@ public abstract class Actor extends Entity {
 		this.sequenceFrame = 0;
 		this.sequenceFrameCycle = 0;
 		this.sequenceDelay = 0;
-		this.field924 = 0;
+		this.field965 = 0;
 		this.spotAnimation = -1;
 		this.spotAnimationFrame = 0;
 		this.spotAnimationFrameCycle = 0;
 		this.npcCycle = 0;
 		this.defaultHeight = 200;
-		this.field976 = 0;
+		this.field981 = 0;
-		this.field953 = 32;
+		this.field982 = 32;
 		this.pathLength = 0;
 		this.pathX = new int[10];
 		this.pathY = new int[10];
 		this.pathTraversed = new byte[10];
-		this.field975 = 0;
+		this.field949 = 0;
-		this.field969 = 0;
+		this.field988 = 0;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(S)Z",
-		garbageValue = "93"
+		garbageValue = "180"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
 		return false;
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "845208492"
+		garbageValue = "4"
 	)
-	final void method1699() {
+	final void method1761() {
 		this.pathLength = 0;
-		this.field969 = 0;
+		this.field988 = 0;
 	}
 
-	@ObfuscatedName("bg")
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
 		signature = "(IIIIIII)V",
-		garbageValue = "-2027410563"
+		garbageValue = "341931021"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -415,38 +402,52 @@ public abstract class Actor extends Entity {
 		int var10 = -1;
 		int var11 = 0;
 		if (var1 >= 0) {
-			HitSplatDefinition var12 = Interpreter.HitSplatDefinition_get(var1);
+			HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1);
-			var10 = var12.field3315;
+			HitSplatDefinition var12;
-			var11 = var12.field3306;
+			if (var13 != null) {
+				var12 = var13;
+			} else {
+				byte[] var14 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var1);
+				var13 = new HitSplatDefinition();
+				if (var14 != null) {
+					var13.decode(new Buffer(var14));
 				}
 
-		int var14;
+				HitSplatDefinition.HitSplatDefinition_cached.put(var13, (long)var1);
+				var12 = var13;
+			}
+
+			var10 = var12.field3327;
+			var11 = var12.field3318;
+		}
+
+		int var15;
 		if (var8) {
 			if (var10 == -1) {
 				return;
 			}
 
 			var9 = 0;
-			var14 = 0;
+			var15 = 0;
 			if (var10 == 0) {
-				var14 = this.hitSplatCycles[0];
+				var15 = this.hitSplatCycles[0];
 			} else if (var10 == 1) {
-				var14 = this.hitSplatValues[0];
+				var15 = this.hitSplatValues[0];
 			}
 
-			for (int var13 = 1; var13 < 4; ++var13) {
+			for (int var16 = 1; var16 < 4; ++var16) {
 				if (var10 == 0) {
-					if (this.hitSplatCycles[var13] < var14) {
+					if (this.hitSplatCycles[var16] < var15) {
-						var9 = var13;
+						var9 = var16;
-						var14 = this.hitSplatCycles[var13];
+						var15 = this.hitSplatCycles[var16];
 					}
-				} else if (var10 == 1 && this.hitSplatValues[var13] < var14) {
+				} else if (var10 == 1 && this.hitSplatValues[var16] < var15) {
-					var9 = var13;
+					var9 = var16;
-					var14 = this.hitSplatValues[var13];
+					var15 = this.hitSplatValues[var16];
 				}
 			}
 
-			if (var10 == 1 && var14 >= var2) {
+			if (var10 == 1 && var15 >= var2) {
 				return;
 			}
 		} else {
@@ -454,11 +455,11 @@ public abstract class Actor extends Entity {
 				this.hitSplatCount = 0;
 			}
 
-			for (var14 = 0; var14 < 4; ++var14) {
+			for (var15 = 0; var15 < 4; ++var15) {
-				byte var15 = this.hitSplatCount;
+				byte var17 = this.hitSplatCount;
 				this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4);
-				if (this.hitSplatCycles[var15] <= var5) {
+				if (this.hitSplatCycles[var17] <= var5) {
-					var9 = var15;
+					var9 = var17;
 					break;
 				}
 			}
@@ -473,10 +474,10 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("bn")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		signature = "(IIIIIIS)V",
+		signature = "(IIIIIIB)V",
-		garbageValue = "199"
+		garbageValue = "31"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -504,7 +505,7 @@ public abstract class Actor extends Entity {
 		HealthBar var13;
 		for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
 			++var12;
-			if (var13.definition.field3253 == var8.field3253) {
+			if (var13.definition.field3258 == var8.field3258) {
 				var13.put(var2 + var4, var5, var6, var3);
 				return;
 			}
@@ -535,10 +536,10 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("bk")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "99"
+		garbageValue = "1895868902"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
@@ -567,173 +568,4 @@ public abstract class Actor extends Entity {
 		}
 
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(CI)Z",
-		garbageValue = "-599596211"
-	)
-	@Export("isDigit")
-	public static boolean isDigit(char var0) {
-		return var0 >= '0' && var0 <= '9';
-	}
-
-	@ObfuscatedName("gk")
-	@ObfuscatedSignature(
-		signature = "(IIIII)V",
-		garbageValue = "1542615577"
-	)
-	static final void method1704(int var0, int var1, int var2, int var3) {
-		Client.overheadTextCount = 0;
-		boolean var4 = false;
-		int var5 = -1;
-		int var6 = -1;
-		int var7 = Players.Players_count;
-		int[] var8 = Players.Players_indices;
-
-		int var9;
-		for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) {
-			Object var10;
-			if (var9 < var7) {
-				var10 = Client.players[var8[var9]];
-				if (var8[var9] == Client.combatTargetPlayerIndex) {
-					var4 = true;
-					var5 = var9;
-					continue;
-				}
-
-				if (var10 == Varps.localPlayer) {
-					var6 = var9;
-					continue;
-				}
-			} else {
-				var10 = Client.npcs[Client.npcIndices[var9 - var7]];
-			}
-
-			VerticalAlignment.drawActor2d((Actor)var10, var9, var0, var1, var2, var3);
-		}
-
-		if (Client.renderSelf && var6 != -1) {
-			VerticalAlignment.drawActor2d(Varps.localPlayer, var6, var0, var1, var2, var3);
-		}
-
-		if (var4) {
-			VerticalAlignment.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3);
-		}
-
-		for (var9 = 0; var9 < Client.overheadTextCount; ++var9) {
-			int var19 = Client.overheadTextXs[var9];
-			int var11 = Client.overheadTextYs[var9];
-			int var12 = Client.overheadTextXOffsets[var9];
-			int var13 = Client.overheadTextAscents[var9];
-			boolean var14 = true;
-
-			while (var14) {
-				var14 = false;
-
-				for (int var15 = 0; var15 < var9; ++var15) {
-					if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXs[var15] + Client.overheadTextXOffsets[var15] && var12 + var19 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) {
-						var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15];
-						var14 = true;
-					}
-				}
-			}
-
-			Client.viewportTempX = Client.overheadTextXs[var9];
-			Client.viewportTempY = Client.overheadTextYs[var9] = var11;
-			String var20 = Client.overheadText[var9];
-			if (Client.chatEffects == 0) {
-				int var16 = 16776960;
-				if (Client.overheadTextColors[var9] < 6) {
-					var16 = Client.field838[Client.overheadTextColors[var9]];
-				}
-
-				if (Client.overheadTextColors[var9] == 6) {
-					var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
-				}
-
-				if (Client.overheadTextColors[var9] == 7) {
-					var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
-				}
-
-				if (Client.overheadTextColors[var9] == 8) {
-					var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
-				}
-
-				int var17;
-				if (Client.overheadTextColors[var9] == 9) {
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-					if (var17 < 50) {
-						var16 = var17 * 1280 + 16711680;
-					} else if (var17 < 100) {
-						var16 = 16776960 - (var17 - 50) * 327680;
-					} else if (var17 < 150) {
-						var16 = (var17 - 100) * 5 + 65280;
-					}
-				}
-
-				if (Client.overheadTextColors[var9] == 10) {
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-					if (var17 < 50) {
-						var16 = var17 * 5 + 16711680;
-					} else if (var17 < 100) {
-						var16 = 16711935 - (var17 - 50) * 327680;
-					} else if (var17 < 150) {
-						var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5;
-					}
-				}
-
-				if (Client.overheadTextColors[var9] == 11) {
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-					if (var17 < 50) {
-						var16 = 16777215 - var17 * 327685;
-					} else if (var17 < 100) {
-						var16 = (var17 - 50) * 327685 + 65280;
-					} else if (var17 < 150) {
-						var16 = 16777215 - (var17 - 100) * 327680;
-					}
-				}
-
-				if (Client.overheadTextEffects[var9] == 0) {
-					HealthBar.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0);
-				}
-
-				if (Client.overheadTextEffects[var9] == 1) {
-					HealthBar.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
-				}
-
-				if (Client.overheadTextEffects[var9] == 2) {
-					HealthBar.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
-				}
-
-				if (Client.overheadTextEffects[var9] == 3) {
-					HealthBar.fontBold12.drawCenteredShake(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]);
-				}
-
-				if (Client.overheadTextEffects[var9] == 4) {
-					var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (HealthBar.fontBold12.stringWidth(var20) + 100) / 150;
-					Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1);
-					HealthBar.fontBold12.draw(var20, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0);
-					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
-				}
-
-				if (Client.overheadTextEffects[var9] == 5) {
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-					int var18 = 0;
-					if (var17 < 25) {
-						var18 = var17 - 25;
-					} else if (var17 > 125) {
-						var18 = var17 - 125;
-					}
-
-					Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - HealthBar.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5);
-					HealthBar.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0);
-					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
-				}
-			} else {
-				HealthBar.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0);
-			}
-		}
-
-	}
 }

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("dx")
+@ObfuscatedName("da")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
-	static int[] field1603;
+	static int[] field1607;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
-	static int[] field1612;
+	static int[] field1598;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
-	static int[] field1604;
+	static int[] field1597;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
-	static int[] field1602;
+	static int[] field1600;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Len;"
+		signature = "Lew;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field1603 = new int[500];
+		field1607 = new int[500];
-		field1612 = new int[500];
+		field1598 = new int[500];
-		field1604 = new int[500];
+		field1597 = new int[500];
-		field1602 = new int[500];
+		field1600 = new int[500];
 	}
 
 	@ObfuscatedSignature(
-		signature = "([BLen;)V"
+		signature = "([BLew;)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) {
-							field1603[var7] = var10;
+							field1607[var7] = var10;
-							field1612[var7] = 0;
+							field1598[var7] = 0;
-							field1604[var7] = 0;
+							field1597[var7] = 0;
-							field1602[var7] = 0;
+							field1600[var7] = 0;
 							++var7;
 							break;
 						}
 					}
 				}
 
-				field1603[var7] = var8;
+				field1607[var7] = var8;
 				short var11 = 0;
 				if (this.skeleton.transformTypes[var8] == 3) {
 					var11 = 128;
 				}
 
 				if ((var9 & 1) != 0) {
-					field1612[var7] = var4.readShortSmart();
+					field1598[var7] = var4.readShortSmart();
 				} else {
-					field1612[var7] = var11;
+					field1598[var7] = var11;
 				}
 
 				if ((var9 & 2) != 0) {
-					field1604[var7] = var4.readShortSmart();
+					field1597[var7] = var4.readShortSmart();
 				} else {
-					field1604[var7] = var11;
+					field1597[var7] = var11;
 				}
 
 				if ((var9 & 4) != 0) {
-					field1602[var7] = var4.readShortSmart();
+					field1600[var7] = var4.readShortSmart();
 				} else {
-					field1602[var7] = var11;
+					field1600[var7] = var11;
 				}
 
 				var6 = var8;
@@ -121,10 +121,10 @@ public class Animation {
 			this.transformZs = new int[var7];
 
 			for (var8 = 0; var8 < var7; ++var8) {
-				this.transformSkeletonLabels[var8] = field1603[var8];
+				this.transformSkeletonLabels[var8] = field1607[var8];
-				this.transformXs[var8] = field1612[var8];
+				this.transformXs[var8] = field1598[var8];
-				this.transformYs[var8] = field1604[var8];
+				this.transformYs[var8] = field1597[var8];
-				this.transformZs[var8] = field1602[var8];
+				this.transformZs[var8] = field1600[var8];
 			}
 
 		}

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

@@ -5,52 +5,58 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("io")
+@ObfuscatedName("ie")
 @Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aw")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("m")
+	@ObfuscatedName("jn")
 	@ObfuscatedSignature(
-		signature = "Lkx;"
+		signature = "Ldz;"
+	)
+	@Export("textureProvider")
+	static TextureProvider textureProvider;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "Lkg;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("o")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "Lkx;"
+		signature = "Lkg;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("a")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1156949557
+		intValue = -341991117
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("b")
+	@ObfuscatedName("k")
-	volatile boolean field3128;
+	volatile boolean field3131;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ac")
-	boolean field3132;
+	boolean field3129;
-	@ObfuscatedName("at")
+	@ObfuscatedName("az")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("av")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -1676614799
+		intValue = 2033402119
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 1205835049
+		intValue = -302073813
 	)
 	@Export("indexVersion")
 	int indexVersion;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = 668240441
+		intValue = -630367829
 	)
 	int field3137;
 
@@ -59,34 +65,34 @@ public class Archive extends AbstractArchive {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkx;Lkx;IZZZ)V"
+		signature = "(Lkg;Lkg;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5);
-		this.field3128 = false;
+		this.field3131 = false;
-		this.field3132 = false;
+		this.field3129 = false;
 		this.field3137 = -1;
 		this.archiveDisk = var1;
 		this.masterDisk = var2;
 		this.index = var3;
-		this.field3132 = var6;
+		this.field3129 = var6;
 		int var8 = this.index;
-		if (DevicePcmPlayerProvider.NetCache_reference != null) {
+		if (AbstractWorldMapIcon.NetCache_reference != null) {
-			DevicePcmPlayerProvider.NetCache_reference.offset = var8 * 8 + 5;
+			AbstractWorldMapIcon.NetCache_reference.offset = var8 * 8 + 5;
-			int var9 = DevicePcmPlayerProvider.NetCache_reference.readInt();
+			int var9 = AbstractWorldMapIcon.NetCache_reference.readInt();
-			int var10 = DevicePcmPlayerProvider.NetCache_reference.readInt();
+			int var10 = AbstractWorldMapIcon.NetCache_reference.readInt();
 			this.loadIndex(var9, var10);
 		} else {
-			Varps.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
+			WorldMapDecoration.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
 			NetCache.NetCache_archives[var8] = this;
 		}
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-2104600002"
+		garbageValue = "15"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
@@ -99,10 +105,10 @@ public class Archive extends AbstractArchive {
 
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "780456172"
+		garbageValue = "-2030453035"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
@@ -114,8 +120,8 @@ public class Archive extends AbstractArchive {
 			int var3 = this.index;
 			long var4 = (long)((var3 << 16) + var1);
 			int var2;
-			if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var4) {
+			if (WorldMapEvent.NetCache_currentResponse != null && WorldMapEvent.NetCache_currentResponse.key == var4) {
-				var2 = class336.NetCache_responseArchiveBuffer.offset * 99 / (class336.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
+				var2 = FaceNormal.NetCache_responseArchiveBuffer.offset * 99 / (FaceNormal.NetCache_responseArchiveBuffer.array.length - WorldMapEvent.NetCache_currentResponse.padding) + 1;
 			} else {
 				var2 = 0;
 			}
@@ -124,38 +130,38 @@ public class Archive extends AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "2123503233"
+		garbageValue = "848617854"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
-			PlayerType.method4120(var1, this.archiveDisk, this);
+			WorldMapArea.method429(var1, this.archiveDisk, this);
 		} else {
-			Varps.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
+			WorldMapDecoration.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
 		}
 
 	}
 
-	@ObfuscatedName("dh")
+	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1760954432"
+		garbageValue = "2035998705"
 	)
-	public boolean method4265() {
+	public boolean method4223() {
-		return this.field3128;
+		return this.field3131;
 	}
 
-	@ObfuscatedName("do")
+	@ObfuscatedName("du")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-185115723"
+		garbageValue = "1744835603"
 	)
 	@Export("percentage")
 	public int percentage() {
-		if (this.field3128) {
+		if (this.field3131) {
 			return 100;
 		} else if (super.groups != null) {
 			return 99;
@@ -163,8 +169,8 @@ public class Archive extends AbstractArchive {
 			int var2 = this.index;
 			long var3 = (long)(var2 + 16711680);
 			int var1;
-			if (NetCache.NetCache_currentResponse != null && var3 == NetCache.NetCache_currentResponse.key) {
+			if (WorldMapEvent.NetCache_currentResponse != null && WorldMapEvent.NetCache_currentResponse.key == var3) {
-				var1 = class336.NetCache_responseArchiveBuffer.offset * 99 / (class336.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
+				var1 = FaceNormal.NetCache_responseArchiveBuffer.offset * 99 / (FaceNormal.NetCache_responseArchiveBuffer.array.length - WorldMapEvent.NetCache_currentResponse.padding) + 1;
 			} else {
 				var1 = 0;
 			}
@@ -178,37 +184,37 @@ public class Archive extends AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("dm")
+	@ObfuscatedName("ds")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-288401160"
+		garbageValue = "684167120"
 	)
 	@Export("loadIndex")
 	void loadIndex(int var1, int var2) {
 		this.indexCrc = var1;
 		this.indexVersion = var2;
 		if (this.masterDisk != null) {
-			PlayerType.method4120(this.index, this.masterDisk, this);
+			WorldMapArea.method429(this.index, this.masterDisk, this);
 		} else {
-			Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+			WorldMapDecoration.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 		}
 
 	}
 
-	@ObfuscatedName("dy")
+	@ObfuscatedName("dc")
 	@ObfuscatedSignature(
-		signature = "(I[BZZB)V",
+		signature = "(I[BZZI)V",
-		garbageValue = "-101"
+		garbageValue = "1316980907"
 	)
 	@Export("write")
 	void write(int var1, byte[] var2, boolean var3, boolean var4) {
 		if (var3) {
-			if (this.field3128) {
+			if (this.field3131) {
 				throw new RuntimeException();
 			}
 
 			if (this.masterDisk != null) {
-				class96.method2259(this.index, var2, this.masterDisk);
+				CollisionMap.method3530(this.index, var2, this.masterDisk);
 			}
 
 			this.decodeIndex(var2);
@@ -217,93 +223,100 @@ 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) {
-				class96.method2259(var1, var2, this.archiveDisk);
+				CollisionMap.method3530(var1, var2, this.archiveDisk);
 				this.validGroups[var1] = true;
 			}
 
 			if (var4) {
-				super.groups[var1] = UserComparator8.method3365(var2, false);
+				super.groups[var1] = GrandExchangeEvents.method76(var2, false);
 			}
 		}
 
 	}
 
-	@ObfuscatedName("dd")
+	@ObfuscatedName("di")
 	@ObfuscatedSignature(
-		signature = "(Lkx;I[BZI)V",
+		signature = "(Lkg;I[BZB)V",
-		garbageValue = "-1896487213"
+		garbageValue = "1"
 	)
 	@Export("load")
-	void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
+	public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
 		int var5;
 		if (var1 == this.masterDisk) {
-			if (this.field3128) {
+			if (this.field3131) {
 				throw new RuntimeException();
-			} else if (var3 == null) {
+			}
-				Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+
-			} else {
+			if (var3 == null) {
+				WorldMapDecoration.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				return;
+			}
+
 			Archive_crc.reset();
 			Archive_crc.update(var3, 0, var3.length);
 			var5 = (int)Archive_crc.getValue();
 			if (var5 != this.indexCrc) {
-					Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				WorldMapDecoration.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
-				} else {
+				return;
-					Buffer var9 = new Buffer(TaskHandler.decompressBytes(var3));
+			}
+
+			Buffer var9 = new Buffer(MusicPatch.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) {
-							Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				WorldMapDecoration.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
-						} else {
+				return;
-							this.decodeIndex(var3);
+			}
-							this.loadAllLocal();
+
-						}
+			this.decodeIndex(var3);
-					}
+			this.loadAllLocal();
-				}
+		} else {
-			}
+			if (!var4 && var2 == this.field3137) {
-		} else {
+				this.field3131 = true;
-			if (!var4 && var2 == this.field3137) {
+			}
-				this.field3128 = true;
+
+			if (var3 == null || var3.length <= 2) {
+				this.validGroups[var2] = false;
+				if (this.field3129 || var4) {
+					WorldMapDecoration.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+				}
+
+				return;
 			}
 
-			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]) {
+			if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) {
+				this.validGroups[var2] = false;
+				if (this.field3129 || var4) {
+					WorldMapDecoration.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+				}
+
+				return;
+			}
+
 			this.validGroups[var2] = true;
 			if (var4) {
-						super.groups[var2] = UserComparator8.method3365(var3, false);
+				super.groups[var2] = GrandExchangeEvents.method76(var3, false);
 			}
-
-				} else {
-					this.validGroups[var2] = false;
-					if (this.field3132 || var4) {
-						Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 		}
 
 	}
-			} else {
-				this.validGroups[var2] = false;
-				if (this.field3132 || var4) {
-					Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
-				}
 
-			}
+	@ObfuscatedName("dk")
-		}
-	}
-
-	@ObfuscatedName("dp")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-1002718108"
+		garbageValue = "8"
 	)
 	@Export("loadAllLocal")
 	void loadAllLocal() {
@@ -315,46 +328,66 @@ public class Archive extends AbstractArchive {
 		}
 
 		if (this.archiveDisk == null) {
-			this.field3128 = true;
+			this.field3131 = true;
 		} else {
 			this.field3137 = -1;
 
 			for (var1 = 0; var1 < this.validGroups.length; ++var1) {
 				if (super.fileCounts[var1] > 0) {
-					Friend.method5190(var1, this.archiveDisk, this);
+					ArchiveDisk var2 = this.archiveDisk;
+					ArchiveDiskAction var4 = new ArchiveDiskAction();
+					var4.type = 1;
+					var4.key = (long)var1;
+					var4.archiveDisk = var2;
+					var4.archive = this;
+					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+						ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4);
+					}
+
+					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+						if (ArchiveDiskActionHandler.field3127 == 0) {
+							UserComparator5.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
+							UserComparator5.ArchiveDiskActionHandler_thread.setDaemon(true);
+							UserComparator5.ArchiveDiskActionHandler_thread.start();
+							UserComparator5.ArchiveDiskActionHandler_thread.setPriority(5);
+						}
+
+						ArchiveDiskActionHandler.field3127 = 600;
+					}
+
 					this.field3137 = var1;
 				}
 			}
 
 			if (this.field3137 == -1) {
-				this.field3128 = true;
+				this.field3131 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("dn")
+	@ObfuscatedName("dx")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "305356325"
+		garbageValue = "-433634856"
 	)
-	public boolean method4283(int var1) {
+	public boolean method4231(int var1) {
 		return this.validGroups[var1];
 	}
 
-	@ObfuscatedName("de")
+	@ObfuscatedName("dz")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-1930544538"
+		garbageValue = "805361618"
 	)
-	public boolean method4261(int var1) {
+	public boolean method4232(int var1) {
 		return this.getGroupFileIds(var1) != null;
 	}
 
-	@ObfuscatedName("da")
+	@ObfuscatedName("do")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "64"
+		garbageValue = "727894645"
 	)
 	@Export("loadPercent")
 	public int loadPercent() {
@@ -377,20 +410,35 @@ public class Archive extends AbstractArchive {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("jq")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;I)I",
+		signature = "(I)V",
-		garbageValue = "1683994137"
+		garbageValue = "-212508230"
 	)
-	@Export("hashString")
+	static final void method4266() {
-	public static int hashString(CharSequence var0) {
+		for (int var0 = 0; var0 < Players.Players_count; ++var0) {
-		int var1 = var0.length();
+			Player var1 = Client.players[Players.Players_indices[var0]];
-		int var2 = 0;
+			var1.clearIsInClanChat();
-
+		}
-		for (int var3 = 0; var3 < var1; ++var3) {
+
-			var2 = (var2 << 5) - var2 + MenuAction.charToByteCp1252(var0.charAt(var3));
+	}
+
+	@ObfuscatedName("km")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "26372698"
+	)
+	static void method4238() {
+		if (StudioGame.field3086 != null) {
+			Client.field905 = Client.cycle;
+			StudioGame.field3086.method4288();
+
+			for (int var0 = 0; var0 < Client.players.length; ++var0) {
+				if (Client.players[var0] != null) {
+					StudioGame.field3086.method4289(class223.baseX * 64 + (Client.players[var0].x >> 7), class286.baseY * 64 + (Client.players[var0].y * 682054857 >> 7));
+				}
+			}
 		}
 
-		return var2;
 	}
 }

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

@@ -6,39 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kx")
+@ObfuscatedName("kg")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("db")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lio;"
+		signature = "Lmm;"
-	)
-	@Export("archive11")
-	static Archive archive11;
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "Lmw;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lmw;"
+		signature = "Lmm;"
 	)
 	@Export("idxFile")
 	BufferedFile idxFile;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1914299203
+		intValue = 558641831
 	)
 	@Export("archive")
 	int archive;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1407150141
+		intValue = -1322039527
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -48,7 +42,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(ILmw;Lmw;I)V"
+		signature = "(ILmm;Lmm;I)V"
 	)
 	public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.datFile = null;
@@ -60,10 +54,10 @@ public final class ArchiveDisk {
 		this.maxEntrySize = var4;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(II)[B",
+		signature = "(IB)[B",
-		garbageValue = "-1665977739"
+		garbageValue = "1"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -87,8 +81,9 @@ public final class ArchiveDisk {
 					} else {
 						byte[] var5 = new byte[var3];
 						int var6 = 0;
+						int var7 = 0;
 
-						for (int var7 = 0; var6 < var3; ++var7) {
+						while (var6 < var3) {
 							if (var4 == 0) {
 								var10000 = null;
 								return (byte[])var10000;
@@ -125,16 +120,8 @@ public final class ArchiveDisk {
 								var12 = ArchiveDisk_buffer[7] & 255;
 							}
 
-							if (var9 != var1 || var10 != var7 || var12 != this.archive) {
+							if (var9 == var1 && var10 == var7 && var12 == this.archive) {
-								var10000 = null;
+								if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) {
-								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) {
@@ -142,6 +129,16 @@ public final class ArchiveDisk {
 									}
 
 									var4 = var11;
+									++var7;
+									continue;
+								}
+
+								var10000 = null;
+								return (byte[])var10000;
+							}
+
+							var10000 = null;
+							return (byte[])var10000;
 						}
 
 						byte[] var20 = var5;
@@ -154,10 +151,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I[BIB)Z",
+		signature = "(I[BII)Z",
-		garbageValue = "73"
+		garbageValue = "-1069570750"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
@@ -175,10 +172,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I[BIZI)Z",
-		garbageValue = "1934021549"
+		garbageValue = "1005578949"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -219,18 +216,18 @@ public final class ArchiveDisk {
 
 				while (true) {
 					if (var7 < var3) {
-						label170: {
+						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 > 65535) {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 10);
 									} catch (EOFException var17) {
-										break label170;
+										break label171;
 									}
 
 									var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
@@ -241,7 +238,7 @@ public final class ArchiveDisk {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 8);
 									} catch (EOFException var16) {
-										break label170;
+										break label171;
 									}
 
 									var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
@@ -268,7 +265,7 @@ public final class ArchiveDisk {
 									++var9;
 								}
 
-								if (var6 == var9) {
+								if (var9 == var6) {
 									++var9;
 								}
 							}
@@ -288,7 +285,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) {
@@ -336,19 +333,138 @@ public final class ArchiveDisk {
 		}
 	}
 
-	public String aai() {
-		return "" + this.archive;
-	}
-
-	public String aan() {
-		return "" + this.archive;
-	}
-
 	public String toString() {
 		return "" + this.archive;
 	}
 
-	public String aar() {
+	public String aak() {
-		return "" + this.archive * 1578141934;
+		return "" + this.archive;
+	}
+
+	public String aah() {
+		return "" + this.archive;
+	}
+
+	public String aae() {
+		return "" + this.archive;
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(Lkl;Ljava/lang/String;I)I",
+		garbageValue = "1895940511"
+	)
+	public static int method5779(Buffer var0, String var1) {
+		int var2 = var0.offset;
+		byte[] var3 = UserComparator3.method3390(var1);
+		var0.writeSmartByteShort(var3.length);
+		var0.offset += class210.huffman.compress(var3, 0, var3.length, var0.array, var0.offset);
+		return var0.offset - var2;
+	}
+
+	@ObfuscatedName("el")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "1355807172"
+	)
+	@Export("getLoginError")
+	static void getLoginError(int var0) {
+		if (var0 == -3) {
+			PlayerType.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
+		} else if (var0 == -2) {
+			PlayerType.setLoginResponseString("", "Error connecting to server.", "");
+		} else if (var0 == -1) {
+			PlayerType.setLoginResponseString("No response from server.", "Please try using a different world.", "");
+		} else if (var0 == 3) {
+			Login.loginIndex = 3;
+			Login.field1171 = 1;
+		} else if (var0 == 4) {
+			Login.loginIndex = 12;
+			Login.field1174 = 0;
+		} else if (var0 == 5) {
+			Login.field1171 = 2;
+			PlayerType.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) {
+			PlayerType.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", "");
+		} else if (var0 == 7) {
+			PlayerType.setLoginResponseString("This world is full.", "Please use a different world.", "");
+		} else if (var0 == 8) {
+			PlayerType.setLoginResponseString("Unable to connect.", "Login server offline.", "");
+		} else if (var0 == 9) {
+			PlayerType.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
+		} else if (var0 == 10) {
+			PlayerType.setLoginResponseString("Unable to connect.", "Bad session id.", "");
+		} else if (var0 == 11) {
+			PlayerType.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
+		} else if (var0 == 12) {
+			PlayerType.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
+		} else if (var0 == 13) {
+			PlayerType.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
+		} else if (var0 == 14) {
+			PlayerType.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
+		} else if (var0 == 16) {
+			PlayerType.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
+		} else if (var0 == 17) {
+			PlayerType.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.field1174 = 1;
+		} else if (var0 == 19) {
+			PlayerType.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
+		} else if (var0 == 20) {
+			PlayerType.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
+		} else if (var0 == 22) {
+			PlayerType.setLoginResponseString("Malformed login packet.", "Please try again.", "");
+		} else if (var0 == 23) {
+			PlayerType.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
+		} else if (var0 == 24) {
+			PlayerType.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
+		} else if (var0 == 25) {
+			PlayerType.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
+		} else if (var0 == 26) {
+			PlayerType.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
+		} else if (var0 == 27) {
+			PlayerType.setLoginResponseString("", "Service unavailable.", "");
+		} else if (var0 == 31) {
+			PlayerType.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) {
+			PlayerType.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) {
+			PlayerType.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
+		} else if (var0 == 38) {
+			PlayerType.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 {
+			if (var0 == 56) {
+				PlayerType.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", "");
+				MouseRecorder.updateGameState(11);
+				return;
+			}
+
+			if (var0 == 57) {
+				PlayerType.setLoginResponseString("The code you entered was incorrect.", "Please try again.", "");
+				MouseRecorder.updateGameState(11);
+				return;
+			}
+
+			if (var0 == 61) {
+				Login.loginIndex = 7;
+			} else {
+				PlayerType.setLoginResponseString("Unexpected server response", "Please try using a different world.", "");
+			}
+		}
+
+		MouseRecorder.updateGameState(10);
+	}
+
+	@ObfuscatedName("kb")
+	@ObfuscatedSignature(
+		signature = "(Lkl;IB)V",
+		garbageValue = "16"
+	)
+	static void method5781(Buffer var0, int var1) {
+		LoginScreenAnimation.method1828(var0.array, var1);
+		SoundSystem.method2464(var0, var1);
 	}
 }

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

@@ -4,98 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hw")
+@ObfuscatedName("hy")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1482898201
+		intValue = -1673038183
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("data")
-	byte[] data;
+	public byte[] data;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lkx;"
+		signature = "Lkg;"
 	)
 	@Export("archiveDisk")
-	ArchiveDisk archiveDisk;
+	public ArchiveDisk archiveDisk;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lio;"
+		signature = "Lie;"
 	)
 	@Export("archive")
-	Archive archive;
+	public Archive archive;
 
 	ArchiveDiskAction() {
 	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-1111446859"
-	)
-	static String method4133(int var0) {
-		return "<img=" + var0 + ">";
-	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "([BIII)Ljava/lang/String;",
-		garbageValue = "-90955785"
-	)
-	public static String method4132(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);
-	}
 }

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

@@ -4,43 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ib")
+@ObfuscatedName("ih")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "Ljv;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
-	static NodeDeque ArchiveDiskActionHandler_requestQueue;
+	public static NodeDeque ArchiveDiskActionHandler_requestQueue;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "Ljv;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
-	static NodeDeque ArchiveDiskActionHandler_responseQueue;
+	public static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("g")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1435645163
+		intValue = 1320379029
 	)
-	public static int field3126;
+	static int field3127;
-	@ObfuscatedName("l")
-	@Export("ArchiveDiskActionHandler_lock")
-	public static Object ArchiveDiskActionHandler_lock;
 	@ObfuscatedName("u")
-	@Export("ArchiveDiskActionHandler_thread")
+	@Export("ArchiveDiskActionHandler_lock")
-	static Thread ArchiveDiskActionHandler_thread;
+	static Object ArchiveDiskActionHandler_lock;
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		signature = "Lhz;"
-	)
-	@Export("Widget_archive")
-	static AbstractArchive Widget_archive;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque();
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque();
-		field3126 = 0;
+		field3127 = 0;
 		ArchiveDiskActionHandler_lock = new Object();
 	}
 
@@ -69,46 +60,50 @@ public class ArchiveDiskActionHandler implements Runnable {
 					}
 
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3126 <= 1) {
+						if (field3127 <= 1) {
-							field3126 = 0;
+							field3127 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						field3126 = 600;
+						field3127 = 600;
 					}
 				} else {
-					FriendsList.sleepMillis(100L);
+					long var8 = 99L;
+
+					try {
+						Thread.sleep(var8);
+					} catch (InterruptedException var15) {
+					}
+
+					try {
+						Thread.sleep(1L);
+					} catch (InterruptedException var14) {
+					}
+
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3126 <= 1) {
+						if (field3127 <= 1) {
-							field3126 = 0;
+							field3127 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						--field3126;
+						--field3127;
 					}
 				}
 			}
-		} catch (Exception var13) {
+		} catch (Exception var17) {
-			class188.RunException_sendStackTrace((String)null, var13);
+			class32.RunException_sendStackTrace((String)null, var17);
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lma;"
+		signature = "(Ljava/lang/String;ZZB)V",
+		garbageValue = "10"
 	)
-	@Export("newRunException")
+	@Export("openURL")
-	public static RunException newRunException(Throwable var0, String var1) {
+	public static void openURL(String var0, boolean var1, boolean var2) {
-		RunException var2;
+		WorldMapID.method568(var0, var1, "openjs", var2);
-		if (var0 instanceof RunException) {
-			var2 = (RunException)var0;
-			var2.message = var2.message + ' ' + var1;
-		} else {
-			var2 = new RunException(var0, var1);
-		}
-
-		return var2;
 	}
 }

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

@@ -3,62 +3,43 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bv")
+@ObfuscatedName("bs")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("nd")
+	@ObfuscatedName("c")
-	@ObfuscatedGetter(
+	@Export("Tiles_saturation")
-		intValue = -1623387895
+	static int[] Tiles_saturation;
+	@ObfuscatedName("bz")
+	@ObfuscatedSignature(
+		signature = "[Llf;"
 	)
-	@Export("widgetDragDuration")
+	@Export("worldSelectBackSprites")
-	static int widgetDragDuration;
+	static Sprite[] worldSelectBackSprites;
-	@ObfuscatedName("sx")
+	@ObfuscatedName("gi")
-	@ObfuscatedGetter(
+	@Export("regionMapArchives")
-		intValue = -1229165351
+	static byte[][] regionMapArchives;
-	)
-	@Export("foundItemIndex")
-	static int foundItemIndex;
 	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -1875812039
-	)
-	static int field510;
-	@ObfuscatedName("eg")
-	@Export("worldHost")
-	static String worldHost;
-	@ObfuscatedName("fe")
 	@ObfuscatedSignature(
-		signature = "Lks;"
+		signature = "Lie;"
-	)
-	static AbstractSocket field512;
-	@ObfuscatedName("go")
-	@ObfuscatedGetter(
-		intValue = -652150827
-	)
-	static int field508;
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "Lio;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1519742751
+		intValue = -1526719037
 	)
 	@Export("groupCount")
 	final int groupCount;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1438963135
+		intValue = 966789861
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		signature = "(Lio;Ljava/lang/String;)V"
+		signature = "(Lie;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0;
@@ -66,17 +47,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount();
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-856910986"
+		garbageValue = "1969120013"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0;
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) {
-			if (!this.archive.method4261(var1) || this.archive.method4283(var1)) {
+			if (!this.archive.method4232(var1) || this.archive.method4231(var1)) {
 				++this.loadedCount;
 			}
 		}
@@ -84,251 +65,58 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Lkt;II)V",
+		signature = "(II)I",
-		garbageValue = "593682033"
+		garbageValue = "-238840199"
 	)
-	@Export("readPlayerUpdate")
+	public static int method1173(int var0) {
-	static void readPlayerUpdate(PacketBuffer var0, int var1) {
+		return class32.method578(ViewportMouse.ViewportMouse_entityTags[var0]);
-		boolean var2 = var0.readBits(1) == 1;
-		if (var2) {
-			Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
 	}
 
-		int var3 = var0.readBits(2);
+	@ObfuscatedName("p")
-		Player var4 = Client.players[var1];
-		if (var3 == 0) {
-			if (var2) {
-				var4.field607 = false;
-			} else if (Client.localPlayerIndex == var1) {
-				throw new RuntimeException();
-			} else {
-				Players.Players_regions[var1] = (var4.plane << 28) + (class4.baseX * 64 + var4.pathX[0] >> 13 << 14) + (ScriptEvent.baseY + var4.pathY[0] >> 13);
-				if (var4.field945 != -1) {
-					Players.Players_orientations[var1] = var4.field945;
-				} else {
-					Players.Players_orientations[var1] = var4.orientation;
-				}
-
-				Players.Players_targetIndices[var1] = var4.targetIndex;
-				Client.players[var1] = null;
-				if (var0.readBits(1) != 0) {
-					Message.updateExternalPlayer(var0, var1);
-				}
-
-			}
-		} else {
-			int var5;
-			int var6;
-			int var7;
-			if (var3 == 1) {
-				var5 = var0.readBits(3);
-				var6 = var4.pathX[0];
-				var7 = var4.pathY[0];
-				if (var5 == 0) {
-					--var6;
-					--var7;
-				} else if (var5 == 1) {
-					--var7;
-				} else if (var5 == 2) {
-					++var6;
-					--var7;
-				} else if (var5 == 3) {
-					--var6;
-				} else if (var5 == 4) {
-					++var6;
-				} else if (var5 == 5) {
-					--var6;
-					++var7;
-				} else if (var5 == 6) {
-					++var7;
-				} else if (var5 == 7) {
-					++var6;
-					++var7;
-				}
-
-				if (Client.localPlayerIndex == var1 && (var4.x * -78439701 < 1536 || var4.y < 1536 || var4.x * -78439701 >= 11776 || var4.y >= 11776)) {
-					var4.resetPath(var6, var7);
-					var4.field607 = false;
-				} else if (var2) {
-					var4.field607 = true;
-					var4.tileX = var6;
-					var4.tileY = var7;
-				} else {
-					var4.field607 = false;
-					var4.method1189(var6, var7, Players.field1220[var1]);
-				}
-
-			} else if (var3 == 2) {
-				var5 = var0.readBits(4);
-				var6 = var4.pathX[0];
-				var7 = var4.pathY[0];
-				if (var5 == 0) {
-					var6 -= 2;
-					var7 -= 2;
-				} else if (var5 == 1) {
-					--var6;
-					var7 -= 2;
-				} else if (var5 == 2) {
-					var7 -= 2;
-				} else if (var5 == 3) {
-					++var6;
-					var7 -= 2;
-				} else if (var5 == 4) {
-					var6 += 2;
-					var7 -= 2;
-				} else if (var5 == 5) {
-					var6 -= 2;
-					--var7;
-				} else if (var5 == 6) {
-					var6 += 2;
-					--var7;
-				} else if (var5 == 7) {
-					var6 -= 2;
-				} else if (var5 == 8) {
-					var6 += 2;
-				} else if (var5 == 9) {
-					var6 -= 2;
-					++var7;
-				} else if (var5 == 10) {
-					var6 += 2;
-					++var7;
-				} else if (var5 == 11) {
-					var6 -= 2;
-					var7 += 2;
-				} else if (var5 == 12) {
-					--var6;
-					var7 += 2;
-				} else if (var5 == 13) {
-					var7 += 2;
-				} else if (var5 == 14) {
-					++var6;
-					var7 += 2;
-				} else if (var5 == 15) {
-					var6 += 2;
-					var7 += 2;
-				}
-
-				if (Client.localPlayerIndex == var1 && (var4.x * -78439701 < 1536 || var4.y < 1536 || var4.x * -78439701 >= 11776 || var4.y >= 11776)) {
-					var4.resetPath(var6, var7);
-					var4.field607 = false;
-				} else if (var2) {
-					var4.field607 = true;
-					var4.tileX = var6;
-					var4.tileY = var7;
-				} else {
-					var4.field607 = false;
-					var4.method1189(var6, var7, Players.field1220[var1]);
-				}
-
-			} else {
-				var5 = var0.readBits(1);
-				int var8;
-				int var9;
-				int var10;
-				int var11;
-				if (var5 == 0) {
-					var6 = var0.readBits(12);
-					var7 = var6 >> 10;
-					var8 = var6 >> 5 & 31;
-					if (var8 > 15) {
-						var8 -= 32;
-					}
-
-					var9 = var6 & 31;
-					if (var9 > 15) {
-						var9 -= 32;
-					}
-
-					var10 = var8 + var4.pathX[0];
-					var11 = var9 + var4.pathY[0];
-					if (Client.localPlayerIndex == var1 && (var4.x * -78439701 < 1536 || var4.y < 1536 || var4.x * -78439701 >= 11776 || var4.y >= 11776)) {
-						var4.resetPath(var10, var11);
-						var4.field607 = false;
-					} else if (var2) {
-						var4.field607 = true;
-						var4.tileX = var10;
-						var4.tileY = var11;
-					} else {
-						var4.field607 = false;
-						var4.method1189(var10, var11, Players.field1220[var1]);
-					}
-
-					var4.plane = (byte)(var7 + var4.plane & 3);
-					if (Client.localPlayerIndex == var1) {
-						MouseRecorder.plane = var4.plane;
-					}
-
-				} else {
-					var6 = var0.readBits(30);
-					var7 = var6 >> 28;
-					var8 = var6 >> 14 & 16383;
-					var9 = var6 & 16383;
-					var10 = (class4.baseX * 64 + var8 + var4.pathX[0] & 16383) - class4.baseX * 64;
-					var11 = (var9 + ScriptEvent.baseY + var4.pathY[0] & 16383) - ScriptEvent.baseY;
-					if (Client.localPlayerIndex != var1 || var4.x * -78439701 >= 1536 && var4.y >= 1536 && var4.x * -78439701 < 11776 && var4.y < 11776) {
-						if (var2) {
-							var4.field607 = true;
-							var4.tileX = var10;
-							var4.tileY = var11;
-						} else {
-							var4.field607 = false;
-							var4.method1189(var10, var11, Players.field1220[var1]);
-						}
-					} else {
-						var4.resetPath(var10, var11);
-						var4.field607 = false;
-					}
-
-					var4.plane = (byte)(var7 + var4.plane & 3);
-					if (Client.localPlayerIndex == var1) {
-						MouseRecorder.plane = var4.plane;
-					}
-
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(Lbo;Lbo;IZIZB)I",
-		garbageValue = "-1052068547"
+		garbageValue = "7"
 	)
-	static final boolean method1099() {
+	static int method1174(World var0, World var1, int var2, boolean var3, int var4, boolean var5) {
-		return ViewportMouse.ViewportMouse_isInViewport;
+		int var6 = UserComparator7.compareWorlds(var0, var1, var2, var3);
-	}
+		if (var6 != 0) {
-
+			return var3 ? -var6 : var6;
-	@ObfuscatedName("k")
+		} else if (var4 == -1) {
-	@ObfuscatedSignature(
-		signature = "(ILcu;ZB)I",
-		garbageValue = "1"
-	)
-	static int method1096(int var0, Script var1, boolean var2) {
-		Widget var3;
-		if (var0 >= 2000) {
-			var0 -= 1000;
-			var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]);
-		} else {
-			var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410;
-		}
-
-		if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
-			if (Interpreter.field1066 >= 10) {
-				throw new RuntimeException();
-			} else if (var3.onResize == null) {
 			return 0;
 		} else {
-				ScriptEvent var4 = new ScriptEvent();
+			int var7 = UserComparator7.compareWorlds(var0, var1, var4, var5);
-				var4.widget = var3;
+			return var5 ? -var7 : var7;
-				var4.args = var3.onResize;
-				var4.field550 = Interpreter.field1066 + 1;
-				Client.scriptEvents.addFirst(var4);
-				return 1;
-			}
-		} else {
-			return 2;
 		}
 	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "([BIIB)Ljava/lang/String;",
+		garbageValue = "-113"
+	)
+	@Export("decodeStringCp1252")
+	public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
+		char[] var3 = new char[var2];
+		int var4 = 0;
+
+		for (int var5 = 0; var5 < var2; ++var5) {
+			int var6 = var0[var5 + var1] & 255;
+			if (var6 != 0) {
+				if (var6 >= 128 && var6 < 160) {
+					char var7 = class287.cp1252AsciiExtension[var6 - 128];
+					if (var7 == 0) {
+						var7 = '?';
+					}
+
+					var6 = var7;
+				}
+
+				var3[var4++] = (char)var6;
+			}
+		}
+
+		return new String(var3, 0, var4);
+	}
 }

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

@@ -1,40 +1,59 @@
+import java.security.SecureRandom;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cl")
+@ObfuscatedName("cn")
 @Implements("AttackOption")
 public enum AttackOption implements Enumerated {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lcl;"
+		signature = "Lcn;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lcl;"
+		signature = "Lcn;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lcl;"
+		signature = "Lcn;"
 	)
 	@Export("AttackOption_leftClickWhereAvailable")
 	AttackOption_leftClickWhereAvailable(2),
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lcl;"
+		signature = "Lcn;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3);
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("dw")
+	@ObfuscatedSignature(
+		signature = "Lie;"
+	)
+	@Export("archive9")
+	static Archive archive9;
+	@ObfuscatedName("gr")
+	@ObfuscatedSignature(
+		signature = "Llf;"
+	)
+	@Export("compass")
+	static Sprite compass;
+	@ObfuscatedName("lc")
 	@ObfuscatedGetter(
-		intValue = 1962411245
+		intValue = 629841565
+	)
+	@Export("selectedSpellWidget")
+	static int selectedSpellWidget;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -1814915457
 	)
 	@Export("id")
 	final int id;
@@ -43,121 +62,107 @@ public enum AttackOption implements Enumerated {
 		this.id = var3;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(S)I",
-		garbageValue = "-1410702910"
+		garbageValue = "221"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "([BI)Lcu;",
+		signature = "(I)Ljava/security/SecureRandom;",
-		garbageValue = "447128018"
+		garbageValue = "639446581"
 	)
-	@Export("newScript")
+	static SecureRandom method2077() {
-	static Script newScript(byte[] var0) {
+		SecureRandom var0 = new SecureRandom();
-		Script var1 = new Script();
+		var0.nextInt();
-		Buffer var2 = new Buffer(var0);
+		return 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);
+	@ObfuscatedName("z")
-				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;
-	}
-
-	@ObfuscatedName("gg")
 	@ObfuscatedSignature(
-		signature = "(Lbe;IB)V",
+		signature = "(Lkf;I)V",
-		garbageValue = "8"
+		garbageValue = "-379415067"
 	)
-	@Export("getActorScreenLocation")
+	@Export("updatePlayer")
-	static final void getActorScreenLocation(Actor var0, int var1) {
+	static final void updatePlayer(PacketBuffer var0) {
-		NPC.worldToScreen(var0.x * -78439701, var0.y, var1);
+		var0.importIndex();
+		int var1 = Client.localPlayerIndex;
+		Player var2 = class223.localPlayer = Client.players[var1] = new Player();
+		var2.index = var1;
+		int var3 = var0.readBits(30);
+		byte var4 = (byte)(var3 >> 28);
+		int var5 = var3 >> 14 & 16383;
+		int var6 = var3 & 16383;
+		var2.pathX[0] = var5 - class223.baseX * 64;
+		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6);
+		var2.pathY[0] = var6 - class286.baseY * 64;
+		var2.y = ((var2.pathY[0] << 7) + (var2.transformedSize() << 6)) * -944175751;
+		WorldMapRectangle.plane = var2.plane = var4;
+		if (Players.field1236[var1] != null) {
+			var2.read(Players.field1236[var1]);
 		}
 
-	@ObfuscatedName("jb")
+		Players.Players_count = 0;
+		Players.Players_indices[++Players.Players_count - 1] = var1;
+		Players.field1244[var1] = 0;
+		Players.Players_emptyIdxCount = 0;
+
+		for (int var7 = 1; var7 < 2048; ++var7) {
+			if (var1 != var7) {
+				int var8 = var0.readBits(18);
+				int var9 = var8 >> 16;
+				int var10 = var8 >> 8 & 597;
+				int var11 = var8 & 597;
+				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28);
+				Players.Players_orientations[var7] = 0;
+				Players.Players_targetIndices[var7] = -1;
+				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7;
+				Players.field1244[var7] = 0;
+			}
+		}
+
+		var0.exportIndex();
+	}
+
+	@ObfuscatedName("ed")
 	@ObfuscatedSignature(
-		signature = "(IIIILli;Lhi;I)V",
+		signature = "(IZZZI)Lie;",
-		garbageValue = "-1905138972"
+		garbageValue = "1568056482"
 	)
-	@Export("worldToMinimap")
+	@Export("newArchive")
-	static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
+	static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
-		int var6 = var3 * var3 + var2 * var2;
+		ArchiveDisk var4 = null;
-		if (var6 > 4225 && var6 < 90000) {
+		if (JagexCache.JagexCache_dat2File != null) {
-			int var7 = Client.camAngleY & 2047;
+			var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class189.JagexCache_idxFiles[var0], 1000000);
-			int var8 = Rasterizer3D.Rasterizer3D_sine[var7];
+		}
-			int var9 = Rasterizer3D.Rasterizer3D_cosine[var7];
+
-			int var10 = var3 * var8 + var9 * var2 >> 16;
+		return new Archive(var4, WorldMapData_0.masterDisk, var0, var1, var2, var3);
-			int var11 = var3 * var9 - var8 * var2 >> 16;
+	}
-			double var12 = Math.atan2((double)var10, (double)var11);
+
-			int var14 = var5.width / 2 - 25;
+	@ObfuscatedName("hj")
-			int var15 = (int)(Math.sin(var12) * (double)var14);
+	@ObfuscatedSignature(
-			int var16 = (int)(Math.cos(var12) * (double)var14);
+		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
-			byte var17 = 20;
+		garbageValue = "844579626"
-			FontName.redHintArrowSprite.method6104(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
+	)
-		} else {
+	@Export("insertMenuItem")
-			ChatChannel.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5);
+	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
+		if (!Client.isMenuOpen) {
+			if (Client.menuOptionsCount < 500) {
+				Client.menuActions[Client.menuOptionsCount] = var0;
+				Client.menuTargets[Client.menuOptionsCount] = var1;
+				Client.menuOpcodes[Client.menuOptionsCount] = var2;
+				Client.menuIdentifiers[Client.menuOptionsCount] = var3;
+				Client.menuArguments1[Client.menuOptionsCount] = var4;
+				Client.menuArguments2[Client.menuOptionsCount] = var5;
+				Client.menuShiftClick[Client.menuOptionsCount] = var6;
+				++Client.menuOptionsCount;
 			}
 
 		}
 	}
+}

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

@@ -3,119 +3,119 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dl")
+@ObfuscatedName("ds")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
-	static float[][] field1447;
+	static float[][] field1454;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
-	static float field1454;
+	static float field1456;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	int[][][] field1458;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
-	int[][][] field1450;
+	int[][][] field1452;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
-	int[] field1451;
+	int[] field1453;
 
 	static {
-		field1447 = new float[2][8];
+		field1454 = new float[2][8];
 		coefficients = new int[2][8];
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2];
 		this.field1458 = new int[2][2][4];
-		this.field1450 = new int[2][2][4];
+		this.field1452 = new int[2][2][4];
-		this.field1451 = new int[2];
+		this.field1453 = new int[2];
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
-	float method2655(int var1, int var2, float var3) {
+	float method2670(int var1, int var2, float var3) {
-		float var4 = (float)this.field1450[var1][0][var2] + var3 * (float)(this.field1450[var1][1][var2] - this.field1450[var1][0][var2]);
+		float var4 = (float)this.field1452[var1][0][var2] + var3 * (float)(this.field1452[var1][1][var2] - this.field1452[var1][0][var2]);
 		var4 *= 0.0015258789F;
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
-	float method2657(int var1, int var2, float var3) {
+	float method2672(int var1, int var2, float var3) {
 		float var4 = (float)this.field1458[var1][0][var2] + var3 * (float)(this.field1458[var1][1][var2] - this.field1458[var1][0][var2]);
 		var4 *= 1.2207031E-4F;
 		return normalize(var4);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) {
-			var3 = (float)this.field1451[0] + (float)(this.field1451[1] - this.field1451[0]) * var2;
+			var3 = (float)this.field1453[0] + (float)(this.field1453[1] - this.field1453[0]) * var2;
 			var3 *= 0.0030517578F;
-			field1454 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+			field1456 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-			forwardMultiplier = (int)(field1454 * 65536.0F);
+			forwardMultiplier = (int)(field1456 * 65536.0F);
 		}
 
 		if (this.pairs[var1] == 0) {
 			return 0;
 		} else {
-			var3 = this.method2655(var1, 0, var2);
+			var3 = this.method2670(var1, 0, var2);
-			field1447[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2657(var1, 0, var2));
+			field1454[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2672(var1, 0, var2));
-			field1447[var1][1] = var3 * var3;
+			field1454[var1][1] = var3 * var3;
 
 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
-				var3 = this.method2655(var1, var4, var2);
+				var3 = this.method2670(var1, var4, var2);
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2657(var1, var4, var2));
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2672(var1, var4, var2));
 				float var6 = var3 * var3;
-				field1447[var1][var4 * 2 + 1] = field1447[var1][var4 * 2 - 1] * var6;
+				field1454[var1][var4 * 2 + 1] = field1454[var1][var4 * 2 - 1] * var6;
-				field1447[var1][var4 * 2] = field1447[var1][var4 * 2 - 1] * var5 + field1447[var1][var4 * 2 - 2] * var6;
+				field1454[var1][var4 * 2] = field1454[var1][var4 * 2 - 1] * var5 + field1454[var1][var4 * 2 - 2] * var6;
 
 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-					var10000 = field1447[var1];
+					var10000 = field1454[var1];
-					var10000[var7] += field1447[var1][var7 - 1] * var5 + field1447[var1][var7 - 2] * var6;
+					var10000[var7] += field1454[var1][var7 - 1] * var5 + field1454[var1][var7 - 2] * var6;
 				}
 
-				var10000 = field1447[var1];
+				var10000 = field1454[var1];
-				var10000[1] += field1447[var1][0] * var5 + var6;
+				var10000[1] += field1454[var1][0] * var5 + var6;
-				var10000 = field1447[var1];
+				var10000 = field1454[var1];
 				var10000[0] += var5;
 			}
 
 			if (var1 == 0) {
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field1447[0];
+					var10000 = field1454[0];
-					var10000[var4] *= field1454;
+					var10000[var4] *= field1456;
 				}
 			}
 
 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
-				coefficients[var1][var4] = (int)(field1447[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field1454[var1][var4] * 65536.0F);
 			}
 
 			return this.pairs[var1] * 2;
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(Lkz;Ldo;)V"
+		signature = "(Lkl;Ldm;)V"
 	)
-	final void method2666(Buffer var1, SoundEnvelope var2) {
+	final void method2674(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte();
 		this.pairs[0] = var3 >> 4;
 		this.pairs[1] = var3 & 15;
 		if (var3 != 0) {
-			this.field1451[0] = var1.readUnsignedShort();
+			this.field1453[0] = var1.readUnsignedShort();
-			this.field1451[1] = var1.readUnsignedShort();
+			this.field1453[1] = var1.readUnsignedShort();
 			int var4 = var1.readUnsignedByte();
 
 			int var5;
@@ -123,7 +123,7 @@ public class AudioFilter {
 			for (var5 = 0; var5 < 2; ++var5) {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
 					this.field1458[var5][0][var6] = var1.readUnsignedShort();
-					this.field1450[var5][0][var6] = var1.readUnsignedShort();
+					this.field1452[var5][0][var6] = var1.readUnsignedShort();
 				}
 			}
 
@@ -131,26 +131,26 @@ public class AudioFilter {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
 					if ((var4 & 1 << var5 * 4 << var6) != 0) {
 						this.field1458[var5][1][var6] = var1.readUnsignedShort();
-						this.field1450[var5][1][var6] = var1.readUnsignedShort();
+						this.field1452[var5][1][var6] = var1.readUnsignedShort();
 					} else {
 						this.field1458[var5][1][var6] = this.field1458[var5][0][var6];
-						this.field1450[var5][1][var6] = this.field1450[var5][0][var6];
+						this.field1452[var5][1][var6] = this.field1452[var5][0][var6];
 					}
 				}
 			}
 
-			if (var4 != 0 || this.field1451[1] != this.field1451[0]) {
+			if (var4 != 0 || this.field1453[1] != this.field1453[0]) {
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var7 = this.field1451;
+			int[] var7 = this.field1453;
-			this.field1451[1] = 0;
+			this.field1453[1] = 0;
 			var7[0] = 0;
 		}
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@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("kw")
+@ObfuscatedName("km")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lki;"
+		signature = "Lkj;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State();
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@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.field3740 = 0;
+			BZip2Decompressor_state.field3713 = 0;
 			BZip2Decompressor_decompress(BZip2Decompressor_state);
 			var1 -= BZip2Decompressor_state.outputLength;
 			BZip2Decompressor_state.inputArray = null;
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lki;)V"
+		signature = "(Lkj;)V"
 	)
-	static void method5753(BZip2State var0) {
+	static void method5690(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 = DirectByteArrayCopier.BZip2Decompressor_block;
-		int var7 = var0.field3725;
+		int var7 = var0.field3732;
 		byte[] var8 = var0.outputArray;
 		int var9 = var0.next_out;
 		int var10 = var0.outputLength;
-		int var12 = var0.field3710 + 1;
+		int var12 = var0.field3750 + 1;
 
 		label61:
 		while (true) {
@@ -148,25 +148,25 @@ public final class BZip2Decompressor {
 			break;
 		}
 
-		int var13 = var0.field3740;
+		int var13 = var0.field3713;
-		var0.field3740 += var10 - var10;
+		var0.field3713 += var10 - var10;
-		if (var0.field3740 < var13) {
+		if (var0.field3713 < var13) {
 		}
 
 		var0.out_char = var2;
 		var0.su_rNToGo = var3;
 		var0.nblocks_used = var4;
 		var0.su_ch2 = var5;
-		VarbitDefinition.BZip2Decompressor_block = var6;
+		DirectByteArrayCopier.BZip2Decompressor_block = var6;
-		var0.field3725 = var7;
+		var0.field3732 = var7;
 		var0.outputArray = var8;
 		var0.next_out = var9;
 		var0.outputLength = var10;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lki;)V"
+		signature = "(Lkj;)V"
 	)
 	@Export("BZip2Decompressor_decompress")
 	static void BZip2Decompressor_decompress(BZip2State var0) {
@@ -193,8 +193,8 @@ public final class BZip2Decompressor {
 		int[] var24 = null;
 		int[] var25 = null;
 		var0.blockSize100k = 1410065408;
-		if (VarbitDefinition.BZip2Decompressor_block == null) {
+		if (DirectByteArrayCopier.BZip2Decompressor_block == null) {
-			VarbitDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * 100000];
+			DirectByteArrayCopier.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;
+							DirectByteArrayCopier.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;
+								DirectByteArrayCopier.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)(DirectByteArrayCopier.BZip2Decompressor_block[var36] & 255);
-						var10000 = VarbitDefinition.BZip2Decompressor_block;
+						var10000 = DirectByteArrayCopier.BZip2Decompressor_block;
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++;
 					}
 
-					var0.field3725 = VarbitDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8;
+					var0.field3732 = DirectByteArrayCopier.BZip2Decompressor_block[var0.originalPointer] >> 8;
 					var0.nblocks_used = 0;
-					var0.field3725 = VarbitDefinition.BZip2Decompressor_block[var0.field3725];
+					var0.field3732 = DirectByteArrayCopier.BZip2Decompressor_block[var0.field3732];
-					var0.su_ch2 = (byte)(var0.field3725 & 255);
+					var0.su_ch2 = (byte)(var0.field3732 & 255);
-					var0.field3725 >>= 8;
+					var0.field3732 >>= 8;
 					++var0.nblocks_used;
-					var0.field3710 = var47;
+					var0.field3750 = var47;
-					method5753(var0);
+					method5690(var0);
-					if (var0.field3710 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
+					if (var0.field3750 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
 						var26 = true;
 						break;
 					}
@@ -538,27 +538,27 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Lki;)B"
+		signature = "(Lkj;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(Lki;)B"
+		signature = "(Lkj;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(ILki;)I"
+		signature = "(ILkj;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
 		return var2;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lki;)V"
+		signature = "(Lkj;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@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

@@ -2,168 +2,175 @@ 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("kj")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("c")
+	@ObfuscatedName("eg")
-	final int field3717;
+	@ObfuscatedGetter(
-	@ObfuscatedName("x")
+		intValue = -1555084527
-	final int field3709;
+	)
-	@ObfuscatedName("t")
+	@Export("port2")
-	final int field3715;
+	static int port2;
-	@ObfuscatedName("g")
+	@ObfuscatedName("z")
-	final int field3712;
+	final int field3723;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
-	final int field3737;
+	final int field3740;
+	@ObfuscatedName("v")
+	final int field3749;
 	@ObfuscatedName("u")
-	final int field3731;
+	final int field3729;
-	@ObfuscatedName("j")
+	@ObfuscatedName("r")
+	final int field3717;
+	@ObfuscatedName("p")
+	final int field3730;
+	@ObfuscatedName("q")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1785442725
+		intValue = -1460237959
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1327133653
+		intValue = 19255173
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1502043783
+		intValue = 577933795
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1076780583
+		intValue = -1492713953
 	)
 	@Export("outputLength")
 	int outputLength;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -2062863895
+		intValue = -1053795843
 	)
-	int field3740;
+	int field3713;
-	@ObfuscatedName("s")
+	@ObfuscatedName("a")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -424992051
+		intValue = 423882031
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 2124513987
+		intValue = -1870654053
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 225690987
+		intValue = 2034972657
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("q")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 813800448
+		intValue = 1804549120
 	)
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1074633139
+		intValue = -2121773995
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("r")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1279441131
+		intValue = -1375440771
 	)
-	int field3725;
+	int field3732;
-	@ObfuscatedName("k")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1234783121
+		intValue = 1764835615
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("w")
+	@ObfuscatedName("f")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("m")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -147337203
+		intValue = 1747033841
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("o")
+	@ObfuscatedName("d")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("b")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1493034079
+		intValue = 1244375945
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ac")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("at")
+	@ObfuscatedName("az")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aw")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("av")
+	@ObfuscatedName("aa")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ap")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ar")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ab")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ax")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("as")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ao")
 	@Export("base")
 	int[][] base;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("al")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("af")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -864562359
+		intValue = 648150601
 	)
-	int field3710;
+	int field3750;
 
 	BZip2State() {
-		this.field3717 = 4096;
+		this.field3723 = 4096;
-		this.field3709 = 16;
+		this.field3740 = 16;
-		this.field3715 = 258;
+		this.field3749 = 258;
-		this.field3712 = 6;
+		this.field3729 = 6;
-		this.field3737 = 50;
+		this.field3717 = 50;
-		this.field3731 = 18002;
+		this.field3730 = 18002;
 		this.nextByte = 0;
 		this.next_out = 0;
 		this.unzftab = new int[256];
@@ -181,4 +188,23 @@ public final class BZip2State {
 		this.perm = new int[6][258];
 		this.minLens = new int[6];
 	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(B)[Lkc;",
+		garbageValue = "-127"
+	)
+	@Export("ChatMode_values")
+	static PrivateChatMode[] ChatMode_values() {
+		return new PrivateChatMode[]{PrivateChatMode.field3792, PrivateChatMode.field3790, PrivateChatMode.field3791};
+	}
+
+	@ObfuscatedName("hy")
+	@ObfuscatedSignature(
+		signature = "(II)Z",
+		garbageValue = "157596925"
+	)
+	static boolean method5688(int var0) {
+		return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30;
+	}
 }

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

@@ -4,69 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ea")
+@ObfuscatedName("eo")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("ok")
+	@ObfuscatedName("dc")
 	@ObfuscatedSignature(
-		signature = "Lcj;"
+		signature = "Lie;"
 	)
-	@Export("varcs")
+	@Export("archive3")
-	static Varcs varcs;
+	static Archive archive3;
-	@ObfuscatedName("sm")
+	@ObfuscatedName("z")
-	@Export("foundItemIds")
-	static short[] foundItemIds;
-	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -2123632967
+		intValue = -21907105
-	)
-	@Export("tileHeight")
-	int tileHeight;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 1852557733
-	)
-	@Export("y")
-	int y;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 728809035
-	)
-	@Export("x")
-	int x;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 848853075
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1849497569
+		intValue = 614934347
+	)
+	@Export("tileHeight")
+	int tileHeight;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -602196191
+	)
+	@Export("x")
+	int x;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = -1866626591
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -1916194803
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Ler;"
 	)
 	@Export("entity1")
 	public Entity entity1;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Ler;"
 	)
 	@Export("entity2")
 	public Entity entity2;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = -720242261539970297L
+		longValue = 7018407287880452951L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1272619537
+		intValue = -461421073
 	)
 	@Export("flags")
 	int flags;
@@ -76,16 +73,12 @@ public final class BoundaryObject {
 		this.flags = 0;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(IB)Ljava/lang/String;",
+		signature = "(CB)Z",
-		garbageValue = "-17"
+		garbageValue = "31"
 	)
-	static final String method3230(int var0) {
+	static final boolean method3222(char var0) {
-		if (var0 < 100000) {
+		return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-';
-			return "<col=ffff00>" + var0 + "</col>";
-		} else {
-			return var0 < 10000000 ? "<col=ffffff>" + var0 / 1000 + "K" + "</col>" : "<col=00ff80>" + var0 / 1000000 + "M" + "</col>";
-		}
 	}
 }

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

@@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lr")
+@ObfuscatedName("ll")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -242928427
+		intValue = -479130629
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1412221703
+		intValue = 724783571
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1383178295
+		intValue = 1669121479
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -647845267
+		intValue = -1354833317
 	)
 	@Export("highY")
 	public int highY;
@@ -41,10 +41,10 @@ public class Bounds {
 		this(0, 0, var1, var2);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(IIS)V",
+		signature = "(III)V",
-		garbageValue = "23378"
+		garbageValue = "166241873"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -52,10 +52,10 @@ public class Bounds {
 		this.lowY = var2;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-361054840"
+		garbageValue = "1712715973"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -63,22 +63,22 @@ public class Bounds {
 		this.highY = var2;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Llr;Llr;S)V",
+		signature = "(Lll;Lll;I)V",
-		garbageValue = "3042"
+		garbageValue = "2079875928"
 	)
-	public void method5948(Bounds var1, Bounds var2) {
+	public void method5893(Bounds var1, Bounds var2) {
-		this.method5936(var1, var2);
+		this.method5905(var1, var2);
-		this.method5938(var1, var2);
+		this.method5894(var1, var2);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Llr;Llr;I)V",
+		signature = "(Lll;Lll;B)V",
-		garbageValue = "1943311297"
+		garbageValue = "-1"
 	)
-	void method5936(Bounds var1, Bounds var2) {
+	void method5905(Bounds var1, Bounds var2) {
 		var2.lowX = this.lowX;
 		var2.highX = this.highX;
 		if (this.lowX < var1.lowX) {
@@ -86,8 +86,8 @@ public class Bounds {
 			var2.lowX = var1.lowX;
 		}
 
-		if (var2.method5947() > var1.method5947()) {
+		if (var2.method5896() > var1.method5896()) {
-			var2.highX -= var2.method5947() - var1.method5947();
+			var2.highX -= var2.method5896() - var1.method5896();
 		}
 
 		if (var2.highX < 0) {
@@ -96,12 +96,12 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(Llr;Llr;B)V",
+		signature = "(Lll;Lll;I)V",
-		garbageValue = "0"
+		garbageValue = "-1654040739"
 	)
-	void method5938(Bounds var1, Bounds var2) {
+	void method5894(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY;
 		var2.highY = this.highY;
 		if (this.lowY < var1.lowY) {
@@ -109,8 +109,8 @@ public class Bounds {
 			var2.lowY = var1.lowY;
 		}
 
-		if (var2.method5940() > var1.method5940()) {
+		if (var2.method5892() > var1.method5892()) {
-			var2.highY -= var2.method5940() - var1.method5940();
+			var2.highY -= var2.method5892() - var1.method5892();
 		}
 
 		if (var2.highY < 0) {
@@ -119,21 +119,21 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-241231712"
+		garbageValue = "769635987"
 	)
-	int method5947() {
+	int method5896() {
-		return this.highX + this.lowX;
+		return this.lowX + this.highX;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1659278045"
+		garbageValue = "59"
 	)
-	int method5940() {
+	int method5892() {
 		return this.highY + this.lowY;
 	}
 
@@ -141,15 +141,15 @@ public class Bounds {
 		return null;
 	}
 
-	public String aan() {
+	public String aak() {
 		return null;
 	}
 
-	public String aai() {
+	public String aae() {
 		return null;
 	}
 
-	public String aar() {
+	public String aah() {
 		return null;
 	}
 }

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

@@ -3,25 +3,26 @@ 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("je")
+@ObfuscatedName("jl")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -359902741
+		intValue = -1753766973
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 725247471
+		intValue = -1761858423
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -846387241
+		intValue = 1627143829
 	)
 	@Export("rank")
 	public int rank;
@@ -30,10 +31,10 @@ public class Buddy extends User {
 		this.world = -1;
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-741499831"
+		garbageValue = "-736416010"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -41,23 +42,384 @@ public class Buddy extends User {
 		this.int2 = var2;
 	}
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "293368620"
+		garbageValue = "-516703486"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world;
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		signature = "(S)Z",
+		signature = "(B)Z",
-		garbageValue = "-12107"
+		garbageValue = "0"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {
 		return this.world > 0;
 	}
+
+	@ObfuscatedName("ap")
+	@ObfuscatedSignature(
+		signature = "(ILcu;ZI)I",
+		garbageValue = "1426462552"
+	)
+	static int method5099(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.FRIEND_COUNT) {
+			if (Tiles.friendSystem.field1052 == 0) {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2;
+			} else if (Tiles.friendSystem.field1052 == 1) {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+			} else {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tiles.friendSystem.friendsList.getSize();
+			}
+
+			return 1;
+		} else {
+			int var3;
+			if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				if (Tiles.friendSystem.method1859() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
+					Friend var8 = (Friend)Tiles.friendSystem.friendsList.get(var3);
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName();
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName();
+				} else {
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				if (Tiles.friendSystem.method1859() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Tiles.friendSystem.friendsList.get(var3)).world;
+				} else {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				if (Tiles.friendSystem.method1859() && var3 >= 0 && var3 < Tiles.friendSystem.friendsList.getSize()) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Tiles.friendSystem.friendsList.get(var3)).rank;
+				} else {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+				}
+
+				return 1;
+			} else {
+				String var5;
+				if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					NPC.method2046(var5, var6);
+					return 1;
+				} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					Tiles.friendSystem.addFriend(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.FRIEND_DEL) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					Tiles.friendSystem.removeFriend(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_ADD) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					Tiles.friendSystem.addIgnore(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_DEL) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					Tiles.friendSystem.removeIgnore(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.FRIEND_TEST) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					var5 = WorldMapSectionType.method250(var5);
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tiles.friendSystem.isFriended(new Username(var5, WorldMapSection1.loginType), false) ? 1 : 0;
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
+					if (Varps.clanChat != null) {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Varps.clanChat.name;
+					} else {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
+					if (Varps.clanChat != null) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.clanChat.getSize();
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
+					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize()) {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Varps.clanChat.get(var3).getUsername().getName();
+					} else {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
+					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize()) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Varps.clanChat.get(var3)).getWorld();
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
+					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize()) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Varps.clanChat.get(var3)).rank;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.clanChat != null ? Varps.clanChat.minKick : 0;
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					NetCache.clanKickUser(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.clanChat != null ? Varps.clanChat.rank : 0;
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					World.Clan_joinChat(var5);
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
+					WorldMapLabel.Clan_leaveChat();
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
+					if (!Tiles.friendSystem.method1859()) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tiles.friendSystem.ignoreList.getSize();
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
+					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					if (Tiles.friendSystem.method1859() && var3 >= 0 && var3 < Tiles.friendSystem.ignoreList.getSize()) {
+						Ignored var4 = (Ignored)Tiles.friendSystem.ignoreList.get(var3);
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName();
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName();
+					} else {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.IGNORE_TEST) {
+					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					var5 = WorldMapSectionType.method250(var5);
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tiles.friendSystem.isIgnored(new Username(var5, WorldMapSection1.loginType)) ? 1 : 0;
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
+					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize() && Varps.clanChat.get(var3).getUsername().equals(class223.localPlayer.username)) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
+					if (Varps.clanChat != null && Varps.clanChat.owner != null) {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Varps.clanChat.owner;
+					} else {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
+					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize() && ((ClanMate)Varps.clanChat.get(var3)).isFriend()) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
+					if (var0 == 3628) {
+						Tiles.friendSystem.friendsList.removeComparator();
+						return 1;
+					} else {
+						boolean var7;
+						if (var0 == 3629) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator1(var7));
+							return 1;
+						} else if (var0 == 3630) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator2(var7));
+							return 1;
+						} else if (var0 == 3631) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator3(var7));
+							return 1;
+						} else if (var0 == 3632) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator4(var7));
+							return 1;
+						} else if (var0 == 3633) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator5(var7));
+							return 1;
+						} else if (var0 == 3634) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator6(var7));
+							return 1;
+						} else if (var0 == 3635) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator7(var7));
+							return 1;
+						} else if (var0 == 3636) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator8(var7));
+							return 1;
+						} else if (var0 == 3637) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator9(var7));
+							return 1;
+						} else if (var0 == 3638) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new UserComparator10(var7));
+							return 1;
+						} else if (var0 == 3639) {
+							Tiles.friendSystem.friendsList.sort();
+							return 1;
+						} else if (var0 == 3640) {
+							Tiles.friendSystem.ignoreList.removeComparator();
+							return 1;
+						} else if (var0 == 3641) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.ignoreList.addComparator(new UserComparator1(var7));
+							return 1;
+						} else if (var0 == 3642) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.ignoreList.addComparator(new UserComparator2(var7));
+							return 1;
+						} else if (var0 == 3643) {
+							Tiles.friendSystem.ignoreList.sort();
+							return 1;
+						} else if (var0 == 3644) {
+							if (Varps.clanChat != null) {
+								Varps.clanChat.removeComparator();
+							}
+
+							return 1;
+						} else if (var0 == 3645) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator1(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3646) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator2(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3647) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator3(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3648) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator4(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3649) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator5(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3650) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator6(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3651) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator7(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3652) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator8(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3653) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator9(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3654) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new UserComparator10(var7));
+							}
+
+							return 1;
+						} else if (var0 == 3655) {
+							if (Varps.clanChat != null) {
+								Varps.clanChat.sort();
+							}
+
+							return 1;
+						} else if (var0 == 3656) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							Tiles.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7));
+							return 1;
+						} else if (var0 == 3657) {
+							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+							if (Varps.clanChat != null) {
+								Varps.clanChat.addComparator(new BuddyRankComparator(var7));
+							}
+
+							return 1;
+						} else {
+							return 2;
+						}
+					}
+				} else {
+					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					if (Varps.clanChat != null && var3 < Varps.clanChat.getSize() && ((ClanMate)Varps.clanChat.get(var3)).isIgnored()) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				}
+			}
+		}
+	}
 }

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

@@ -1,19 +1,12 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fh")
+@ObfuscatedName("fd")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("my")
+	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 30724641
-	)
-	@Export("selectedSpellFlags")
-	static int selectedSpellFlags;
-	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -21,10 +14,10 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		this.reversed = var1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lje;Lje;S)I",
+		signature = "(Ljl;Ljl;I)I",
-		garbageValue = "28982"
+		garbageValue = "-1443378495"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -38,4 +31,14 @@ public class BuddyRankComparator extends AbstractUserComparator {
 	public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
+
+	@ObfuscatedName("hs")
+	@ObfuscatedSignature(
+		signature = "(B)I",
+		garbageValue = "96"
+	)
+	@Export("getNewestMenuIdx")
+	static final int getNewestMenuIdx() {
+		return Client.menuOptionsCount - 1;
+	}
 }

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("mw")
+@ObfuscatedName("mm")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lmr;"
+		signature = "Lmh;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		longValue = 3832537233495769245L
+		longValue = -7294963934648719297L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 327772987
+		intValue = 1845108509
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		longValue = -7089347366618851565L
+		longValue = -8408813098273597985L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1970592505
+		intValue = 1704738159
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = -5326533979176937991L
+		longValue = -7862153769092129291L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		longValue = -2696097310497379977L
+		longValue = 3070804450108675653L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = 7888031407881302655L
+		longValue = 8830743471394433983L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		longValue = -3322791226298163907L
+		longValue = 3243026924650541047L
 	)
 	@Export("fileOffset")
 	long fileOffset;
 
 	@ObfuscatedSignature(
-		signature = "(Lmr;II)V"
+		signature = "(Lmh;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("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "806301306"
+		garbageValue = "-55"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +95,7 @@ public class BufferedFile {
 		this.accessFile.close();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) {
@@ -105,30 +105,30 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)J",
+		signature = "(S)J",
-		garbageValue = "-1810414752"
+		garbageValue = "15865"
 	)
 	@Export("length")
 	public long length() {
 		return this.length;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "318329174"
+		garbageValue = "588547682"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "([BIIS)V",
+		signature = "([BIIB)V",
-		garbageValue = "-2545"
+		garbageValue = "-41"
 	)
 	@Export("read")
 	public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -137,7 +137,7 @@ public class BufferedFile {
 				throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
 			}
 
-			if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) {
+			if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) {
 				System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3);
 				this.offset += (long)var3;
 				return;
@@ -200,16 +200,16 @@ public class BufferedFile {
 
 				long var13 = -1L;
 				long var10 = -1L;
-				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) {
+				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) {
 					var13 = this.writeBufferOffset;
-				} else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) {
+				} else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) {
 					var13 = var4;
 				}
 
 				if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) {
 					var10 = (long)this.writeBufferLength + this.writeBufferOffset;
-				} else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) {
+				} else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) {
-					var10 = var4 + (long)var7;
+					var10 = (long)var7 + var4;
 				}
 
 				if (var13 > -1L && var10 > var13) {
@@ -231,15 +231,15 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "1455247160"
+		garbageValue = "77"
 	)
 	@Export("load")
 	void load() throws IOException {
 		this.readBufferLength = 0;
-		if (this.fileOffset != this.offset) {
+		if (this.offset != this.fileOffset) {
 			this.accessFile.seek(this.offset);
 			this.fileOffset = this.offset;
 		}
@@ -261,10 +261,10 @@ public class BufferedFile {
 
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "-2110413759"
+		garbageValue = "2016597591"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
@@ -273,11 +273,11 @@ public class BufferedFile {
 				this.length = (long)var3 + this.offset;
 			}
 
-			if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) {
+			if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) {
 				this.flush();
 			}
 
-			if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) {
+			if (-1L != this.writeBufferOffset && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) {
 				int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset));
 				System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4);
 				this.offset += (long)var4;
@@ -301,7 +301,7 @@ public class BufferedFile {
 
 				}
 			} else {
-				if (this.offset != this.fileOffset) {
+				if (this.fileOffset != this.offset) {
 					this.accessFile.seek(this.offset);
 					this.fileOffset = this.offset;
 				}
@@ -316,14 +316,14 @@ public class BufferedFile {
 				long var6 = -1L;
 				if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
 					var9 = this.offset;
-				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) {
+				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) {
 					var9 = this.readBufferOffset;
 				}
 
-				if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= this.readBufferOffset + (long)this.readBufferLength) {
+				if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) {
-					var6 = (long)var3 + this.offset;
+					var6 = this.offset + (long)var3;
 				} else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) {
-					var6 = this.readBufferOffset + (long)this.readBufferLength;
+					var6 = (long)this.readBufferLength + this.readBufferOffset;
 				}
 
 				if (var9 > -1L && var6 > var9) {
@@ -339,10 +339,10 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-753348835"
+		garbageValue = "928727943"
 	)
 	@Export("flush")
 	void flush() throws IOException {
@@ -353,23 +353,23 @@ public class BufferedFile {
 			}
 
 			this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength);
-			this.fileOffset += 1970592505L * (long)(this.writeBufferLength * -1633237175);
+			this.fileOffset += (long)(this.writeBufferLength * -1599618673) * 1704738159L;
 			if (this.fileOffset > this.fileLength) {
 				this.fileLength = this.fileOffset;
 			}
 
 			long var1 = -1L;
 			long var3 = -1L;
-			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) {
+			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) {
 				var1 = this.writeBufferOffset;
-			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) {
+			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) {
 				var1 = this.readBufferOffset;
 			}
 
-			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) {
+			if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) {
 				var3 = (long)this.writeBufferLength + this.writeBufferOffset;
-			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) {
+			} else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) {
-				var3 = this.readBufferOffset + (long)this.readBufferLength;
+				var3 = (long)this.readBufferLength + this.readBufferOffset;
 			}
 
 			if (var1 > -1L && var3 > var1) {

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

@@ -1,30 +1,38 @@
 import java.io.IOException;
 import java.net.Socket;
+import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ka")
+@ObfuscatedName("kd")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("c")
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		intValue = 966969419
+	)
+	@Export("cacheGamebuild")
+	public static int cacheGamebuild;
+	@ObfuscatedName("z")
 	@Export("socket")
 	Socket socket;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lkl;"
+		signature = "Lkx;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lkq;"
+		signature = "Lkv;"
 	)
 	@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 +42,10 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "-75"
+		garbageValue = "-119"
 	)
 	@Export("close")
 	public void close() {
@@ -51,50 +59,50 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.source.close();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1827163357"
+		garbageValue = "1784126558"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.source.readUnsignedByte();
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1354053248"
+		garbageValue = "3"
 	)
 	@Export("available")
 	public int available() throws IOException {
 		return this.source.available();
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-377412375"
+		garbageValue = "-336706705"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
 		return this.source.isAvailable(var1);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "2063129771"
+		garbageValue = "-2035668362"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		return this.source.read(var1, var2, var3);
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "([BIIB)V",
-		garbageValue = "9"
+		garbageValue = "-68"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
@@ -105,7 +113,51 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.close();
 	}
 
-	protected void aaj() {
+	protected void aav() {
 		this.close();
 	}
+
+	protected void aao() {
+		this.close();
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(I)Z",
+		garbageValue = "2009022285"
+	)
+	@Export("loadWorlds")
+	static boolean loadWorlds() {
+		try {
+			if (class51.World_request == null) {
+				class51.World_request = Client.urlRequester.request(new URL(WorldMapSectionType.field150));
+			} else if (class51.World_request.isDone()) {
+				byte[] var0 = class51.World_request.getResponse();
+				Buffer var1 = new Buffer(var0);
+				var1.readInt();
+				World.World_count = var1.readUnsignedShort();
+				World.World_worlds = new World[World.World_count];
+
+				World var3;
+				for (int var2 = 0; var2 < World.World_count; var3.index = var2++) {
+					var3 = World.World_worlds[var2] = new World();
+					var3.id = var1.readUnsignedShort();
+					var3.properties = var1.readInt();
+					var3.host = var1.readStringCp1252NullTerminated();
+					var3.activity = var1.readStringCp1252NullTerminated();
+					var3.location = var1.readUnsignedByte();
+					var3.population = var1.readShort();
+				}
+
+				WorldMapData_0.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2);
+				class51.World_request = null;
+				return true;
+			}
+		} catch (Exception var4) {
+			var4.printStackTrace();
+			class51.World_request = null;
+		}
+
+		return false;
+	}
 }

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

@@ -6,40 +6,46 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kq")
+@ObfuscatedName("kv")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("c")
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		signature = "Lbr;"
+	)
+	@Export("loginScreenRunesAnimation")
+	static LoginScreenAnimation loginScreenRunesAnimation;
+	@ObfuscatedName("z")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -416558403
+		intValue = 1047270953
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1582745375
+		intValue = 205486611
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1128021535
+		intValue = -1646863699
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("closed")
 	boolean closed;
 
@@ -54,10 +60,10 @@ public class BufferedSink implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(S)Z",
+		signature = "(B)Z",
-		garbageValue = "2879"
+		garbageValue = "-57"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
@@ -79,10 +85,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
+		signature = "([BIIB)V",
-		garbageValue = "2082682209"
+		garbageValue = "30"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
@@ -119,10 +125,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "0"
+		garbageValue = "-1627292871"
 	)
 	@Export("close")
 	void close() {
@@ -197,4 +203,72 @@ public class BufferedSink implements Runnable {
 		} while(!this.isClosed());
 
 	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(Lli;I)I",
+		garbageValue = "-828018974"
+	)
+	static final int method5777(LoginType var0) {
+		if (var0 == null) {
+			return 12;
+		} else {
+			switch(var0.field4033) {
+			case 0:
+				return 20;
+			default:
+				return 12;
+			}
+		}
+	}
+
+	@ObfuscatedName("fm")
+	@ObfuscatedSignature(
+		signature = "(Lho;IIB)V",
+		garbageValue = "-112"
+	)
+	@Export("checkIfMinimapClicked")
+	static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
+		if (Client.minimapState == 0 || Client.minimapState == 3) {
+			if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !WorldMapIcon_1.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) {
+				SpriteMask var3 = var0.getSpriteMask(true);
+				if (var3 == null) {
+					return;
+				}
+
+				int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
+				int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
+				if (var3.contains(var4, var5)) {
+					var4 -= var3.width / 2;
+					var5 -= var3.height / 2;
+					int var6 = Client.camAngleY & 2047;
+					int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
+					int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
+					int var9 = var5 * var7 + var4 * var8 >> 11;
+					int var10 = var5 * var8 - var7 * var4 >> 11;
+					int var11 = var9 + class223.localPlayer.x >> 7;
+					int var12 = class223.localPlayer.y * 682054857 - var10 >> 7;
+					PacketBufferNode var13 = InterfaceParent.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher);
+					var13.packetBuffer.writeByte(18);
+					var13.packetBuffer.writeShortLE(class223.baseX * 64 + var11);
+					var13.packetBuffer.method5461(class286.baseY * 64 + var12);
+					var13.packetBuffer.method5453(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
+					var13.packetBuffer.writeByte(var4);
+					var13.packetBuffer.writeByte(var5);
+					var13.packetBuffer.writeShort(Client.camAngleY);
+					var13.packetBuffer.writeByte(57);
+					var13.packetBuffer.writeByte(0);
+					var13.packetBuffer.writeByte(0);
+					var13.packetBuffer.writeByte(89);
+					var13.packetBuffer.writeShort(class223.localPlayer.x);
+					var13.packetBuffer.writeShort(class223.localPlayer.y * 682054857);
+					var13.packetBuffer.writeByte(63);
+					Client.packetWriter.addNode(var13);
+					Client.destinationX = var11;
+					Client.destinationY = var12;
+				}
+			}
+
+		}
+	}
 }

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

@@ -7,43 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kl")
+@ObfuscatedName("kx")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("dr")
+	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "Lio;"
-	)
-	@Export("archive15")
-	static Archive archive15;
-	@ObfuscatedName("c")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -957972311
+		intValue = -1837703949
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -499111829
+		intValue = 496960127
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1421427639
+		intValue = -589477741
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("exception")
 	IOException exception;
 
@@ -58,10 +52,10 @@ public class BufferedSource implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(IB)Z",
-		garbageValue = "-46"
+		garbageValue = "-42"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
@@ -92,10 +86,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-266051829"
+		garbageValue = "-99"
 	)
 	@Export("available")
 	int available() throws IOException {
@@ -116,15 +110,15 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "842069737"
+		garbageValue = "1540455812"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
 		synchronized(this) {
-			if (this.position == this.limit) {
+			if (this.limit == this.position) {
 				if (this.exception != null) {
 					throw new IOException(this.exception.toString());
 				} else {
@@ -139,10 +133,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "372085290"
+		garbageValue = "2103598010"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
@@ -180,10 +174,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-122132580"
+		garbageValue = "2069219110"
 	)
 	@Export("close")
 	void close() {

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

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

@@ -4,39 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ky")
+@ObfuscatedName("kt")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1827163357
+		intValue = 1085109787
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1136755957
+		intValue = -745592959
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 871575803
+		intValue = 1171490501
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("ByteArrayPool_alternativeSizes")
-	static int[] ByteArrayPool_alternativeSizes;
+	public static int[] ByteArrayPool_alternativeSizes;
+	@ObfuscatedName("m")
+	@Export("ByteArrayPool_altSizeArrayCounts")
+	public static int[] ByteArrayPool_altSizeArrayCounts;
 
 	static {
 		ByteArrayPool_smallCount = 0;
@@ -47,10 +50,10 @@ public class ByteArrayPool {
 		ByteArrayPool_large = new byte[50][];
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(IZI)[B",
+		signature = "(IZB)[B",
-		garbageValue = "-2146041378"
+		garbageValue = "-44"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
@@ -82,14 +85,14 @@ public class ByteArrayPool {
 			return var2;
 		}
 
-		if (WorldMapEvent.ByteArrayPool_arrays != null) {
+		if (class81.ByteArrayPool_arrays != null) {
 			for (int var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) {
 				if (ByteArrayPool_alternativeSizes[var4] != var0) {
 					if (var0 < ByteArrayPool_alternativeSizes[var4]) {
 					}
-				} else if (Login.ByteArrayPool_altSizeArrayCounts[var4] > 0) {
+				} else if (ByteArrayPool_altSizeArrayCounts[var4] > 0) {
-					byte[] var3 = WorldMapEvent.ByteArrayPool_arrays[var4][--Login.ByteArrayPool_altSizeArrayCounts[var4]];
+					byte[] var3 = class81.ByteArrayPool_arrays[var4][--ByteArrayPool_altSizeArrayCounts[var4]];
-					WorldMapEvent.ByteArrayPool_arrays[var4][Login.ByteArrayPool_altSizeArrayCounts[var4]] = null;
+					class81.ByteArrayPool_arrays[var4][ByteArrayPool_altSizeArrayCounts[var4]] = null;
 					return var3;
 				}
 			}
@@ -97,17 +100,4 @@ public class ByteArrayPool {
 
 		return new byte[var0];
 	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;II)V",
-		garbageValue = "651984351"
-	)
-	static final void method5750(String var0, int var1) {
-		PacketBufferNode var2 = MenuAction.getPacketBufferNode(ClientPacket.field2193, Client.packetWriter.isaacCipher);
-		var2.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var0) + 1);
-		var2.packetBuffer.writeStringCp1252NullTerminated(var0);
-		var2.packetBuffer.method5493(var1);
-		Client.packetWriter.addNode(var2);
-	}
 }

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

@@ -4,18 +4,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gm")
+@ObfuscatedName("gz")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
-	static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
+	public static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("DAYS_OF_THE_WEEK")
-	static final String[] DAYS_OF_THE_WEEK;
+	public static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@Export("Calendar_calendar")
-	static java.util.Calendar Calendar_calendar;
+	public static java.util.Calendar Calendar_calendar;
 
 	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"}};
@@ -24,22 +24,38 @@ public class Calendar {
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
+		signature = "(Lho;I[B[BB)V",
-		garbageValue = "-283445433"
+		garbageValue = "-75"
 	)
-	@Export("isWorldMapEvent")
+	@Export("Widget_setKey")
-	public static boolean isWorldMapEvent(int var0) {
+	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
-		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17;
+		if (var0.field2552 == null) {
+			if (var2 == null) {
+				return;
 			}
 
-	@ObfuscatedName("z")
+			var0.field2552 = new byte[11][];
-	@ObfuscatedSignature(
+			var0.field2621 = new byte[11][];
-		signature = "(Ljava/lang/String;B)V",
+			var0.field2586 = new int[11];
-		garbageValue = "121"
+			var0.field2548 = new int[11];
-	)
+		}
-	static final void method3933(String var0) {
+
-		WorldMapSection2.method283(var0 + " is already on your friend list");
+		var0.field2552[var1] = var2;
+		if (var2 != null) {
+			var0.field2619 = true;
+		} else {
+			var0.field2619 = false;
+
+			for (int var4 = 0; var4 < var0.field2552.length; ++var4) {
+				if (var0.field2552[var4] != null) {
+					var0.field2619 = true;
+					break;
+				}
+			}
+		}
+
+		var0.field2621[var1] = var3;
 	}
 }

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

@@ -1,23 +1,15 @@
 import java.awt.Component;
 import java.awt.Graphics;
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
-import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ai")
+@ObfuscatedName("ay")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 1291773237
-	)
-	public static int field395;
-	@ObfuscatedName("c")
 	@Export("component")
 	Component component;
 
@@ -33,509 +25,119 @@ public final class Canvas extends java.awt.Canvas {
 		this.component.paint(var1);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
+		signature = "(II)Lho;",
-		garbageValue = "1869082478"
+		garbageValue = "313560965"
 	)
-	@Export("setLoginResponseString")
+	@Export("getWidget")
-	static void setLoginResponseString(String var0, String var1, String var2) {
+	public static Widget getWidget(int var0) {
-		Login.Login_response1 = var0;
+		int var1 = var0 >> 16;
-		Login.Login_response2 = var1;
+		int var2 = var0 & 65535;
-		Login.Login_response3 = var2;
+		if (UserComparator5.Widget_interfaceComponents[var1] == null || UserComparator5.Widget_interfaceComponents[var1][var2] == null) {
+			boolean var3 = WorldMapData_0.loadInterface(var1);
+			if (!var3) {
+				return null;
+			}
 		}
 
-	@ObfuscatedName("v")
+		return UserComparator5.Widget_interfaceComponents[var1][var2];
+	}
+
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(Lhp;III)[Llf;",
-		garbageValue = "-87"
+		garbageValue = "-2024454786"
 	)
-	@Export("WorldMapElement_clearCached")
+	@Export("SpriteBuffer_getSpriteArray")
-	public static void WorldMapElement_clearCached() {
+	public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) {
-		WorldMapElement.WorldMapElement_cachedSprites.clear();
+		return !VertexNormal.method2958(var0, var1, var2) ? null : AbstractWorldMapIcon.method642();
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(ILcu;ZI)I",
-		garbageValue = "1591612905"
+		garbageValue = "952621968"
 	)
-	@Export("getGcDuration")
+	static int method889(int var0, Script var1, boolean var2) {
-	protected static int getGcDuration() {
+		if (var0 == ScriptOpcodes.GETWINDOWMODE) {
-		int var0 = 0;
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class247.getWindowedMode();
-		if (GrandExchangeOfferTotalQuantityComparator.garbageCollector == null || !GrandExchangeOfferTotalQuantityComparator.garbageCollector.isValid()) {
+			return 1;
-			try {
+		} else {
-				Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator();
-
-				while (var1.hasNext()) {
-					GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next();
-					if (var2.isValid()) {
-						GrandExchangeOfferTotalQuantityComparator.garbageCollector = var2;
-						GameShell.garbageCollectorLastCheckTimeMs = -1L;
-						GameShell.garbageCollectorLastCollectionTime = -1L;
-					}
-				}
-			} catch (Throwable var11) {
-			}
-		}
-
-		if (GrandExchangeOfferTotalQuantityComparator.garbageCollector != null) {
-			long var9 = SoundCache.method2480();
-			long var3 = GrandExchangeOfferTotalQuantityComparator.garbageCollector.getCollectionTime();
-			if (GameShell.garbageCollectorLastCollectionTime != -1L) {
-				long var5 = var3 - GameShell.garbageCollectorLastCollectionTime;
-				long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs;
-				if (var7 != 0L) {
-					var0 = (int)(100L * var5 / var7);
-				}
-			}
-
-			GameShell.garbageCollectorLastCollectionTime = var3;
-			GameShell.garbageCollectorLastCheckTimeMs = var9;
-		}
-
-		return var0;
-	}
-
-	@ObfuscatedName("gs")
-	@ObfuscatedSignature(
-		signature = "(ZLkt;B)V",
-		garbageValue = "-109"
-	)
-	@Export("loadRegions")
-	static final void loadRegions(boolean var0, PacketBuffer var1) {
-		Client.isInInstance = var0;
 			int var3;
-		int var4;
+			if (var0 == ScriptOpcodes.SETWINDOWMODE) {
-		int var5;
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-		int var6;
+				if (var3 == 1 || var3 == 2) {
-		int var7;
+					UserComparator8.setWindowedMode(var3);
-		int var8;
-		if (!Client.isInInstance) {
-			int var2 = var1.method5514();
-			var3 = var1.method5514();
-			var4 = var1.readUnsignedShort();
-			GrandExchangeOfferAgeComparator.xteaKeys = new int[var4][4];
-
-			for (var5 = 0; var5 < var4; ++var5) {
-				for (var6 = 0; var6 < 4; ++var6) {
-					GrandExchangeOfferAgeComparator.xteaKeys[var5][var6] = var1.readInt();
-				}
 				}
 
-			class197.regions = new int[var4];
+				return 1;
-			WorldMapEvent.regionMapArchiveIds = new int[var4];
+			} else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) {
-			SequenceDefinition.regionLandArchiveIds = new int[var4];
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractArchive.clientPreferences.windowMode;
-			MusicPatchPcmStream.regionLandArchives = new byte[var4][];
+				return 1;
-			Client.regionMapArchives = new byte[var4][];
+			} else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) {
-			boolean var16 = false;
+				if (var0 == 5310) {
-			if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) {
+					--Interpreter.Interpreter_intStackSize;
-				var16 = true;
+					return 1;
-			}
-
-			if (var2 / 8 == 48 && var3 / 8 == 148) {
-				var16 = true;
-			}
-
-			var4 = 0;
-
-			for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) {
-				for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) {
-					var8 = var7 + (var6 << 8);
-					if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) {
-						class197.regions[var4] = var8;
-						WorldMapEvent.regionMapArchiveIds[var4] = Timer.archive5.getGroupId("m" + var6 + "_" + var7);
-						SequenceDefinition.regionLandArchiveIds[var4] = Timer.archive5.getGroupId("l" + var6 + "_" + var7);
-						++var4;
-					}
-				}
-			}
-
-			WorldMapSection2.method301(var2, var3, true);
 				} else {
-			boolean var15 = var1.method5494() == 1;
+					return 2;
-			var3 = var1.readUnsignedShort();
+				}
-			var4 = var1.method5459();
-			var5 = var1.readUnsignedShort();
-			var1.importIndex();
-
-			int var9;
-			for (var6 = 0; var6 < 4; ++var6) {
-				for (var7 = 0; var7 < 13; ++var7) {
-					for (var8 = 0; var8 < 13; ++var8) {
-						var9 = var1.readBits(1);
-						if (var9 == 1) {
-							Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26);
 			} else {
-							Client.instanceChunkTemplates[var6][var7][var8] = -1;
+				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				if (var3 == 1 || var3 == 2) {
+					AbstractArchive.clientPreferences.windowMode = var3;
+					Language.savePreferences();
 				}
+
+				return 1;
 			}
 		}
 	}
 
-			var1.exportIndex();
+	@ObfuscatedName("kn")
-			GrandExchangeOfferAgeComparator.xteaKeys = new int[var5][4];
-
-			for (var6 = 0; var6 < var5; ++var6) {
-				for (var7 = 0; var7 < 4; ++var7) {
-					GrandExchangeOfferAgeComparator.xteaKeys[var6][var7] = var1.readInt();
-				}
-			}
-
-			class197.regions = new int[var5];
-			WorldMapEvent.regionMapArchiveIds = new int[var5];
-			SequenceDefinition.regionLandArchiveIds = new int[var5];
-			MusicPatchPcmStream.regionLandArchives = new byte[var5][];
-			Client.regionMapArchives = new byte[var5][];
-			var5 = 0;
-
-			for (var6 = 0; var6 < 4; ++var6) {
-				for (var7 = 0; var7 < 13; ++var7) {
-					for (var8 = 0; var8 < 13; ++var8) {
-						var9 = Client.instanceChunkTemplates[var6][var7][var8];
-						if (var9 != -1) {
-							int var10 = var9 >> 14 & 1023;
-							int var11 = var9 >> 3 & 2047;
-							int var12 = (var10 / 8 << 8) + var11 / 8;
-
-							int var13;
-							for (var13 = 0; var13 < var5; ++var13) {
-								if (class197.regions[var13] == var12) {
-									var12 = -1;
-									break;
-								}
-							}
-
-							if (var12 != -1) {
-								class197.regions[var5] = var12;
-								var13 = var12 >> 8 & 255;
-								int var14 = var12 & 255;
-								WorldMapEvent.regionMapArchiveIds[var5] = Timer.archive5.getGroupId("m" + var13 + "_" + var14);
-								SequenceDefinition.regionLandArchiveIds[var5] = Timer.archive5.getGroupId("l" + var13 + "_" + var14);
-								++var5;
-							}
-						}
-					}
-				}
-			}
-
-			WorldMapSection2.method301(var3, var4, !var15);
-		}
-
-	}
-
-	@ObfuscatedName("gb")
 	@ObfuscatedSignature(
-		signature = "(Lgn;I)V",
+		signature = "(Ljava/lang/String;ZI)V",
-		garbageValue = "1871694401"
+		garbageValue = "328041460"
 	)
-	static final void method815(class185 var0) {
+	@Export("findItemDefinitions")
-		PacketBuffer var1 = Client.packetWriter.packetBuffer;
+	static void findItemDefinitions(String var0, boolean var1) {
-		int var3;
+		var0 = var0.toLowerCase();
-		int var6;
+		short[] var2 = new short[16];
-		int var37;
+		int var3 = 0;
-		int var38;
+
-		int var39;
+		for (int var4 = 0; var4 < JagexCache.ItemDefinition_fileCount; ++var4) {
-		int var40;
+			ItemDefinition var5 = Occluder.ItemDefinition_get(var4);
-		if (class185.field2299 == var0) {
+			if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) {
-			var37 = var1.readUnsignedShort();
+				if (var3 >= 250) {
-			var3 = var1.readUnsignedByteNegate();
+					DevicePcmPlayerProvider.foundItemIdCount = -1;
-			var38 = (var3 >> 4 & 7) + WorldMapSection1.field286;
+					WorldMapIcon_0.foundItemIds = null;
-			var39 = (var3 & 7) + ArchiveLoader.field508;
+					return;
-			var6 = var1.method5459();
-			var40 = var1.readUnsignedByteNegate();
-			if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) {
-				var38 = var38 * 128 + 64;
-				var39 = var39 * 128 + 64;
-				GraphicsObject var41 = new GraphicsObject(var37, MouseRecorder.plane, var38, var39, WorldMapAreaData.getTileHeight(var38, var39, MouseRecorder.plane) - var40, var6, Client.cycle);
-				Client.graphicsObjects.addFirst(var41);
 				}
 
-		} else {
+				if (var3 >= var2.length) {
-			int var31;
+					short[] var6 = new short[var2.length * 2];
-			if (class185.field2303 == var0) {
+
-				var37 = var1.readUnsignedByte();
+					for (int var7 = 0; var7 < var3; ++var7) {
-				var3 = (var37 >> 4 & 7) + WorldMapSection1.field286;
+						var6[var7] = var2[var7];
-				var38 = (var37 & 7) + ArchiveLoader.field508;
-				var39 = var1.method5494();
-				var6 = var39 >> 2;
-				var40 = var39 & 3;
-				var31 = Client.field682[var6];
-				if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
-					Tiles.updatePendingSpawn(MouseRecorder.plane, var3, var38, var31, -1, var6, var40, 0, -1);
 					}
 
-			} else {
+					var2 = var6;
-				byte var4;
-				byte var5;
-				int var9;
-				int var10;
-				int var11;
-				int var12;
-				int var13;
-				int var14;
-				if (class185.field2296 == var0) {
-					var37 = var1.readUnsignedByteNegate();
-					var3 = var1.method5506();
-					var4 = var1.method5634();
-					var5 = var1.method5634();
-					var6 = var1.method5494();
-					var40 = (var6 >> 4 & 7) + WorldMapSection1.field286;
-					var31 = (var6 & 7) + ArchiveLoader.field508;
-					var9 = var1.readUnsignedByteNegate() * 4;
-					var10 = var1.method5514();
-					var11 = var1.method5459();
-					var12 = var1.readUnsignedByte() * 4;
-					var13 = var1.method5514();
-					var14 = var1.readUnsignedByte();
-					var39 = var5 + var40;
-					var38 = var4 + var31;
-					if (var40 >= 0 && var31 >= 0 && var40 < 104 && var31 < 104 && var39 >= 0 && var38 >= 0 && var39 < 104 && var38 < 104 && var10 != 65535) {
-						var40 = var40 * 128 + 64;
-						var31 = var31 * 128 + 64;
-						var39 = var39 * 128 + 64;
-						var38 = var38 * 128 + 64;
-						Projectile var15 = new Projectile(var10, MouseRecorder.plane, var40, var31, WorldMapAreaData.getTileHeight(var40, var31, MouseRecorder.plane) - var12, var13 + Client.cycle, var11 + Client.cycle, var14, var37, var3, var9);
-						var15.setDestination(var39, var38, WorldMapAreaData.getTileHeight(var39, var38, MouseRecorder.plane) - var9, var13 + Client.cycle);
-						Client.projectiles.addFirst(var15);
 				}
 
-				} else if (class185.field2301 == var0) {
+				var2[var3++] = (short)var4;
-					var37 = var1.method5514();
-					var3 = var1.method5547();
-					var38 = (var3 >> 4 & 7) + WorldMapSection1.field286;
-					var39 = (var3 & 7) + ArchiveLoader.field508;
-					var6 = var1.readUnsignedByteNegate();
-					var40 = var6 >> 2;
-					var31 = var6 & 3;
-					var9 = Client.field682[var40];
-					if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) {
-						Tiles.updatePendingSpawn(MouseRecorder.plane, var38, var39, var9, var37, var40, var31, 0, -1);
-					}
-
-				} else if (class185.field2304 == var0) {
-					var37 = var1.method5514();
-					var3 = var1.method5494();
-					var38 = (var3 >> 4 & 7) + WorldMapSection1.field286;
-					var39 = (var3 & 7) + ArchiveLoader.field508;
-					var6 = var1.method5494();
-					var40 = var6 >> 2;
-					var31 = var6 & 3;
-					var9 = Client.field682[var40];
-					if (var38 >= 0 && var39 >= 0 && var38 < 103 && var39 < 103) {
-						if (var9 == 0) {
-							BoundaryObject var32 = WorldMapIcon_1.scene.method3063(MouseRecorder.plane, var38, var39);
-							if (var32 != null) {
-								var11 = SecureRandomFuture.Entity_unpackID(var32.tag);
-								if (var40 == 2) {
-									var32.entity1 = new DynamicObject(var11, 2, var31 + 4, MouseRecorder.plane, var38, var39, var37, false, var32.entity1);
-									var32.entity2 = new DynamicObject(var11, 2, var31 + 1 & 3, MouseRecorder.plane, var38, var39, var37, false, var32.entity2);
-								} else {
-									var32.entity1 = new DynamicObject(var11, var40, var31, MouseRecorder.plane, var38, var39, var37, false, var32.entity1);
-								}
 			}
 		}
 
-						if (var9 == 1) {
+		WorldMapIcon_0.foundItemIds = var2;
-							WallDecoration var42 = WorldMapIcon_1.scene.method3189(MouseRecorder.plane, var38, var39);
+		ReflectionCheck.foundItemIndex = 0;
-							if (var42 != null) {
+		DevicePcmPlayerProvider.foundItemIdCount = var3;
-								var11 = SecureRandomFuture.Entity_unpackID(var42.tag);
+		String[] var8 = new String[DevicePcmPlayerProvider.foundItemIdCount];
-								if (var40 != 4 && var40 != 5) {
+
-									if (var40 == 6) {
+		for (int var9 = 0; var9 < DevicePcmPlayerProvider.foundItemIdCount; ++var9) {
-										var42.entity1 = new DynamicObject(var11, 4, var31 + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity1);
+			var8[var9] = Occluder.ItemDefinition_get(var2[var9]).name;
-									} else if (var40 == 7) {
-										var42.entity1 = new DynamicObject(var11, 4, (var31 + 2 & 3) + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity1);
-									} else if (var40 == 8) {
-										var42.entity1 = new DynamicObject(var11, 4, var31 + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity1);
-										var42.entity2 = new DynamicObject(var11, 4, (var31 + 2 & 3) + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity2);
-									}
-								} else {
-									var42.entity1 = new DynamicObject(var11, 4, var31, MouseRecorder.plane, var38, var39, var37, false, var42.entity1);
-								}
-							}
 		}
 
-						if (var9 == 2) {
+		short[] var10 = WorldMapIcon_0.foundItemIds;
-							GameObject var43 = WorldMapIcon_1.scene.method3065(MouseRecorder.plane, var38, var39);
+		GrandExchangeOfferNameComparator.sortItemsByName(var8, var10, 0, var8.length - 1);
-							if (var40 == 11) {
-								var40 = 10;
-							}
-
-							if (var43 != null) {
-								var43.entity = new DynamicObject(SecureRandomFuture.Entity_unpackID(var43.tag), var40, var31, MouseRecorder.plane, var38, var39, var37, false, var43.entity);
-							}
-						}
-
-						if (var9 == 3) {
-							FloorDecoration var44 = WorldMapIcon_1.scene.getFloorDecoration(MouseRecorder.plane, var38, var39);
-							if (var44 != null) {
-								var44.entity = new DynamicObject(SecureRandomFuture.Entity_unpackID(var44.tag), 22, var31, MouseRecorder.plane, var38, var39, var37, false, var44.entity);
-							}
-						}
-					}
-
-				} else {
-					if (class185.field2297 == var0) {
-						byte var2 = var1.method5634();
-						var3 = var1.readUnsignedShort();
-						var4 = var1.method5497();
-						var5 = var1.method5634();
-						var6 = var1.method5514();
-						byte var7 = var1.method5498();
-						var31 = var1.method5503();
-						var9 = var1.method5514();
-						var10 = var1.readUnsignedByte();
-						var11 = (var10 >> 4 & 7) + WorldMapSection1.field286;
-						var12 = (var10 & 7) + ArchiveLoader.field508;
-						var13 = var1.readUnsignedByte();
-						var14 = var13 >> 2;
-						int var33 = var13 & 3;
-						int var16 = Client.field682[var14];
-						Player var17;
-						if (var9 == Client.localPlayerIndex) {
-							var17 = Varps.localPlayer;
-						} else {
-							var17 = Client.players[var9];
-						}
-
-						if (var17 != null) {
-							ObjectDefinition var18 = WallDecoration.getObjectDefinition(var31);
-							int var19;
-							int var20;
-							if (var33 != 1 && var33 != 3) {
-								var19 = var18.sizeX;
-								var20 = var18.sizeY;
-							} else {
-								var19 = var18.sizeY;
-								var20 = var18.sizeX;
-							}
-
-							int var21 = var11 + (var19 >> 1);
-							int var22 = var11 + (var19 + 1 >> 1);
-							int var23 = var12 + (var20 >> 1);
-							int var24 = var12 + (var20 + 1 >> 1);
-							int[][] var25 = Tiles.Tiles_heights[MouseRecorder.plane];
-							int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2;
-							int var27 = (var11 << 7) + (var19 << 6);
-							int var28 = (var12 << 7) + (var20 << 6);
-							Model var29 = var18.getModel(var14, var33, var25, var27, var26, var28);
-							if (var29 != null) {
-								Tiles.updatePendingSpawn(MouseRecorder.plane, var11, var12, var16, -1, 0, 0, var6 + 1, var3 + 1);
-								var17.animationCycleStart = var6 + Client.cycle;
-								var17.animationCycleEnd = var3 + Client.cycle;
-								var17.model0 = var29;
-								var17.field597 = var11 * 128 + var19 * 64;
-								var17.field599 = var12 * 128 + var20 * 64;
-								var17.tileHeight2 = var26;
-								byte var30;
-								if (var4 > var2) {
-									var30 = var4;
-									var4 = var2;
-									var2 = var30;
-								}
-
-								if (var7 > var5) {
-									var30 = var7;
-									var7 = var5;
-									var5 = var30;
-								}
-
-								var17.field601 = var4 + var11;
-								var17.field609 = var11 + var2;
-								var17.field602 = var7 + var12;
-								var17.field604 = var5 + var12;
-							}
-						}
-					}
-
-					if (class185.field2305 == var0) {
-						var37 = var1.method5547();
-						var3 = (var37 >> 4 & 7) + WorldMapSection1.field286;
-						var38 = (var37 & 7) + ArchiveLoader.field508;
-						var39 = var1.method5547();
-						var6 = var39 >> 4 & 15;
-						var40 = var39 & 7;
-						var31 = var1.readUnsignedShort();
-						var9 = var1.method5547();
-						if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
-							var10 = var6 + 1;
-							if (Varps.localPlayer.pathX[0] >= var3 - var10 && Varps.localPlayer.pathX[0] <= var3 + var10 && Varps.localPlayer.pathY[0] >= var38 - var10 && Varps.localPlayer.pathY[0] <= var38 + var10 && Client.field860 != 0 && var40 > 0 && Client.soundEffectCount < 50) {
-								Client.soundEffectIds[Client.soundEffectCount] = var31;
-								Client.queuedSoundEffectLoops[Client.soundEffectCount] = var40;
-								Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9;
-								Client.soundEffects[Client.soundEffectCount] = null;
-								Client.soundLocations[Client.soundEffectCount] = var6 + (var38 << 8) + (var3 << 16);
-								++Client.soundEffectCount;
-							}
-						}
-					}
-
-					TileItem var35;
-					if (class185.field2298 == var0) {
-						var37 = var1.readUnsignedByte();
-						var3 = (var37 >> 4 & 7) + WorldMapSection1.field286;
-						var38 = (var37 & 7) + ArchiveLoader.field508;
-						var39 = var1.method5514();
-						if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
-							NodeDeque var34 = Client.groundItems[MouseRecorder.plane][var3][var38];
-							if (var34 != null) {
-								for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) {
-									if ((var39 & 32767) == var35.id) {
-										var35.remove();
-										break;
-									}
-								}
-
-								if (var34.last() == null) {
-									Client.groundItems[MouseRecorder.plane][var3][var38] = null;
-								}
-
-								WorldMapCacheName.updateItemPile(var3, var38);
-							}
-						}
-
-					} else if (class185.field2302 == var0) {
-						var37 = var1.method5514();
-						var3 = var1.method5503();
-						var38 = var1.method5547();
-						var39 = (var38 >> 4 & 7) + WorldMapSection1.field286;
-						var6 = (var38 & 7) + ArchiveLoader.field508;
-						if (var39 >= 0 && var6 >= 0 && var39 < 104 && var6 < 104) {
-							var35 = new TileItem();
-							var35.id = var37;
-							var35.quantity = var3;
-							if (Client.groundItems[MouseRecorder.plane][var39][var6] == null) {
-								Client.groundItems[MouseRecorder.plane][var39][var6] = new NodeDeque();
-							}
-
-							Client.groundItems[MouseRecorder.plane][var39][var6].addFirst(var35);
-							WorldMapCacheName.updateItemPile(var39, var6);
-						}
-
-					} else if (class185.field2300 == var0) {
-						var37 = var1.readUnsignedShort();
-						var3 = var1.readUnsignedShort();
-						var38 = var1.method5547();
-						var39 = (var38 >> 4 & 7) + WorldMapSection1.field286;
-						var6 = (var38 & 7) + ArchiveLoader.field508;
-						var40 = var1.method5459();
-						if (var39 >= 0 && var6 >= 0 && var39 < 104 && var6 < 104) {
-							NodeDeque var8 = Client.groundItems[MouseRecorder.plane][var39][var6];
-							if (var8 != null) {
-								for (TileItem var36 = (TileItem)var8.last(); var36 != null; var36 = (TileItem)var8.previous()) {
-									if ((var37 & 32767) == var36.id && var3 == var36.quantity) {
-										var36.quantity = var40;
-										break;
-									}
-								}
-
-								WorldMapCacheName.updateItemPile(var39, var6);
-							}
-						}
-
-					}
-				}
-			}
-		}
 	}
 }

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

@@ -4,18 +4,18 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cs")
+@ObfuscatedName("cc")
 @Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "[Lbj;"
+		signature = "[Lbe;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 26719133
+		intValue = -864101903
 	)
 	@Export("count")
 	int count;
@@ -24,10 +24,10 @@ public class ChatChannel {
 		this.messages = new Message[100];
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbj;",
+		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbe;",
-		garbageValue = "2"
+		garbageValue = "56"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
@@ -55,159 +55,223 @@ public class ChatChannel {
 		return var5;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(II)Lbj;",
+		signature = "(II)Lbe;",
-		garbageValue = "-1600519730"
+		garbageValue = "601749225"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
 		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(S)I",
+		signature = "(I)I",
-		garbageValue = "255"
+		garbageValue = "-135495526"
 	)
 	@Export("size")
 	int size() {
 		return this.count;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("ft")
 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;Lhz;B)V",
+		signature = "(I)V",
-		garbageValue = "-105"
+		garbageValue = "247037730"
 	)
-	public static void method2220(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
+	static final void method2233() {
-		HitSplatDefinition.HitSplatDefinition_archive = var0;
+		int var0 = class225.field3045 * 16384 + 64;
-		HitSplatDefinition.field3300 = var1;
+		int var1 = Clock.field2039 * 128 + 64;
-		class189.HitSplatDefinition_fontsArchive = var2;
+		int var2 = MusicPatchPcmStream.getTileHeight(var0, var1, WorldMapRectangle.plane) - GrandExchangeOfferOwnWorldComparator.field627;
-	}
+		if (GrandExchangeOfferOwnWorldComparator.cameraX < var0) {
-
+			GrandExchangeOfferOwnWorldComparator.cameraX = (var0 - GrandExchangeOfferOwnWorldComparator.cameraX) * Messages.field1262 / 1000 + GrandExchangeOfferOwnWorldComparator.cameraX + MouseRecorder.field572;
-	@ObfuscatedName("g")
+			if (GrandExchangeOfferOwnWorldComparator.cameraX > var0) {
-	@ObfuscatedSignature(
+				GrandExchangeOfferOwnWorldComparator.cameraX = var0;
-		signature = "(Ljava/lang/CharSequence;I)[B",
-		garbageValue = "1945232856"
-	)
-	public static byte[] method2212(CharSequence var0) {
-		int var1 = var0.length();
-		byte[] var2 = new byte[var1];
-
-		for (int var3 = 0; var3 < var1; ++var3) {
-			char var4 = var0.charAt(var3);
-			if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) {
-				var2[var3] = (byte)var4;
-			} else if (var4 == 8364) {
-				var2[var3] = -128;
-			} else if (var4 == 8218) {
-				var2[var3] = -126;
-			} else if (var4 == 402) {
-				var2[var3] = -125;
-			} else if (var4 == 8222) {
-				var2[var3] = -124;
-			} else if (var4 == 8230) {
-				var2[var3] = -123;
-			} else if (var4 == 8224) {
-				var2[var3] = -122;
-			} else if (var4 == 8225) {
-				var2[var3] = -121;
-			} else if (var4 == 710) {
-				var2[var3] = -120;
-			} else if (var4 == 8240) {
-				var2[var3] = -119;
-			} else if (var4 == 352) {
-				var2[var3] = -118;
-			} else if (var4 == 8249) {
-				var2[var3] = -117;
-			} else if (var4 == 338) {
-				var2[var3] = -116;
-			} else if (var4 == 381) {
-				var2[var3] = -114;
-			} else if (var4 == 8216) {
-				var2[var3] = -111;
-			} else if (var4 == 8217) {
-				var2[var3] = -110;
-			} else if (var4 == 8220) {
-				var2[var3] = -109;
-			} else if (var4 == 8221) {
-				var2[var3] = -108;
-			} else if (var4 == 8226) {
-				var2[var3] = -107;
-			} else if (var4 == 8211) {
-				var2[var3] = -106;
-			} else if (var4 == 8212) {
-				var2[var3] = -105;
-			} else if (var4 == 732) {
-				var2[var3] = -104;
-			} else if (var4 == 8482) {
-				var2[var3] = -103;
-			} else if (var4 == 353) {
-				var2[var3] = -102;
-			} else if (var4 == 8250) {
-				var2[var3] = -101;
-			} else if (var4 == 339) {
-				var2[var3] = -100;
-			} else if (var4 == 382) {
-				var2[var3] = -98;
-			} else if (var4 == 376) {
-				var2[var3] = -97;
-			} else {
-				var2[var3] = 63;
 			}
 		}
 
-		return var2;
+		if (GrandExchangeOfferOwnWorldComparator.cameraX > var0) {
+			GrandExchangeOfferOwnWorldComparator.cameraX -= Messages.field1262 * (GrandExchangeOfferOwnWorldComparator.cameraX - var0) / 1000 + MouseRecorder.field572;
+			if (GrandExchangeOfferOwnWorldComparator.cameraX < var0) {
+				GrandExchangeOfferOwnWorldComparator.cameraX = var0;
+			}
 		}
 
-	@ObfuscatedName("v")
+		if (Varcs.cameraY < var2) {
-	@ObfuscatedSignature(
+			Varcs.cameraY = (var2 - Varcs.cameraY) * Messages.field1262 / 1000 + Varcs.cameraY + MouseRecorder.field572;
-		signature = "(I)Lli;",
+			if (Varcs.cameraY > var2) {
-		garbageValue = "1800491151"
+				Varcs.cameraY = var2;
-	)
+			}
-	static Sprite method2218() {
+		}
-		Sprite var0 = new Sprite();
+
-		var0.width = class325.SpriteBuffer_spriteWidth;
+		if (Varcs.cameraY > var2) {
-		var0.height = class325.SpriteBuffer_spriteHeight;
+			Varcs.cameraY -= Messages.field1262 * (Varcs.cameraY - var2) / 1000 + MouseRecorder.field572;
-		var0.xOffset = class325.SpriteBuffer_xOffsets[0];
+			if (Varcs.cameraY < var2) {
-		var0.yOffset = SecureRandomCallable.SpriteBuffer_yOffsets[0];
+				Varcs.cameraY = var2;
-		var0.subWidth = class325.SpriteBuffer_spriteWidths[0];
+			}
-		var0.subHeight = SoundSystem.SpriteBuffer_spriteHeights[0];
+		}
-		int var1 = var0.subWidth * var0.subHeight;
+
-		byte[] var2 = InvDefinition.SpriteBuffer_pixels[0];
+		if (WorldMapIcon_1.cameraZ < var1) {
-		var0.pixels = new int[var1];
+			WorldMapIcon_1.cameraZ = (var1 - WorldMapIcon_1.cameraZ) * Messages.field1262 / 1000 + WorldMapIcon_1.cameraZ + MouseRecorder.field572;
-
+			if (WorldMapIcon_1.cameraZ > var1) {
-		for (int var3 = 0; var3 < var1; ++var3) {
+				WorldMapIcon_1.cameraZ = var1;
-			var0.pixels[var3] = class325.SpriteBuffer_spritePalette[var2[var3] & 255];
+			}
+		}
+
+		if (WorldMapIcon_1.cameraZ > var1) {
+			WorldMapIcon_1.cameraZ -= Messages.field1262 * (WorldMapIcon_1.cameraZ - var1) / 1000 + MouseRecorder.field572;
+			if (WorldMapIcon_1.cameraZ < var1) {
+				WorldMapIcon_1.cameraZ = var1;
+			}
+		}
+
+		var0 = GameShell.field455 * 128 + 64;
+		var1 = SecureRandomFuture.field1228 * 16384 + 64;
+		var2 = MusicPatchPcmStream.getTileHeight(var0, var1, WorldMapRectangle.plane) - class14.field90;
+		int var3 = var0 - GrandExchangeOfferOwnWorldComparator.cameraX;
+		int var4 = var2 - Varcs.cameraY;
+		int var5 = var1 - WorldMapIcon_1.cameraZ;
+		int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3));
+		int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047;
+		int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047;
+		if (var7 < 128) {
+			var7 = 128;
+		}
+
+		if (var7 > 383) {
+			var7 = 383;
+		}
+
+		if (IgnoreList.cameraPitch < var7) {
+			IgnoreList.cameraPitch = (var7 - IgnoreList.cameraPitch) * ScriptEvent.field570 / 1000 + IgnoreList.cameraPitch + class80.field1126;
+			if (IgnoreList.cameraPitch > var7) {
+				IgnoreList.cameraPitch = var7;
+			}
+		}
+
+		if (IgnoreList.cameraPitch > var7) {
+			IgnoreList.cameraPitch -= ScriptEvent.field570 * (IgnoreList.cameraPitch - var7) / 1000 + class80.field1126;
+			if (IgnoreList.cameraPitch < var7) {
+				IgnoreList.cameraPitch = var7;
+			}
+		}
+
+		int var9 = var8 - WorldMapSection2.cameraYaw;
+		if (var9 > 1024) {
+			var9 -= 2048;
+		}
+
+		if (var9 < -1024) {
+			var9 += 2048;
+		}
+
+		if (var9 > 0) {
+			WorldMapSection2.cameraYaw = WorldMapSection2.cameraYaw + class80.field1126 + var9 * ScriptEvent.field570 / 1000;
+			WorldMapSection2.cameraYaw &= 2047;
+		}
+
+		if (var9 < 0) {
+			WorldMapSection2.cameraYaw -= class80.field1126 + -var9 * ScriptEvent.field570 / 1000;
+			WorldMapSection2.cameraYaw &= 2047;
+		}
+
+		int var10 = var8 - WorldMapSection2.cameraYaw;
+		if (var10 > 1024) {
+			var10 -= 2048;
+		}
+
+		if (var10 < -1024) {
+			var10 += 2048;
+		}
+
+		if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) {
+			WorldMapSection2.cameraYaw = var8;
 		}
 
-		class192.SpriteBuffer_clear();
-		return var0;
 	}
 
 	@ObfuscatedName("jx")
 	@ObfuscatedSignature(
-		signature = "(IIIILli;Lhi;I)V",
+		signature = "(IB)V",
-		garbageValue = "219480869"
+		garbageValue = "73"
 	)
-	@Export("drawSpriteOnMinimap")
+	static void method2225(int var0) {
-	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
+		ParamDefinition.tempMenuAction = new MenuAction();
-		if (var4 != null) {
+		ParamDefinition.tempMenuAction.argument1 = Client.menuArguments1[var0];
-			int var6 = Client.camAngleY & 2047;
+		ParamDefinition.tempMenuAction.argument2 = Client.menuArguments2[var0];
-			int var7 = var3 * var3 + var2 * var2;
+		ParamDefinition.tempMenuAction.opcode = Client.menuOpcodes[var0];
-			if (var7 <= 6400) {
+		ParamDefinition.tempMenuAction.argument0 = Client.menuIdentifiers[var0];
-				int var8 = Rasterizer3D.Rasterizer3D_sine[var6];
+		ParamDefinition.tempMenuAction.action = Client.menuActions[var0];
-				int var9 = Rasterizer3D.Rasterizer3D_cosine[var6];
+	}
-				int var10 = var9 * var2 + var3 * var8 >> 16;
+
-				int var11 = var3 * var9 - var8 * var2 >> 16;
+	@ObfuscatedName("ja")
-				if (var7 > 2500) {
+	@ObfuscatedSignature(
-					var4.method6102(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths);
+		signature = "([Lho;II)V",
+		garbageValue = "559815398"
+	)
+	@Export("drawModelComponents")
+	static final void drawModelComponents(Widget[] var0, int var1) {
+		for (int var2 = 0; var2 < var0.length; ++var2) {
+			Widget var3 = var0[var2];
+			if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !WorldMapSectionType.isComponentHidden(var3))) {
+				int var5;
+				if (var3.type == 0) {
+					if (!var3.isIf3 && WorldMapSectionType.isComponentHidden(var3) && var3 != NetSocket.mousedOverWidgetIf1) {
+						continue;
+					}
+
+					drawModelComponents(var0, var3.id);
+					if (var3.children != null) {
+						drawModelComponents(var3.children, var3.id);
+					}
+
+					InterfaceParent var7 = (InterfaceParent)Client.interfaceParents.get((long)var3.id);
+					if (var7 != null) {
+						var5 = var7.group;
+						if (WorldMapData_0.loadInterface(var5)) {
+							drawModelComponents(UserComparator5.Widget_interfaceComponents[var5], -1);
+						}
+					}
+				}
+
+				if (var3.type == 6) {
+					if (var3.sequenceId != -1 || var3.sequenceId2 != -1) {
+						boolean var4 = Projectile.runCs1(var3);
+						if (var4) {
+							var5 = var3.sequenceId2;
 						} else {
-					var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
+							var5 = var3.sequenceId;
+						}
+
+						if (var5 != -1) {
+							SequenceDefinition var6 = GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var5);
+
+							for (var3.modelFrameCycle += Client.field698; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; WorldMapSectionType.invalidateWidget(var3)) {
+								var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame];
+								++var3.modelFrame;
+								if (var3.modelFrame >= var6.frameIds.length) {
+									var3.modelFrame -= var6.frameCount;
+									if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) {
+										var3.modelFrame = 0;
+									}
+								}
+							}
+						}
+					}
+
+					if (var3.field2601 != 0 && !var3.isIf3) {
+						int var8 = var3.field2601 >> 16;
+						var5 = var3.field2601 << 16 >> 16;
+						var8 *= Client.field698;
+						var5 *= Client.field698;
+						var3.modelAngleX = var8 + var3.modelAngleX & 2047;
+						var3.modelAngleY = var5 + var3.modelAngleY & 2047;
+						WorldMapSectionType.invalidateWidget(var3);
+					}
+				}
+			}
 		}
 
 	}
 }
-	}
-}

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

@@ -4,137 +4,154 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jz")
+@ObfuscatedName("jk")
 @Implements("ClanChat")
 public class ClanChat extends UserList {
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lll;"
+		signature = "Lli;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Ljj;"
+		signature = "Lju;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 591472141
+		intValue = 198699637
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("s")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1862278063
+		intValue = -2033888675
 	)
-	int field3609;
+	int field3622;
 
 	@ObfuscatedSignature(
-		signature = "(Lll;Ljj;)V"
+		signature = "(Lli;Lju;)V"
 	)
 	public ClanChat(LoginType var1, Usernamed var2) {
 		super(100);
 		this.name = null;
 		this.owner = null;
-		this.field3609 = 1;
+		this.field3622 = 1;
 		this.loginType = var1;
 		this.localUser = var2;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)Ljw;",
+		signature = "(B)Ljh;",
-		garbageValue = "-734254876"
+		garbageValue = "2"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljw;",
+		signature = "(II)[Ljh;",
-		garbageValue = "1353779565"
+		garbageValue = "951526901"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1];
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "682747367"
+		garbageValue = "969628158"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		String var3 = StudioGame.base37DecodeLong(MouseHandler.method1041(var1));
+		this.name = VertexNormal.method2957(var1);
-		if (var3 == null) {
-			var3 = "";
 	}
 
-		this.name = var3;
+	@ObfuscatedName("m")
-	}
-
-	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-7"
+		garbageValue = "-1129044853"
 	)
 	@Export("setOwner")
 	final void setOwner(String var1) {
-		String var3 = StudioGame.base37DecodeLong(MouseHandler.method1041(var1));
+		this.owner = VertexNormal.method2957(var1);
-		if (var3 == null) {
-			var3 = "";
 	}
 
-		this.owner = var3;
+	@ObfuscatedName("y")
-	}
-
-	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(Lkz;I)V",
+		signature = "(Lkl;S)V",
-		garbageValue = "110384625"
+		garbageValue = "20227"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
 		this.setOwner(var1.readStringCp1252NullTerminated());
 		long var2 = var1.readLong();
-		this.readName(GameObject.method3262(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; 0L != var13; 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) {
 			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.field3609 - 1);
+				var9.set(var10, ++this.field3622 - 1);
-				var6.rank = var1.readByte();
+				var9.rank = var1.readByte();
 				var1.readStringCp1252NullTerminated();
-				this.isLocalPlayer(var6);
+				this.isLocalPlayer(var9);
 			}
 
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkz;I)V",
+		signature = "(Lkl;B)V",
-		garbageValue = "1536132448"
+		garbageValue = "-31"
 	)
-	public final void method5217(Buffer var1) {
+	public final void method5151(Buffer var1) {
 		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
 		int var3 = var1.readUnsignedShort();
 		byte var4 = var1.readByte();
@@ -164,17 +181,17 @@ public class ClanChat extends UserList {
 				var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
 			}
 
-			var6.set(var3, ++this.field3609 - 1);
+			var6.set(var3, ++this.field3622 - 1);
 			var6.rank = var4;
 			this.isLocalPlayer(var6);
 		}
 
 	}
 
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cr")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-116"
+		garbageValue = "85012014"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
@@ -184,10 +201,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("ca")
+	@ObfuscatedName("ct")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1536312249"
+		garbageValue = "313560965"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
@@ -197,10 +214,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("ck")
+	@ObfuscatedName("ci")
 	@ObfuscatedSignature(
-		signature = "(Ljl;I)V",
+		signature = "(Ljo;I)V",
-		garbageValue = "1986230893"
+		garbageValue = "345857456"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {

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

@@ -3,18 +3,24 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jl")
+@ObfuscatedName("jo")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("c")
+	@ObfuscatedName("dj")
 	@ObfuscatedSignature(
-		signature = "Ljb;"
+		signature = "Lie;"
+	)
+	@Export("archive11")
+	static Archive archive11;
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "Ljm;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ljb;"
+		signature = "Ljm;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -24,20 +30,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "36"
+		garbageValue = "-407939513"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "23475902"
+		garbageValue = "1388018244"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -48,30 +54,30 @@ public class ClanMate extends Buddy {
 		return this.friend == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1435568825"
+		garbageValue = "2101732622"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = class218.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.friend = Tiles.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1913743784"
+		garbageValue = "349082109"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "2009413985"
+		garbageValue = "-1700541155"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -82,13 +88,22 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "83457319"
+		garbageValue = "-735499948"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = class218.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.ignored = Tiles.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		signature = "(Lhp;Lhp;III)Lkn;",
+		garbageValue = "-569680121"
+	)
+	public static Font method4964(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+		return !VertexNormal.method2958(var0, var2, var3) ? null : class49.method893(var1.takeFile(var2, var3));
 	}
 }

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

@@ -7,40 +7,45 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bz")
+@ObfuscatedName("bl")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("qz")
+	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "Ldh;"
-	)
-	@Export("pcmPlayer1")
-	static PcmPlayer pcmPlayer1;
-	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -312136501
+		intValue = -1035730115
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "Lhp;"
+	)
+	@Export("Widget_spritesArchive")
+	static AbstractArchive Widget_spritesArchive;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		signature = "Llp;"
+	)
+	static IndexedSprite field1046;
+	@ObfuscatedName("v")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1319305605
+		intValue = 1970428567
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
@@ -53,11 +58,11 @@ public class ClientPreferences {
 		this.rememberedUsername = null;
 		this.hideUsername = false;
 		this.parameters = new LinkedHashMap();
-		this.method1811(true);
+		this.method1847(true);
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkz;)V"
+		signature = "(Lkl;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1;
@@ -97,26 +102,26 @@ public class ClientPreferences {
 					this.hideUsername = var1.readBoolean();
 				}
 			} else {
-				this.method1811(true);
+				this.method1847(true);
 			}
 		} else {
-			this.method1811(true);
+			this.method1847(true);
 		}
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(ZB)V",
+		signature = "(ZI)V",
-		garbageValue = "-20"
+		garbageValue = "864937253"
 	)
-	void method1811(boolean var1) {
+	void method1847(boolean var1) {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)Lkz;",
+		signature = "(I)Lkl;",
-		garbageValue = "215138382"
+		garbageValue = "-630561096"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -138,4 +143,142 @@ public class ClientPreferences {
 		var1.writeBoolean(this.hideUsername);
 		return var1;
 	}
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "-70"
+	)
+	static void method1857() {
+		Players.Players_count = 0;
+
+		for (int var0 = 0; var0 < 2048; ++var0) {
+			Players.field1236[var0] = null;
+			Players.field1235[var0] = 1;
+		}
+
+	}
+
+	@ObfuscatedName("jb")
+	@ObfuscatedSignature(
+		signature = "(Lho;IIII)V",
+		garbageValue = "1173230125"
+	)
+	@Export("drawMinimap")
+	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
+		WorldMapID.playPcmPlayers();
+		SpriteMask var4 = var0.getSpriteMask(false);
+		if (var4 != null) {
+			Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height);
+			if (Client.minimapState != 2 && Client.minimapState != 5) {
+				int var5 = Client.camAngleY & 2047;
+				int var6 = class223.localPlayer.x / 32 + 48;
+				int var7 = 464 - class223.localPlayer.y * 682054857 / 32;
+				ObjectSound.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 - class223.localPlayer.x / 32;
+					var10 = Client.mapIconYs[var8] * 4 + 2 - class223.localPlayer.y * 682054857 / 32;
+					class208.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[WorldMapRectangle.plane][var8][var9];
+						if (var15 != null) {
+							var11 = var8 * 4 + 2 - class223.localPlayer.x / 32;
+							var12 = var9 * 4 + 2 - class223.localPlayer.y * 682054857 / 32;
+							class208.drawSpriteOnMinimap(var1, var2, var11, var12, class13.mapDotSprites[0], var4);
+						}
+					}
+				}
+
+				for (var8 = 0; var8 < Client.npcCount; ++var8) {
+					NPC var16 = Client.npcs[Client.npcIndices[var8]];
+					if (var16 != null && var16.isVisible()) {
+						NPCDefinition var18 = var16.definition;
+						if (var18 != null && var18.transforms != null) {
+							var18 = var18.transform();
+						}
+
+						if (var18 != null && var18.drawMapDot && var18.isInteractable) {
+							var11 = var16.x / 32 - class223.localPlayer.x / 32;
+							var12 = var16.y * 682054857 / 32 - class223.localPlayer.y * 682054857 / 32;
+							class208.drawSpriteOnMinimap(var1, var2, var11, var12, class13.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 != class223.localPlayer) {
+						var12 = var17.x / 32 - class223.localPlayer.x / 32;
+						int var13 = var17.y * 682054857 / 32 - class223.localPlayer.y * 682054857 / 32;
+						boolean var14 = false;
+						if (class223.localPlayer.team != 0 && var17.team != 0 && var17.team == class223.localPlayer.team) {
+							var14 = true;
+						}
+
+						if (var17.isFriend()) {
+							class208.drawSpriteOnMinimap(var1, var2, var12, var13, class13.mapDotSprites[3], var4);
+						} else if (var14) {
+							class208.drawSpriteOnMinimap(var1, var2, var12, var13, class13.mapDotSprites[4], var4);
+						} else if (var17.isClanMember()) {
+							class208.drawSpriteOnMinimap(var1, var2, var12, var13, class13.mapDotSprites[5], var4);
+						} else {
+							class208.drawSpriteOnMinimap(var1, var2, var12, var13, class13.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 - class223.localPlayer.x / 32;
+							var12 = var20.y * 682054857 / 32 - class223.localPlayer.y * 682054857 / 32;
+							FloorDecoration.worldToMinimap(var1, var2, var11, var12, GameObject.mapMarkerSprites[1], var4);
+						}
+					}
+
+					if (Client.hintArrowType == 2) {
+						var10 = Client.hintArrowX * 4 - class223.baseX * 256 + 2 - class223.localPlayer.x / 32;
+						var11 = Client.hintArrowY * 4 - class286.baseY * 256 + 2 - class223.localPlayer.y * 682054857 / 32;
+						FloorDecoration.worldToMinimap(var1, var2, var10, var11, GameObject.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 - class223.localPlayer.x / 32;
+							var12 = var21.y * 682054857 / 32 - class223.localPlayer.y * 682054857 / 32;
+							FloorDecoration.worldToMinimap(var1, var2, var11, var12, GameObject.mapMarkerSprites[1], var4);
+						}
+					}
+				}
+
+				if (Client.destinationX != 0) {
+					var10 = Client.destinationX * 4 + 2 - class223.localPlayer.x / 32;
+					var11 = Client.destinationY * 4 + 2 - class223.localPlayer.y * 682054857 / 32;
+					class208.drawSpriteOnMinimap(var1, var2, var10, var11, GameObject.mapMarkerSprites[0], var4);
+				}
+
+				if (!class223.localPlayer.isHidden) {
+					Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
+				}
+			} else {
+				Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths);
+			}
+
+			Client.field842[var3] = true;
+		}
+	}
 }

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

@@ -1,174 +1,71 @@
 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("fk")
+@ObfuscatedName("fz")
 @Implements("Clock")
 public abstract class Clock {
+	@ObfuscatedName("qq")
+	@ObfuscatedGetter(
+		intValue = 1800617984
+	)
+	static int field2039;
+
 	Clock() {
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-250719361"
+		garbageValue = "-54"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(III)I",
-		garbageValue = "1652957447"
+		garbageValue = "569029249"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(ILcu;ZI)I",
+		signature = "(II)I",
-		garbageValue = "1861663871"
+		garbageValue = "1663360326"
 	)
-	static int method3490(int var0, Script var1, boolean var2) {
+	@Export("Messages_getLastChatID")
-		int var3;
+	static int Messages_getLastChatID(int var0) {
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) {
+		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
-			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
+		if (var1 == null) {
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
+			return -1;
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
-			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
-			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
-			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
-			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
-			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
-			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
-			return 1;
 		} else {
-			int var12;
+			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count;
-			if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
+		}
-				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-				var12 = Client.grandExchangeOffers[var3].status();
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
-				return 1;
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
-				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-				var12 = Client.grandExchangeOffers[var3].status();
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
-				return 1;
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
-				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-				var12 = Client.grandExchangeOffers[var3].status();
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
-				return 1;
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
-				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-				var12 = Client.grandExchangeOffers[var3].status();
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
-				return 1;
-			} else {
-				boolean var13;
-				if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
-					var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
-					if (PacketWriter.grandExchangeEvents != null) {
-						PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13);
 	}
 
-					return 1;
+	@ObfuscatedName("b")
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
+	@ObfuscatedSignature(
-					var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
+		signature = "(I)I",
-					if (PacketWriter.grandExchangeEvents != null) {
+		garbageValue = "1644538233"
-						PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
+	)
+	static final int method3459() {
+		return ViewportMouse.ViewportMouse_x;
 	}
 
-					return 1;
+	@ObfuscatedName("hf")
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
+	@ObfuscatedSignature(
-					class160.Interpreter_intStackSize -= 2;
+		signature = "(IIB)V",
-					var13 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] == 1;
+		garbageValue = "-31"
-					boolean var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1] == 1;
+	)
-					if (PacketWriter.grandExchangeEvents != null) {
+	@Export("resumePauseWidget")
-						Client.GrandExchangeEvents_worldComparator.filterWorlds = var4;
+	static void resumePauseWidget(int var0, int var1) {
-						PacketWriter.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13);
+		PacketBufferNode var2 = InterfaceParent.getPacketBufferNode(ClientPacket.field2185, Client.packetWriter.isaacCipher);
-					}
+		var2.packetBuffer.writeIntLE16(var0);
-
+		var2.packetBuffer.writeShort(var1);
-					return 1;
+		Client.packetWriter.addNode(var2);
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
-					var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
-					if (PacketWriter.grandExchangeEvents != null) {
-						PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
-					var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
-					if (PacketWriter.grandExchangeEvents != null) {
-						PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = PacketWriter.grandExchangeEvents == null ? 0 : PacketWriter.grandExchangeEvents.events.size();
-					return 1;
-				} else {
-					GrandExchangeEvent var11;
-					if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
-						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.world;
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
-						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var11.getOfferName();
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
-						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
-						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
-						long var5 = SoundCache.method2480() - GrandExchangeOfferWorldComparator.field25 - 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[++TextureProvider.Interpreter_stringStackSize - 1] = var10;
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
-						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
-						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
-						return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
-						var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-						var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3);
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
-						return 1;
-					} else {
-						return 2;
-					}
-				}
-			}
-		}
 	}
 }

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

@@ -1,43 +1,38 @@
+import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fj")
+@ObfuscatedName("fa")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("x")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = 1935458159
+		intValue = 2078354851
-	)
-	@Export("VarpDefinition_fileCount")
-	public static int VarpDefinition_fileCount;
-	@ObfuscatedName("ad")
-	@ObfuscatedGetter(
-		intValue = -1822416471
 	)
 	@Export("xInset")
 	int xInset;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 711877459
+		intValue = -518382829
 	)
 	@Export("yInset")
 	int yInset;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 942404383
+		intValue = 1308792903
 	)
 	@Export("xSize")
 	int xSize;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = 1645469007
+		intValue = -888202655
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("flags")
 	public int[][] flags;
 
@@ -50,10 +45,10 @@ public class CollisionMap {
 		this.clear();
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "1948261737"
+		garbageValue = "11"
 	)
 	@Export("clear")
 	public void clear() {
@@ -69,12 +64,12 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(IIIIZI)V",
-		garbageValue = "807460009"
+		garbageValue = "1400659630"
 	)
-	public void method3534(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3502(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -221,10 +216,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(IIIIZB)V",
+		signature = "(IIIIZI)V",
-		garbageValue = "-41"
+		garbageValue = "1277713715"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -248,10 +243,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
+		signature = "(III)V",
-		garbageValue = "116"
+		garbageValue = "-691975667"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
@@ -261,10 +256,10 @@ public class CollisionMap {
 		var10000[var2] |= 2097152;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
+		signature = "(III)V",
-		garbageValue = "0"
+		garbageValue = "-119630021"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
@@ -274,10 +269,10 @@ public class CollisionMap {
 		var10000[var2] |= 262144;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(IIII)V",
+		signature = "(IIIB)V",
-		garbageValue = "-1965469777"
+		garbageValue = "-3"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
@@ -285,12 +280,12 @@ public class CollisionMap {
 		var10000[var2] |= var3;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(IIIIZB)V",
+		signature = "(IIIIZI)V",
-		garbageValue = "-91"
+		garbageValue = "1060838313"
 	)
-	public void method3536(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3508(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -437,10 +432,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(IIIIIZI)V",
-		garbageValue = "-1821218728"
+		garbageValue = "-476929644"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -470,10 +465,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(IIII)V",
+		signature = "(IIIB)V",
-		garbageValue = "-156666572"
+		garbageValue = "6"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -481,15 +476,54 @@ public class CollisionMap {
 		var10000[var2] &= ~var3;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIS)V",
-		garbageValue = "848915256"
+		garbageValue = "-6856"
 	)
-	public void method3541(int var1, int var2) {
+	public void method3511(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		int[] var10000 = this.flags[var1];
 		var10000[var2] &= -262145;
 	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(I[BLkg;I)V",
+		garbageValue = "1190241493"
+	)
+	static void method3530(int var0, byte[] var1, ArchiveDisk var2) {
+		ArchiveDiskAction var3 = new ArchiveDiskAction();
+		var3.type = 0;
+		var3.key = (long)var0;
+		var3.data = var1;
+		var3.archiveDisk = var2;
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
+		}
+
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+			if (ArchiveDiskActionHandler.field3127 == 0) {
+				UserComparator5.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
+				UserComparator5.ArchiveDiskActionHandler_thread.setDaemon(true);
+				UserComparator5.ArchiveDiskActionHandler_thread.start();
+				UserComparator5.ArchiveDiskActionHandler_thread.setPriority(5);
+			}
+
+			ArchiveDiskActionHandler.field3127 = 600;
+		}
+	}
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		signature = "(Ljava/awt/Component;I)V",
+		garbageValue = "-1662439433"
+	)
+	static void method3538(Component var0) {
+		var0.removeMouseListener(MouseHandler.MouseHandler_instance);
+		var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance);
+		var0.removeFocusListener(MouseHandler.MouseHandler_instance);
+		MouseHandler.MouseHandler_currentButtonVolatile = 0;
+	}
 }

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

@@ -4,36 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hj")
+@ObfuscatedName("hb")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("aw")
+	@ObfuscatedName("n")
-	@Export("client")
-	@ObfuscatedSignature(
-		signature = "Lclient;"
-	)
-	static Client client;
-	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -275324431
+		intValue = 562826067
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1946522259
+		intValue = 2054727359
-	)
-	@Export("y")
-	public int y;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 212884917
 	)
 	@Export("x")
 	public int x;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = -1032758603
+	)
+	@Export("y")
+	public int y;
 
 	@ObfuscatedSignature(
-		signature = "(Lhj;)V"
+		signature = "(Lhb;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane;
@@ -58,20 +52,20 @@ public class Coord {
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "94"
+		garbageValue = "-444536660"
 	)
 	@Export("packed")
 	public int packed() {
 		return this.plane << 28 | this.x << 14 | this.y;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lhj;I)Z",
+		signature = "(Lhb;I)Z",
-		garbageValue = "49953005"
+		garbageValue = "-1914028694"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
@@ -84,10 +78,10 @@ public class Coord {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-2113109490"
+		garbageValue = "-986705762"
 	)
 	@Export("toString")
 	String toString(String var1) {
@@ -106,28 +100,50 @@ public class Coord {
 		return this.packed();
 	}
 
-	public String aai() {
-		return this.toString(",");
-	}
-
-	public String aar() {
-		return this.toString(",");
-	}
-
-	public String aan() {
-		return this.toString(",");
-	}
-
 	public String toString() {
 		return this.toString(",");
 	}
 
-	@ObfuscatedName("x")
+	public String aah() {
+		return this.toString(",");
+	}
+
+	public String aae() {
+		return this.toString(",");
+	}
+
+	public String aak() {
+		return this.toString(",");
+	}
+
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)[Lcl;",
+		signature = "(I)V",
-		garbageValue = "69"
+		garbageValue = "-2118719705"
 	)
-	static AttackOption[] method3981() {
+	static void method3964() {
-		return new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
+		Login.worldSelectOpen = false;
+		WorldMapID.leftTitleSprite.drawAt(Login.xPadding, 0);
+		class51.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+		FontName.logoSprite.drawAt(Login.xPadding + 382 - FontName.logoSprite.subWidth / 2, 18);
+	}
+
+	@ObfuscatedName("jm")
+	@ObfuscatedSignature(
+		signature = "(S)V",
+		garbageValue = "22280"
+	)
+	@Export("FriendSystem_invalidateFriends")
+	static final void FriendSystem_invalidateFriends() {
+		for (int var0 = 0; var0 < Players.Players_count; ++var0) {
+			Player var1 = Client.players[Players.Players_indices[var0]];
+			var1.clearIsFriend();
+		}
+
+		KeyHandler.method873();
+		if (Varps.clanChat != null) {
+			Varps.clanChat.clearFriends();
+		}
+
 	}
 }

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

@@ -3,29 +3,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("de")
+@ObfuscatedName("dr")
 @Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("et")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -722271125
+		intValue = -222965331
-	)
-	static int field1431;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -313653259
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -172648561
+		intValue = 747601715
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("table")
 	int[][] table;
 
@@ -52,13 +46,13 @@ public class Decimator {
 
 			for (int var7 = 0; var7 < var1; ++var7) {
 				int[] var8 = this.table[var7];
-				double var9 = 6.0D + (double)var7 / (double)var1;
+				double var9 = (double)var7 / (double)var1 + 6.0D;
-				int var11 = (int)Math.floor(1.0D + (var9 - 7.0D));
+				int var11 = (int)Math.floor(var9 - 7.0D + 1.0D);
 				if (var11 < 0) {
 					var11 = 0;
 				}
 
-				int var12 = (int)Math.ceil(7.0D + var9);
+				int var12 = (int)Math.ceil(var9 + 7.0D);
 				if (var12 > 14) {
 					var12 = 14;
 				}
@@ -71,17 +65,17 @@ public class Decimator {
 					}
 
 					var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D);
-					var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D);
+					var8[var11] = (int)Math.floor(65536.0D * var17 + 0.5D);
 				}
 			}
 
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "([BB)[B",
+		signature = "([BI)[B",
-		garbageValue = "63"
+		garbageValue = "906746870"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
@@ -98,7 +92,7 @@ public class Decimator {
 
 				int var9;
 				for (var9 = 0; var9 < 14; ++var9) {
-					var3[var9 + var4] += var8[var9] * var7;
+					var3[var4 + var9] += var7 * var8[var9];
 				}
 
 				var5 += this.outputRate;
@@ -124,24 +118,24 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-749198393"
+		garbageValue = "1984702959"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
 		if (this.table != null) {
-			var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate);
+			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate);
 		}
 
 		return var1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(IB)I",
+		signature = "(II)I",
-		garbageValue = "-106"
+		garbageValue = "-1527580857"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
@@ -152,593 +146,88 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(II)Lij;",
-		garbageValue = "-2091115234"
+		garbageValue = "-1096040565"
 	)
-	public static void method2499(int var0) {
+	@Export("WorldMapElement_get")
-		if (class197.field2376 != 0) {
+	public static WorldMapElement WorldMapElement_get(int var0) {
-			Canvas.field395 = var0;
+		return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0);
-		} else {
-			class197.midiPcmStream.method3686(var0);
-		}
-
-	}
-
-	@ObfuscatedName("ay")
-	@ObfuscatedSignature(
-		signature = "(ILcu;ZB)I",
-		garbageValue = "1"
-	)
-	static int method2494(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) {
-			class160.Interpreter_intStackSize -= 2;
-			Client.field873 = (short)class1.method17(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]);
-			if (Client.field873 <= 0) {
-				Client.field873 = 256;
-			}
-
-			Client.field752 = (short)class1.method17(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]);
-			if (Client.field752 <= 0) {
-				Client.field752 = 256;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) {
-			class160.Interpreter_intStackSize -= 2;
-			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			if (Client.zoomHeight <= 0) {
-				Client.zoomHeight = 256;
-			}
-
-			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			if (Client.zoomWidth <= 0) {
-				Client.zoomWidth = 320;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) {
-			class160.Interpreter_intStackSize -= 4;
-			Client.field877 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			if (Client.field877 <= 0) {
-				Client.field877 = 1;
-			}
-
-			Client.field878 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			if (Client.field878 <= 0) {
-				Client.field878 = 32767;
-			} else if (Client.field878 < Client.field877) {
-				Client.field878 = Client.field877;
-			}
-
-			Client.field879 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
-			if (Client.field879 <= 0) {
-				Client.field879 = 1;
-			}
-
-			Client.field717 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3];
-			if (Client.field717 <= 0) {
-				Client.field717 = 32767;
-			} else if (Client.field717 < Client.field879) {
-				Client.field717 = Client.field879;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) {
-			if (Client.viewportWidget != null) {
-				DesktopPlatformInfoProvider.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false);
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.viewportWidth;
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.viewportHeight;
-			} else {
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) {
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.zoomHeight;
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.zoomWidth;
-			return 1;
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) {
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapLabel.method381(Client.field873);
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapLabel.method381(Client.field752);
-			return 1;
-		} else if (var0 == 6220) {
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-			return 1;
-		} else if (var0 == 6221) {
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-			return 1;
-		} else if (var0 == 6222) {
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GraphicsDefaults.canvasWidth;
-			return 1;
-		} else if (var0 == 6223) {
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GameShell.canvasHeight;
-			return 1;
-		} else {
-			return 2;
-		}
 	}
 
 	@ObfuscatedName("ei")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(I)Lla;",
-		garbageValue = "1128100526"
+		garbageValue = "-695758013"
 	)
-	@Export("load")
+	@Export("getWorldMap")
-	static void load() {
+	static WorldMap getWorldMap() {
-		int var0;
+		return Tiles.worldMap;
-		if (Client.titleLoadingStage == 0) {
-			WorldMapIcon_1.scene = new Scene(4, 104, 104, Tiles.Tiles_heights);
-
-			for (var0 = 0; var0 < 4; ++var0) {
-				Client.collisionMaps[var0] = new CollisionMap(104, 104);
 	}
 
-			class60.sceneMinimapSprite = new Sprite(512, 512);
+	@ObfuscatedName("hz")
-			Login.Login_loadingText = "Starting game engine...";
-			Login.Login_loadingPercent = 5;
-			Client.titleLoadingStage = 20;
-		} else if (Client.titleLoadingStage == 20) {
-			Login.Login_loadingText = "Prepared visibility map";
-			Login.Login_loadingPercent = 10;
-			Client.titleLoadingStage = 30;
-		} else if (Client.titleLoadingStage == 30) {
-			ScriptEvent.archive0 = FloorOverlayDefinition.newArchive(0, false, true, true);
-			GrandExchangeOffer.archive1 = FloorOverlayDefinition.newArchive(1, false, true, true);
-			class173.archive2 = FloorOverlayDefinition.newArchive(2, true, false, true);
-			WorldMapData_0.archive3 = FloorOverlayDefinition.newArchive(3, false, true, true);
-			class13.archive4 = FloorOverlayDefinition.newArchive(4, false, true, true);
-			Timer.archive5 = FloorOverlayDefinition.newArchive(5, true, true, true);
-			WorldMapDecoration.archive6 = FloorOverlayDefinition.newArchive(6, true, true, true);
-			class49.archive7 = FloorOverlayDefinition.newArchive(7, false, true, true);
-			WorldMapDecoration.archive8 = FloorOverlayDefinition.newArchive(8, false, true, true);
-			WorldMapData_0.archive9 = FloorOverlayDefinition.newArchive(9, false, true, true);
-			FontName.archive10 = FloorOverlayDefinition.newArchive(10, false, true, true);
-			ArchiveDisk.archive11 = FloorOverlayDefinition.newArchive(11, false, true, true);
-			Message.archive12 = FloorOverlayDefinition.newArchive(12, false, true, true);
-			TextureProvider.archive13 = FloorOverlayDefinition.newArchive(13, true, false, true);
-			WorldMapLabel.archive14 = FloorOverlayDefinition.newArchive(14, false, true, true);
-			BufferedSource.archive15 = FloorOverlayDefinition.newArchive(15, false, true, true);
-			class49.archive17 = FloorOverlayDefinition.newArchive(17, true, true, true);
-			WorldMapArea.archive18 = FloorOverlayDefinition.newArchive(18, false, true, true);
-			UrlRequest.archive19 = FloorOverlayDefinition.newArchive(19, false, true, true);
-			WorldMapSection1.archive20 = FloorOverlayDefinition.newArchive(20, false, true, true);
-			Login.Login_loadingText = "Connecting to update server";
-			Login.Login_loadingPercent = 20;
-			Client.titleLoadingStage = 40;
-		} else if (Client.titleLoadingStage == 40) {
-			byte var24 = 0;
-			var0 = var24 + ScriptEvent.archive0.percentage() * 4 / 100;
-			var0 += GrandExchangeOffer.archive1.percentage() * 4 / 100;
-			var0 += class173.archive2.percentage() * 2 / 100;
-			var0 += WorldMapData_0.archive3.percentage() * 2 / 100;
-			var0 += class13.archive4.percentage() * 6 / 100;
-			var0 += Timer.archive5.percentage() * 4 / 100;
-			var0 += WorldMapDecoration.archive6.percentage() * 2 / 100;
-			var0 += class49.archive7.percentage() * 56 / 100;
-			var0 += WorldMapDecoration.archive8.percentage() * 2 / 100;
-			var0 += WorldMapData_0.archive9.percentage() * 2 / 100;
-			var0 += FontName.archive10.percentage() * 2 / 100;
-			var0 += ArchiveDisk.archive11.percentage() * 2 / 100;
-			var0 += Message.archive12.percentage() * 2 / 100;
-			var0 += TextureProvider.archive13.percentage() * 2 / 100;
-			var0 += WorldMapLabel.archive14.percentage() * 2 / 100;
-			var0 += BufferedSource.archive15.percentage() * 2 / 100;
-			var0 += UrlRequest.archive19.percentage() / 100;
-			var0 += WorldMapArea.archive18.percentage() / 100;
-			var0 += WorldMapSection1.archive20.percentage() / 100;
-			var0 += class49.archive17.method4265() && class49.archive17.isFullyLoaded() ? 1 : 0;
-			if (var0 != 100) {
-				if (var0 != 0) {
-					Login.Login_loadingText = "Checking for updates - " + var0 + "%";
-				}
-
-				Login.Login_loadingPercent = 30;
-			} else {
-				class14.method142(ScriptEvent.archive0, "Animations");
-				class14.method142(GrandExchangeOffer.archive1, "Skeletons");
-				class14.method142(class13.archive4, "Sound FX");
-				class14.method142(Timer.archive5, "Maps");
-				class14.method142(WorldMapDecoration.archive6, "Music Tracks");
-				class14.method142(class49.archive7, "Models");
-				class14.method142(WorldMapDecoration.archive8, "Sprites");
-				class14.method142(ArchiveDisk.archive11, "Music Jingles");
-				class14.method142(WorldMapLabel.archive14, "Music Samples");
-				class14.method142(BufferedSource.archive15, "Music Patches");
-				class14.method142(UrlRequest.archive19, "World Map");
-				class14.method142(WorldMapArea.archive18, "World Map Geography");
-				class14.method142(WorldMapSection1.archive20, "World Map Ground");
-				Frames.spriteIds = new GraphicsDefaults();
-				Frames.spriteIds.decode(class49.archive17);
-				Login.Login_loadingText = "Loaded update list";
-				Login.Login_loadingPercent = 30;
-				Client.titleLoadingStage = 45;
-			}
-		} else if (Client.titleLoadingStage == 45) {
-			Login.PcmPlayer_configure(22050, !Client.isLowDetail, 2);
-			MidiPcmStream var26 = new MidiPcmStream();
-			var26.method3732(9, 128);
-			WorldMapIcon_1.pcmPlayer0 = PacketWriter.method2246(GameShell.taskHandler, 0, 22050);
-			WorldMapIcon_1.pcmPlayer0.setStream(var26);
-			class192.setAudioArchives(BufferedSource.archive15, WorldMapLabel.archive14, class13.archive4, var26);
-			ClientPreferences.pcmPlayer1 = PacketWriter.method2246(GameShell.taskHandler, 1, 2048);
-			class51.pcmStreamMixer = new PcmStreamMixer();
-			ClientPreferences.pcmPlayer1.setStream(class51.pcmStreamMixer);
-			class81.decimator = new Decimator(22050, GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate);
-			Login.Login_loadingText = "Prepared sound engine";
-			Login.Login_loadingPercent = 35;
-			Client.titleLoadingStage = 50;
-			GraphicsObject.WorldMapElement_fonts = new Fonts(WorldMapDecoration.archive8, TextureProvider.archive13);
-		} else if (Client.titleLoadingStage == 50) {
-			var0 = FontName.method5288().length;
-			Client.fontsMap = GraphicsObject.WorldMapElement_fonts.createMap(FontName.method5288());
-			if (Client.fontsMap.size() < var0) {
-				Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var0 + "%";
-				Login.Login_loadingPercent = 40;
-			} else {
-				GrandExchangeEvent.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11);
-				class197.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12);
-				HealthBar.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12);
-				class32.platformInfo = Client.platformInfoProvider.get();
-				Login.Login_loadingText = "Loaded fonts";
-				Login.Login_loadingPercent = 40;
-				Client.titleLoadingStage = 60;
-			}
-		} else {
-			Archive var2;
-			int var3;
-			Archive var20;
-			int var23;
-			if (Client.titleLoadingStage == 60) {
-				var20 = FontName.archive10;
-				var2 = WorldMapDecoration.archive8;
-				var3 = 0;
-				if (var20.tryLoadFileByNames("title.jpg", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("logo", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("logo_deadman_mode", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("titlebox", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("titlebutton", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("runes", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("title_mute", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) {
-					++var3;
-				}
-
-				if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) {
-					++var3;
-				}
-
-				var2.tryLoadFileByNames("sl_back", "");
-				var2.tryLoadFileByNames("sl_flags", "");
-				var2.tryLoadFileByNames("sl_arrows", "");
-				var2.tryLoadFileByNames("sl_stars", "");
-				var2.tryLoadFileByNames("sl_button", "");
-				var23 = AbstractWorldMapIcon.method587();
-				if (var3 < var23) {
-					Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var23 + "%";
-					Login.Login_loadingPercent = 50;
-				} else {
-					Login.Login_loadingText = "Loaded title screen";
-					Login.Login_loadingPercent = 50;
-					WorldMapIcon_0.updateGameState(5);
-					Client.titleLoadingStage = 70;
-				}
-			} else if (Client.titleLoadingStage == 70) {
-				if (!class173.archive2.isFullyLoaded()) {
-					Login.Login_loadingText = "Loading config - " + class173.archive2.loadPercent() + "%";
-					Login.Login_loadingPercent = 60;
-				} else {
-					Player.method1228(class173.archive2);
-					Archive var25 = class173.archive2;
-					FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var25;
-					WorldMapID.method526(class173.archive2, class49.archive7);
-					var20 = class173.archive2;
-					var2 = class49.archive7;
-					boolean var21 = Client.isLowDetail;
-					GrandExchangeOfferNameComparator.ObjectDefinition_archive = var20;
-					ObjectDefinition.ObjectDefinition_modelsArchive = var2;
-					ObjectDefinition.ObjectDefinition_isLowDetail = var21;
-					GameObject.NpcDefinition_setArchives(class173.archive2, class49.archive7);
-					class188.method3617(class173.archive2);
-					GrandExchangeEvents.method69(class173.archive2, class49.archive7, Client.isMembersWorld, GrandExchangeEvent.fontPlain11);
-					Archive var17 = class173.archive2;
-					Archive var22 = ScriptEvent.archive0;
-					Archive var6 = GrandExchangeOffer.archive1;
-					SequenceDefinition.SequenceDefinition_archive = var17;
-					SequenceDefinition.SequenceDefinition_animationsArchive = var22;
-					SequenceDefinition.SequenceDefinition_skeletonsArchive = var6;
-					Archive var7 = class173.archive2;
-					Archive var8 = class49.archive7;
-					SpotAnimationDefinition.SpotAnimationDefinition_archive = var7;
-					SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var8;
-					Archive var9 = class173.archive2;
-					VarbitDefinition.VarbitDefinition_archive = var9;
-					Archive var10 = class173.archive2;
-					class297.VarpDefinition_archive = var10;
-					CollisionMap.VarpDefinition_fileCount = class297.VarpDefinition_archive.getGroupFileCount(16);
-					class162.Widget_setArchives(WorldMapData_0.archive3, class49.archive7, WorldMapDecoration.archive8, TextureProvider.archive13);
-					PcmPlayer.InvDefinition_setArchives(class173.archive2);
-					Archive var11 = class173.archive2;
-					EnumDefinition.EnumDefinition_archive = var11;
-					class293.method5298(class173.archive2);
-					VarcInt.method4407(class173.archive2);
-					BoundaryObject.varcs = new Varcs();
-					ChatChannel.method2220(class173.archive2, WorldMapDecoration.archive8, TextureProvider.archive13);
-					NPCDefinition.method4749(class173.archive2, WorldMapDecoration.archive8);
-					Archive var12 = class173.archive2;
-					Archive var13 = WorldMapDecoration.archive8;
-					WorldMapElement.WorldMapElement_archive = var13;
-					if (var12.isFullyLoaded()) {
-						WorldMapElement.WorldMapElement_count = var12.getGroupFileCount(35);
-						WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count];
-
-						for (int var14 = 0; var14 < WorldMapElement.WorldMapElement_count; ++var14) {
-							byte[] var15 = var12.takeFile(35, var14);
-							WorldMapElement.WorldMapElement_cached[var14] = new WorldMapElement(var14);
-							if (var15 != null) {
-								WorldMapElement.WorldMapElement_cached[var14].decode(new Buffer(var15));
-								WorldMapElement.WorldMapElement_cached[var14].method4378();
-							}
-						}
-					}
-
-					Login.Login_loadingText = "Loaded config";
-					Login.Login_loadingPercent = 60;
-					Client.titleLoadingStage = 80;
-				}
-			} else if (Client.titleLoadingStage == 80) {
-				var0 = 0;
-				if (UrlRequest.compass == null) {
-					UrlRequest.compass = FillMode.SpriteBuffer_getSprite(WorldMapDecoration.archive8, Frames.spriteIds.compass, 0);
-				} else {
-					++var0;
-				}
-
-				if (FontName.redHintArrowSprite == null) {
-					FontName.redHintArrowSprite = FillMode.SpriteBuffer_getSprite(WorldMapDecoration.archive8, Frames.spriteIds.field3794, 0);
-				} else {
-					++var0;
-				}
-
-				IndexedSprite[] var1;
-				boolean var4;
-				byte[] var5;
-				if (class287.mapSceneSprites == null) {
-					var2 = WorldMapDecoration.archive8;
-					var3 = Frames.spriteIds.mapScenes;
-					var5 = var2.takeFile(var3, 0);
-					if (var5 == null) {
-						var4 = false;
-					} else {
-						GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var5);
-						var4 = true;
-					}
-
-					if (!var4) {
-						var1 = null;
-					} else {
-						var1 = FileSystem.method3489();
-					}
-
-					class287.mapSceneSprites = var1;
-				} else {
-					++var0;
-				}
-
-				if (PlatformInfo.headIconPkSprites == null) {
-					PlatformInfo.headIconPkSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.headIconsPk, 0);
-				} else {
-					++var0;
-				}
-
-				if (RouteStrategy.headIconPrayerSprites == null) {
-					RouteStrategy.headIconPrayerSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3797, 0);
-				} else {
-					++var0;
-				}
-
-				if (GrandExchangeEvents.headIconHintSprites == null) {
-					GrandExchangeEvents.headIconHintSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3798, 0);
-				} else {
-					++var0;
-				}
-
-				if (WorldMapLabelSize.mapMarkerSprites == null) {
-					WorldMapLabelSize.mapMarkerSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3800, 0);
-				} else {
-					++var0;
-				}
-
-				if (class270.crossSprites == null) {
-					class270.crossSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3804, 0);
-				} else {
-					++var0;
-				}
-
-				if (class42.mapDotSprites == null) {
-					class42.mapDotSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3801, 0);
-				} else {
-					++var0;
-				}
-
-				if (WorldMapIcon_1.scrollBarSprites == null) {
-					var2 = WorldMapDecoration.archive8;
-					var3 = Frames.spriteIds.field3802;
-					var5 = var2.takeFile(var3, 0);
-					if (var5 == null) {
-						var4 = false;
-					} else {
-						GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var5);
-						var4 = true;
-					}
-
-					if (!var4) {
-						var1 = null;
-					} else {
-						var1 = FileSystem.method3489();
-					}
-
-					WorldMapIcon_1.scrollBarSprites = var1;
-				} else {
-					++var0;
-				}
-
-				if (SecureRandomCallable.modIconSprites == null) {
-					var2 = WorldMapDecoration.archive8;
-					var3 = Frames.spriteIds.field3799;
-					var5 = var2.takeFile(var3, 0);
-					if (var5 == null) {
-						var4 = false;
-					} else {
-						GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var5);
-						var4 = true;
-					}
-
-					if (!var4) {
-						var1 = null;
-					} else {
-						var1 = FileSystem.method3489();
-					}
-
-					SecureRandomCallable.modIconSprites = var1;
-				} else {
-					++var0;
-				}
-
-				if (var0 < 11) {
-					Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%";
-					Login.Login_loadingPercent = 70;
-				} else {
-					AbstractFont.AbstractFont_modIconSprites = SecureRandomCallable.modIconSprites;
-					FontName.redHintArrowSprite.normalize();
-					int var18 = (int)(Math.random() * 21.0D) - 10;
-					int var19 = (int)(Math.random() * 21.0D) - 10;
-					var3 = (int)(Math.random() * 21.0D) - 10;
-					var23 = (int)(Math.random() * 41.0D) - 20;
-					class287.mapSceneSprites[0].shiftColors(var23 + var18, var19 + var23, var3 + var23);
-					Login.Login_loadingText = "Loaded sprites";
-					Login.Login_loadingPercent = 70;
-					Client.titleLoadingStage = 90;
-				}
-			} else if (Client.titleLoadingStage == 90) {
-				if (!WorldMapData_0.archive9.isFullyLoaded()) {
-					Login.Login_loadingText = "Loading textures - " + "0%";
-					Login.Login_loadingPercent = 90;
-				} else {
-					class216.textureProvider = new TextureProvider(WorldMapData_0.archive9, WorldMapDecoration.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128);
-					Rasterizer3D.Rasterizer3D_setTextureLoader(class216.textureProvider);
-					Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
-					Client.titleLoadingStage = 100;
-				}
-			} else if (Client.titleLoadingStage == 100) {
-				var0 = class216.textureProvider.getLoadedPercentage();
-				if (var0 < 100) {
-					Login.Login_loadingText = "Loading textures - " + var0 + "%";
-					Login.Login_loadingPercent = 90;
-				} else {
-					Login.Login_loadingText = "Loaded textures";
-					Login.Login_loadingPercent = 90;
-					Client.titleLoadingStage = 110;
-				}
-			} else if (Client.titleLoadingStage == 110) {
-				ParamDefinition.mouseRecorder = new MouseRecorder();
-				GameShell.taskHandler.newThreadTask(ParamDefinition.mouseRecorder, 10);
-				Login.Login_loadingText = "Loaded input handler";
-				Login.Login_loadingPercent = 92;
-				Client.titleLoadingStage = 120;
-			} else if (Client.titleLoadingStage == 120) {
-				if (!FontName.archive10.tryLoadFileByNames("huffman", "")) {
-					Login.Login_loadingText = "Loading wordpack - " + 0 + "%";
-					Login.Login_loadingPercent = 94;
-				} else {
-					Huffman var16 = new Huffman(FontName.archive10.takeFileByNames("huffman", ""));
-					class210.huffman = var16;
-					Login.Login_loadingText = "Loaded wordpack";
-					Login.Login_loadingPercent = 94;
-					Client.titleLoadingStage = 130;
-				}
-			} else if (Client.titleLoadingStage == 130) {
-				if (!WorldMapData_0.archive3.isFullyLoaded()) {
-					Login.Login_loadingText = "Loading interfaces - " + WorldMapData_0.archive3.loadPercent() * 4 / 5 + "%";
-					Login.Login_loadingPercent = 96;
-				} else if (!Message.archive12.isFullyLoaded()) {
-					Login.Login_loadingText = "Loading interfaces - " + (80 + Message.archive12.loadPercent() / 6) + "%";
-					Login.Login_loadingPercent = 96;
-				} else if (!TextureProvider.archive13.isFullyLoaded()) {
-					Login.Login_loadingText = "Loading interfaces - " + (96 + TextureProvider.archive13.loadPercent() / 50) + "%";
-					Login.Login_loadingPercent = 96;
-				} else {
-					Login.Login_loadingText = "Loaded interfaces";
-					Login.Login_loadingPercent = 98;
-					Client.titleLoadingStage = 140;
-				}
-			} else if (Client.titleLoadingStage == 140) {
-				Login.Login_loadingPercent = 100;
-				if (!UrlRequest.archive19.tryLoadGroupByName(WorldMapCacheName.field294.name)) {
-					Login.Login_loadingText = "Loading world map - " + UrlRequest.archive19.groupLoadPercentByName(WorldMapCacheName.field294.name) / 10 + "%";
-				} else {
-					if (GrandExchangeOfferUnitPriceComparator.worldMap == null) {
-						GrandExchangeOfferUnitPriceComparator.worldMap = new WorldMap();
-						GrandExchangeOfferUnitPriceComparator.worldMap.init(UrlRequest.archive19, WorldMapArea.archive18, WorldMapSection1.archive20, HealthBar.fontBold12, Client.fontsMap, class287.mapSceneSprites);
-					}
-
-					Login.Login_loadingText = "Loaded world map";
-					Client.titleLoadingStage = 150;
-				}
-			} else if (Client.titleLoadingStage == 150) {
-				WorldMapIcon_0.updateGameState(10);
-			}
-		}
-	}
-
-	@ObfuscatedName("hg")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
+		signature = "(I)V",
-		garbageValue = "-281939606"
+		garbageValue = "851552801"
 	)
-	@Export("insertMenuItem")
+	static final void method2496() {
-	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
+		PacketBuffer var0 = Client.packetWriter.packetBuffer;
-		if (!Client.isMenuOpen) {
+		var0.importIndex();
-			if (Client.menuOptionsCount < 500) {
+		int var1 = var0.readBits(8);
-				Client.menuActions[Client.menuOptionsCount] = var0;
+		int var2;
-				Client.menuTargets[Client.menuOptionsCount] = var1;
+		if (var1 < Client.npcCount) {
-				Client.menuOpcodes[Client.menuOptionsCount] = var2;
+			for (var2 = var1; var2 < Client.npcCount; ++var2) {
-				Client.menuIdentifiers[Client.menuOptionsCount] = var3;
+				Client.field758[++Client.field640 - 1] = Client.npcIndices[var2];
-				Client.menuArguments1[Client.menuOptionsCount] = var4;
+			}
-				Client.menuArguments2[Client.menuOptionsCount] = var5;
+		}
-				Client.menuShiftClick[Client.menuOptionsCount] = var6;
+
-				++Client.menuOptionsCount;
+		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.field681[++Client.field633 - 1] = var3;
+					} else {
+						int var7;
+						int var8;
+						if (var6 == 1) {
+							Client.npcIndices[++Client.npcCount - 1] = var3;
+							var4.npcCycle = Client.cycle;
+							var7 = var0.readBits(3);
+							var4.method2044(var7, (byte)1);
+							var8 = var0.readBits(1);
+							if (var8 == 1) {
+								Client.field681[++Client.field633 - 1] = var3;
+							}
+						} else if (var6 == 2) {
+							Client.npcIndices[++Client.npcCount - 1] = var3;
+							var4.npcCycle = Client.cycle;
+							var7 = var0.readBits(3);
+							var4.method2044(var7, (byte)2);
+							var8 = var0.readBits(3);
+							var4.method2044(var8, (byte)2);
+							int var9 = var0.readBits(1);
+							if (var9 == 1) {
+								Client.field681[++Client.field633 - 1] = var3;
+							}
+						} else if (var6 == 3) {
+							Client.field758[++Client.field640 - 1] = var3;
+						}
+					}
+				}
 			}
 
 		}

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

@@ -4,23 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ke")
+@ObfuscatedName("kp")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lke;"
+		signature = "Lkp;"
 	)
-	static final DefaultsGroup field3792;
+	static final DefaultsGroup field3794;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1766167295
+		intValue = 779550305
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field3792 = new DefaultsGroup(3);
+		field3794 = new DefaultsGroup(3);
 	}
 
 	DefaultsGroup(int var1) {

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("ez")
+@ObfuscatedName("eu")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Llj;"
+		signature = "Llb;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Ljn;"
+		signature = "Lji;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Lev;"
 	)
-	class146 field1931;
+	class146 field1944;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue();
@@ -42,7 +42,7 @@ public final class DemotingHashTable {
 		this.hashTable = new IterableNodeHashTable(var3);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
@@ -73,16 +73,16 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		this.removeWrapper(var3);
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Ley;)V"
+		signature = "(Lec;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -94,7 +94,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("put")
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) {
@@ -113,8 +113,8 @@ public final class DemotingHashTable {
 				}
 
 				this.removeWrapper(var5);
-				if (this.field1931 != null) {
+				if (this.field1944 != null) {
-					this.field1931.method3299(var5.get());
+					this.field1944.method3298(var5.get());
 				}
 			}
 
@@ -125,7 +125,7 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@Export("demote")
 	public void demote(int var1) {
 		for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) {
@@ -146,7 +146,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear();

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

@@ -5,38 +5,41 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lc")
+@ObfuscatedName("lv")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("g")
+	@ObfuscatedName("bx")
-	@ObfuscatedGetter(
+	@Export("otp")
-		intValue = -1989921303
+	static String otp;
-	)
-	int field3899;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = 1264264203
-	)
-	int field3900;
 	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -962266715
+		intValue = -1774295629
 	)
-	int field3896;
+	int field3898;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 1935188169
+	)
+	int field3899;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 271278755
+	)
+	int field3900;
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)Lla;",
+		signature = "(I)Llt;",
-		garbageValue = "-2012824793"
+		garbageValue = "2006662723"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (UserComparator9.field1940.startsWith("win")) {
+		if (class162.field1990.startsWith("win")) {
 			var1 = 1;
-		} else if (UserComparator9.field1940.startsWith("mac")) {
+		} else if (class162.field1990.startsWith("mac")) {
 			var1 = 2;
-		} else if (UserComparator9.field1940.startsWith("linux")) {
+		} else if (class162.field1990.startsWith("linux")) {
 			var1 = 3;
 		} else {
 			var1 = 4;
@@ -134,11 +137,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			var8 = 4;
 		}
 
-		this.method6218(var5);
+		this.method6216(var5);
 		Runtime.getRuntime();
 		int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
 		int var11;
-		if (this.field3899 > 3) {
+		if (this.field3898 > 3) {
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
 			var11 = 0;
@@ -152,147 +155,55 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 		String var17 = "";
 		String var18 = "";
 		int[] var23 = new int[3];
-		return new PlatformInfo(var1, var24, var7, var8, this.field3899, this.field3900, this.field3896, 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.field3898, this.field3899, this.field3900, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "1517223421"
+		garbageValue = "-611564637"
-	)
-	void method6218(String var1) {
-		if (var1.startsWith("1.")) {
-			this.method6216(var1);
-		} else {
-			this.method6219(var1);
-		}
-
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "943324304"
 	)
 	void method6216(String var1) {
-		String[] var2 = var1.split("\\.");
+		if (var1.startsWith("1.")) {
-
+			this.method6209(var1);
-		try {
+		} else {
-			this.field3899 = Integer.parseInt(var2[1]);
+			this.method6210(var1);
-			var2 = var2[2].split("_");
-			this.field3900 = Integer.parseInt(var2[0]);
-			this.field3896 = Integer.parseInt(var2[1]);
-		} catch (Exception var4) {
 		}
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-1994454967"
+		garbageValue = "1764264863"
 	)
-	void method6219(String var1) {
+	void method6209(String var1) {
 		String[] var2 = var1.split("\\.");
 
 		try {
+			this.field3898 = Integer.parseInt(var2[1]);
+			var2 = var2[2].split("_");
 			this.field3899 = Integer.parseInt(var2[0]);
 			this.field3900 = Integer.parseInt(var2[1]);
-			this.field3896 = Integer.parseInt(var2[2]);
 		} catch (Exception var4) {
 		}
 
 	}
 
-	@ObfuscatedName("fo")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(IIIIZI)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-608218598"
+		garbageValue = "-775775529"
 	)
-	@Export("setViewportShape")
+	void method6210(String var1) {
-	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+		String[] var2 = var1.split("\\.");
-		if (var2 < 1) {
+
-			var2 = 1;
+		try {
+			this.field3898 = Integer.parseInt(var2[0]);
+			this.field3899 = Integer.parseInt(var2[1]);
+			this.field3900 = Integer.parseInt(var2[2]);
+		} catch (Exception var4) {
 		}
 
-		if (var3 < 1) {
-			var3 = 1;
-		}
-
-		int var5 = var3 - 334;
-		int var6;
-		if (var5 < 0) {
-			var6 = Client.field873;
-		} else if (var5 >= 100) {
-			var6 = Client.field752;
-		} else {
-			var6 = (Client.field752 - Client.field873) * var5 / 100 + Client.field873;
-		}
-
-		int var7 = var3 * var6 * 512 / (var2 * 334);
-		int var8;
-		int var9;
-		short var18;
-		if (var7 < Client.field879) {
-			var18 = Client.field879;
-			var6 = var18 * var2 * 334 / (var3 * 512);
-			if (var6 > Client.field878) {
-				var6 = Client.field878;
-				var8 = var3 * var6 * 512 / (var18 * 334);
-				var9 = (var2 - var8) / 2;
-				if (var4) {
-					Rasterizer2D.Rasterizer2D_resetClip();
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
-				}
-
-				var0 += var9;
-				var2 -= var9 * 2;
-			}
-		} else if (var7 > Client.field717) {
-			var18 = Client.field717;
-			var6 = var18 * var2 * 334 / (var3 * 512);
-			if (var6 < Client.field877) {
-				var6 = Client.field877;
-				var8 = var18 * var2 * 334 / (var6 * 512);
-				var9 = (var3 - var8) / 2;
-				if (var4) {
-					Rasterizer2D.Rasterizer2D_resetClip();
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
-				}
-
-				var1 += var9;
-				var3 -= var9 * 2;
-			}
-		}
-
-		Client.viewportZoom = var3 * var6 / 334;
-		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
-			int[] var17 = new int[9];
-
-			for (var9 = 0; var9 < var17.length; ++var9) {
-				int var10 = var9 * 32 + 15 + 128;
-				int var11 = var10 * 3 + 600;
-				int var13 = Rasterizer3D.Rasterizer3D_sine[var10];
-				int var15 = var3 - 334;
-				if (var15 < 0) {
-					var15 = 0;
-				} else if (var15 > 100) {
-					var15 = 100;
-				}
-
-				int var16 = (Client.zoomWidth - Client.zoomHeight) * var15 / 100 + Client.zoomHeight;
-				int var14 = var16 * var11 / 256;
-				var17[var9] = var14 * var13 >> 16;
-			}
-
-			Scene.Scene_buildVisiblityMap(var17, 500, 800, var2 * 334 / var3, 334);
-		}
-
-		Client.viewportOffsetX = var0;
-		Client.viewportOffsetY = var1;
-		Client.viewportWidth = var2;
-		Client.viewportHeight = var3;
 	}
 }

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

@@ -9,43 +9,43 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("aw")
+@ObfuscatedName("af")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1378130065
+		intValue = -66296385
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("byteSamples")
 	byte[] byteSamples;
 
 	DevicePcmPlayer() {
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "1989780823"
+		garbageValue = "8"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
+		this.format = new AudioFormat((float)UrlRequest.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
 		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(IS)V",
-		garbageValue = "91"
+		garbageValue = "2148"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
@@ -55,7 +55,7 @@ public class DevicePcmPlayer extends PcmPlayer {
 			this.line.open();
 			this.line.start();
 			this.capacity2 = var1;
-		} catch (LineUnavailableException var7) {
+		} catch (LineUnavailableException var5) {
 			int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765);
 			var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459);
 			var4 = (var4 >>> 4) + var4 & 252645135;
@@ -63,32 +63,25 @@ public class DevicePcmPlayer extends PcmPlayer {
 			var4 += var4 >>> 16;
 			int var3 = var4 & 255;
 			if (var3 != 1) {
-				int var6 = var1 - 1;
+				this.open(Timer.method4923(var1));
-				var6 |= var6 >>> 1;
-				var6 |= var6 >>> 2;
-				var6 |= var6 >>> 4;
-				var6 |= var6 >>> 8;
-				var6 |= var6 >>> 16;
-				int var5 = var6 + 1;
-				this.open(var5);
 			} else {
 				this.line = null;
-				throw var7;
+				throw var5;
 			}
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1120986508"
+		garbageValue = "1"
 	)
 	@Export("position")
 	protected int position() {
 		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("write")
 	protected void write() {
 		int var1 = 256;
@@ -109,10 +102,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		this.line.write(this.byteSamples, 0, var1 << 1);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1450874669"
+		garbageValue = "90832052"
 	)
 	@Export("close")
 	protected void close() {
@@ -123,10 +116,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-93486639"
+		garbageValue = "1875138754"
 	)
 	@Export("discard")
 	protected void discard() {

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

@@ -3,172 +3,95 @@ 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("ac")
+@ObfuscatedName("ag")
 @Implements("DevicePcmPlayerProvider")
 public class DevicePcmPlayerProvider implements PcmPlayerProvider {
-	@ObfuscatedName("p")
+	@ObfuscatedName("sg")
-	@ObfuscatedSignature(
-		signature = "[Lmw;"
-	)
-	@Export("JagexCache_idxFiles")
-	public static BufferedFile[] JagexCache_idxFiles;
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		signature = "Lkz;"
-	)
-	@Export("NetCache_reference")
-	static Buffer NetCache_reference;
-	@ObfuscatedName("ay")
-	@ObfuscatedSignature(
-		signature = "Llf;"
-	)
-	@Export("rasterProvider")
-	public static AbstractRasterProvider rasterProvider;
-	@ObfuscatedName("iz")
 	@ObfuscatedGetter(
-		intValue = -102001369
+		intValue = 408059263
 	)
-	@Export("selectedItemId")
+	@Export("foundItemIdCount")
-	static int selectedItemId;
+	static int foundItemIdCount;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -1430118873
+	)
+	@Export("KitDefinition_fileCount")
+	public static int KitDefinition_fileCount;
+	@ObfuscatedName("p")
+	static byte[][][] field393;
+	@ObfuscatedName("y")
+	static int[][] field386;
+	@ObfuscatedName("i")
+	public static short[][] field390;
+	@ObfuscatedName("ja")
+	@ObfuscatedSignature(
+		signature = "Lho;"
+	)
+	static Widget field391;
+	@ObfuscatedName("lk")
+	@ObfuscatedGetter(
+		intValue = -783171563
+	)
+	@Export("selectedItemSlot")
+	static int selectedItemSlot;
 
 	DevicePcmPlayerProvider() {
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)Ldh;",
+		signature = "(I)Ldv;",
-		garbageValue = "-131796443"
+		garbageValue = "-79742550"
 	)
 	@Export("player")
 	public PcmPlayer player() {
 		return new DevicePcmPlayer();
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("im")
 	@ObfuscatedSignature(
-		signature = "(IIB)I",
+		signature = "(IIIIIII)V",
-		garbageValue = "24"
+		garbageValue = "405770761"
 	)
-	static final int method811(int var0, int var1) {
+	static final void method877(int var0, int var1, int var2, int var3, int var4, int var5) {
-		int var2 = method805(var0 - 1, var1 - 1) + method805(var0 + 1, var1 - 1) + method805(var0 - 1, var1 + 1) + method805(1 + var0, 1 + var1);
+		int var6 = var2 - var0;
-		int var3 = method805(var0 - 1, var1) + method805(1 + var0, var1) + method805(var0, var1 - 1) + method805(var0, 1 + var1);
+		int var7 = var3 - var1;
-		int var4 = method805(var0, var1);
+		int var8 = var6 >= 0 ? var6 : -var6;
-		return var2 / 16 + var3 / 8 + var4 / 4;
+		int var9 = var7 >= 0 ? var7 : -var7;
+		int var10 = var8;
+		if (var8 < var9) {
+			var10 = var9;
 		}
 
-	@ObfuscatedName("i")
+		if (var10 != 0) {
-	@ObfuscatedSignature(
+			int var11 = (var6 << 16) / var10;
-		signature = "(IIB)I",
+			int var12 = (var7 << 16) / var10;
-		garbageValue = "118"
+			if (var12 <= var11) {
-	)
+				var11 = -var11;
-	static final int method805(int var0, int var1) {
-		int var2 = var0 + var1 * 57;
-		var2 ^= var2 << 13;
-		int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE;
-		return var3 >> 19 & 255;
-	}
-
-	@ObfuscatedName("ao")
-	@ObfuscatedSignature(
-		signature = "(ILcu;ZB)I",
-		garbageValue = "13"
-	)
-	static int method809(int var0, Script var1, boolean var2) {
-		int var3;
-		int var4;
-		int var6;
-		if (var0 == ScriptOpcodes.ENUM_STRING) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			EnumDefinition var5 = NetFileRequest.getEnum(var3);
-			if (var5.outputType != 's') {
-			}
-
-			for (var6 = 0; var6 < var5.outputCount; ++var6) {
-				if (var4 == var5.keys[var6]) {
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var5.strVals[var6];
-					var5 = null;
-					break;
-				}
-			}
-
-			if (var5 != null) {
-				Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var5.defaultStr;
-			}
-
-			return 1;
-		} else if (var0 != ScriptOpcodes.ENUM) {
-			if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) {
-				var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-				EnumDefinition var10 = NetFileRequest.getEnum(var3);
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var10.size();
-				return 1;
 			} else {
-				return 2;
+				var12 = -var12;
-			}
-		} else {
-			class160.Interpreter_intStackSize -= 4;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			int var9 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
-			var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3];
-			EnumDefinition var7 = NetFileRequest.getEnum(var9);
-			if (var3 == var7.inputType && var4 == var7.outputType) {
-				for (int var8 = 0; var8 < var7.outputCount; ++var8) {
-					if (var6 == var7.keys[var8]) {
-						if (var4 == 115) {
-							Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var7.strVals[var8];
-						} else {
-							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var7.intVals[var8];
-						}
-
-						var7 = null;
-						break;
-					}
-				}
-
-				if (var7 != null) {
-					if (var4 == 115) {
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var7.defaultStr;
-					} else {
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var7.defaultInt;
-					}
-				}
-
-				return 1;
-			} else {
-				if (var4 == 115) {
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "null";
-				} else {
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-				}
-
-				return 1;
-			}
-		}
-	}
-
-	@ObfuscatedName("jc")
-	@ObfuscatedSignature(
-		signature = "(IB)V",
-		garbageValue = "105"
-	)
-	@Export("Widget_resetModelFrames")
-	static final void Widget_resetModelFrames(int var0) {
-		if (TaskHandler.loadInterface(var0)) {
-			Widget[] var1 = class289.Widget_interfaceComponents[var0];
-
-			for (int var2 = 0; var2 < var1.length; ++var2) {
-				Widget var3 = var1[var2];
-				if (var3 != null) {
-					var3.modelFrame = 0;
-					var3.modelFrameCycle = 0;
-				}
 			}
 
+			int var13 = var5 * var12 >> 17;
+			int var14 = var5 * var12 + 1 >> 17;
+			int var15 = var5 * var11 >> 17;
+			int var16 = var5 * var11 + 1 >> 17;
+			var0 -= Rasterizer2D.Rasterizer2D_xClipStart;
+			var1 -= Rasterizer2D.Rasterizer2D_yClipStart;
+			int var17 = var0 + var13;
+			int var18 = var0 - var14;
+			int var19 = var0 + var6 - var14;
+			int var20 = var0 + var13 + var6;
+			int var21 = var15 + var1;
+			int var22 = var1 - var16;
+			int var23 = var7 + var1 - var16;
+			int var24 = var15 + var7 + var1;
+			Rasterizer3D.method2968(var17, var18, var19);
+			Rasterizer3D.method2971(var21, var22, var23, var17, var18, var19, var4);
+			Rasterizer3D.method2968(var17, var19, var20);
+			Rasterizer3D.method2971(var21, var23, var24, var17, var19, var20, var4);
 		}
 	}
 }

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

@@ -1,23 +1,29 @@
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gx")
+@ObfuscatedName("gj")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("c")
+	@ObfuscatedName("l")
+	@Export("BZip2Decompressor_block")
+	static int[] BZip2Decompressor_block;
+	@ObfuscatedName("eu")
+	static int[] field2482;
+	@ObfuscatedName("z")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
 	DirectByteArrayCopier() {
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(B)[B",
-		garbageValue = "49"
+		garbageValue = "-37"
 	)
 	@Export("get")
 	byte[] get() {
@@ -27,10 +33,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		return var1;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "-1981176877"
+		garbageValue = "-793496359"
 	)
 	@Export("set")
 	void set(byte[] var1) {
@@ -39,8 +45,28 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		this.directBuffer.put(var1);
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("n")
-	static final void method3932(long var0) {
+	@ObfuscatedSignature(
-		ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0;
+		signature = "(ZI)V",
+		garbageValue = "-2052817052"
+	)
+	public static void method3915(boolean var0) {
+		if (NetCache.NetCache_socket != null) {
+			try {
+				Buffer var1 = new Buffer(4);
+				var1.writeByte(var0 ? 2 : 3);
+				var1.writeMedium(0);
+				NetCache.NetCache_socket.write(var1.array, 0, 4);
+			} catch (IOException var4) {
+				try {
+					NetCache.NetCache_socket.close();
+				} catch (Exception var3) {
+				}
+
+				++NetCache.NetCache_ioExceptions;
+				NetCache.NetCache_socket = null;
+			}
+
+		}
 	}
 }

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("ei")
+@ObfuscatedName("ez")
 @Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("obj")
 	Object obj;
 
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("get")
 	Object get() {
 		return this.obj;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@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("fv")
+@ObfuscatedName("fw")
 @Implements("DualNode")
 public class DualNode extends Node {
 	@ObfuscatedName("cu")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("cd")
+	@ObfuscatedName("ce")
 	@ObfuscatedSignature(
-		signature = "Lfv;"
+		signature = "Lfw;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cc")
 	@ObfuscatedSignature(
-		signature = "Lfv;"
+		signature = "Lfw;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("cx")
+	@ObfuscatedName("ce")
 	@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("ig")
+@ObfuscatedName("ic")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lfv;"
+		signature = "Lfw;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lfv;)V"
+		signature = "(Lfw;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lfv;)V"
+		signature = "(Lfw;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "()Lfv;"
+		signature = "()Lfw;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {

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

@@ -4,66 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cd")
+@ObfuscatedName("ce")
 @Implements("DynamicObject")
 public class DynamicObject extends Entity {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -440317767
+		intValue = 1757320161
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1457716031
+		intValue = 270171291
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 2004235481
+		intValue = 1684018413
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1247808451
+		intValue = -804761033
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 910065863
+		intValue = -1414323503
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 439709923
+		intValue = 1753767283
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Liw;"
+		signature = "Lix;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1565823045
+		intValue = -1311165823
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1402940691
+		intValue = 972994897
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		signature = "(IIIIIIIZLel;)V"
+		signature = "(IIIIIIIZLer;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
 		this.id = var1;
@@ -73,10 +73,10 @@ public class DynamicObject extends Entity {
 		this.x = var5;
 		this.y = var6;
 		if (var7 != -1) {
-			this.sequenceDefinition = class83.SequenceDefinition_get(var7);
+			this.sequenceDefinition = GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var7);
 			this.frame = 0;
 			this.cycleStart = Client.cycle - 1;
-			if (this.sequenceDefinition.field3502 == 0 && var9 != null && var9 instanceof DynamicObject) {
+			if (this.sequenceDefinition.field3517 == 0 && var9 != null && var9 instanceof DynamicObject) {
 				DynamicObject var10 = (DynamicObject)var9;
 				if (var10.sequenceDefinition == this.sequenceDefinition) {
 					this.frame = var10.frame;
@@ -93,10 +93,10 @@ public class DynamicObject extends Entity {
 
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(B)Ldr;",
+		signature = "(I)Ldh;",
-		garbageValue = "-35"
+		garbageValue = "-62237472"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -106,11 +106,11 @@ public class DynamicObject extends Entity {
 				var1 = 100;
 			}
 
-			label55: {
+			label56: {
 				do {
 					do {
 						if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
-							break label55;
+							break label56;
 						}
 
 						var1 -= this.sequenceDefinition.frameLengths[this.frame];
@@ -126,7 +126,7 @@ public class DynamicObject extends Entity {
 			this.cycleStart = Client.cycle - var1;
 		}
 
-		ObjectDefinition var12 = WallDecoration.getObjectDefinition(this.id);
+		ObjectDefinition var12 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(this.id);
 		if (var12.transforms != null) {
 			var12 = var12.transform();
 		}
@@ -149,82 +149,115 @@ public class DynamicObject extends Entity {
 			int var6 = (var3 >> 1) + this.y;
 			int var7 = (var3 + 1 >> 1) + this.y;
 			int[][] var8 = Tiles.Tiles_heights[this.plane];
-			int var9 = var8[var5][var7] + var8[var4][var6] + var8[var5][var6] + var8[var4][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 var11 = (this.y << 7) + (var3 << 6);
 			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;I)Z",
+		signature = "(I)Z",
-		garbageValue = "1791385097"
+		garbageValue = "1880284014"
 	)
-	@Export("isNumber")
+	@Export("isKeyDown")
-	public static boolean isNumber(CharSequence var0) {
+	public static final boolean isKeyDown() {
-		boolean var2 = false;
+		synchronized(KeyHandler.KeyHandler_instance) {
-		boolean var3 = false;
+			if (KeyHandler.field380 == KeyHandler.field378) {
-		int var4 = 0;
+				return false;
-		int var5 = var0.length();
-		int var6 = 0;
-
-		boolean var1;
-		while (true) {
-			if (var6 >= var5) {
-				var1 = var3;
-				break;
-			}
-
-			label84: {
-				char var7 = var0.charAt(var6);
-				if (var6 == 0) {
-					if (var7 == '-') {
-						var2 = true;
-						break label84;
-					}
-
-					if (var7 == '+') {
-						break label84;
-					}
-				}
-
-				int var9;
-				if (var7 >= '0' && var7 <= '9') {
-					var9 = var7 - '0';
-				} else if (var7 >= 'A' && var7 <= 'Z') {
-					var9 = var7 - '7';
 			} else {
-					if (var7 < 'a' || var7 > 'z') {
+				SecureRandomFuture.field1230 = KeyHandler.field375[KeyHandler.field378];
-						var1 = false;
+				KeyHandler.field381 = KeyHandler.field374[KeyHandler.field378];
-						break;
+				KeyHandler.field378 = KeyHandler.field378 + 1 & 127;
+				return true;
+			}
+		}
 	}
 
-					var9 = var7 - 'W';
+	@ObfuscatedName("ao")
+	@ObfuscatedSignature(
+		signature = "(Ldc;I)V",
+		garbageValue = "1888530585"
+	)
+	@Export("PcmStream_disable")
+	static final void PcmStream_disable(PcmStream var0) {
+		var0.active = false;
+		if (var0.sound != null) {
+			var0.sound.position = 0;
 		}
 
-				if (var9 >= 10) {
+		for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
-					var1 = false;
+			PcmStream_disable(var1);
-					break;
 		}
 
-				if (var2) {
-					var9 = -var9;
 	}
 
-				int var8 = var9 + var4 * 10;
+	@ObfuscatedName("ea")
-				if (var4 != var8 / 10) {
+	@ObfuscatedSignature(
-					var1 = false;
+		signature = "(I)V",
-					break;
+		garbageValue = "274251023"
+	)
+	static final void method2219() {
+		Client.packetWriter.close();
+		WorldMapIcon_1.method314();
+		PacketWriter.scene.clear();
+
+		for (int var0 = 0; var0 < 4; ++var0) {
+			Client.collisionMaps[var0].clear();
 		}
 
-				var4 = var8;
+		System.gc();
-				var3 = true;
+		class197.field2386 = 1;
+		class197.musicTrackArchive = null;
+		class188.musicTrackGroupId = -1;
+		class49.musicTrackFileId = -1;
+		TileItem.field1223 = 0;
+		WorldMapSectionType.musicTrackBoolean = false;
+		MusicPatchNode2.field2382 = 2;
+		Client.field666 = -1;
+		Client.field759 = false;
+		ClientPacket.method3575();
+		MouseRecorder.updateGameState(10);
 	}
 
-			++var6;
+	@ObfuscatedName("gn")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "652940971"
+	)
+	static final void method2221() {
+		for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) {
+			if (var0.plane == WorldMapRectangle.plane && Client.cycle <= var0.cycleEnd) {
+				if (Client.cycle >= var0.cycleStart) {
+					if (var0.targetIndex > 0) {
+						NPC var1 = Client.npcs[var0.targetIndex - 1];
+						if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y * 682054857 >= 0 && var1.y * 682054857 < 13312) {
+							var0.setDestination(var1.x, var1.y * 682054857, MusicPatchPcmStream.getTileHeight(var1.x, var1.y * 682054857, var0.plane) - var0.endHeight, Client.cycle);
+						}
+					}
+
+					if (var0.targetIndex < 0) {
+						int var2 = -var0.targetIndex - 1;
+						Player var3;
+						if (var2 == Client.localPlayerIndex) {
+							var3 = class223.localPlayer;
+						} else {
+							var3 = Client.players[var2];
+						}
+
+						if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y * 682054857 >= 0 && var3.y * 682054857 < 13312) {
+							var0.setDestination(var3.x, var3.y * 682054857, MusicPatchPcmStream.getTileHeight(var3.x, var3.y * 682054857, var0.plane) - var0.endHeight, Client.cycle);
+						}
+					}
+
+					var0.advance(Client.field698);
+					PacketWriter.scene.drawEntity(WorldMapRectangle.plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false);
+				}
+			} else {
+				var0.remove();
+			}
 		}
 
-		return var1;
 	}
 }

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

@@ -1,23 +1,17 @@
-import java.io.File;
+import java.util.Iterator;
-import java.io.IOException;
-import java.io.RandomAccessFile;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("el")
+@ObfuscatedName("er")
 @Implements("Entity")
 public abstract class Entity extends DualNode {
-	@ObfuscatedName("jn")
+	@ObfuscatedName("ci")
-	@ObfuscatedSignature(
-		signature = "Lhy;"
-	)
-	static Widget field1835;
-	@ObfuscatedName("cw")
 	@ObfuscatedGetter(
-		intValue = -160272347
+		intValue = -2145101269
 	)
 	@Export("height")
 	public int height;
@@ -26,17 +20,17 @@ public abstract class Entity extends DualNode {
 		this.height = 1000;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(B)Ldr;",
+		signature = "(I)Ldh;",
-		garbageValue = "-35"
+		garbageValue = "-62237472"
 	)
 	@Export("getModel")
 	protected Model getModel() {
 		return null;
 	}
 
-	@ObfuscatedName("cm")
+	@ObfuscatedName("cb")
 	@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();
@@ -47,227 +41,185 @@ public abstract class Entity extends DualNode {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;",
+		signature = "(CB)B",
-		garbageValue = "1018244137"
+		garbageValue = "92"
 	)
-	@Export("getCacheDir")
+	@Export("charToByteCp1252")
-	static File getCacheDir(String var0, String var1, int var2) {
+	public static byte charToByteCp1252(char var0) {
-		String var3 = var2 == 0 ? "" : "" + var2;
+		byte var1;
-		JagexCache.JagexCache_locationFile = new File(Message.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat");
+		if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) {
-		String var4 = null;
+			var1 = (byte)var0;
-		String var5 = null;
+		} else if (var0 == 8364) {
-		boolean var6 = false;
+			var1 = -128;
-		int var11;
+		} else if (var0 == 8218) {
-		File var26;
+			var1 = -126;
-		if (JagexCache.JagexCache_locationFile.exists()) {
+		} else if (var0 == 402) {
-			try {
+			var1 = -125;
-				AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L);
+		} else if (var0 == 8222) {
-
+			var1 = -124;
-				Buffer var8;
+		} else if (var0 == 8230) {
-				int var9;
+			var1 = -123;
-				for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) {
+		} else if (var0 == 8224) {
-					var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset);
+			var1 = -122;
-					if (var9 == -1) {
+		} else if (var0 == 8225) {
-						throw new IOException();
+			var1 = -121;
-					}
+		} else if (var0 == 710) {
-				}
+			var1 = -120;
-
+		} else if (var0 == 8240) {
-				var8.offset = 0;
+			var1 = -119;
-				var9 = var8.readUnsignedByte();
+		} else if (var0 == 352) {
-				if (var9 < 1 || var9 > 3) {
+			var1 = -118;
-					throw new IOException("" + var9);
+		} else if (var0 == 8249) {
-				}
+			var1 = -117;
-
+		} else if (var0 == 338) {
-				int var10 = 0;
+			var1 = -116;
-				if (var9 > 1) {
+		} else if (var0 == 381) {
-					var10 = var8.readUnsignedByte();
+			var1 = -114;
-				}
+		} else if (var0 == 8216) {
-
+			var1 = -111;
-				if (var9 <= 2) {
+		} else if (var0 == 8217) {
-					var4 = var8.readStringCp1252NullCircumfixed();
+			var1 = -110;
-					if (var10 == 1) {
+		} else if (var0 == 8220) {
-						var5 = var8.readStringCp1252NullCircumfixed();
+			var1 = -109;
-					}
+		} else if (var0 == 8221) {
+			var1 = -108;
+		} else if (var0 == 8226) {
+			var1 = -107;
+		} else if (var0 == 8211) {
+			var1 = -106;
+		} else if (var0 == 8212) {
+			var1 = -105;
+		} else if (var0 == 732) {
+			var1 = -104;
+		} else if (var0 == 8482) {
+			var1 = -103;
+		} else if (var0 == 353) {
+			var1 = -102;
+		} else if (var0 == 8250) {
+			var1 = -101;
+		} else if (var0 == 339) {
+			var1 = -100;
+		} else if (var0 == 382) {
+			var1 = -98;
+		} else if (var0 == 376) {
+			var1 = -97;
 		} else {
-					var4 = var8.readCESU8();
+			var1 = 63;
-					if (var10 == 1) {
-						var5 = var8.readCESU8();
-					}
 		}
 
-				var7.close();
+		return var1;
-			} catch (IOException var24) {
-				var24.printStackTrace();
 	}
 
-			if (var4 != null) {
+	@ObfuscatedName("i")
-				var26 = new File(var4);
-				if (!var26.exists()) {
-					var4 = null;
-				}
-			}
-
-			if (var4 != null) {
-				var26 = new File(var4, "test.dat");
-
-				boolean var27;
-				try {
-					RandomAccessFile var15 = new RandomAccessFile(var26, "rw");
-					var11 = var15.read();
-					var15.seek(0L);
-					var15.write(var11);
-					var15.seek(0L);
-					var15.close();
-					var26.delete();
-					var27 = true;
-				} catch (Exception var22) {
-					var27 = false;
-				}
-
-				if (!var27) {
-					var4 = null;
-				}
-			}
-		}
-
-		if (var4 == null && var2 == 0) {
-			label139:
-			for (int var16 = 0; var16 < NetFileRequest.field3096.length; ++var16) {
-				for (int var17 = 0; var17 < GrandExchangeOfferWorldComparator.field30.length; ++var17) {
-					File var18 = new File(GrandExchangeOfferWorldComparator.field30[var17] + NetFileRequest.field3096[var16] + File.separatorChar + var0 + File.separatorChar);
-					if (var18.exists()) {
-						File var19 = new File(var18, "test.dat");
-
-						boolean var28;
-						try {
-							RandomAccessFile var12 = new RandomAccessFile(var19, "rw");
-							int var13 = var12.read();
-							var12.seek(0L);
-							var12.write(var13);
-							var12.seek(0L);
-							var12.close();
-							var19.delete();
-							var28 = true;
-						} catch (Exception var21) {
-							var28 = false;
-						}
-
-						if (var28) {
-							var4 = var18.toString();
-							var6 = true;
-							break label139;
-						}
-					}
-				}
-			}
-		}
-
-		if (var4 == null) {
-			var4 = Message.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar;
-			var6 = true;
-		}
-
-		if (var5 != null) {
-			File var25 = new File(var5);
-			var26 = new File(var4);
-
-			try {
-				File[] var31 = var25.listFiles();
-				File[] var30 = var31;
-
-				for (var11 = 0; var11 < var30.length; ++var11) {
-					File var29 = var30[var11];
-					File var20 = new File(var26, var29.getName());
-					boolean var14 = var29.renameTo(var20);
-					if (!var14) {
-						throw new IOException();
-					}
-				}
-			} catch (Exception var23) {
-				var23.printStackTrace();
-			}
-
-			var6 = true;
-		}
-
-		if (var6) {
-			WorldMapManager.method611(new File(var4), (File)null);
-		}
-
-		return new File(var4);
-	}
-
-	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(IIII)I",
+		signature = "(I)Ljava/lang/String;",
-		garbageValue = "-284240639"
+		garbageValue = "67381036"
 	)
-	@Export("hslToRgb")
+	static String method3221() {
-	static final int hslToRgb(int var0, int var1, int var2) {
+		String var0 = "";
-		if (var2 > 179) {
+
-			var1 /= 2;
+		Message var2;
+		for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') {
+			var2 = (Message)var1.next();
 		}
 
-		if (var2 > 192) {
+		return var0;
-			var1 /= 2;
 	}
 
-		if (var2 > 217) {
+	@ObfuscatedName("aq")
-			var1 /= 2;
-		}
-
-		if (var2 > 243) {
-			var1 /= 2;
-		}
-
-		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2;
-		return var3;
-	}
-
-	@ObfuscatedName("er")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(ILcu;ZI)I",
-		garbageValue = "-16"
+		garbageValue = "160012965"
 	)
-	static void method3228() {
+	static int method3212(int var0, Script var1, boolean var2) {
-		Client.packetWriter.clearBuffer();
+		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) {
-		Client.packetWriter.packetBuffer.offset = 0;
+			Interpreter.Interpreter_intStackSize -= 2;
-		Client.packetWriter.serverPacket = null;
+			Client.field880 = (short)PlayerAppearance.method3966(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]);
-		Client.packetWriter.field1274 = null;
+			if (Client.field880 <= 0) {
-		Client.packetWriter.field1286 = null;
+				Client.field880 = 256;
-		Client.packetWriter.field1287 = null;
-		Client.packetWriter.serverPacketLength = 0;
-		Client.packetWriter.field1283 = 0;
-		Client.rebootTimer = 0;
-		Client.menuOptionsCount = 0;
-		Client.isMenuOpen = false;
-		Client.minimapState = 0;
-		Client.destinationX = 0;
-
-		int var0;
-		for (var0 = 0; var0 < 2048; ++var0) {
-			Client.players[var0] = null;
 			}
 
-		Varps.localPlayer = null;
+			Client.field887 = (short)PlayerAppearance.method3966(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
-
+			if (Client.field887 <= 0) {
-		for (var0 = 0; var0 < Client.npcs.length; ++var0) {
+				Client.field887 = 256;
-			NPC var1 = Client.npcs[var0];
-			if (var1 != null) {
-				var1.targetIndex = -1;
-				var1.false0 = false;
-			}
 			}
 
-		class286.method5221();
+			return 1;
-		WorldMapIcon_0.updateGameState(30);
+		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) {
-
+			Interpreter.Interpreter_intStackSize -= 2;
-		for (var0 = 0; var0 < 100; ++var0) {
+			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-			Client.field827[var0] = true;
+			if (Client.zoomHeight <= 0) {
+				Client.zoomHeight = 256;
 			}
 
-		MouseRecorder.method1145();
+			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			if (Client.zoomWidth <= 0) {
+				Client.zoomWidth = 320;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) {
+			Interpreter.Interpreter_intStackSize -= 4;
+			Client.field686 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			if (Client.field686 <= 0) {
+				Client.field686 = 1;
+			}
+
+			Client.field891 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			if (Client.field891 <= 0) {
+				Client.field891 = 32767;
+			} else if (Client.field891 < Client.field686) {
+				Client.field891 = Client.field686;
+			}
+
+			Client.field892 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+			if (Client.field892 <= 0) {
+				Client.field892 = 1;
+			}
+
+			Client.field893 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
+			if (Client.field893 <= 0) {
+				Client.field893 = 32767;
+			} else if (Client.field893 < Client.field892) {
+				Client.field893 = Client.field892;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) {
+			if (Client.viewportWidget != null) {
+				AbstractByteArrayCopier.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false);
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth;
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight;
+			} else {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight;
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth;
+			return 1;
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class219.method4069(Client.field880);
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class219.method4069(Client.field887);
+			return 1;
+		} else if (var0 == 6220) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+			return 1;
+		} else if (var0 == 6221) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+			return 1;
+		} else if (var0 == 6222) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorDecoration.canvasWidth;
+			return 1;
+		} else if (var0 == 6223) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.canvasHeight;
+			return 1;
+		} else {
+			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("gk")
+@ObfuscatedName("ga")
 @Implements("Enumerated")
 public interface Enumerated {
-	@ObfuscatedName("c")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(S)I",
-		garbageValue = "-1410702910"
+		garbageValue = "221"
 	)
 	@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("et")
+@ObfuscatedName("em")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lfv;"
+		signature = "Lfw;"
 	)
-	DualNode field1923;
+	DualNode field1937;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@Export("remainingCapacity")
 	int remainingCapacity;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Llj;"
+		signature = "Llb;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Ljn;"
+		signature = "Lji;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
 
 	public EvictingDualNodeHashTable(int var1) {
-		this.field1923 = new DualNode();
+		this.field1937 = 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("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(J)Lfv;"
+		signature = "(J)Lfw;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
@@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable {
 		return var3;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("remove")
 	public void remove(long var1) {
 		DualNode var3 = (DualNode)this.hashTable.get(var1);
@@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable {
 
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lfv;J)V"
+		signature = "(Lfw;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.field1923) {
+			if (var4 == this.field1937) {
 				var4 = this.deque.removeLast();
 				var4.remove();
 				var4.removeDual();
@@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable {
 		this.deque.add(var1);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("clear")
 	public void clear() {
 		this.deque.clear();
 		this.hashTable.clear();
-		this.field1923 = new DualNode();
+		this.field1937 = new DualNode();
 		this.remainingCapacity = this.capacity;
 	}
 }

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

@@ -2,35 +2,127 @@ 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("em")
+@ObfuscatedName("ee")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("kk")
+	@ObfuscatedName("o")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = -2016617893
+		signature = "Lkn;"
 	)
-	@Export("menuHeight")
+	@Export("ItemDefinition_fontPlain11")
-	static int menuHeight;
+	static Font ItemDefinition_fontPlain11;
-	@ObfuscatedName("c")
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		signature = "Lkl;"
+	)
+	@Export("NetCache_responseArchiveBuffer")
+	static Buffer NetCache_responseArchiveBuffer;
+	@ObfuscatedName("ds")
+	@ObfuscatedSignature(
+		signature = "Lie;"
+	)
+	@Export("archive2")
+	static Archive archive2;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 153550735
+		intValue = 149051353
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1428823539
+		intValue = -1494841217
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("t")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1573119105
+		intValue = 2026615431
 	)
 	@Export("z")
 	int z;
 
 	FaceNormal() {
 	}
+
+	@ObfuscatedName("iy")
+	@ObfuscatedSignature(
+		signature = "([Lho;IIIZI)V",
+		garbageValue = "2028417948"
+	)
+	@Export("resizeInterface")
+	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
+		for (int var5 = 0; var5 < var0.length; ++var5) {
+			Widget var6 = var0[var5];
+			if (var6 != null && var6.parentId == var1) {
+				TileItem.alignWidgetSize(var6, var2, var3, var4);
+				class30.alignWidgetPosition(var6, var2, var3);
+				if (var6.scrollX > var6.scrollWidth - var6.width) {
+					var6.scrollX = var6.scrollWidth - var6.width;
+				}
+
+				if (var6.scrollX < 0) {
+					var6.scrollX = 0;
+				}
+
+				if (var6.scrollY > var6.scrollHeight - var6.height) {
+					var6.scrollY = var6.scrollHeight - var6.height;
+				}
+
+				if (var6.scrollY < 0) {
+					var6.scrollY = 0;
+				}
+
+				if (var6.type == 0) {
+					GameShell.revalidateWidgetScroll(var0, var6, var4);
+				}
+			}
+		}
+
+	}
+
+	@ObfuscatedName("ki")
+	@ObfuscatedSignature(
+		signature = "(Lho;II)Ljava/lang/String;",
+		garbageValue = "-1147965976"
+	)
+	static String method3224(Widget var0, int var1) {
+		int var3 = class2.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;
+		}
+	}
+
+	@ObfuscatedName("kr")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;ZB)Ljava/lang/String;",
+		garbageValue = "17"
+	)
+	static String method3225(String var0, boolean var1) {
+		String var2 = var1 ? "https://" : "http://";
+		if (Client.gameBuild == 1) {
+			var0 = var0 + "-wtrc";
+		} else if (Client.gameBuild == 2) {
+			var0 = var0 + "-wtqa";
+		} else if (Client.gameBuild == 3) {
+			var0 = var0 + "-wtwip";
+		} else if (Client.gameBuild == 5) {
+			var0 = var0 + "-wti";
+		} else if (Client.gameBuild == 4) {
+			var0 = "local";
+		}
+
+		String var3 = "";
+		if (class197.field2390 != null) {
+			var3 = "/p=" + class197.field2390;
+		}
+
+		String var4 = "runescape.com";
+		return var2 + var0 + "." + var4 + "/l=" + WorldMapLabelSize.clientLanguage + "/a=" + WorldMapArea.field218 + var3 + "/";
+	}
 }

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

@@ -1,69 +1,24 @@
+import java.io.File;
 import java.util.Hashtable;
 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("fi")
+@ObfuscatedName("fg")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("qd")
+	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 1877422611
-	)
-	static int field2027;
-	@ObfuscatedName("c")
 	@Export("FileSystem_hasPermissions")
-	static boolean FileSystem_hasPermissions;
+	public static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
+	@Export("FileSystem_cacheDir")
+	public static File FileSystem_cacheDir;
+	@ObfuscatedName("v")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "[Llt;"
-	)
-	@Export("title_muteSprite")
-	static IndexedSprite[] title_muteSprite;
-	@ObfuscatedName("bw")
-	@ObfuscatedSignature(
-		signature = "[Llt;"
-	)
-	@Export("worldSelectArrows")
-	static IndexedSprite[] worldSelectArrows;
-	@ObfuscatedName("kl")
-	@ObfuscatedGetter(
-		intValue = -841195075
-	)
-	@Export("menuX")
-	static int menuX;
 
 	static {
 		FileSystem_hasPermissions = false;
 		FileSystem_cacheFiles = new Hashtable(16);
 	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(I)[Llt;",
-		garbageValue = "584570356"
-	)
-	public static IndexedSprite[] method3489() {
-		IndexedSprite[] var0 = new IndexedSprite[class325.SpriteBuffer_spriteCount];
-
-		for (int var1 = 0; var1 < class325.SpriteBuffer_spriteCount; ++var1) {
-			IndexedSprite var2 = var0[var1] = new IndexedSprite();
-			var2.width = class325.SpriteBuffer_spriteWidth;
-			var2.height = class325.SpriteBuffer_spriteHeight;
-			var2.xOffset = class325.SpriteBuffer_xOffsets[var1];
-			var2.yOffset = SecureRandomCallable.SpriteBuffer_yOffsets[var1];
-			var2.subWidth = class325.SpriteBuffer_spriteWidths[var1];
-			var2.subHeight = SoundSystem.SpriteBuffer_spriteHeights[var1];
-			var2.palette = class325.SpriteBuffer_spritePalette;
-			var2.pixels = InvDefinition.SpriteBuffer_pixels[var1];
-		}
-
-		class192.SpriteBuffer_clear();
-		return var0;
-	}
 }

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

@@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lq")
+@ObfuscatedName("lu")
 @Implements("FillMode")
 public enum FillMode implements Enumerated {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Llq;"
+		signature = "Llu;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Llq;"
+		signature = "Llu;"
 	)
-	field3855(1, 1),
+	field3856(1, 1),
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Llq;"
+		signature = "Llu;"
 	)
-	field3852(2, 2);
+	field3857(2, 2);
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -494470033
+		intValue = -640256921
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1639084691
+		intValue = -532498775
 	)
 	@Export("id")
 	final int id;
@@ -42,32 +42,43 @@ public enum FillMode implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(S)I",
-		garbageValue = "-1410702910"
+		garbageValue = "221"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lhz;IIS)Lli;",
+		signature = "(I)Llf;",
-		garbageValue = "-25317"
+		garbageValue = "1508787563"
 	)
-	@Export("SpriteBuffer_getSprite")
+	static Sprite method6007() {
-	public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
+		Sprite var0 = new Sprite();
-		byte[] var4 = var0.takeFile(var1, var2);
+		var0.width = class325.SpriteBuffer_spriteWidth;
-		boolean var3;
+		var0.height = Frames.SpriteBuffer_spriteHeight;
-		if (var4 == null) {
+		var0.xOffset = class325.SpriteBuffer_xOffsets[0];
-			var3 = false;
+		var0.yOffset = MusicPatchPcmStream.SpriteBuffer_yOffsets[0];
-		} else {
+		var0.subWidth = class325.SpriteBuffer_spriteWidths[0];
-			GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var4);
+		var0.subHeight = RunException.SpriteBuffer_spriteHeights[0];
-			var3 = true;
+		int var1 = var0.subHeight * var0.subWidth;
+		byte[] var2 = PacketBufferNode.SpriteBuffer_pixels[0];
+		var0.pixels = new int[var1];
+
+		for (int var3 = 0; var3 < var1; ++var3) {
+			var0.pixels[var3] = class325.SpriteBuffer_spritePalette[var2[var3] & 255];
 		}
 
-		return !var3 ? null : ChatChannel.method2218();
+		class325.SpriteBuffer_xOffsets = null;
+		MusicPatchPcmStream.SpriteBuffer_yOffsets = null;
+		class325.SpriteBuffer_spriteWidths = null;
+		RunException.SpriteBuffer_spriteHeights = null;
+		class325.SpriteBuffer_spritePalette = null;
+		PacketBufferNode.SpriteBuffer_pixels = null;
+		return var0;
 	}
 }

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

@@ -4,47 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("db")
+@ObfuscatedName("dj")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("fg")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 2143903215
+		intValue = 1829552079
 	)
-	static int field1585;
+	@Export("canvasWidth")
-	@ObfuscatedName("c")
+	public static int canvasWidth;
-	@ObfuscatedGetter(
+	@ObfuscatedName("z")
-		intValue = -1477946129
-	)
-	@Export("tileHeight")
-	int tileHeight;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = -662619385
-	)
-	@Export("y")
-	int y;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = -1897979537
-	)
-	@Export("x")
-	int x;
-	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Ler;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		longValue = -6178260684418985297L
+		intValue = 1834213503
+	)
+	@Export("tileHeight")
+	int tileHeight;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 461857131
+	)
+	@Export("x")
+	int x;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = -848464295
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		longValue = 3642112439868332829L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 944766785
+		intValue = -1953587145
 	)
 	@Export("flags")
 	int flags;
@@ -52,103 +53,48 @@ public final class FloorDecoration {
 	FloorDecoration() {
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
+		signature = "(II)Lhs;",
-		garbageValue = "423054360"
+		garbageValue = "-1156266256"
 	)
-	static final void method2813(int var0, int var1, int var2, int var3) {
+	public static ServerBuild method2837(int var0) {
-		for (int var4 = var1; var4 <= var3 + var1; ++var4) {
+		ServerBuild[] var1 = new ServerBuild[]{ServerBuild.BUILDLIVE, ServerBuild.LIVE, ServerBuild.RC, ServerBuild.WIP};
-			for (int var5 = var0; var5 <= var0 + var2; ++var5) {
+		ServerBuild[] var2 = var1;
-				if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) {
-					Tiles.field473[0][var5][var4] = 127;
-					if (var0 == var5 && var5 > 0) {
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
-					}
 
-					if (var5 == var0 + var2 && var5 < 103) {
+		for (int var3 = 0; var3 < var2.length; ++var3) {
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
+			ServerBuild var4 = var2[var3];
-					}
+			if (var0 == var4.field3079) {
-
+				return var4;
-					if (var4 == var1 && var4 > 0) {
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
-					}
-
-					if (var3 + var1 == var4 && var4 < 103) {
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
-					}
-				}
 			}
 		}
 
+		return null;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("jl")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(IIIILlf;Lhz;S)V",
-		garbageValue = "3"
+		garbageValue = "1700"
 	)
-	public static void method2811() {
+	@Export("worldToMinimap")
-		try {
+	static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
-			JagexCache.JagexCache_dat2File.close();
+		int var6 = var3 * var3 + var2 * var2;
-
+		if (var6 > 4225 && var6 < 90000) {
-			for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) {
+			int var7 = Client.camAngleY & 2047;
-				DevicePcmPlayerProvider.JagexCache_idxFiles[var0].close();
+			int var8 = Rasterizer3D.Rasterizer3D_sine[var7];
-			}
+			int var9 = Rasterizer3D.Rasterizer3D_cosine[var7];
-
+			int var10 = var9 * var2 + var3 * var8 >> 16;
-			JagexCache.JagexCache_idx255File.close();
+			int var11 = var3 * var9 - var8 * var2 >> 16;
-			JagexCache.JagexCache_randomDat.close();
+			double var12 = Math.atan2((double)var10, (double)var11);
-		} catch (Exception var2) {
+			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;
-
+			PendingSpawn.redHintArrowSprite.method6067(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		signature = "(IIB)I",
-		garbageValue = "119"
-	)
-	static final int method2812(int var0, int var1) {
-		if (var0 == -2) {
-			return 12345678;
-		} else if (var0 == -1) {
-			if (var1 < 2) {
-				var1 = 2;
-			} else if (var1 > 126) {
-				var1 = 126;
-			}
-
-			return var1;
 		} else {
-			var1 = (var0 & 127) * var1 / 128;
+			class208.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5);
-			if (var1 < 2) {
-				var1 = 2;
-			} else if (var1 > 126) {
-				var1 = 126;
 		}
 
-			return (var0 & 65408) + var1;
-		}
-	}
-
-	@ObfuscatedName("hx")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "932065265"
-	)
-	@Export("Widget_runOnTargetLeave")
-	static void Widget_runOnTargetLeave() {
-		if (Client.isSpellSelected) {
-			Widget var0 = class49.getWidgetChild(class83.selectedSpellWidget, Client.selectedSpellChildIndex);
-			if (var0 != null && var0.onTargetLeave != null) {
-				ScriptEvent var1 = new ScriptEvent();
-				var1.widget = var0;
-				var1.args = var0.onTargetLeave;
-				SecureRandomFuture.runScriptEvent(var1);
-			}
-
-			Client.isSpellSelected = false;
-			WorldMapID.invalidateWidget(var0);
-		}
 	}
 }

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

@@ -1,78 +1,82 @@
+import java.awt.FontMetrics;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ip")
+@ObfuscatedName("ii")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lhp;"
 	)
 	@Export("FloorOverlayDefinition_archive")
 	public static AbstractArchive FloorOverlayDefinition_archive;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Let;"
+		signature = "Lem;"
 	)
 	@Export("FloorOverlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("t")
+	@ObfuscatedName("ap")
+	@Export("loginScreenFontMetrics")
+	static FontMetrics loginScreenFontMetrics;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 54951813
+		intValue = 1255212273
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1779680487
+		intValue = -1279665091
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -707302109
+		intValue = 420813751
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1456521303
+		intValue = 1507689835
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 688606529
+		intValue = -898918847
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -870998143
+		intValue = -298509321
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1714187585
+		intValue = 171308105
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1373753821
+		intValue = 1584668069
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1682451449
+		intValue = 1614583675
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -88,10 +92,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.secondaryRgb = -1;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "-55"
+		garbageValue = "1"
 	)
 	@Export("postDecode")
 	public void postDecode() {
@@ -105,10 +109,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.setHsl(this.primaryRgb);
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkz;II)V",
+		signature = "(Lkl;IB)V",
-		garbageValue = "1739304063"
+		garbageValue = "64"
 	)
 	@Export("decode")
 	public void decode(Buffer var1, int var2) {
@@ -122,10 +126,10 @@ public class FloorOverlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkz;III)V",
+		signature = "(Lkl;III)V",
-		garbageValue = "-1287071458"
+		garbageValue = "-973510442"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -142,10 +146,10 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-809760850"
+		garbageValue = "-1969849655"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -172,10 +176,10 @@ public class FloorOverlayDefinition extends DualNode {
 
 		double var12 = 0.0D;
 		double var14 = 0.0D;
-		double var16 = (var10 + var8) / 2.0D;
+		double var16 = (var8 + var10) / 2.0D;
 		if (var8 != var10) {
 			if (var16 < 0.5D) {
-				var14 = (var10 - var8) / (var10 + var8);
+				var14 = (var10 - var8) / (var8 + var10);
 			}
 
 			if (var16 >= 0.5D) {
@@ -184,8 +188,8 @@ public class FloorOverlayDefinition extends DualNode {
 
 			if (var10 == var2) {
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var4 == var10) {
+			} else if (var10 == var4) {
-				var12 = 2.0D + (var6 - var2) / (var10 - var8);
+				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
 			} else if (var6 == var10) {
 				var12 = (var2 - var4) / (var10 - var8) + 4.0D;
 			}
@@ -193,7 +197,7 @@ public class FloorOverlayDefinition extends DualNode {
 
 		var12 /= 6.0D;
 		this.hue = (int)(256.0D * var12);
-		this.saturation = (int)(var14 * 256.0D);
+		this.saturation = (int)(256.0D * var14);
 		this.lightness = (int)(var16 * 256.0D);
 		if (this.saturation < 0) {
 			this.saturation = 0;
@@ -209,54 +213,42 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lkz;Llj;I)Llj;",
+		signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
-		garbageValue = "1335279742"
+		garbageValue = "137024567"
 	)
-	@Export("readStringIntParameters")
+	public static String method4704(CharSequence[] var0, int var1, int var2) {
-	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
+		if (var2 == 0) {
-		int var2 = var0.readUnsignedByte();
+			return "";
-		int var3;
+		} else if (var2 == 1) {
-		if (var1 == null) {
+			CharSequence var3 = var0[var1];
-			int var4 = var2 - 1;
+			return var3 == null ? "null" : var3.toString();
-			var4 |= var4 >>> 1;
-			var4 |= var4 >>> 2;
-			var4 |= var4 >>> 4;
-			var4 |= var4 >>> 8;
-			var4 |= var4 >>> 16;
-			var3 = var4 + 1;
-			var1 = new IterableNodeHashTable(var3);
-		}
-
-		for (var3 = 0; var3 < var2; ++var3) {
-			boolean var7 = var0.readUnsignedByte() == 1;
-			int var5 = var0.readMedium();
-			Object var6;
-			if (var7) {
-				var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
 		} else {
-				var6 = new IntegerNode(var0.readInt());
+			int var8 = var2 + var1;
+			int var4 = 0;
+
+			for (int var5 = var1; var5 < var8; ++var5) {
+				CharSequence var6 = var0[var5];
+				if (var6 == null) {
+					var4 += 4;
+				} else {
+					var4 += var6.length();
+				}
 			}
 
-			var1.put((Node)var6, (long)var5);
+			StringBuilder var9 = new StringBuilder(var4);
+
+			for (int var10 = var1; var10 < var8; ++var10) {
+				CharSequence var7 = var0[var10];
+				if (var7 == null) {
+					var9.append("null");
+				} else {
+					var9.append(var7);
+				}
 			}
 
-		return var1;
+			return var9.toString();
-	}
+		}
-
-	@ObfuscatedName("ey")
-	@ObfuscatedSignature(
-		signature = "(IZZZI)Lio;",
-		garbageValue = "90068714"
-	)
-	@Export("newArchive")
-	static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
-		ArchiveDisk var4 = null;
-		if (JagexCache.JagexCache_dat2File != null) {
-			var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, DevicePcmPlayerProvider.JagexCache_idxFiles[var0], 1000000);
-		}
-
-		return new Archive(var4, RouteStrategy.masterDisk, var0, var1, var2, var3);
 	}
 }

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("il")
+@ObfuscatedName("iu")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lhp;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
 	public static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Let;"
+		signature = "Lem;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
-	static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
+	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 502539723
+		intValue = -1923870903
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -387630933
+		intValue = -2031878355
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1309988489
+		intValue = 922832793
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1550343627
+		intValue = 1084903515
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 241046707
+		intValue = 568958993
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -59,20 +58,20 @@ public class FloorUnderlayDefinition extends DualNode {
 		this.rgb = 0;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-2017124449"
+		garbageValue = "-2090929650"
 	)
 	@Export("postDecode")
 	void postDecode() {
 		this.setHsl(this.rgb);
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkz;II)V",
+		signature = "(Lkl;II)V",
-		garbageValue = "-336580480"
+		garbageValue = "-840924474"
 	)
 	@Export("decode")
 	void decode(Buffer var1, int var2) {
@@ -86,10 +85,10 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Lkz;III)V",
+		signature = "(Lkl;III)V",
-		garbageValue = "1777076366"
+		garbageValue = "-1673078715"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -99,10 +98,10 @@ public class FloorUnderlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "1419999023"
+		garbageValue = "307020215"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -130,7 +129,7 @@ public class FloorUnderlayDefinition 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);
 			}
@@ -142,15 +141,15 @@ public class FloorUnderlayDefinition extends DualNode {
 			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 (var6 == var10) {
-				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)(256.0D * var16);
+		this.lightness = (int)(var16 * 256.0D);
 		if (this.saturation < 0) {
 			this.saturation = 0;
 		} else if (this.saturation > 255) {
@@ -164,7 +163,7 @@ 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)(512.0D * var16 * var14);
 		}
@@ -176,55 +175,27 @@ public class FloorUnderlayDefinition extends DualNode {
 		this.hue = (int)((double)this.hueMultiplier * var12);
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(ILcu;ZB)I",
+		signature = "(B)[Lcn;",
+		garbageValue = "126"
+	)
+	static AttackOption[] method4383() {
+		return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
+	}
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		signature = "(IIB)I",
 		garbageValue = "1"
 	)
-	static int method4423(int var0, Script var1, boolean var2) {
+	@Export("ItemContainer_getCount")
-		if (var0 == ScriptOpcodes.SOUND_SYNTH) {
+	static int ItemContainer_getCount(int var0, int var1) {
-			class160.Interpreter_intStackSize -= 3;
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-			class192.queueSoundEffect(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]);
+		if (var2 == null) {
-			return 1;
+			return 0;
-		} else if (var0 == ScriptOpcodes.SOUND_SONG) {
-			WorldMapData_1.playSong(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]);
-			return 1;
-		} else if (var0 == ScriptOpcodes.SOUND_JINGLE) {
-			class160.Interpreter_intStackSize -= 2;
-			SecureRandomCallable.playSoundJingle(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]);
-			return 1;
 		} else {
-			return 2;
+			return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0;
 		}
 	}
-
-	@ObfuscatedName("fu")
-	@ObfuscatedSignature(
-		signature = "(Lby;IIB)V",
-		garbageValue = "0"
-	)
-	@Export("performPlayerAnimation")
-	static void performPlayerAnimation(Player var0, int var1, int var2) {
-		if (var0.sequence == var1 && var1 != -1) {
-			int var3 = class83.SequenceDefinition_get(var1).field3502;
-			if (var3 == 1) {
-				var0.sequenceFrame = 0;
-				var0.sequenceFrameCycle = 0;
-				var0.sequenceDelay = var2;
-				var0.field924 = 0;
-			}
-
-			if (var3 == 2) {
-				var0.field924 = 0;
-			}
-		} else if (var1 == -1 || var0.sequence == -1 || class83.SequenceDefinition_get(var1).field3504 >= class83.SequenceDefinition_get(var0.sequence).field3504) {
-			var0.sequence = var1;
-			var0.sequenceFrame = 0;
-			var0.sequenceFrameCycle = 0;
-			var0.sequenceDelay = var2;
-			var0.field924 = 0;
-			var0.field969 = var0.pathLength;
-		}
-
-	}
 }

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("kf")
+@ObfuscatedName("kn")
 @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("c")
+	@ObfuscatedName("z")
 	@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("x")
+	@ObfuscatedName("n")
 	@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

@@ -2,65 +2,57 @@ 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("kn")
+@ObfuscatedName("ko")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lkn;"
+		signature = "Lko;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lkn;"
+		signature = "Lko;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lkn;"
+		signature = "Lko;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lkn;"
+		signature = "Lko;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Lkn;"
+		signature = "Lko;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lkn;"
+		signature = "Lko;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("z")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Ldm;"
+		signature = "Llp;"
 	)
-	@Export("soundSystem")
+	@Export("logoSprite")
-	static SoundSystem soundSystem;
+	static IndexedSprite logoSprite;
-	@ObfuscatedName("dv")
+	@ObfuscatedName("o")
-	@ObfuscatedSignature(
+	@Export("Tiles_hueMultiplier")
-		signature = "Lio;"
+	static int[] Tiles_hueMultiplier;
-	)
+	@ObfuscatedName("q")
-	@Export("archive10")
-	static Archive archive10;
-	@ObfuscatedName("gt")
-	@ObfuscatedSignature(
-		signature = "Lli;"
-	)
-	@Export("redHintArrowSprite")
-	static Sprite redHintArrowSprite;
-	@ObfuscatedName("j")
 	@Export("name")
 	String name;
 
@@ -77,781 +69,83 @@ public class FontName {
 		this.name = var1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
-	public static final int method5287(double var0, double var2, double var4) {
-		double var6 = var4;
-		double var8 = var4;
-		double var10 = var4;
-		if (0.0D != var2) {
-			double var12;
-			if (var4 < 0.5D) {
-				var12 = (var2 + 1.0D) * var4;
-			} else {
-				var12 = var2 + var4 - var2 * var4;
-			}
-
-			double var14 = var4 * 2.0D - var12;
-			double var16 = 0.3333333333333333D + var0;
-			if (var16 > 1.0D) {
-				--var16;
-			}
-
-			double var20 = var0 - 0.3333333333333333D;
-			if (var20 < 0.0D) {
-				++var20;
-			}
-
-			if (var16 * 6.0D < 1.0D) {
-				var6 = var14 + var16 * (var12 - var14) * 6.0D;
-			} else if (var16 * 2.0D < 1.0D) {
-				var6 = var12;
-			} else if (3.0D * var16 < 2.0D) {
-				var6 = 6.0D * (0.6666666666666666D - var16) * (var12 - var14) + var14;
-			} else {
-				var6 = var14;
-			}
-
-			if (6.0D * var0 < 1.0D) {
-				var8 = var0 * 6.0D * (var12 - var14) + var14;
-			} else if (2.0D * var0 < 1.0D) {
-				var8 = var12;
-			} else if (3.0D * var0 < 2.0D) {
-				var8 = (var12 - var14) * (0.6666666666666666D - var0) * 6.0D + var14;
-			} else {
-				var8 = var14;
-			}
-
-			if (6.0D * var20 < 1.0D) {
-				var10 = var14 + var20 * (var12 - var14) * 6.0D;
-			} else if (var20 * 2.0D < 1.0D) {
-				var10 = var12;
-			} else if (3.0D * var20 < 2.0D) {
-				var10 = var14 + (0.6666666666666666D - var20) * (var12 - var14) * 6.0D;
-			} else {
-				var10 = var14;
-			}
-		}
-
-		int var22 = (int)(256.0D * var6);
-		int var13 = (int)(256.0D * var8);
-		int var23 = (int)(var10 * 256.0D);
-		int var15 = var23 + (var13 << 8) + (var22 << 16);
-		return var15;
-	}
-
-	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)[Lkn;",
+		signature = "(B)[Lko;",
-		garbageValue = "-1831558082"
+		garbageValue = "-88"
 	)
-	public static FontName[] method5288() {
+	public static FontName[] method5257() {
-		return new FontName[]{FontName_verdana13, FontName_plain11, FontName_verdana11, FontName_verdana15, FontName_plain12, FontName_bold12};
+		return new FontName[]{FontName_verdana13, FontName_bold12, FontName_verdana11, FontName_plain12, FontName_verdana15, FontName_plain11};
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(II)Lia;",
+		signature = "(B)V",
-		garbageValue = "1426575141"
+		garbageValue = "14"
 	)
-	@Export("getNpcDefinition")
+	static void method5251() {
-	public static NPCDefinition getNpcDefinition(int var0) {
+		ItemContainer.itemContainers = new NodeHashTable(32);
-		NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0);
-			var1 = new NPCDefinition();
-			var1.id = var0;
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
 	}
 
-			var1.postDecode();
+	@ObfuscatedName("o")
-			NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
-	}
-
-	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;II)Z",
+		signature = "(ILcu;ZI)I",
-		garbageValue = "-1001272425"
+		garbageValue = "-1537038267"
 	)
-	static boolean method5292(String var0, int var1) {
+	static int method5256(int var0, Script var1, boolean var2) {
-		return ReflectionCheck.method2261(var0, var1, "openjs");
+		Widget var3 = var2 ? GrandExchangeOfferAgeComparator.field76 : KitDefinition.field3252;
+		if (var0 == ScriptOpcodes.CC_GETX) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETY) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETHIDE) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETLAYER) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId;
+			return 1;
+		} else {
+			return 2;
+		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("jr")
 	@ObfuscatedSignature(
-		signature = "(Lbn;I)V",
+		signature = "(Lbk;ZI)V",
-		garbageValue = "76683988"
+		garbageValue = "2027801614"
 	)
-	static void method5284(GameShell var0) {
+	@Export("closeInterface")
-		int var4;
+	static final void closeInterface(InterfaceParent var0, boolean var1) {
-		if (Login.worldSelectOpen) {
+		int var2 = var0.group;
-			while (true) {
+		int var3 = (int)var0.key;
-				if (!AbstractUserComparator.isKeyDown()) {
+		var0.remove();
-					if (MouseHandler.MouseHandler_lastButton != 1 && (WorldMapSection1.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) {
+		if (var1) {
-						break;
+			InterfaceParent.method1192(var2);
 		}
 
-					int var1 = Login.xPadding + 280;
+		for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) {
-					if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+			if ((long)var2 == (var4.key >> 48 & 65535L)) {
-						class30.changeWorldSelectSorting(0, 0);
+				var4.remove();
-						break;
 			}
-
-					if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-						class30.changeWorldSelectSorting(0, 1);
-						break;
-					}
-
-					int var2 = Login.xPadding + 390;
-					if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-						class30.changeWorldSelectSorting(1, 0);
-						break;
-					}
-
-					if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-						class30.changeWorldSelectSorting(1, 1);
-						break;
-					}
-
-					int var17 = Login.xPadding + 500;
-					if (MouseHandler.MouseHandler_lastPressedX >= var17 && MouseHandler.MouseHandler_lastPressedX <= var17 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-						class30.changeWorldSelectSorting(2, 0);
-						break;
-					}
-
-					if (MouseHandler.MouseHandler_lastPressedX >= var17 + 15 && MouseHandler.MouseHandler_lastPressedX <= var17 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-						class30.changeWorldSelectSorting(2, 1);
-						break;
-					}
-
-					var4 = Login.xPadding + 610;
-					if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-						class30.changeWorldSelectSorting(3, 0);
-						break;
-					}
-
-					if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-						class30.changeWorldSelectSorting(3, 1);
-						break;
-					}
-
-					if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) {
-						GrandExchangeOfferOwnWorldComparator.method1232();
-						break;
-					}
-
-					if (Login.hoveredWorldIndex != -1) {
-						World var5 = World.World_worlds[Login.hoveredWorldIndex];
-						ReflectionCheck.changeWorld(var5);
-						GrandExchangeOfferOwnWorldComparator.method1232();
-					} else {
-						if (Login.worldSelectPage > 0 && class2.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class2.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) {
-							--Login.worldSelectPage;
-						}
-
-						if (Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapRectangle.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GraphicsDefaults.canvasWidth - WorldMapRectangle.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GraphicsDefaults.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) {
-							++Login.worldSelectPage;
-						}
-					}
-					break;
-				}
-
-				if (class43.field361 == 13) {
-					GrandExchangeOfferOwnWorldComparator.method1232();
-					break;
-				}
-
-				if (class43.field361 == 96) {
-					if (Login.worldSelectPage > 0 && class2.worldSelectLeftSprite != null) {
-						--Login.worldSelectPage;
-					}
-				} else if (class43.field361 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapRectangle.worldSelectRightSprite != null) {
-					++Login.worldSelectPage;
-				}
-			}
-
-		} else {
-			if ((MouseHandler.MouseHandler_lastButton == 1 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) {
-				Actor.clientPreferences.titleMusicDisabled = !Actor.clientPreferences.titleMusicDisabled;
-				class296.savePreferences();
-				if (!Actor.clientPreferences.titleMusicDisabled) {
-					UserComparator7.method3376(WorldMapDecoration.archive6, "scape main", "", 255, false);
-				} else {
-					class197.midiPcmStream.clear();
-					class197.field2376 = 1;
-					class197.musicTrackArchive = null;
-				}
-			}
-
-			if (Client.gameState != 5) {
-				if (-1L == Login.field1162) {
-					Login.field1162 = SoundCache.method2480() + 1000L;
-				}
-
-				long var12 = SoundCache.method2480();
-				boolean var3;
-				if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) {
-					while (true) {
-						if (Client.archiveLoaderArchive >= Client.archiveLoaders.size()) {
-							var3 = true;
-							break;
-						}
-
-						ArchiveLoader var16 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive);
-						if (!var16.isLoaded()) {
-							var3 = false;
-							break;
-						}
-
-						++Client.archiveLoaderArchive;
-					}
-				} else {
-					var3 = true;
-				}
-
-				if (var3 && Login.field1164 == -1L) {
-					Login.field1164 = var12;
-					if (Login.field1164 > Login.field1162) {
-						Login.field1162 = Login.field1164;
-					}
-				}
-
-				if (Client.gameState == 10 || Client.gameState == 11) {
-					if (class43.clientLanguage == Language.Language_EN) {
-						if (MouseHandler.MouseHandler_lastButton == 1 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_lastButton == 4) {
-							var4 = Login.xPadding + 5;
-							short var14 = 463;
-							byte var6 = 100;
-							byte var7 = 35;
-							if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + var6 && MouseHandler.MouseHandler_lastPressedY >= var14 && MouseHandler.MouseHandler_lastPressedY <= var7 + var14) {
-								if (ClientPacket.loadWorlds()) {
-									Login.worldSelectOpen = true;
-									Login.worldSelectPage = 0;
-									Login.worldSelectPagesCount = 0;
-								}
-
-								return;
-							}
-						}
-
-						if (RouteStrategy.World_request != null && ClientPacket.loadWorlds()) {
-							Login.worldSelectOpen = true;
-							Login.worldSelectPage = 0;
-							Login.worldSelectPagesCount = 0;
-						}
-					}
-
-					var4 = MouseHandler.MouseHandler_lastButton;
-					int var25 = MouseHandler.MouseHandler_lastPressedX;
-					int var18 = MouseHandler.MouseHandler_lastPressedY;
-					if (var4 == 0) {
-						var25 = MouseHandler.MouseHandler_x;
-						var18 = MouseHandler.MouseHandler_y;
-					}
-
-					if (!WorldMapSection1.mouseCam && var4 == 4) {
-						var4 = 1;
-					}
-
-					int var8;
-					short var9;
-					if (Login.loginIndex == 0) {
-						boolean var19 = false;
-
-						while (AbstractUserComparator.isKeyDown()) {
-							if (class43.field361 == 84) {
-								var19 = true;
-							}
-						}
-
-						var8 = VarcInt.loginBoxCenter - 80;
-						var9 = 291;
-						if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
-							WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
-						}
-
-						var8 = VarcInt.loginBoxCenter + 80;
-						if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20 || var19) {
-							if ((Client.worldProperties & 33554432) != 0) {
-								Login.Login_response0 = "";
-								Login.Login_response1 = "This is a <col=00ffff>Beta<col=ffffff> world.";
-								Login.Login_response2 = "Your normal account will not be affected.";
-								Login.Login_response3 = "";
-								Login.loginIndex = 1;
-								if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
-									Login.currentLoginField = 1;
-								} else {
-									Login.currentLoginField = 0;
-								}
-							} else if ((Client.worldProperties & 4) != 0) {
-								if ((Client.worldProperties & 1024) != 0) {
-									Login.Login_response1 = "This is a <col=ffff00>High Risk <col=ff0000>PvP<col=ffffff> world.";
-									Login.Login_response2 = "Players can attack each other almost everywhere";
-									Login.Login_response3 = "and the Protect Item prayer won't work.";
-								} else {
-									Login.Login_response1 = "This is a <col=ff0000>PvP<col=ffffff> world.";
-									Login.Login_response2 = "Players can attack each other";
-									Login.Login_response3 = "almost everywhere.";
-								}
-
-								Login.Login_response0 = "Warning!";
-								Login.loginIndex = 1;
-								if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
-									Login.currentLoginField = 1;
-								} else {
-									Login.currentLoginField = 0;
-								}
-							} else if ((Client.worldProperties & 1024) != 0) {
-								Login.Login_response1 = "This is a <col=ffff00>High Risk<col=ffffff> world.";
-								Login.Login_response2 = "The Protect Item prayer will";
-								Login.Login_response3 = "not work on this world.";
-								Login.Login_response0 = "Warning!";
-								Login.loginIndex = 1;
-								if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
-									Login.currentLoginField = 1;
-								} else {
-									Login.currentLoginField = 0;
-								}
-							} else {
-								WorldMapID.method520(false);
-							}
-						}
-					} else {
-						int var20;
-						short var22;
-						if (Login.loginIndex != 1) {
-							boolean var10;
-							int var11;
-							short var21;
-							if (Login.loginIndex == 2) {
-								var21 = 201;
-								var20 = var21 + 52;
-								if (var4 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) {
-									Login.currentLoginField = 0;
-								}
-
-								var20 += 15;
-								if (var4 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) {
-									Login.currentLoginField = 1;
-								}
-
-								var20 += 15;
-								var21 = 361;
-								if (MusicPatchNode2.field2369 != null) {
-									var8 = MusicPatchNode2.field2369.highX / 2;
-									if (var4 == 1 && var25 >= MusicPatchNode2.field2369.lowX - var8 && var25 <= var8 + MusicPatchNode2.field2369.lowX && var18 >= var21 - 15 && var18 < var21) {
-										switch(Login.field1161) {
-										case 1:
-											Canvas.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
-											Login.loginIndex = 5;
-											return;
-										case 2:
-											WorldMapIcon_0.openURL("https://support.runescape.com/hc/en-gb", true, false);
-										}
-									}
-								}
-
-								var8 = VarcInt.loginBoxCenter - 80;
-								var9 = 321;
-								if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
-									Login.Login_username = Login.Login_username.trim();
-									if (Login.Login_username.length() == 0) {
-										Canvas.setLoginResponseString("", "Please enter your username/email address.", "");
-										return;
-									}
-
-									if (Login.Login_password.length() == 0) {
-										Canvas.setLoginResponseString("", "Please enter your password.", "");
-										return;
-									}
-
-									Canvas.setLoginResponseString("", "Connecting to server...", "");
-									PacketWriter.method2238(false);
-									WorldMapIcon_0.updateGameState(20);
-									return;
-								}
-
-								var8 = Login.loginBoxX + 180 + 80;
-								if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
-									Login.loginIndex = 0;
-									Login.Login_username = "";
-									Login.Login_password = "";
-									class222.field2729 = 0;
-									class81.otp = "";
-									Login.field1183 = true;
-								}
-
-								var8 = VarcInt.loginBoxCenter + -117;
-								var9 = 277;
-								Login.field1169 = var25 >= var8 && var25 < var8 + class4.field17 && var18 >= var9 && var18 < var9 + class267.field3524;
-								if (var4 == 1 && Login.field1169) {
-									Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered;
-									if (!Client.Login_isUsernameRemembered && Actor.clientPreferences.rememberedUsername != null) {
-										Actor.clientPreferences.rememberedUsername = null;
-										class296.savePreferences();
-									}
-								}
-
-								var8 = VarcInt.loginBoxCenter + 24;
-								var9 = 277;
-								Login.field1170 = var25 >= var8 && var25 < var8 + class4.field17 && var18 >= var9 && var18 < var9 + class267.field3524;
-								if (var4 == 1 && Login.field1170) {
-									Actor.clientPreferences.hideUsername = !Actor.clientPreferences.hideUsername;
-									if (!Actor.clientPreferences.hideUsername) {
-										Login.Login_username = "";
-										Actor.clientPreferences.rememberedUsername = null;
-										if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
-											Login.currentLoginField = 1;
-										} else {
-											Login.currentLoginField = 0;
-										}
-									}
-
-									class296.savePreferences();
-								}
-
-								while (true) {
-									while (AbstractUserComparator.isKeyDown()) {
-										var10 = false;
-
-										for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) {
-											if (WorldMapIcon_0.field126 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) {
-												var10 = true;
-												break;
-											}
-										}
-
-										if (class43.field361 == 13) {
-											Login.loginIndex = 0;
-											Login.Login_username = "";
-											Login.Login_password = "";
-											class222.field2729 = 0;
-											class81.otp = "";
-											Login.field1183 = true;
-										} else if (Login.currentLoginField == 0) {
-											if (class43.field361 == 85 && Login.Login_username.length() > 0) {
-												Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
 		}
 
-											if (class43.field361 == 84 || class43.field361 == 80) {
+		Widget var5 = Canvas.getWidget(var3);
-												Login.currentLoginField = 1;
+		if (var5 != null) {
+			WorldMapSectionType.invalidateWidget(var5);
 		}
 
-											if (var10 && Login.Login_username.length() < 320) {
+		SecureRandomFuture.method2134();
-												Login.Login_username = Login.Login_username + WorldMapIcon_0.field126;
+		if (Client.rootInterface != -1) {
-											}
+			class40.runIntfCloseListeners(Client.rootInterface, 1);
-										} else if (Login.currentLoginField == 1) {
-											if (class43.field361 == 85 && Login.Login_password.length() > 0) {
-												Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1);
-											}
-
-											if (class43.field361 == 84 || class43.field361 == 80) {
-												Login.currentLoginField = 0;
-											}
-
-											if (class43.field361 == 84) {
-												Login.Login_username = Login.Login_username.trim();
-												if (Login.Login_username.length() == 0) {
-													Canvas.setLoginResponseString("", "Please enter your username/email address.", "");
-													return;
-												}
-
-												if (Login.Login_password.length() == 0) {
-													Canvas.setLoginResponseString("", "Please enter your password.", "");
-													return;
-												}
-
-												Canvas.setLoginResponseString("", "Connecting to server...", "");
-												PacketWriter.method2238(false);
-												WorldMapIcon_0.updateGameState(20);
-												return;
-											}
-
-											if (var10 && Login.Login_password.length() < 20) {
-												Login.Login_password = Login.Login_password + WorldMapIcon_0.field126;
-											}
-										}
-									}
-
-									return;
-								}
-							} else if (Login.loginIndex == 3) {
-								var20 = Login.loginBoxX + 180;
-								var22 = 276;
-								if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-									WorldMapID.method520(false);
-								}
-
-								var20 = Login.loginBoxX + 180;
-								var22 = 326;
-								if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-									Canvas.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
-									Login.loginIndex = 5;
-									return;
-								}
-							} else {
-								int var24;
-								if (Login.loginIndex == 4) {
-									var20 = Login.loginBoxX + 180 - 80;
-									var22 = 321;
-									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-										class81.otp.trim();
-										if (class81.otp.length() != 6) {
-											Canvas.setLoginResponseString("", "Please enter a 6-digit PIN.", "");
-											return;
-										}
-
-										class222.field2729 = Integer.parseInt(class81.otp);
-										class81.otp = "";
-										PacketWriter.method2238(true);
-										Canvas.setLoginResponseString("", "Connecting to server...", "");
-										WorldMapIcon_0.updateGameState(20);
-										return;
-									}
-
-									if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 9 && var25 <= Login.loginBoxX + 180 + 130 && var18 >= 263 && var18 <= 296) {
-										Login.field1183 = !Login.field1183;
-									}
-
-									if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 34 && var25 <= Login.loginBoxX + 34 + 180 && var18 >= 351 && var18 <= 363) {
-										WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
 		}
 
-									var20 = Login.loginBoxX + 180 + 80;
-									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-										Login.loginIndex = 0;
-										Login.Login_username = "";
-										Login.Login_password = "";
-										class222.field2729 = 0;
-										class81.otp = "";
-									}
-
-									while (AbstractUserComparator.isKeyDown()) {
-										boolean var23 = false;
-
-										for (var24 = 0; var24 < "1234567890".length(); ++var24) {
-											if (WorldMapIcon_0.field126 == "1234567890".charAt(var24)) {
-												var23 = true;
-												break;
-											}
-										}
-
-										if (class43.field361 == 13) {
-											Login.loginIndex = 0;
-											Login.Login_username = "";
-											Login.Login_password = "";
-											class222.field2729 = 0;
-											class81.otp = "";
-										} else {
-											if (class43.field361 == 85 && class81.otp.length() > 0) {
-												class81.otp = class81.otp.substring(0, class81.otp.length() - 1);
-											}
-
-											if (class43.field361 == 84) {
-												class81.otp.trim();
-												if (class81.otp.length() != 6) {
-													Canvas.setLoginResponseString("", "Please enter a 6-digit PIN.", "");
-													return;
-												}
-
-												class222.field2729 = Integer.parseInt(class81.otp);
-												class81.otp = "";
-												PacketWriter.method2238(true);
-												Canvas.setLoginResponseString("", "Connecting to server...", "");
-												WorldMapIcon_0.updateGameState(20);
-												return;
-											}
-
-											if (var23 && class81.otp.length() < 6) {
-												class81.otp = class81.otp + WorldMapIcon_0.field126;
-											}
-										}
-									}
-								} else if (Login.loginIndex == 5) {
-									var20 = Login.loginBoxX + 180 - 80;
-									var22 = 321;
-									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-										WorldMapDecorationType.method4099();
-										return;
-									}
-
-									var20 = Login.loginBoxX + 180 + 80;
-									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-										WorldMapID.method520(true);
-									}
-
-									var9 = 361;
-									if (class51.field411 != null) {
-										var24 = class51.field411.highX / 2;
-										if (var4 == 1 && var25 >= class51.field411.lowX - var24 && var25 <= var24 + class51.field411.lowX && var18 >= var9 - 15 && var18 < var9) {
-											WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
-										}
-									}
-
-									while (AbstractUserComparator.isKeyDown()) {
-										var10 = false;
-
-										for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) {
-											if (WorldMapIcon_0.field126 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) {
-												var10 = true;
-												break;
-											}
-										}
-
-										if (class43.field361 == 13) {
-											WorldMapID.method520(true);
-										} else {
-											if (class43.field361 == 85 && Login.Login_username.length() > 0) {
-												Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
-											}
-
-											if (class43.field361 == 84) {
-												WorldMapDecorationType.method4099();
-												return;
-											}
-
-											if (var10 && Login.Login_username.length() < 320) {
-												Login.Login_username = Login.Login_username + WorldMapIcon_0.field126;
-											}
-										}
-									}
-								} else if (Login.loginIndex == 6) {
-									while (true) {
-										do {
-											if (!AbstractUserComparator.isKeyDown()) {
-												var21 = 321;
-												if (var4 == 1 && var18 >= var21 - 20 && var18 <= var21 + 20) {
-													WorldMapID.method520(true);
-												}
-
-												return;
-											}
-										} while(class43.field361 != 84 && class43.field361 != 13);
-
-										WorldMapID.method520(true);
-									}
-								} else if (Login.loginIndex == 7) {
-									var20 = Login.loginBoxX + 180 - 80;
-									var22 = 321;
-									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-										WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=dob/set_dob.ws", true, false);
-										Canvas.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)");
-										Login.loginIndex = 6;
-										return;
-									}
-
-									var20 = Login.loginBoxX + 180 + 80;
-									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-										WorldMapID.method520(true);
-									}
-								} else if (Login.loginIndex == 8) {
-									var20 = Login.loginBoxX + 180 - 80;
-									var22 = 321;
-									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-										WorldMapIcon_0.openURL("https://www.jagex.com/terms/privacy/#eight", true, false);
-										Canvas.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)");
-										Login.loginIndex = 6;
-										return;
-									}
-
-									var20 = Login.loginBoxX + 180 + 80;
-									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-										WorldMapID.method520(true);
-									}
-								} else if (Login.loginIndex == 12) {
-									String var15 = "";
-									switch(Login.field1156) {
-									case 0:
-										var15 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans";
-										break;
-									case 1:
-										var15 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked";
-										break;
-									default:
-										WorldMapID.method520(false);
-									}
-
-									var8 = Login.loginBoxX + 180;
-									var9 = 276;
-									if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
-										WorldMapIcon_0.openURL(var15, true, false);
-										Canvas.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)");
-										Login.loginIndex = 6;
-										return;
-									}
-
-									var8 = Login.loginBoxX + 180;
-									var9 = 326;
-									if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) {
-										WorldMapID.method520(false);
-									}
-								} else if (Login.loginIndex == 24) {
-									var20 = Login.loginBoxX + 180;
-									var22 = 301;
-									if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-										WorldMapID.method520(false);
-									}
-								}
-							}
-						} else {
-							while (AbstractUserComparator.isKeyDown()) {
-								if (class43.field361 == 84) {
-									WorldMapID.method520(false);
-								} else if (class43.field361 == 13) {
-									Login.loginIndex = 0;
-								}
-							}
-
-							var20 = VarcInt.loginBoxCenter - 80;
-							var22 = 321;
-							if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-								WorldMapID.method520(false);
-							}
-
-							var20 = VarcInt.loginBoxCenter + 80;
-							if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) {
-								Login.loginIndex = 0;
-							}
-						}
-					}
-
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("hw")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V",
-		garbageValue = "-1882548128"
-	)
-	@Export("insertMenuItemNoShift")
-	public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
-		Decimator.insertMenuItem(var0, var1, var2, var3, var4, var5, false);
-	}
-
-	@ObfuscatedName("ku")
-	@ObfuscatedSignature(
-		signature = "(Lhy;I)Lhy;",
-		garbageValue = "1031312756"
-	)
-	static Widget method5290(Widget var0) {
-		int var1 = ScriptFrame.method1086(class60.getWidgetClickMask(var0));
-		if (var1 == 0) {
-			return null;
-		} else {
-			for (int var2 = 0; var2 < var1; ++var2) {
-				var0 = Player.getWidget(var0.parentId);
-				if (var0 == null) {
-					return null;
-				}
-			}
-
-			return var0;
-		}
 	}
 }

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

@@ -1,32 +1,30 @@
-import java.io.IOException;
-import java.net.Socket;
 import java.util.HashMap;
 import net.runelite.mapping.Export;
 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("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lhp;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lhp;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;)V"
+		signature = "(Lhp;Lhp;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1;
@@ -34,10 +32,10 @@ public class Fonts {
 		this.map = new HashMap();
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "([Lkn;B)Ljava/util/HashMap;",
+		signature = "([Lko;I)Ljava/util/HashMap;",
-		garbageValue = "-84"
+		garbageValue = "-1165155916"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -49,7 +47,12 @@ public class Fonts {
 			if (this.map.containsKey(var5)) {
 				var2.put(var5, this.map.get(var5));
 			} else {
-				Font var6 = Skeleton.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, "");
+				AbstractArchive var7 = this.spritesArchive;
+				AbstractArchive var8 = this.fontsArchive;
+				String var9 = var5.name;
+				int var10 = var7.getGroupId(var9);
+				int var11 = var7.getFileId(var10, "");
+				Font var6 = ClanMate.method4964(var7, var8, var10, var11);
 				if (var6 != null) {
 					this.map.put(var5, var6);
 					var2.put(var5, var6);
@@ -60,12 +63,21 @@ public class Fonts {
 		return var2;
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Ljava/net/Socket;III)Lks;",
+		signature = "(II)Lkc;",
-		garbageValue = "1860750557"
+		garbageValue = "202775938"
 	)
-	public static AbstractSocket method5293(Socket var0, int var1, int var2) throws IOException {
+	public static PrivateChatMode method5258(int var0) {
-		return new BufferedNetSocket(var0, var1, var2);
+		PrivateChatMode[] var1 = BZip2State.ChatMode_values();
+
+		for (int var2 = 0; var2 < var1.length; ++var2) {
+			PrivateChatMode var3 = var1[var2];
+			if (var0 == var3.field3793) {
+				return var3;
+			}
+		}
+
+		return null;
 	}
 }

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

@@ -1,28 +1,42 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ev")
+@ObfuscatedName("ep")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("ep")
+	@ObfuscatedName("v")
-	@ObfuscatedSignature(
+	@ObfuscatedGetter(
-		signature = "Lkk;"
+		intValue = -779358423
 	)
-	@Export("spriteIds")
+	@Export("SpriteBuffer_spriteHeight")
-	static GraphicsDefaults spriteIds;
+	public static int SpriteBuffer_spriteHeight;
-	@ObfuscatedName("c")
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		signature = "[Ldx;"
+		signature = "[Llp;"
+	)
+	@Export("worldSelectStars")
+	static IndexedSprite[] worldSelectStars;
+	@ObfuscatedName("jg")
+	@ObfuscatedSignature(
+		signature = "Lho;"
+	)
+	@Export("dragInventoryWidget")
+	static Widget dragInventoryWidget;
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "[Lda;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;IZ)V"
+		signature = "(Lhp;Lhp;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];
@@ -41,13 +55,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);
 			}
@@ -57,33 +65,13 @@ public class Frames extends DualNode {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "1628861134"
+		garbageValue = "-546780661"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
 		return this.frames[var1].hasAlphaTransform;
 	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "(B)[Lkc;",
-		garbageValue = "50"
-	)
-	@Export("ChatMode_values")
-	static PrivateChatMode[] ChatMode_values() {
-		return new PrivateChatMode[]{PrivateChatMode.field3786, PrivateChatMode.field3789, PrivateChatMode.field3788};
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "(I)Lbb;",
-		garbageValue = "1062873352"
-	)
-	@Export("getNextWorldListWorld")
-	static World getNextWorldListWorld() {
-		return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null;
-	}
 }

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

@@ -6,18 +6,18 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("jy")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
-	boolean field3599;
+	boolean field3615;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
-	boolean field3598;
+	boolean field3614;
 
 	Friend() {
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Ljy;B)I",
+		signature = "(Ljy;I)I",
-		garbageValue = "0"
+		garbageValue = "371914259"
 	)
 	@Export("compareToFriend")
 	int compareToFriend(Friend var1) {
@@ -29,23 +29,23 @@ public class Friend extends Buddy {
 			return -1;
 		} else if (var1.world != 0 && super.world == 0) {
 			return 1;
-		} else if (this.field3599 && !var1.field3599) {
+		} else if (this.field3615 && !var1.field3615) {
 			return -1;
-		} else if (!this.field3599 && var1.field3599) {
+		} else if (!this.field3615 && var1.field3615) {
 			return 1;
-		} else if (this.field3598 && !var1.field3598) {
+		} else if (this.field3614 && !var1.field3614) {
 			return -1;
-		} else if (!this.field3598 && var1.field3598) {
+		} else if (!this.field3614 && var1.field3614) {
 			return 1;
 		} else {
 			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 		}
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Ljw;B)I",
+		signature = "(Ljh;I)I",
-		garbageValue = "-92"
+		garbageValue = "-531306911"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -56,30 +56,311 @@ public class Friend extends Buddy {
 		return this.compareToFriend((Friend)var1);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(ILkx;Lio;I)V",
+		signature = "(I)V",
-		garbageValue = "-394636832"
+		garbageValue = "530220947"
 	)
-	static void method5190(int var0, ArchiveDisk var1, Archive var2) {
+	static void method5133() {
-		ArchiveDiskAction var3 = new ArchiveDiskAction();
+		Tiles.field501 = null;
-		var3.type = 1;
+		Tiles.field483 = null;
-		var3.key = (long)var0;
+		DevicePcmPlayerProvider.field393 = null;
-		var3.archiveDisk = var1;
+		class287.field3634 = null;
-		var3.archive = var2;
+		Tiles.field488 = null;
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+		Tiles.field486 = null;
-			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
+		DevicePcmPlayerProvider.field386 = null;
+		Tiles.Tiles_hue = null;
+		ArchiveLoader.Tiles_saturation = null;
+		Tiles.Tiles_lightness = null;
+		FontName.Tiles_hueMultiplier = null;
+		Tiles.field487 = null;
 	}
 
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+	@ObfuscatedName("fp")
-			if (ArchiveDiskActionHandler.field3126 == 0) {
+	@ObfuscatedSignature(
-				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
+		signature = "(IIIII)V",
-				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true);
+		garbageValue = "-541695875"
-				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start();
+	)
-				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5);
+	@Export("drawEntities")
+	static final void drawEntities(int var0, int var1, int var2, int var3) {
+		++Client.viewportDrawCount;
+		if (class223.localPlayer.x >> 7 == Client.destinationX && class223.localPlayer.y * 682054857 >> 7 == Client.destinationY) {
+			Client.destinationX = 0;
 		}
 
-			ArchiveDiskActionHandler.field3126 = 600;
+		if (Client.renderSelf) {
+			Players.addPlayerToScene(class223.localPlayer, false);
+		}
+
+		UrlRequest.method3275();
+		class4.addNpcsToScene(true);
+		Login.method2110();
+		class4.addNpcsToScene(false);
+		DynamicObject.method2221();
+
+		for (GraphicsObject var4 = (GraphicsObject)Client.graphicsObjects.last(); var4 != null; var4 = (GraphicsObject)Client.graphicsObjects.previous()) {
+			if (var4.plane == WorldMapRectangle.plane && !var4.isFinished) {
+				if (Client.cycle >= var4.cycleStart) {
+					var4.advance(Client.field698);
+					if (var4.isFinished) {
+						var4.remove();
+					} else {
+						PacketWriter.scene.drawEntity(var4.plane, var4.x, var4.y, var4.height, 60, var4, 0, -1L, false);
+					}
+				}
+			} else {
+				var4.remove();
+			}
+		}
+
+		AbstractByteArrayCopier.setViewportShape(var0, var1, var2, var3, true);
+		var0 = Client.viewportOffsetX;
+		var1 = Client.viewportOffsetY;
+		var2 = Client.viewportWidth;
+		var3 = Client.viewportHeight;
+		Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
+		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+		int var5;
+		int var6;
+		int var7;
+		int var8;
+		int var11;
+		int var15;
+		if (!Client.isCameraLocked) {
+			var15 = Client.camAngleX;
+			if (Client.field722 / 256 > var15) {
+				var15 = Client.field722 / 256;
+			}
+
+			if (Client.field835[4] && Client.field883[4] + 128 > var15) {
+				var15 = Client.field883[4] + 128;
+			}
+
+			var5 = Client.camAngleY & 2047;
+			var6 = ObjectSound.oculusOrbFocalPointX;
+			var7 = ModelData0.field1840 * -1351160427;
+			var8 = class14.oculusOrbFocalPointY;
+			var11 = var15 * 3 + 600;
+			NPCDefinition.method4665(var6, var7, var8, var15, var5, var11, var3);
+		}
+
+		int var9;
+		int var10;
+		int var12;
+		int var13;
+		int var14;
+		if (!Client.isCameraLocked) {
+			if (AbstractArchive.clientPreferences.roofsHidden) {
+				var5 = WorldMapRectangle.plane;
+			} else {
+				label409: {
+					var6 = 3;
+					if (IgnoreList.cameraPitch < 310) {
+						if (Client.oculusOrbState == 1) {
+							var7 = ObjectSound.oculusOrbFocalPointX >> 7;
+							var8 = class14.oculusOrbFocalPointY >> 7;
+						} else {
+							var7 = class223.localPlayer.x >> 7;
+							var8 = class223.localPlayer.y * 682054857 >> 7;
+						}
+
+						var9 = GrandExchangeOfferOwnWorldComparator.cameraX >> 7;
+						var10 = WorldMapIcon_1.cameraZ >> 7;
+						if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) {
+							var5 = WorldMapRectangle.plane;
+							break label409;
+						}
+
+						if (var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) {
+							var5 = WorldMapRectangle.plane;
+							break label409;
+						}
+
+						if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
+							var6 = WorldMapRectangle.plane;
+						}
+
+						if (var7 > var9) {
+							var11 = var7 - var9;
+						} else {
+							var11 = var9 - var7;
+						}
+
+						if (var8 > var10) {
+							var12 = var8 - var10;
+						} else {
+							var12 = var10 - var8;
+						}
+
+						if (var11 > var12) {
+							var13 = var12 * 65536 / var11;
+							var14 = 32768;
+
+							while (var7 != var9) {
+								if (var9 < var7) {
+									++var9;
+								} else if (var9 > var7) {
+									--var9;
+								}
+
+								if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
+									var6 = WorldMapRectangle.plane;
+								}
+
+								var14 += var13;
+								if (var14 >= 65536) {
+									var14 -= 65536;
+									if (var10 < var8) {
+										++var10;
+									} else if (var10 > var8) {
+										--var10;
+									}
+
+									if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
+										var6 = WorldMapRectangle.plane;
 									}
 								}
 							}
+						} else if (var12 > 0) {
+							var13 = var11 * 65536 / var12;
+							var14 = 32768;
+
+							while (var8 != var10) {
+								if (var10 < var8) {
+									++var10;
+								} else if (var10 > var8) {
+									--var10;
+								}
+
+								if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
+									var6 = WorldMapRectangle.plane;
+								}
+
+								var14 += var13;
+								if (var14 >= 65536) {
+									var14 -= 65536;
+									if (var9 < var7) {
+										++var9;
+									} else if (var9 > var7) {
+										--var9;
+									}
+
+									if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][var9][var10] & 4) != 0) {
+										var6 = WorldMapRectangle.plane;
+									}
+								}
+							}
+						}
+					}
+
+					if (class223.localPlayer.x >= 0 && class223.localPlayer.y * 682054857 >= 0 && class223.localPlayer.x < 13312 && class223.localPlayer.y * 682054857 < 13312) {
+						if ((Tiles.Tiles_renderFlags[WorldMapRectangle.plane][class223.localPlayer.x >> 7][class223.localPlayer.y * 682054857 >> 7] & 4) != 0) {
+							var6 = WorldMapRectangle.plane;
+						}
+
+						var5 = var6;
+					} else {
+						var5 = WorldMapRectangle.plane;
+					}
+				}
+			}
+
+			var15 = var5;
+		} else {
+			var15 = class208.getHighestVisiblePlane();
+		}
+
+		var5 = GrandExchangeOfferOwnWorldComparator.cameraX;
+		var6 = Varcs.cameraY;
+		var7 = WorldMapIcon_1.cameraZ;
+		var8 = IgnoreList.cameraPitch;
+		var9 = WorldMapSection2.cameraYaw;
+
+		for (var10 = 0; var10 < 5; ++var10) {
+			if (Client.field835[var10]) {
+				var11 = (int)(Math.random() * (double)(Client.field882[var10] * 2 + 1) - (double)Client.field882[var10] + Math.sin((double)Client.field884[var10] / 100.0D * (double)Client.field885[var10]) * (double)Client.field883[var10]);
+				if (var10 == 0) {
+					GrandExchangeOfferOwnWorldComparator.cameraX += var11;
+				}
+
+				if (var10 == 1) {
+					Varcs.cameraY += var11;
+				}
+
+				if (var10 == 2) {
+					WorldMapIcon_1.cameraZ += var11;
+				}
+
+				if (var10 == 3) {
+					WorldMapSection2.cameraYaw = var11 + WorldMapSection2.cameraYaw & 2047;
+				}
+
+				if (var10 == 4) {
+					IgnoreList.cameraPitch += var11;
+					if (IgnoreList.cameraPitch < 128) {
+						IgnoreList.cameraPitch = 128;
+					}
+
+					if (IgnoreList.cameraPitch > 383) {
+						IgnoreList.cameraPitch = 383;
+					}
+				}
+			}
+		}
+
+		var10 = MouseHandler.MouseHandler_x;
+		var11 = MouseHandler.MouseHandler_y;
+		if (MouseHandler.MouseHandler_lastButton != 0) {
+			var10 = MouseHandler.MouseHandler_lastPressedX;
+			var11 = MouseHandler.MouseHandler_lastPressedY;
+		}
+
+		if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) {
+			WorldMapSection1.method582(var10 - var0, var11 - var1);
+		} else {
+			MenuAction.method2062();
+		}
+
+		WorldMapID.playPcmPlayers();
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0);
+		WorldMapID.playPcmPlayers();
+		var12 = Rasterizer3D.Rasterizer3D_zoom;
+		Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom;
+		PacketWriter.scene.draw(GrandExchangeOfferOwnWorldComparator.cameraX, Varcs.cameraY, WorldMapIcon_1.cameraZ, IgnoreList.cameraPitch, WorldMapSection2.cameraYaw, var15);
+		Rasterizer3D.Rasterizer3D_zoom = var12;
+		WorldMapID.playPcmPlayers();
+		PacketWriter.scene.clearTempGameObjects();
+		ViewportMouse.method2950(var0, var1, var2, var3);
+		Message.method1231(var0, var1);
+		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field698);
+		Client.field634 = 0;
+		var13 = class223.baseX * 64 + (class223.localPlayer.x >> 7);
+		var14 = class286.baseY * 64 + (class223.localPlayer.y * 682054857 >> 7);
+		if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) {
+			Client.field634 = 1;
+		}
+
+		if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) {
+			Client.field634 = 1;
+		}
+
+		if (Client.field634 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) {
+			Client.field634 = 0;
+		}
+
+		GrandExchangeOfferOwnWorldComparator.cameraX = var5;
+		Varcs.cameraY = var6;
+		WorldMapIcon_1.cameraZ = var7;
+		IgnoreList.cameraPitch = var8;
+		WorldMapSection2.cameraYaw = var9;
+		if (Client.isLoading && class1.method5(true, false) == 0) {
+			Client.isLoading = false;
+		}
+
+		if (Client.isLoading) {
+			Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0);
+			WorldMapSprite.drawLoadingMessage("Loading - please wait.", false);
+		}
+
+	}
+}

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

@@ -3,31 +3,96 @@ 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("jp")
+@ObfuscatedName("jj")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("t")
+	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = 235623703
-	)
-	public int field3613;
-	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Ljt;"
+		signature = "Ldq;"
+	)
+	@Export("soundCache")
+	public static SoundCache soundCache;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -1649732045
+	)
+	public int field3627;
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		signature = "Ljq;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		signature = "(Ljt;I)V"
+		signature = "(Ljq;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field3613 = (int)(SoundCache.method2480() / 1000L);
+		this.field3627 = (int)(class30.method566() / 1000L);
 		this.username = var1;
 		this.world = (short)var2;
 	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(ILcu;ZS)I",
+		garbageValue = "-14883"
+	)
+	static int method5178(int var0, Script var1, boolean var2) {
+		Widget var3;
+		if (var0 >= 2000) {
+			var0 -= 1000;
+			var3 = Canvas.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
+		} else {
+			var3 = var2 ? GrandExchangeOfferAgeComparator.field76 : KitDefinition.field3252;
+		}
+
+		WorldMapSectionType.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 = class223.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 = Occluder.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 | var6.isStackable == 1) {
+				var3.itemQuantityMode = 1;
+			} else {
+				var3.itemQuantityMode = 2;
+			}
+
+			if (var3.field2667 > 0) {
+				var3.modelZoom = var3.modelZoom * 32 / var3.field2667;
+			} else if (var3.rawWidth > 0) {
+				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
+			}
+
+			return 1;
+		}
+	}
 }

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

@@ -4,99 +4,94 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bc")
+@ObfuscatedName("bf")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("qh")
+	@ObfuscatedName("kp")
 	@ObfuscatedGetter(
-		intValue = -1955536512
+		intValue = 784647043
 	)
-	static int field1037;
+	@Export("menuWidth")
-	@ObfuscatedName("h")
+	static int menuWidth;
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lfk;"
+		signature = "Lli;"
-	)
-	@Export("clock")
-	static Clock clock;
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "Lll;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Ljx;"
+		signature = "Ljz;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lji;"
+		signature = "Ljw;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1109899493
+		intValue = -154127357
 	)
-	int field1034;
+	int field1052;
 
 	@ObfuscatedSignature(
-		signature = "(Lll;)V"
+		signature = "(Lli;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field1034 = 0;
+		this.field1052 = 0;
 		this.loginType = var1;
 		this.friendsList = new FriendsList(var1);
 		this.ignoreList = new IgnoreList(var1);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1338647349"
+		garbageValue = "-537546182"
 	)
-	boolean method1825() {
+	boolean method1859() {
-		return this.field1034 == 2;
+		return this.field1052 == 2;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "1"
+		garbageValue = "-1827488115"
 	)
-	final void method1856() {
+	final void method1860() {
-		this.field1034 = 1;
+		this.field1052 = 1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkz;IB)V",
+		signature = "(Lkl;II)V",
-		garbageValue = "0"
+		garbageValue = "87159269"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2);
-		this.field1034 = 2;
+		this.field1052 = 2;
-		WallDecoration.FriendSystem_invalidateFriends();
+		Coord.FriendSystem_invalidateFriends();
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-916004239"
+		garbageValue = "1809100173"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
 		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
-			if ((long)var1.field3613 < SoundCache.method2480() / 1000L - 5L) {
+			if ((long)var1.field3627 < class30.method566() / 1000L - 5L) {
 				if (var1.world > 0) {
-					WorldMapCacheName.addGameMessage(5, "", var1.username + " has logged in.");
+					class210.addGameMessage(5, "", var1.username + " has logged in.");
 				}
 
 				if (var1.world == 0) {
-					WorldMapCacheName.addGameMessage(5, "", var1.username + " has logged out.");
+					class210.addGameMessage(5, "", var1.username + " has logged out.");
 				}
 
 				var1.remove();
@@ -105,38 +100,38 @@ public class FriendSystem {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "299049416"
+		garbageValue = "2097335947"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field1034 = 0;
+		this.field1052 = 0;
 		this.friendsList.clear();
 		this.ignoreList.clear();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Ljt;ZI)Z",
+		signature = "(Ljq;ZI)Z",
-		garbageValue = "1657738118"
+		garbageValue = "-99546473"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) {
 			return false;
-		} else if (var1.equals(Varps.localPlayer.username)) {
+		} else if (var1.equals(class223.localPlayer.username)) {
 			return true;
 		} else {
 			return this.friendsList.isFriended(var1, var2);
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Ljt;I)Z",
+		signature = "(Ljq;I)Z",
-		garbageValue = "2143942402"
+		garbageValue = "-1271048446"
 	)
 	@Export("isIgnored")
 	final boolean isIgnored(Username var1) {
@@ -147,45 +142,65 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "365133706"
+		garbageValue = "70213064"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
 		if (var1 != null) {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
+				StringBuilder var10000;
+				String var4;
 				if (this.friendsListIsFull()) {
-					WorldMapSection2.method283("Your friend list is full. Max of 200 for free users, and 400 for members");
+					var10000 = null;
-				} else if (Varps.localPlayer.username.equals(var2)) {
+					var4 = "Your friend list is full. Max of 200 for free users, and 400 for members";
-					class1.method9();
+					class210.addGameMessage(30, "", var4);
-				} else if (this.isFriended(var2, false)) {
+				} else if (class223.localPlayer.username.equals(var2)) {
-					Calendar.method3933(var1);
+					var10000 = null;
-				} else if (this.isIgnored(var2)) {
+					var4 = "You can't add yourself to your own friend list";
-					WorldMapSection2.method283("Please remove " + var1 + " from your ignore list first");
+					class210.addGameMessage(30, "", var4);
 				} else {
-					WorldMapLabelSize.method172(var1);
+					Object var10001;
+					if (this.isFriended(var2, false)) {
+						var10000 = (new StringBuilder()).append(var1);
+						var10001 = null;
+						var4 = var10000.append(" is already on your friend list").toString();
+						class210.addGameMessage(30, "", var4);
+					} else if (this.isIgnored(var2)) {
+						var10000 = new StringBuilder();
+						var10001 = null;
+						var10000 = var10000.append("Please remove ").append(var1);
+						var10001 = null;
+						var4 = var10000.append(" from your ignore list first").toString();
+						class210.addGameMessage(30, "", var4);
+					} else {
+						PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher);
+						var3.packetBuffer.writeByte(class268.stringCp1252NullTerminatedByteSize(var1));
+						var3.packetBuffer.writeStringCp1252NullTerminated(var1);
+						Client.packetWriter.addNode(var3);
 					}
 				}
 			}
 		}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "-567390482"
-	)
-	@Export("friendsListIsFull")
-	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field739 != 1;
 	}
 
 	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(I)Z",
+		garbageValue = "-414102513"
+	)
+	@Export("friendsListIsFull")
+	final boolean friendsListIsFull() {
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field636 != 1;
+	}
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-1635625891"
+		garbageValue = "1251138329"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
@@ -193,37 +208,54 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.canAddIgnore()) {
-					WorldMapSection2.method283("Your ignore list is full. Max of 100 for free users, and 400 for members");
+					WorldMapCacheName.method644();
-				} else if (Varps.localPlayer.username.equals(var2)) {
-					Huffman.method3943();
-				} else if (this.isIgnored(var2)) {
-					WorldMapSection2.method283(var1 + " is already on your ignore list");
-				} else if (this.isFriended(var2, false)) {
-					WorldMapSection2.method283("Please remove " + var1 + " from your friend list first");
 				} else {
-					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher);
+					StringBuilder var10000;
-					var3.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var1));
+					String var4;
+					if (class223.localPlayer.username.equals(var2)) {
+						var10000 = null;
+						var4 = "You can't add yourself to your own ignore list";
+						class210.addGameMessage(30, "", var4);
+					} else {
+						Object var10001;
+						if (this.isIgnored(var2)) {
+							var10000 = (new StringBuilder()).append(var1);
+							var10001 = null;
+							var4 = var10000.append(" is already on your ignore list").toString();
+							class210.addGameMessage(30, "", var4);
+						} else if (this.isFriended(var2, false)) {
+							var10000 = new StringBuilder();
+							var10001 = null;
+							var10000 = var10000.append("Please remove ").append(var1);
+							var10001 = null;
+							var4 = var10000.append(" from your friend list first").toString();
+							class210.addGameMessage(30, "", var4);
+						} else {
+							PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher);
+							var3.packetBuffer.writeByte(class268.stringCp1252NullTerminatedByteSize(var1));
 							var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 							Client.packetWriter.addNode(var3);
 						}
 					}
 				}
 			}
+		}
+	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(S)Z",
-		garbageValue = "-41"
+		garbageValue = "30910"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field739 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field636 != 1;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "73"
+		garbageValue = "1378951166"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
@@ -231,22 +263,22 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsList.removeByUsername(var2)) {
-					GrandExchangeEvents.method66();
+					Client.field744 = Client.cycleCntr;
-					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(class268.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				WallDecoration.FriendSystem_invalidateFriends();
+				Coord.FriendSystem_invalidateFriends();
 			}
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;S)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "257"
+		garbageValue = "-1989545258"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
@@ -254,70 +286,26 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.ignoreList.removeByUsername(var2)) {
-					GrandExchangeEvents.method66();
+					Client.field744 = Client.cycleCntr;
-					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(class268.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				HealthBarUpdate.FriendSystem_invalidateIgnoreds();
+				class195.FriendSystem_invalidateIgnoreds();
 			}
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(Ljt;I)Z",
+		signature = "(Ljq;I)Z",
-		garbageValue = "-1345116753"
+		garbageValue = "869979117"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
 		Friend var2 = (Friend)this.friendsList.getByUsername(var1);
 		return var2 != null && var2.hasWorld();
 	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "591224258"
-	)
-	public static void method1871() {
-		if (KeyHandler.KeyHandler_instance != null) {
-			synchronized(KeyHandler.KeyHandler_instance) {
-				KeyHandler.KeyHandler_instance = null;
-			}
-		}
-
-	}
-
-	@ObfuscatedName("ih")
-	@ObfuscatedSignature(
-		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-1994917329"
-	)
-	@Export("formatItemStacks")
-	static final String formatItemStacks(int var0) {
-		String var1 = Integer.toString(var0);
-
-		for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) {
-			var1 = var1.substring(0, var2) + "," + var1.substring(var2);
-		}
-
-		if (var1.length() > 9) {
-			return " " + UserComparator7.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
-		} else {
-			return var1.length() > 6 ? " " + UserComparator7.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + UserComparator7.colorStartTag(16776960) + var1 + "</col>";
-		}
-	}
-
-	@ObfuscatedName("ip")
-	@ObfuscatedSignature(
-		signature = "(ZB)V",
-		garbageValue = "71"
-	)
-	@Export("setTapToDrop")
-	static void setTapToDrop(boolean var0) {
-		Client.tapToDrop = var0;
-	}
 }

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

@@ -4,61 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jx")
+@ObfuscatedName("jz")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lll;"
+		signature = "Lli;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -699388303
+		intValue = 348884647
 	)
-	int field3587;
+	int field3607;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Ljo;"
+		signature = "Lje;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
 
 	@ObfuscatedSignature(
-		signature = "(Lll;)V"
+		signature = "(Lli;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400);
-		this.field3587 = 1;
+		this.field3607 = 1;
 		this.friendLoginUpdates = new LinkDeque();
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)Ljw;",
+		signature = "(B)Ljh;",
-		garbageValue = "-734254876"
+		garbageValue = "2"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Friend();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljw;",
+		signature = "(II)[Ljh;",
-		garbageValue = "1353779565"
+		garbageValue = "951526901"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Friend[var1];
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Ljt;ZB)Z",
+		signature = "(Ljq;ZB)Z",
-		garbageValue = "0"
+		garbageValue = "-80"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
@@ -70,10 +70,10 @@ public class FriendsList extends UserList {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lkz;II)V",
+		signature = "(Lkl;II)V",
-		garbageValue = "149092737"
+		garbageValue = "-1601651584"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -98,7 +98,7 @@ public class FriendsList extends UserList {
 					Friend var11 = (Friend)this.getByCurrentUsername(var4);
 					if (var3) {
 						Friend var12 = (Friend)this.getByCurrentUsername(var5);
-						if (var12 != null && var12 != var11) {
+						if (var12 != null && var11 != var12) {
 							if (var11 != null) {
 								this.remove(var12);
 							} else {
@@ -137,17 +137,17 @@ public class FriendsList extends UserList {
 					}
 
 					if (var6 != var11.world) {
-						var11.int2 = ++this.field3587 - 1;
+						var11.int2 = ++this.field3607 - 1;
 						if (var11.world == -1 && var6 == 0) {
-							var11.int2 = -(var11.int2 * -2054461169) * 725247471;
+							var11.int2 = -(var11.int2 * 1171982777) * -1761858423;
 						}
 
 						var11.world = var6;
 					}
 
 					var11.rank = var7;
-					var11.field3599 = var9;
+					var11.field3615 = var9;
-					var11.field3598 = var10;
+					var11.field3614 = var10;
 					continue;
 				}
 
@@ -158,69 +158,4 @@ public class FriendsList extends UserList {
 			return;
 		}
 	}
-
-	@ObfuscatedName("c")
-	@Export("sleepMillis")
-	public static final void sleepMillis(long var0) {
-		if (var0 > 0L) {
-			if (var0 % 10L == 0L) {
-				long var2 = var0 - 1L;
-
-				try {
-					Thread.sleep(var2);
-				} catch (InterruptedException var8) {
-				}
-
-				try {
-					Thread.sleep(1L);
-				} catch (InterruptedException var7) {
-				}
-			} else {
-				try {
-					Thread.sleep(var0);
-				} catch (InterruptedException var6) {
-				}
-			}
-
-		}
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
-		garbageValue = "6"
-	)
-	public static String method5163(CharSequence var0) {
-		int var1 = var0.length();
-		StringBuilder var2 = new StringBuilder(var1);
-
-		for (int var3 = 0; var3 < var1; ++var3) {
-			char var4 = var0.charAt(var3);
-			if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') {
-				if (var4 == ' ') {
-					var2.append('+');
-				} else {
-					byte var5 = MenuAction.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();
-	}
 }

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

@@ -4,10 +4,10 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lu")
+@ObfuscatedName("lr")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("inflater")
 	Inflater inflater;
 
@@ -22,10 +22,10 @@ public class GZipDecompressor {
 	GZipDecompressor(int var1, int var2, int var3) {
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lkz;[BB)V",
+		signature = "(Lkl;[BI)V",
-		garbageValue = "0"
+		garbageValue = "-1227959018"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {
@@ -47,30 +47,4 @@ public class GZipDecompressor {
 			throw new RuntimeException("");
 		}
 	}
-
-	@ObfuscatedName("fb")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;ZI)V",
-		garbageValue = "-1847999572"
-	)
-	@Export("drawLoadingMessage")
-	static final void drawLoadingMessage(String var0, boolean var1) {
-		if (Client.showLoadingMessages) {
-			byte var2 = 4;
-			int var3 = var2 + 6;
-			int var4 = var2 + 6;
-			int var5 = class197.fontPlain12.lineWidth(var0, 250);
-			int var6 = class197.fontPlain12.lineCount(var0, 250) * 13;
-			Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0);
-			Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 16777215);
-			class197.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0);
-			HealthBar.method2007(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2);
-			if (var1) {
-				DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0);
-			} else {
-				WorldMapElement.method4392(var3, var4, var5, var6);
-			}
-
-		}
-	}
 }

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

@@ -4,89 +4,95 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ef")
+@ObfuscatedName("ej")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("c")
+	@ObfuscatedName("gh")
-	@ObfuscatedGetter(
-		intValue = -373728187
-	)
-	@Export("plane")
-	int plane;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 351218671
-	)
-	@Export("centerY")
-	int centerY;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = -722622461
-	)
-	@Export("height")
-	int height;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -1130119677
-	)
-	@Export("centerX")
-	int centerX;
-	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "[Llf;"
+	)
+	@Export("mapMarkerSprites")
+	static Sprite[] mapMarkerSprites;
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "Ler;"
 	)
 	@Export("entity")
 	public Entity entity;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = 23072497
+	)
+	@Export("plane")
+	int plane;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1467218039
+	)
+	@Export("height")
+	int height;
 	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1883842779
+		intValue = 1096373851
+	)
+	@Export("centerX")
+	int centerX;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -921514335
+	)
+	@Export("centerY")
+	int centerY;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 1901316909
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1330255505
+		intValue = -714921437
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -941264089
+		intValue = -1336647537
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -2072718285
+		intValue = -1244242871
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1022796885
+		intValue = 1759509999
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1238429947
+		intValue = -1933245697
 	)
-	int field1904;
+	int field1914;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 792454525
+		intValue = 505349389
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		longValue = -8257733995685858193L
+		longValue = 2276908467403178719L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("s")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1096273189
+		intValue = 8294449
 	)
 	@Export("flags")
 	int flags;
@@ -95,100 +101,4 @@ public final class GameObject {
 		this.tag = 0L;
 		this.flags = 0;
 	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;S)V",
-		garbageValue = "390"
-	)
-	@Export("NpcDefinition_setArchives")
-	public static void NpcDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) {
-		NPCDefinition.NpcDefinition_archive = var0;
-		NPCDefinition.NpcDefinition_modelArchive = var1;
-	}
-
-	@ObfuscatedName("x")
-	public static String method3262(long var0) {
-		if (var0 > 0L && var0 < 6582952005840035281L) {
-			if (var0 % 37L == 0L) {
-				return null;
-			} else {
-				int var2 = 0;
-
-				for (long var3 = var0; var3 != 0L; var3 /= 37L) {
-					++var2;
-				}
-
-				StringBuilder var5 = new StringBuilder(var2);
-
-				while (var0 != 0L) {
-					long var6 = var0;
-					var0 /= 37L;
-					var5.append(class288.base37Table[(int)(var6 - var0 * 37L)]);
-				}
-
-				return var5.reverse().toString();
-			}
-		} else {
-			return null;
-		}
-	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(II)Lkc;",
-		garbageValue = "143572048"
-	)
-	public static PrivateChatMode method3263(int var0) {
-		PrivateChatMode[] var1 = Frames.ChatMode_values();
-
-		for (int var2 = 0; var2 < var1.length; ++var2) {
-			PrivateChatMode var3 = var1[var2];
-			if (var0 == var3.field3787) {
-				return var3;
-			}
-		}
-
-		return null;
-	}
-
-	@ObfuscatedName("gz")
-	@ObfuscatedSignature(
-		signature = "(Lby;ZI)V",
-		garbageValue = "100665877"
-	)
-	@Export("addPlayerToScene")
-	static void addPlayerToScene(Player var0, boolean var1) {
-		if (var0 != null && var0.isVisible() && !var0.isHidden) {
-			var0.isUnanimated = false;
-			if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.readySequence == var0.movementSequence) {
-				var0.isUnanimated = true;
-			}
-
-			int var2 = var0.x * -78439701 >> 7;
-			int var3 = var0.y >> 7;
-			if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
-				long var4 = WorldMapIcon_1.calculateTag(0, 0, 0, false, var0.index);
-				if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) {
-					var0.isUnanimated = false;
-					var0.tileHeight = WorldMapAreaData.getTileHeight(var0.x * -78439701, var0.y, MouseRecorder.plane);
-					var0.playerCycle = Client.cycle;
-					WorldMapIcon_1.scene.addNullableObject(MouseRecorder.plane, var0.x * -78439701, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field601, var0.field602, var0.field609, var0.field604);
-				} else {
-					if ((var0.x * -78439701 & 127) == 64 && (var0.y & 127) == 64) {
-						if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) {
-							return;
-						}
-
-						Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount;
-					}
-
-					var0.tileHeight = WorldMapAreaData.getTileHeight(var0.x * -78439701, var0.y, MouseRecorder.plane);
-					var0.playerCycle = Client.cycle;
-					WorldMapIcon_1.scene.drawEntity(MouseRecorder.plane, var0.x * -78439701, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking);
-				}
-			}
-		}
-
-	}
 }

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

@@ -4,42 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("v")
+@ObfuscatedName("m")
 @Implements("GrandExchangeEvent")
 public class GrandExchangeEvent {
-	@ObfuscatedName("fi")
+	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "Lkf;"
-	)
-	@Export("fontPlain11")
-	static Font fontPlain11;
-	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -158786095
+		intValue = 1358084805
 	)
 	@Export("world")
 	public final int world;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		longValue = 3834067055658986045L
+		longValue = 5655370423736122045L
 	)
 	@Export("age")
 	public final long age;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lz;"
+		signature = "Li;"
 	)
 	@Export("grandExchangeOffer")
 	public final GrandExchangeOffer grandExchangeOffer;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("offerName")
 	String offerName;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@Export("previousOfferName")
 	String previousOfferName;
 
 	@ObfuscatedSignature(
-		signature = "(Lkz;BI)V"
+		signature = "(Lkl;BI)V"
 	)
 	GrandExchangeEvent(Buffer var1, byte var2, int var3) {
 		this.offerName = var1.readStringCp1252NullTerminated();
@@ -49,8 +43,8 @@ public class GrandExchangeEvent {
 		int var4 = var1.readInt();
 		int var5 = var1.readInt();
 		this.grandExchangeOffer = new GrandExchangeOffer();
-		this.grandExchangeOffer.method98(2);
+		this.grandExchangeOffer.method110(2);
-		this.grandExchangeOffer.method92(var2);
+		this.grandExchangeOffer.method117(var2);
 		this.grandExchangeOffer.unitPrice = var4;
 		this.grandExchangeOffer.totalQuantity = var5;
 		this.grandExchangeOffer.currentQuantity = 0;
@@ -58,54 +52,163 @@ public class GrandExchangeEvent {
 		this.grandExchangeOffer.id = var3;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(B)Ljava/lang/String;",
+		signature = "(I)Ljava/lang/String;",
-		garbageValue = "1"
+		garbageValue = "963027705"
 	)
 	@Export("getOfferName")
 	public String getOfferName() {
 		return this.offerName;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(B)Ljava/lang/String;",
+		signature = "(I)Ljava/lang/String;",
-		garbageValue = "3"
+		garbageValue = "1720570985"
 	)
 	@Export("getPreviousOfferName")
 	public String getPreviousOfferName() {
 		return this.previousOfferName;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;II)I",
-		garbageValue = "1731864296"
-	)
-	public static int method74(CharSequence var0, int var1) {
-		return class51.parseIntCustomRadix(var0, var1, true);
-	}
-
-	@ObfuscatedName("jq")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "-57"
+		garbageValue = "33"
 	)
-	static final void method73() {
+	public static void method83() {
-		PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher);
+		HitSplatDefinition.HitSplatDefinition_cached.clear();
-		Client.packetWriter.addNode(var0);
+		HitSplatDefinition.HitSplatDefinition_cachedSprites.clear();
+		HitSplatDefinition.HitSplatDefinition_cachedFonts.clear();
+	}
 
-		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) {
+	@ObfuscatedName("gj")
-			if (var1.type == 0 || var1.type == 3) {
+	@ObfuscatedSignature(
-				StructDefinition.closeInterface(var1, true);
+		signature = "(Lbt;B)V",
+		garbageValue = "76"
+	)
+	static final void method88(PendingSpawn var0) {
+		long var1 = 0L;
+		int var3 = -1;
+		int var4 = 0;
+		int var5 = 0;
+		if (var0.type == 0) {
+			var1 = PacketWriter.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 1) {
+			var1 = PacketWriter.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 2) {
+			var1 = PacketWriter.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 3) {
+			var1 = PacketWriter.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (0L != var1) {
+			int var6 = PacketWriter.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1);
+			var3 = class81.Entity_unpackID(var1);
+			var4 = var6 & 31;
+			var5 = var6 >> 6 & 3;
+		}
+
+		var0.objectId = var3;
+		var0.field921 = var4;
+		var0.field922 = var5;
+	}
+
+	@ObfuscatedName("ie")
+	@ObfuscatedSignature(
+		signature = "(Lbi;IIII)V",
+		garbageValue = "1547441010"
+	)
+	@Export("addPlayerToMenu")
+	static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
+		if (class223.localPlayer != var0) {
+			if (Client.menuOptionsCount < 400) {
+				String var4;
+				int var7;
+				if (var0.skillLevel == 0) {
+					String var5 = var0.actions[0] + var0.username + var0.actions[1];
+					var7 = var0.combatLevel;
+					int var8 = class223.localPlayer.combatLevel;
+					int var9 = var8 - var7;
+					String var6;
+					if (var9 < -9) {
+						var6 = World.colorStartTag(16711680);
+					} else if (var9 < -6) {
+						var6 = World.colorStartTag(16723968);
+					} else if (var9 < -3) {
+						var6 = World.colorStartTag(16740352);
+					} else if (var9 < 0) {
+						var6 = World.colorStartTag(16756736);
+					} else if (var9 > 9) {
+						var6 = World.colorStartTag(65280);
+					} else if (var9 > 6) {
+						var6 = World.colorStartTag(4259584);
+					} else if (var9 > 3) {
+						var6 = World.colorStartTag(8453888);
+					} else if (var9 > 0) {
+						var6 = World.colorStartTag(12648192);
+					} else {
+						var6 = World.colorStartTag(16776960);
+					}
+
+					var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
+				} else {
+					var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2];
+				}
+
+				int var10;
+				if (Client.isItemSelected == 1) {
+					WorldMapData_1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + World.colorStartTag(16777215) + var4, 14, var1, var2, var3);
+				} else if (Client.isSpellSelected) {
+					if ((ItemContainer.selectedSpellFlags & 8) == 8) {
+						WorldMapData_1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + World.colorStartTag(16777215) + var4, 15, var1, var2, var3);
+					}
+				} else {
+					for (var10 = 7; var10 >= 0; --var10) {
+						if (Client.playerMenuActions[var10] != null) {
+							short var11 = 0;
+							if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) {
+								if (AttackOption.AttackOption_hidden == Client.playerAttackOption) {
+									continue;
+								}
+
+								if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class223.localPlayer.combatLevel) {
+									var11 = 2000;
+								}
+
+								if (class223.localPlayer.team != 0 && var0.team != 0) {
+									if (var0.team == class223.localPlayer.team) {
+										var11 = 2000;
+									} else {
+										var11 = 0;
+									}
+								}
+							} else if (Client.playerOptionsPriorities[var10]) {
+								var11 = 2000;
+							}
+
+							boolean var12 = false;
+							var7 = Client.playerMenuOpcodes[var10] + var11;
+							WorldMapData_1.insertMenuItemNoShift(Client.playerMenuActions[var10], World.colorStartTag(16777215) + var4, var7, var1, var2, var3);
+						}
 					}
 				}
 
-		if (Client.meslayerContinueWidget != null) {
+				for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
-			WorldMapID.invalidateWidget(Client.meslayerContinueWidget);
+					if (Client.menuOpcodes[var10] == 23) {
-			Client.meslayerContinueWidget = null;
+						Client.menuTargets[var10] = World.colorStartTag(16777215) + var4;
+						break;
+					}
 				}
 
 			}
 		}
+	}
+}

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

@@ -4,38 +4,25 @@ import java.util.Comparator;
 import java.util.List;
 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("j")
+@ObfuscatedName("q")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("d")
+	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 1066542769
-	)
-	@Export("PcmPlayer_count")
-	static int PcmPlayer_count;
-	@ObfuscatedName("gd")
-	@ObfuscatedSignature(
-		signature = "[Lli;"
-	)
-	@Export("headIconHintSprites")
-	static Sprite[] headIconHintSprites;
-	@ObfuscatedName("c")
 	@Export("events")
 	public final List events;
 
@@ -48,7 +35,7 @@ public class GrandExchangeEvents {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkz;Z)V",
+		signature = "(Lkl;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -70,10 +57,10 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Ljava/util/Comparator;ZB)V",
+		signature = "(Ljava/util/Comparator;ZI)V",
-		garbageValue = "0"
+		garbageValue = "663869471"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {
@@ -85,72 +72,41 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;ZLkf;B)V",
+		signature = "([BZB)Ljava/lang/Object;",
-		garbageValue = "118"
+		garbageValue = "-1"
 	)
-	public static void method69(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) {
+	public static Object method76(byte[] var0, boolean var1) {
-		class65.ItemDefinition_archive = var0;
+		if (var0 == null) {
-		ItemDefinition.ItemDefinition_modelArchive = var1;
+			return null;
-		ItemDefinition.ItemDefinition_inMembersWorld = var2;
+		} else if (var0.length > 136) {
-		ItemDefinition.ItemDefinition_fileCount = class65.ItemDefinition_archive.getGroupFileCount(10);
+			DirectByteArrayCopier var2 = new DirectByteArrayCopier();
-		class215.ItemDefinition_fontPlain11 = var3;
+			var2.set(var0);
+			return var2;
+		} else {
+			return var0;
+		}
 	}
 
-	@ObfuscatedName("jp")
+	@ObfuscatedName("ke")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(Lho;B)Lho;",
-		garbageValue = "2004785230"
+		garbageValue = "91"
 	)
-	static final void method66() {
+	static Widget method81(Widget var0) {
-		Client.field815 = Client.cycleCntr;
+		int var1 = UserComparator9.method3355(class2.getWidgetClickMask(var0));
-	}
+		if (var1 == 0) {
-
+			return null;
-	@ObfuscatedName("ko")
+		} else {
-	@ObfuscatedSignature(
+			for (int var2 = 0; var2 < var1; ++var2) {
-		signature = "(Ljava/lang/String;ZB)Ljava/lang/String;",
+				var0 = Canvas.getWidget(var0.parentId);
-		garbageValue = "59"
+				if (var0 == null) {
-	)
+					return null;
-	static String method67(String var0, boolean var1) {
-		String var2 = var1 ? "https://" : "http://";
-		if (Client.gameBuild == 1) {
-			var0 = var0 + "-wtrc";
-		} else if (Client.gameBuild == 2) {
-			var0 = var0 + "-wtqa";
-		} else if (Client.gameBuild == 3) {
-			var0 = var0 + "-wtwip";
-		} else if (Client.gameBuild == 5) {
-			var0 = var0 + "-wti";
-		} else if (Client.gameBuild == 4) {
-			var0 = "local";
-		}
-
-		String var3 = "";
-		if (WorldMapArea.field217 != null) {
-			var3 = "/p=" + WorldMapArea.field217;
-		}
-
-		String var4 = "runescape.com";
-		return var2 + var0 + "." + var4 + "/l=" + class43.clientLanguage + "/a=" + MouseRecorder.field565 + var3 + "/";
-	}
-
-	@ObfuscatedName("kq")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-1862958560"
-	)
-	static String method68(String var0) {
-		PlayerType[] var1 = PlayerAppearance.PlayerType_values();
-
-		for (int var2 = 0; var2 < var1.length; ++var2) {
-			PlayerType var3 = var1[var2];
-			if (var3.modIcon != -1 && var0.startsWith(ArchiveDiskAction.method4133(var3.modIcon))) {
-				var0 = var0.substring(6 + Integer.toString(var3.modIcon).length());
-				break;
 				}
 			}
 
 			return var0;
 		}
 	}
+}

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

@@ -1,51 +1,48 @@
+import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("z")
+@ObfuscatedName("i")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("d")
+	@ObfuscatedName("nx")
-	static int[] field67;
-	@ObfuscatedName("da")
 	@ObfuscatedSignature(
-		signature = "Lio;"
+		signature = "[Lho;"
 	)
-	@Export("archive1")
+	static Widget[] field61;
-	static Archive archive1;
+	@ObfuscatedName("z")
-	@ObfuscatedName("c")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 742288721
+		intValue = 152227217
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -900885629
+		intValue = -1304592967
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 915947343
+		intValue = -1942003277
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1696571551
+		intValue = 244433103
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 737013101
+		intValue = 22250551
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -54,7 +51,7 @@ public class GrandExchangeOffer {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkz;Z)V",
+		signature = "(Lkl;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -66,42 +63,42 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "1"
+		garbageValue = "-719257783"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "639881605"
+		garbageValue = "-9"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "1620696399"
+		garbageValue = "1269791927"
 	)
-	void method98(int var1) {
+	void method110(int var1) {
 		this.state &= -8;
 		this.state = (byte)(this.state | var1 & 7);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-417146285"
+		garbageValue = "3"
 	)
-	void method92(int var1) {
+	void method117(int var1) {
 		this.state &= -9;
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8);
@@ -109,203 +106,27 @@ public class GrandExchangeOffer {
 
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("gc")
 	@ObfuscatedSignature(
-		signature = "(ILcu;ZI)I",
+		signature = "(ZI)V",
-		garbageValue = "1743615056"
+		garbageValue = "2022647645"
 	)
-	static int method103(int var0, Script var1, boolean var2) {
+	static final void method129(boolean var0) {
-		if (var0 == ScriptOpcodes.WORLDLIST_FETCH) {
+		WorldMapID.playPcmPlayers();
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = ClientPacket.loadWorlds() ? 1 : 0;
+		++Client.packetWriter.pendingWrites;
-			return 1;
+		if (Client.packetWriter.pendingWrites >= 50 || var0) {
-		} else {
+			Client.packetWriter.pendingWrites = 0;
-			World var3;
+			if (!Client.field730 && Client.packetWriter.getSocket() != null) {
-			if (var0 == ScriptOpcodes.WORLDLIST_START) {
+				PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2207, Client.packetWriter.isaacCipher);
-				var3 = class185.worldListStart();
+				Client.packetWriter.addNode(var1);
-				if (var3 != null) {
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.id;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.properties;
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.activity;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.location;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.population;
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.host;
-				} else {
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-				}
 
-				return 1;
+				try {
-			} else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) {
+					Client.packetWriter.flush();
-				var3 = Frames.getNextWorldListWorld();
+				} catch (IOException var3) {
-				if (var3 != null) {
+					Client.field730 = true;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.id;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.properties;
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.activity;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.location;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.population;
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.host;
-				} else {
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-					Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-				}
-
-				return 1;
-			} else {
-				World var4;
-				int var5;
-				int var7;
-				if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) {
-					var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-					var4 = null;
-
-					for (var5 = 0; var5 < World.World_count; ++var5) {
-						if (var7 == World.World_worlds[var5].id) {
-							var4 = World.World_worlds[var5];
-							break;
 				}
 			}
 
-					if (var4 != null) {
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.id;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.properties;
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.activity;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.location;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.population;
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.host;
-					} else {
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDLIST_SORT) {
-					class160.Interpreter_intStackSize -= 4;
-					var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-					boolean var10 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1] == 1;
-					var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
-					boolean var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3] == 1;
-					WorldMapID.sortWorldList(var7, var10, var5, var6);
-					return 1;
-				} else if (var0 != ScriptOpcodes.GETWORLDINFO) {
-					if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) {
-						Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1;
-						return 1;
-					} else {
-						int var8;
-						ParamDefinition var9;
-						if (var0 == ScriptOpcodes.NC_PARAM) {
-							class160.Interpreter_intStackSize -= 2;
-							var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-							var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-							var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8);
-							if (var9.isString()) {
-								Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = FontName.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr);
-							} else {
-								Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = FontName.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt);
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.LC_PARAM) {
-							class160.Interpreter_intStackSize -= 2;
-							var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-							var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-							var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8);
-							if (var9.isString()) {
-								Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = WallDecoration.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr);
-							} else {
-								Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WallDecoration.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt);
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.OC_PARAM) {
-							class160.Interpreter_intStackSize -= 2;
-							var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-							var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-							var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8);
-							if (var9.isString()) {
-								Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = Player.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr);
-							} else {
-								Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Player.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt);
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.STRUCT_PARAM) {
-							class160.Interpreter_intStackSize -= 2;
-							var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-							var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-							var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8);
-							if (var9.isString()) {
-								Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = class225.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr);
-							} else {
-								Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class225.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt);
-							}
-
-							return 1;
-						} else if (var0 == ScriptOpcodes.ON_MOBILE) {
-							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0;
-							return 1;
-						} else if (var0 == ScriptOpcodes.CLIENTTYPE) {
-							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.clientType & 3;
-							return 1;
-						} else if (var0 == 6520) {
-							return 1;
-						} else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) {
-							return 1;
-						} else if (var0 == 6522) {
-							--TextureProvider.Interpreter_stringStackSize;
-							--class160.Interpreter_intStackSize;
-							return 1;
-						} else if (var0 == 6523) {
-							--TextureProvider.Interpreter_stringStackSize;
-							--class160.Interpreter_intStackSize;
-							return 1;
-						} else if (var0 == ScriptOpcodes.BATTERYLEVEL) {
-							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
-							return 1;
-						} else if (var0 == ScriptOpcodes.BATTERYCHARGING) {
-							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1;
-							return 1;
-						} else if (var0 == ScriptOpcodes.WIFIAVAILABLE) {
-							Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1;
-							return 1;
-						} else {
-							return 2;
-						}
-					}
-				} else {
-					var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-					if (var7 >= 0 && var7 < World.World_count) {
-						var4 = World.World_worlds[var7];
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.id;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.properties;
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.activity;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.location;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.population;
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.host;
-					} else {
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-						Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "";
-					}
-
-					return 1;
-				}
-			}
 		}
 	}
 }

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

@@ -1,46 +1,742 @@
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.Comparator;
+import java.util.Random;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("f")
+@ObfuscatedName("o")
 @Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("gj")
+	@ObfuscatedName("pq")
-	@Export("xteaKeys")
+	@Export("ClanChat_inClanChat")
-	static int[][] xteaKeys;
+	static boolean ClanChat_inClanChat;
-
+	@ObfuscatedName("a")
-	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lv;Lv;I)I",
+		signature = "Lho;"
-		garbageValue = "-231146255"
+	)
+	static Widget field76;
+	@ObfuscatedName("di")
+	@ObfuscatedSignature(
+		signature = "Lie;"
+	)
+	@Export("archive4")
+	static Archive archive4;
+	@ObfuscatedName("do")
+	@ObfuscatedSignature(
+		signature = "Lie;"
+	)
+	@Export("archive8")
+	static Archive archive8;
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(Lm;Lm;B)I",
+		garbageValue = "24"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.age < var2.age ? -1 : (var1.age == var2.age ? 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("z")
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+	}
+
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Lhy;IIII)V",
+		signature = "(I)V",
-		garbageValue = "-1708148250"
+		garbageValue = "-72081221"
 	)
-	@Export("Widget_setKeyRate")
+	static void method167() {
-	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+		Login.Login_username = Login.Login_username.trim();
-		if (var0.field2615 == null) {
+		if (Login.Login_username.length() == 0) {
-			throw new RuntimeException();
+			PlayerType.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
 		} else {
-			var0.field2615[var1] = var2;
+			long var1;
-			var0.field2616[var1] = var3;
+			try {
+				URL var3 = new URL(FaceNormal.method3225("services", false) + "m=accountappeal/login.ws");
+				URLConnection var4 = var3.openConnection();
+				var4.setRequestProperty("connection", "close");
+				var4.setDoInput(true);
+				var4.setDoOutput(true);
+				var4.setConnectTimeout(5000);
+				OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream());
+				var5.write("data1=req");
+				var5.flush();
+				InputStream var6 = var4.getInputStream();
+				Buffer var7 = new Buffer(new byte[1000]);
+
+				while (true) {
+					int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset);
+					if (var8 == -1) {
+						var7.offset = 0;
+						long var31 = var7.readLong();
+						var1 = var31;
+						break;
+					}
+
+					var7.offset += var8;
+					if (var7.offset >= 1000) {
+						var1 = 0L;
+						break;
+					}
+				}
+			} catch (Exception var46) {
+				var1 = 0L;
+			}
+
+			byte var0;
+			if (0L == var1) {
+				var0 = 5;
+			} else {
+				String var47 = Login.Login_username;
+				Random var48 = new Random();
+				Buffer var35 = new Buffer(128);
+				Buffer var9 = new Buffer(128);
+				int[] var10 = new int[]{var48.nextInt(), var48.nextInt(), (int)(var1 >> 32), (int)var1};
+				var35.writeByte(10);
+
+				int var11;
+				for (var11 = 0; var11 < 4; ++var11) {
+					var35.writeInt(var48.nextInt());
+				}
+
+				var35.writeInt(var10[0]);
+				var35.writeInt(var10[1]);
+				var35.writeLong(var1);
+				var35.writeLong(0L);
+
+				for (var11 = 0; var11 < 4; ++var11) {
+					var35.writeInt(var48.nextInt());
+				}
+
+				var35.encryptRsa(class80.field1119, class80.field1120);
+				var9.writeByte(10);
+
+				for (var11 = 0; var11 < 3; ++var11) {
+					var9.writeInt(var48.nextInt());
+				}
+
+				var9.writeLong(var48.nextLong());
+				var9.writeLongMedium(var48.nextLong());
+				if (Client.randomDatData != null) {
+					var9.writeBytes(Client.randomDatData, 0, Client.randomDatData.length);
+				} else {
+					byte[] var12 = new byte[24];
+
+					try {
+						JagexCache.JagexCache_randomDat.seek(0L);
+						JagexCache.JagexCache_randomDat.readFully(var12);
+
+						int var13;
+						for (var13 = 0; var13 < 24 && var12[var13] == 0; ++var13) {
+						}
+
+						if (var13 >= 24) {
+							throw new IOException();
+						}
+					} catch (Exception var45) {
+						for (int var14 = 0; var14 < 24; ++var14) {
+							var12[var14] = -1;
+						}
+					}
+
+					var9.writeBytes(var12, 0, var12.length);
+				}
+
+				var9.writeLong(var48.nextLong());
+				var9.encryptRsa(class80.field1119, class80.field1120);
+				var11 = class268.stringCp1252NullTerminatedByteSize(var47);
+				if (var11 % 8 != 0) {
+					var11 += 8 - var11 % 8;
+				}
+
+				Buffer var49 = new Buffer(var11);
+				var49.writeStringCp1252NullTerminated(var47);
+				var49.offset = var11;
+				var49.xteaEncryptAll(var10);
+				Buffer var36 = new Buffer(var49.offset + var35.offset + var9.offset + 5);
+				var36.writeByte(2);
+				var36.writeByte(var35.offset);
+				var36.writeBytes(var35.array, 0, var35.offset);
+				var36.writeByte(var9.offset);
+				var36.writeBytes(var9.array, 0, var9.offset);
+				var36.writeShort(var49.offset);
+				var36.writeBytes(var49.array, 0, var49.offset);
+				byte[] var15 = var36.array;
+				String var38 = class3.method52(var15, 0, var15.length);
+				String var16 = var38;
+
+				byte var43;
+				try {
+					URL var17 = new URL(FaceNormal.method3225("services", false) + "m=accountappeal/login.ws");
+					URLConnection var18 = var17.openConnection();
+					var18.setDoInput(true);
+					var18.setDoOutput(true);
+					var18.setConnectTimeout(5000);
+					OutputStreamWriter var19 = new OutputStreamWriter(var18.getOutputStream());
+					int var22 = var16.length();
+					StringBuilder var23 = new StringBuilder(var22);
+
+					int var27;
+					for (int var24 = 0; var24 < var22; ++var24) {
+						char var25 = var16.charAt(var24);
+						if ((var25 < 'a' || var25 > 'z') && (var25 < 'A' || var25 > 'Z') && (var25 < '0' || var25 > '9') && var25 != '.' && var25 != '-' && var25 != '*' && var25 != '_') {
+							if (var25 == ' ') {
+								var23.append('+');
+							} else {
+								byte var26 = Entity.charToByteCp1252(var25);
+								var23.append('%');
+								var27 = var26 >> 4 & 15;
+								if (var27 >= 10) {
+									var23.append((char)(var27 + 55));
+								} else {
+									var23.append((char)(var27 + 48));
+								}
+
+								var27 = var26 & 15;
+								if (var27 >= 10) {
+									var23.append((char)(var27 + 55));
+								} else {
+									var23.append((char)(var27 + 48));
+								}
+							}
+						} else {
+							var23.append(var25);
+						}
+					}
+
+					String var21 = var23.toString();
+					String var50 = "data2=" + var21 + "&dest=";
+					int var51 = "passwordchoice.ws".length();
+					StringBuilder var40 = new StringBuilder(var51);
+
+					for (var27 = 0; var27 < var51; ++var27) {
+						char var28 = "passwordchoice.ws".charAt(var27);
+						if ((var28 < 'a' || var28 > 'z') && (var28 < 'A' || var28 > 'Z') && (var28 < '0' || var28 > '9') && var28 != '.' && var28 != '-' && var28 != '*' && var28 != '_') {
+							if (var28 == ' ') {
+								var40.append('+');
+							} else {
+								byte var29 = Entity.charToByteCp1252(var28);
+								var40.append('%');
+								int var30 = var29 >> 4 & 15;
+								if (var30 >= 10) {
+									var40.append((char)(var30 + 55));
+								} else {
+									var40.append((char)(var30 + 48));
+								}
+
+								var30 = var29 & 15;
+								if (var30 >= 10) {
+									var40.append((char)(var30 + 55));
+								} else {
+									var40.append((char)(var30 + 48));
+								}
+							}
+						} else {
+							var40.append(var28);
+						}
+					}
+
+					String var41 = var40.toString();
+					var19.write(var50 + var41);
+					var19.flush();
+					InputStream var42 = var18.getInputStream();
+					var36 = new Buffer(new byte[1000]);
+
+					while (true) {
+						int var52 = var42.read(var36.array, var36.offset, 1000 - var36.offset);
+						if (var52 == -1) {
+							var19.close();
+							var42.close();
+							String var53 = new String(var36.array);
+							if (var53.startsWith("OFFLINE")) {
+								var43 = 4;
+							} else if (var53.startsWith("WRONG")) {
+								var43 = 7;
+							} else if (var53.startsWith("RELOAD")) {
+								var43 = 3;
+							} else if (var53.startsWith("Not permitted for social network accounts.")) {
+								var43 = 6;
+							} else {
+								var36.xteaDecryptAll(var10);
+
+								while (var36.offset > 0 && var36.array[var36.offset - 1] == 0) {
+									--var36.offset;
+								}
+
+								var53 = new String(var36.array, 0, var36.offset);
+								if (LoginScreenAnimation.isValidURL(var53)) {
+									ArchiveDiskActionHandler.openURL(var53, true, false);
+									var43 = 2;
+								} else {
+									var43 = 5;
+								}
+							}
+							break;
+						}
+
+						var36.offset += var52;
+						if (var36.offset >= 1000) {
+							var43 = 5;
+							break;
+						}
+					}
+				} catch (Throwable var44) {
+					var44.printStackTrace();
+					var43 = 5;
+				}
+
+				var0 = var43;
+			}
+
+			switch(var0) {
+			case 2:
+				PlayerType.setLoginResponseString(Strings.field3008, Strings.field3009, Strings.field3010);
+				Login.loginIndex = 6;
+				break;
+			case 3:
+				PlayerType.setLoginResponseString("", "Error connecting to server.", "");
+				break;
+			case 4:
+				PlayerType.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later.");
+				break;
+			case 5:
+				PlayerType.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later.");
+				break;
+			case 6:
+				PlayerType.setLoginResponseString("", "Error connecting to server.", "");
+				break;
+			case 7:
+				PlayerType.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username.");
+			}
+
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(IIIIIILex;Lfa;I)V",
+		garbageValue = "2071227561"
+	)
+	static final void method165(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
+		if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) {
+			if (var0 < Tiles.Tiles_minPlane) {
+				Tiles.Tiles_minPlane = var0;
+			}
+
+			ObjectDefinition var8 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(var3);
+			int var9;
+			int var10;
+			if (var4 != 1 && var4 != 3) {
+				var9 = var8.sizeX;
+				var10 = var8.sizeY;
+			} else {
+				var9 = var8.sizeY;
+				var10 = var8.sizeX;
+			}
+
+			int var11;
+			int var12;
+			if (var9 + var1 <= 104) {
+				var11 = (var9 >> 1) + var1;
+				var12 = (var9 + 1 >> 1) + var1;
+			} else {
+				var11 = var1;
+				var12 = var1 + 1;
+			}
+
+			int var13;
+			int var14;
+			if (var10 + var2 <= 104) {
+				var13 = (var10 >> 1) + var2;
+				var14 = var2 + (var10 + 1 >> 1);
+			} else {
+				var13 = var2;
+				var14 = var2 + 1;
+			}
+
+			int[][] var15 = Tiles.Tiles_heights[var0];
+			int var16 = var15[var12][var13] + var15[var11][var13] + var15[var11][var14] + var15[var12][var14] >> 2;
+			int var17 = (var1 << 7) + (var9 << 6);
+			int var18 = (var2 << 7) + (var10 << 6);
+			long var19 = class267.calculateTag(var1, var2, 2, var8.int1 == 0, var3);
+			int var21 = var5 + (var4 << 6);
+			if (var8.int3 == 1) {
+				var21 += 256;
+			}
+
+			int var23;
+			int var24;
+			if (var8.hasSound()) {
+				ObjectSound var22 = new ObjectSound();
+				var22.plane = var0;
+				var22.x = var1 * 128;
+				var22.y = var2 * 128;
+				var23 = var8.sizeX;
+				var24 = var8.sizeY;
+				if (var4 == 1 || var4 == 3) {
+					var23 = var8.sizeY;
+					var24 = var8.sizeX;
+				}
+
+				var22.field1059 = (var23 + var1) * 128;
+				var22.field1060 = (var24 + var2) * 128;
+				var22.soundEffectId = var8.ambientSoundId;
+				var22.field1061 = var8.int4 * 128;
+				var22.field1064 = var8.int5;
+				var22.field1070 = var8.int6;
+				var22.soundEffectIds = var8.soundEffectIds;
+				if (var8.transforms != null) {
+					var22.obj = var8;
+					var22.set();
+				}
+
+				ObjectSound.objectSounds.addFirst(var22);
+				if (var22.soundEffectIds != null) {
+					var22.field1067 = var22.field1064 + (int)(Math.random() * (double)(var22.field1070 - var22.field1064));
+				}
+			}
+
+			Object var34;
+			if (var5 == 22) {
+				if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
+					if (var8.animationId == -1 && var8.transforms == null) {
+						var34 = var8.getEntity(22, var4, var15, var17, var16, var18);
+					} else {
+						var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+					}
+
+					var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21);
+					if (var8.interactType == 1 && var7 != null) {
+						var7.setBlockedByFloorDec(var1, var2);
+					}
+
+				}
+			} else if (var5 != 10 && var5 != 11) {
+				int[] var10000;
+				if (var5 >= 12) {
+					if (var8.animationId == -1 && var8.transforms == null) {
+						var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
+					} else {
+						var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+					}
+
+					var6.method3052(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
+					if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
+						var10000 = Tiles.field488[var0][var1];
+						var10000[var2] |= 2340;
+					}
+
+					if (var8.interactType != 0 && var7 != null) {
+						var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+					}
+
+				} else if (var5 == 0) {
+					if (var8.animationId == -1 && var8.transforms == null) {
+						var34 = var8.getEntity(0, var4, var15, var17, var16, var18);
+					} else {
+						var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+					}
+
+					var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field489[var4], 0, var19, var21);
+					if (var4 == 0) {
+						if (var8.clipped) {
+							Tiles.field486[var0][var1][var2] = 50;
+							Tiles.field486[var0][var1][var2 + 1] = 50;
+						}
+
+						if (var8.modelClipped) {
+							var10000 = Tiles.field488[var0][var1];
+							var10000[var2] |= 585;
+						}
+					} else if (var4 == 1) {
+						if (var8.clipped) {
+							Tiles.field486[var0][var1][var2 + 1] = 50;
+							Tiles.field486[var0][var1 + 1][var2 + 1] = 50;
+						}
+
+						if (var8.modelClipped) {
+							var10000 = Tiles.field488[var0][var1];
+							var10000[var2 + 1] |= 1170;
+						}
+					} else if (var4 == 2) {
+						if (var8.clipped) {
+							Tiles.field486[var0][var1 + 1][var2] = 50;
+							Tiles.field486[var0][var1 + 1][var2 + 1] = 50;
+						}
+
+						if (var8.modelClipped) {
+							var10000 = Tiles.field488[var0][var1 + 1];
+							var10000[var2] |= 585;
+						}
+					} else if (var4 == 3) {
+						if (var8.clipped) {
+							Tiles.field486[var0][var1][var2] = 50;
+							Tiles.field486[var0][var1 + 1][var2] = 50;
+						}
+
+						if (var8.modelClipped) {
+							var10000 = Tiles.field488[var0][var1];
+							var10000[var2] |= 1170;
+						}
+					}
+
+					if (var8.interactType != 0 && var7 != null) {
+						var7.method3502(var1, var2, var5, var4, var8.boolean1);
+					}
+
+					if (var8.int2 != 16) {
+						var6.method3123(var0, var1, var2, var8.int2);
+					}
+
+				} else if (var5 == 1) {
+					if (var8.animationId == -1 && var8.transforms == null) {
+						var34 = var8.getEntity(1, var4, var15, var17, var16, var18);
+					} else {
+						var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+					}
+
+					var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field493[var4], 0, var19, var21);
+					if (var8.clipped) {
+						if (var4 == 0) {
+							Tiles.field486[var0][var1][var2 + 1] = 50;
+						} else if (var4 == 1) {
+							Tiles.field486[var0][var1 + 1][var2 + 1] = 50;
+						} else if (var4 == 2) {
+							Tiles.field486[var0][var1 + 1][var2] = 50;
+						} else if (var4 == 3) {
+							Tiles.field486[var0][var1][var2] = 50;
+						}
+					}
+
+					if (var8.interactType != 0 && var7 != null) {
+						var7.method3502(var1, var2, var5, var4, var8.boolean1);
+					}
+
+				} else {
+					int var28;
+					if (var5 == 2) {
+						var28 = var4 + 1 & 3;
+						Object var29;
+						Object var30;
+						if (var8.animationId == -1 && var8.transforms == null) {
+							var29 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18);
+							var30 = var8.getEntity(2, var28, var15, var17, var16, var18);
+						} else {
+							var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+							var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null);
+						}
+
+						var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field489[var4], Tiles.field489[var28], var19, var21);
+						if (var8.modelClipped) {
+							if (var4 == 0) {
+								var10000 = Tiles.field488[var0][var1];
+								var10000[var2] |= 585;
+								var10000 = Tiles.field488[var0][var1];
+								var10000[1 + var2] |= 1170;
+							} else if (var4 == 1) {
+								var10000 = Tiles.field488[var0][var1];
+								var10000[var2 + 1] |= 1170;
+								var10000 = Tiles.field488[var0][var1 + 1];
+								var10000[var2] |= 585;
+							} else if (var4 == 2) {
+								var10000 = Tiles.field488[var0][var1 + 1];
+								var10000[var2] |= 585;
+								var10000 = Tiles.field488[var0][var1];
+								var10000[var2] |= 1170;
+							} else if (var4 == 3) {
+								var10000 = Tiles.field488[var0][var1];
+								var10000[var2] |= 1170;
+								var10000 = Tiles.field488[var0][var1];
+								var10000[var2] |= 585;
+							}
+						}
+
+						if (var8.interactType != 0 && var7 != null) {
+							var7.method3502(var1, var2, var5, var4, var8.boolean1);
+						}
+
+						if (var8.int2 != 16) {
+							var6.method3123(var0, var1, var2, var8.int2);
+						}
+
+					} else if (var5 == 3) {
+						if (var8.animationId == -1 && var8.transforms == null) {
+							var34 = var8.getEntity(3, var4, var15, var17, var16, var18);
+						} else {
+							var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+						}
+
+						var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field493[var4], 0, var19, var21);
+						if (var8.clipped) {
+							if (var4 == 0) {
+								Tiles.field486[var0][var1][var2 + 1] = 50;
+							} else if (var4 == 1) {
+								Tiles.field486[var0][var1 + 1][var2 + 1] = 50;
+							} else if (var4 == 2) {
+								Tiles.field486[var0][var1 + 1][var2] = 50;
+							} else if (var4 == 3) {
+								Tiles.field486[var0][var1][var2] = 50;
+							}
+						}
+
+						if (var8.interactType != 0 && var7 != null) {
+							var7.method3502(var1, var2, var5, var4, var8.boolean1);
+						}
+
+					} else if (var5 == 9) {
+						if (var8.animationId == -1 && var8.transforms == null) {
+							var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
+						} else {
+							var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+						}
+
+						var6.method3052(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
+						if (var8.interactType != 0 && var7 != null) {
+							var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+						}
+
+						if (var8.int2 != 16) {
+							var6.method3123(var0, var1, var2, var8.int2);
+						}
+
+					} else if (var5 == 4) {
+						if (var8.animationId == -1 && var8.transforms == null) {
+							var34 = var8.getEntity(4, var4, var15, var17, var16, var18);
+						} else {
+							var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+						}
+
+						var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field489[var4], 0, 0, 0, var19, var21);
+					} else {
+						long var31;
+						Object var33;
+						if (var5 == 5) {
+							var28 = 16;
+							var31 = var6.getBoundaryObjectTag(var0, var1, var2);
+							if (0L != var31) {
+								var28 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(class81.Entity_unpackID(var31)).int2;
+							}
+
+							if (var8.animationId == -1 && var8.transforms == null) {
+								var33 = var8.getEntity(4, var4, var15, var17, var16, var18);
+							} else {
+								var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+							}
+
+							var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field489[var4], 0, var28 * Tiles.field491[var4], var28 * Tiles.field492[var4], var19, var21);
+						} else if (var5 == 6) {
+							var28 = 8;
+							var31 = var6.getBoundaryObjectTag(var0, var1, var2);
+							if (0L != var31) {
+								var28 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(class81.Entity_unpackID(var31)).int2 / 2;
+							}
+
+							if (var8.animationId == -1 && var8.transforms == null) {
+								var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
+							} else {
+								var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+							}
+
+							var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field484[var4], var28 * Tiles.field494[var4], var19, var21);
+						} else if (var5 == 7) {
+							var23 = var4 + 2 & 3;
+							if (var8.animationId == -1 && var8.transforms == null) {
+								var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18);
+							} else {
+								var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+							}
+
+							var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21);
+						} else if (var5 == 8) {
+							var28 = 8;
+							var31 = var6.getBoundaryObjectTag(var0, var1, var2);
+							if (0L != var31) {
+								var28 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(class81.Entity_unpackID(var31)).int2 / 2;
+							}
+
+							int var27 = var4 + 2 & 3;
+							Object var26;
+							if (var8.animationId == -1 && var8.transforms == null) {
+								var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
+								var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18);
+							} else {
+								var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+								var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+							}
+
+							var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field484[var4], var28 * Tiles.field494[var4], var19, var21);
 						}
 					}
 				}
+			} else {
+				if (var8.animationId == -1 && var8.transforms == null) {
+					var34 = var8.getEntity(10, var4, var15, var17, var16, var18);
+				} else {
+					var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+				}
+
+				if (var34 != null && var6.method3052(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) {
+					var23 = 15;
+					if (var34 instanceof Model) {
+						var23 = ((Model)var34).method2855() / 4;
+						if (var23 > 30) {
+							var23 = 30;
+						}
+					}
+
+					for (var24 = 0; var24 <= var9; ++var24) {
+						for (int var25 = 0; var25 <= var10; ++var25) {
+							if (var23 > Tiles.field486[var0][var24 + var1][var25 + var2]) {
+								Tiles.field486[var0][var24 + var1][var25 + var2] = (byte)var23;
+							}
+						}
+					}
+				}
+
+				if (var8.interactType != 0 && var7 != null) {
+					var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+				}
+
+			}
+		}
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		signature = "(IIII)I",
+		garbageValue = "1521796882"
+	)
+	@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;
+	}
+}

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

@@ -1,73 +1,129 @@
 import java.util.Comparator;
+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("h")
+@ObfuscatedName("b")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("ne")
+	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = 1296404691
-	)
-	static int field79;
-	@ObfuscatedName("sp")
-	@ObfuscatedGetter(
-		intValue = -1426574287
-	)
-	@Export("foundItemIdCount")
-	static int foundItemIdCount;
-	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lhp;"
 	)
-	@Export("ObjectDefinition_archive")
+	static AbstractArchive field66;
-	public static AbstractArchive ObjectDefinition_archive;
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lv;Lv;I)I",
+		signature = "(Lm;Lm;I)I",
-		garbageValue = "576633421"
+		garbageValue = "1692871938"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.getOfferName().compareTo(var2.getOfferName());
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1);
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("t")
+	public boolean equals(Object var1) {
+		return super.equals(var1);
+	}
+
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;I)[Llt;",
+		signature = "(Lhp;I)V",
-		garbageValue = "-527219234"
+		garbageValue = "1206640259"
 	)
-	public static IndexedSprite[] method122(AbstractArchive var0, String var1, String var2) {
+	public static void method153(AbstractArchive var0) {
-		int var3 = var0.getGroupId(var1);
+		VarbitDefinition.VarbitDefinition_archive = var0;
-		int var4 = var0.getFileId(var3, var2);
-		byte[] var7 = var0.takeFile(var3, var4);
-		boolean var6;
-		if (var7 == null) {
-			var6 = false;
-		} else {
-			GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var7);
-			var6 = true;
 	}
 
-		IndexedSprite[] var5;
+	@ObfuscatedName("z")
-		if (!var6) {
+	@ObfuscatedSignature(
-			var5 = null;
+		signature = "([Ljava/lang/String;[SIIB)V",
-		} else {
+		garbageValue = "-18"
-			var5 = FileSystem.method3489();
+	)
+	@Export("sortItemsByName")
+	public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
+		if (var2 < var3) {
+			int var4 = (var3 + var2) / 2;
+			int var5 = var2;
+			String var6 = var0[var4];
+			var0[var4] = var0[var3];
+			var0[var3] = var6;
+			short var7 = var1[var4];
+			var1[var4] = var1[var3];
+			var1[var3] = var7;
+
+			for (int var8 = var2; var8 < var3; ++var8) {
+				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
+					String var9 = var0[var8];
+					var0[var8] = var0[var5];
+					var0[var5] = var9;
+					short var10 = var1[var8];
+					var1[var8] = var1[var5];
+					var1[var5++] = var10;
+				}
 			}
 
-		return var5;
+			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 = "(Lfm;III)Ldv;",
+		garbageValue = "-1644992820"
+	)
+	public static final PcmPlayer method151(TaskHandler var0, int var1, int var2) {
+		if (UrlRequest.PcmPlayer_sampleRate == 0) {
+			throw new IllegalStateException();
+		} else if (var1 >= 0 && var1 < 2) {
+			if (var2 < 256) {
+				var2 = 256;
+			}
+
+			try {
+				PcmPlayer var3 = PcmPlayer.pcmPlayerProvider.player();
+				var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
+				var3.field1391 = var2;
+				var3.init();
+				var3.capacity = (var2 & -1024) + 1024;
+				if (var3.capacity > 16384) {
+					var3.capacity = 16384;
+				}
+
+				var3.open(var3.capacity);
+				if (MenuAction.PcmPlayer_count > 0 && RunException.soundSystem == null) {
+					RunException.soundSystem = new SoundSystem();
+					PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1);
+					PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(RunException.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
+				}
+
+				if (RunException.soundSystem != null) {
+					if (RunException.soundSystem.players[var1] != null) {
+						throw new IllegalArgumentException();
+					}
+
+					RunException.soundSystem.players[var1] = var3;
+				}
+
+				return var3;
+			} catch (Throwable var4) {
+				return new PcmPlayer();
+			}
+		} else {
+			throw new IllegalArgumentException();
+		}
 	}
 }

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

@@ -1,29 +1,62 @@
+import java.io.File;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bh")
+@ObfuscatedName("bb")
 @Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("dm")
+	@ObfuscatedName("qs")
-	@ObfuscatedSignature(
+	@ObfuscatedGetter(
-		signature = "Lfc;"
+		intValue = 683599059
 	)
-	@Export("js5SocketTask")
+	static int field627;
-	static Task js5SocketTask;
+	@ObfuscatedName("n")
-	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "Lhp;"
+	)
+	@Export("KitDefinition_modelsArchive")
+	public static AbstractArchive KitDefinition_modelsArchive;
+	@ObfuscatedName("r")
+	@Export("cacheDir")
+	public static File cacheDir;
+	@ObfuscatedName("dg")
+	@ObfuscatedSignature(
+		signature = "Lie;"
+	)
+	@Export("archive12")
+	static Archive archive12;
+	@ObfuscatedName("fg")
+	@ObfuscatedSignature(
+		signature = "Lkn;"
+	)
+	@Export("fontPlain11")
+	static Font fontPlain11;
+	@ObfuscatedName("hq")
+	@ObfuscatedGetter(
+		intValue = 1137329779
+	)
+	@Export("cameraX")
+	static int cameraX;
+	@ObfuscatedName("ji")
+	@ObfuscatedSignature(
+		signature = "Lho;"
+	)
+	static Widget field628;
+	@ObfuscatedName("z")
 	@Export("filterWorlds")
 	boolean filterWorlds;
 
 	GrandExchangeOfferOwnWorldComparator() {
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lv;Lv;S)I",
+		signature = "(Lm;Lm;I)I",
-		garbageValue = "27782"
+		garbageValue = "-1661947065"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -44,78 +77,50 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
 		}
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1);
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("t")
+	public boolean equals(Object var1) {
-	@ObfuscatedSignature(
+		return super.equals(var1);
-		signature = "([BIIII[Lfj;I)V",
-		garbageValue = "-1084526407"
-	)
-	static final void method1244(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
-		int var7;
-		int var8;
-		for (int var6 = 0; var6 < 4; ++var6) {
-			for (var7 = 0; var7 < 64; ++var7) {
-				for (var8 = 0; var8 < 64; ++var8) {
-					if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) {
-						int[] var10000 = var5[var6].flags[var7 + var1];
-						var10000[var8 + var2] &= -16777217;
-					}
-				}
-			}
-		}
-
-		Buffer var10 = new Buffer(var0);
-
-		for (var7 = 0; var7 < 4; ++var7) {
-			for (var8 = 0; var8 < 64; ++var8) {
-				for (int var9 = 0; var9 < 64; ++var9) {
-					class32.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0);
-				}
-			}
-		}
-
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "(II)I",
-		garbageValue = "1688016819"
-	)
-	@Export("Messages_getLastChatID")
-	static int Messages_getLastChatID(int var0) {
-		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
-		if (var1 == null) {
-			return -1;
-		} else {
-			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count;
-		}
 	}
 
 	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(IB)Liz;",
-		garbageValue = "-325368382"
+		garbageValue = "123"
 	)
-	static void method1232() {
+	@Export("getObjectDefinition")
-		Login.worldSelectOpen = false;
+	public static ObjectDefinition getObjectDefinition(int var0) {
-		Login.leftTitleSprite.drawAt(Login.xPadding, 0);
+		ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0);
-		class191.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+		if (var1 != null) {
-		HealthBar.logoSprite.drawAt(Login.xPadding + 382 - HealthBar.logoSprite.subWidth / 2, 18);
+			return var1;
+		} else {
+			byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0);
+			var1 = new ObjectDefinition();
+			var1.id = var0;
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
 			}
 
-	@ObfuscatedName("aw")
+			var1.postDecode();
+			if (var1.isSolid) {
+				var1.interactType = 0;
+				var1.boolean1 = false;
+			}
+
+			ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)I",
+		signature = "(IS)Lbe;",
-		garbageValue = "1088235300"
+		garbageValue = "-12583"
 	)
-	public static int method1245(String var0) {
+	@Export("Messages_getMessage")
-		return var0.length() + 2;
+	static Message Messages_getMessage(int var0) {
+		return (Message)Messages.Messages_hashTable.get((long)var0);
 	}
 }

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

@@ -1,28 +1,23 @@
-import java.lang.management.GarbageCollectorMXBean;
 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("d")
+@ObfuscatedName("y")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("ac")
+	@ObfuscatedName("bk")
-	@Export("garbageCollector")
-	static GarbageCollectorMXBean garbageCollector;
-	@ObfuscatedName("hy")
-	@ObfuscatedGetter(
-		intValue = -1848118147
-	)
-	@Export("cameraY")
-	static int cameraY;
-
-	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lv;Lv;I)I",
+		signature = "[Llp;"
-		garbageValue = "1419484112"
+	)
+	@Export("worldSelectArrows")
+	static IndexedSprite[] worldSelectArrows;
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		signature = "(Lm;Lm;I)I",
+		garbageValue = "-1270482233"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -37,26 +32,371 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(II)Lij;",
+		signature = "(II)Z",
-		garbageValue = "957184783"
+		garbageValue = "1729511296"
 	)
-	@Export("getParamDefinition")
+	public static boolean method93(int var0) {
-	public static ParamDefinition getParamDefinition(int var0) {
+		return (var0 >> 20 & 1) != 0;
-		ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0);
-			var1 = new ParamDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
 	}
 
-			var1.postDecode();
+	@ObfuscatedName("ez")
-			ParamDefinition.ParamDefinition_cached.put(var1, (long)var0);
+	@ObfuscatedSignature(
-			return var1;
+		signature = "(I)I",
+		garbageValue = "-1447475674"
+	)
+	static int method100() {
+		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.field908;
+		} else {
+			return 10000;
+		}
+	}
+
+	@ObfuscatedName("ec")
+	@ObfuscatedSignature(
+		signature = "(IIB)V",
+		garbageValue = "99"
+	)
+	static void method91(int var0, int var1) {
+		int[] var2 = new int[9];
+
+		for (int var3 = 0; var3 < var2.length; ++var3) {
+			int var4 = var3 * 32 + 15 + 128;
+			int var5 = var4 * 3 + 600;
+			int var7 = Rasterizer3D.Rasterizer3D_sine[var4];
+			int var9 = var1 - 334;
+			if (var9 < 0) {
+				var9 = 0;
+			} else if (var9 > 100) {
+				var9 = 100;
+			}
+
+			int var10 = (Client.zoomWidth - Client.zoomHeight) * var9 / 100 + Client.zoomHeight;
+			int var8 = var10 * var5 / 256;
+			var2[var3] = var7 * var8 >> 16;
+		}
+
+		Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334);
+	}
+
+	@ObfuscatedName("gq")
+	@ObfuscatedSignature(
+		signature = "(Lgw;I)V",
+		garbageValue = "865930097"
+	)
+	static final void method105(class185 var0) {
+		PacketBuffer var1 = Client.packetWriter.packetBuffer;
+		int var4;
+		int var5;
+		int var6;
+		int var7;
+		int var8;
+		int var9;
+		int var10;
+		int var12;
+		int var13;
+		int var14;
+		if (class185.field2298 == var0) {
+			byte var2 = var1.readByte();
+			byte var3 = var1.readByte();
+			var4 = var1.readUnsignedByte();
+			var5 = var4 >> 2;
+			var6 = var4 & 3;
+			var7 = Client.field697[var5];
+			var8 = var1.method5456();
+			var9 = (var8 >> 4 & 7) + class40.field326;
+			var10 = (var8 & 7) + WorldMapSection2.field195;
+			byte var11 = var1.method5459();
+			var12 = var1.method5465();
+			var13 = var1.method5464();
+			var14 = var1.readUnsignedShort();
+			int var15 = var1.method5465();
+			byte var16 = var1.method5458();
+			Player var17;
+			if (var15 == Client.localPlayerIndex) {
+				var17 = class223.localPlayer;
+			} else {
+				var17 = Client.players[var15];
+			}
+
+			if (var17 != null) {
+				ObjectDefinition var18 = GrandExchangeOfferOwnWorldComparator.getObjectDefinition(var14);
+				int var19;
+				int var20;
+				if (var6 != 1 && var6 != 3) {
+					var19 = var18.sizeX;
+					var20 = var18.sizeY;
+				} else {
+					var19 = var18.sizeY;
+					var20 = var18.sizeX;
+				}
+
+				int var21 = var9 + (var19 >> 1);
+				int var22 = var9 + (var19 + 1 >> 1);
+				int var23 = var10 + (var20 >> 1);
+				int var24 = var10 + (var20 + 1 >> 1);
+				int[][] var25 = Tiles.Tiles_heights[WorldMapRectangle.plane];
+				int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2;
+				int var27 = (var9 << 7) + (var19 << 6);
+				int var28 = (var10 << 7) + (var20 << 6);
+				Model var29 = var18.getModel(var5, var6, var25, var27, var26, var28);
+				if (var29 != null) {
+					WorldMapSection1.updatePendingSpawn(WorldMapRectangle.plane, var9, var10, var7, -1, 0, 0, var12 + 1, var13 + 1);
+					var17.animationCycleStart = var12 + Client.cycle;
+					var17.animationCycleEnd = var13 + Client.cycle;
+					var17.model0 = var29;
+					var17.field606 = var9 * 128 + var19 * 64;
+					var17.field608 = var10 * 128 + var20 * 64;
+					var17.tileHeight2 = var26;
+					byte var30;
+					if (var2 > var11) {
+						var30 = var2;
+						var2 = var11;
+						var11 = var30;
+					}
+
+					if (var3 > var16) {
+						var30 = var3;
+						var3 = var16;
+						var16 = var30;
+					}
+
+					var17.field622 = var2 + var9;
+					var17.field612 = var11 + var9;
+					var17.field611 = var10 + var3;
+					var17.field613 = var10 + var16;
+				}
+			}
+		}
+
+		int var37;
+		int var38;
+		int var40;
+		if (class185.field2302 == var0) {
+			var37 = var1.method5465();
+			var38 = var1.method5456();
+			var4 = (var38 >> 4 & 7) + class40.field326;
+			var5 = (var38 & 7) + WorldMapSection2.field195;
+			var6 = var1.readUnsignedByte();
+			var7 = var6 >> 2;
+			var8 = var6 & 3;
+			var9 = Client.field697[var7];
+			if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) {
+				if (var9 == 0) {
+					BoundaryObject var31 = PacketWriter.scene.method3064(WorldMapRectangle.plane, var4, var5);
+					if (var31 != null) {
+						var40 = class81.Entity_unpackID(var31.tag);
+						if (var7 == 2) {
+							var31.entity1 = new DynamicObject(var40, 2, var8 + 4, WorldMapRectangle.plane, var4, var5, var37, false, var31.entity1);
+							var31.entity2 = new DynamicObject(var40, 2, var8 + 1 & 3, WorldMapRectangle.plane, var4, var5, var37, false, var31.entity2);
+						} else {
+							var31.entity1 = new DynamicObject(var40, var7, var8, WorldMapRectangle.plane, var4, var5, var37, false, var31.entity1);
+						}
+					}
+				}
+
+				if (var9 == 1) {
+					WallDecoration var42 = PacketWriter.scene.method3065(WorldMapRectangle.plane, var4, var5);
+					if (var42 != null) {
+						var40 = class81.Entity_unpackID(var42.tag);
+						if (var7 != 4 && var7 != 5) {
+							if (var7 == 6) {
+								var42.entity1 = new DynamicObject(var40, 4, var8 + 4, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity1);
+							} else if (var7 == 7) {
+								var42.entity1 = new DynamicObject(var40, 4, (var8 + 2 & 3) + 4, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity1);
+							} else if (var7 == 8) {
+								var42.entity1 = new DynamicObject(var40, 4, var8 + 4, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity1);
+								var42.entity2 = new DynamicObject(var40, 4, (var8 + 2 & 3) + 4, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity2);
+							}
+						} else {
+							var42.entity1 = new DynamicObject(var40, 4, var8, WorldMapRectangle.plane, var4, var5, var37, false, var42.entity1);
+						}
+					}
+				}
+
+				if (var9 == 2) {
+					GameObject var43 = PacketWriter.scene.method3066(WorldMapRectangle.plane, var4, var5);
+					if (var7 == 11) {
+						var7 = 10;
+					}
+
+					if (var43 != null) {
+						var43.entity = new DynamicObject(class81.Entity_unpackID(var43.tag), var7, var8, WorldMapRectangle.plane, var4, var5, var37, false, var43.entity);
+					}
+				}
+
+				if (var9 == 3) {
+					FloorDecoration var44 = PacketWriter.scene.getFloorDecoration(WorldMapRectangle.plane, var4, var5);
+					if (var44 != null) {
+						var44.entity = new DynamicObject(class81.Entity_unpackID(var44.tag), 22, var8, WorldMapRectangle.plane, var4, var5, var37, false, var44.entity);
+					}
+				}
+			}
+
+		} else {
+			TileItem var33;
+			if (class185.field2304 == var0) {
+				var37 = var1.method5455();
+				var38 = (var37 >> 4 & 7) + class40.field326;
+				var4 = (var37 & 7) + WorldMapSection2.field195;
+				var5 = var1.method5632();
+				if (var38 >= 0 && var4 >= 0 && var38 < 104 && var4 < 104) {
+					NodeDeque var32 = Client.groundItems[WorldMapRectangle.plane][var38][var4];
+					if (var32 != null) {
+						for (var33 = (TileItem)var32.last(); var33 != null; var33 = (TileItem)var32.previous()) {
+							if ((var5 & 32767) == var33.id) {
+								var33.remove();
+								break;
+							}
+						}
+
+						if (var32.last() == null) {
+							Client.groundItems[WorldMapRectangle.plane][var38][var4] = null;
+						}
+
+						WorldMapCacheName.updateItemPile(var38, var4);
+					}
+				}
+
+			} else if (class185.field2296 == var0) {
+				var37 = var1.method5456();
+				var38 = var37 >> 2;
+				var4 = var37 & 3;
+				var5 = Client.field697[var38];
+				var6 = var1.method5455();
+				var7 = (var6 >> 4 & 7) + class40.field326;
+				var8 = (var6 & 7) + WorldMapSection2.field195;
+				if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
+					WorldMapSection1.updatePendingSpawn(WorldMapRectangle.plane, var7, var8, var5, -1, var38, var4, 0, -1);
+				}
+
+			} else if (class185.field2297 == var0) {
+				var37 = var1.method5465();
+				var38 = var1.method5464();
+				var4 = var1.method5455();
+				var5 = (var4 >> 4 & 7) + class40.field326;
+				var6 = (var4 & 7) + WorldMapSection2.field195;
+				if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+					var33 = new TileItem();
+					var33.id = var38;
+					var33.quantity = var37;
+					if (Client.groundItems[WorldMapRectangle.plane][var5][var6] == null) {
+						Client.groundItems[WorldMapRectangle.plane][var5][var6] = new NodeDeque();
+					}
+
+					Client.groundItems[WorldMapRectangle.plane][var5][var6].addFirst(var33);
+					WorldMapCacheName.updateItemPile(var5, var6);
+				}
+
+			} else {
+				if (class185.field2300 == var0) {
+					var37 = var1.method5496();
+					var38 = (var37 >> 4 & 7) + class40.field326;
+					var4 = (var37 & 7) + WorldMapSection2.field195;
+					var5 = var1.method5496();
+					var6 = var5 >> 4 & 15;
+					var7 = var5 & 7;
+					var8 = var1.readUnsignedShort();
+					var9 = var1.method5496();
+					if (var38 >= 0 && var4 >= 0 && var38 < 104 && var4 < 104) {
+						var10 = var6 + 1;
+						if (class223.localPlayer.pathX[0] >= var38 - var10 && class223.localPlayer.pathX[0] <= var10 + var38 && class223.localPlayer.pathY[0] >= var4 - var10 && class223.localPlayer.pathY[0] <= var10 + var4 && Client.field868 != 0 && var7 > 0 && Client.soundEffectCount < 50) {
+							Client.soundEffectIds[Client.soundEffectCount] = var8;
+							Client.queuedSoundEffectLoops[Client.soundEffectCount] = var7;
+							Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9;
+							Client.soundEffects[Client.soundEffectCount] = null;
+							Client.soundLocations[Client.soundEffectCount] = var6 + (var4 << 8) + (var38 << 16);
+							++Client.soundEffectCount;
+						}
+					}
+				}
+
+				if (class185.field2299 == var0) {
+					var37 = var1.readUnsignedByte();
+					var38 = var37 >> 2;
+					var4 = var37 & 3;
+					var5 = Client.field697[var38];
+					var6 = var1.method5455();
+					var7 = (var6 >> 4 & 7) + class40.field326;
+					var8 = (var6 & 7) + WorldMapSection2.field195;
+					var9 = var1.readUnsignedShort();
+					if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
+						WorldMapSection1.updatePendingSpawn(WorldMapRectangle.plane, var7, var8, var5, var9, var38, var4, 0, -1);
+					}
+
+				} else if (class185.field2295 == var0) {
+					var37 = var1.method5632();
+					var38 = var1.method5496();
+					var4 = (var38 >> 4 & 7) + class40.field326;
+					var5 = (var38 & 7) + WorldMapSection2.field195;
+					var6 = var1.method5464();
+					var7 = var1.method5632();
+					byte var39 = var1.method5460();
+					var9 = var1.method5496() * 4;
+					var10 = var1.readUnsignedByte();
+					var40 = var1.method5455();
+					byte var41 = var1.method5458();
+					var13 = var1.method5471();
+					var14 = var1.method5496() * 4;
+					var12 = var41 + var4;
+					var8 = var39 + var5;
+					if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104 && var12 >= 0 && var8 >= 0 && var12 < 104 && var8 < 104 && var37 != 65535) {
+						var4 = var4 * 128 + 64;
+						var5 = var5 * 128 + 64;
+						var12 = var12 * 128 + 64;
+						var8 = var8 * 128 + 64;
+						Projectile var34 = new Projectile(var37, WorldMapRectangle.plane, var4, var5, MusicPatchPcmStream.getTileHeight(var4, var5, WorldMapRectangle.plane) - var14, var6 + Client.cycle, var7 + Client.cycle, var40, var10, var13, var9);
+						var34.setDestination(var12, var8, MusicPatchPcmStream.getTileHeight(var12, var8, WorldMapRectangle.plane) - var9, var6 + Client.cycle);
+						Client.projectiles.addFirst(var34);
+					}
+
+				} else if (class185.field2303 != var0) {
+					if (class185.field2301 == var0) {
+						var37 = var1.method5632();
+						var38 = var1.method5455();
+						var4 = var1.method5455();
+						var5 = (var4 >> 4 & 7) + class40.field326;
+						var6 = (var4 & 7) + WorldMapSection2.field195;
+						var7 = var1.method5464();
+						if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+							var5 = var5 * 128 + 64;
+							var6 = var6 * 128 + 64;
+							GraphicsObject var45 = new GraphicsObject(var7, WorldMapRectangle.plane, var5, var6, MusicPatchPcmStream.getTileHeight(var5, var6, WorldMapRectangle.plane) - var38, var37, Client.cycle);
+							Client.graphicsObjects.addFirst(var45);
+						}
+
+					}
+				} else {
+					var37 = var1.method5464();
+					var38 = var1.method5465();
+					var4 = var1.method5456();
+					var5 = (var4 >> 4 & 7) + class40.field326;
+					var6 = (var4 & 7) + WorldMapSection2.field195;
+					var7 = var1.method5465();
+					if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+						NodeDeque var35 = Client.groundItems[WorldMapRectangle.plane][var5][var6];
+						if (var35 != null) {
+							for (TileItem var36 = (TileItem)var35.last(); var36 != null; var36 = (TileItem)var35.previous()) {
+								if ((var37 & 32767) == var36.id && var7 == var36.quantity) {
+									var36.quantity = var38;
+									break;
+								}
+							}
+
+							WorldMapCacheName.updateItemPile(var5, var6);
+						}
+					}
+
+				}
+			}
 		}
 	}
 }

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

@@ -1,5 +1,3 @@
-import java.io.File;
-import java.io.IOException;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
@@ -7,31 +5,20 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("n")
+@ObfuscatedName("c")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("pa")
+	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "Ljz;"
-	)
-	@Export("clanChat")
-	static ClanChat clanChat;
-	@ObfuscatedName("sb")
-	@ObfuscatedSignature(
-		signature = "Lln;"
-	)
-	@Export("worldMap")
-	static WorldMap worldMap;
-	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -135135315
+		intValue = -1987201491
 	)
-	static int field75;
+	@Export("loginBoxCenter")
+	static int loginBoxCenter;
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lv;Lv;I)I",
+		signature = "(Lm;Lm;I)I",
-		garbageValue = "-1189972175"
+		garbageValue = "1379036847"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -46,53 +33,92 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(B)[Lgn;",
+		signature = "(II)Lix;",
-		garbageValue = "-20"
+		garbageValue = "-1839745147"
 	)
-	public static class185[] method116() {
+	@Export("SequenceDefinition_get")
-		return new class185[]{class185.field2298, class185.field2300, class185.field2297, class185.field2299, class185.field2304, class185.field2296, class185.field2302, class185.field2301, class185.field2303, class185.field2305};
+	public static SequenceDefinition SequenceDefinition_get(int var0) {
+		SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0);
+			var1 = new SequenceDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
 			}
 
-	@ObfuscatedName("g")
+			var1.postDecode();
+			SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;ZB)Lmr;",
+		signature = "(Ljava/lang/Object;ZI)[B",
-		garbageValue = "48"
+		garbageValue = "264970062"
 	)
-	@Export("getPreferencesFile")
+	@Export("serialize")
-	public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
+	public static byte[] serialize(Object var0, boolean var1) {
-		File var3 = new File(InvDefinition.cacheDir, "preferences" + var0 + ".dat");
+		if (var0 == null) {
-		if (var3.exists()) {
+			return null;
-			try {
+		} else if (var0 instanceof byte[]) {
-				AccessFile var10 = new AccessFile(var3, "rw", 10000L);
+			byte[] var6 = (byte[])((byte[])var0);
-				return var10;
+			if (var1) {
-			} catch (IOException var9) {
+				int var4 = var6.length;
-			}
+				byte[] var5 = new byte[var4];
-		}
+				System.arraycopy(var6, 0, var5, 0, var4);
-
+				return var5;
-		String var4 = "";
+			} else {
-		if (ViewportMouse.cacheGamebuild == 33) {
-			var4 = "_rc";
-		} else if (ViewportMouse.cacheGamebuild == 34) {
-			var4 = "_wip";
-		}
-
-		File var5 = new File(Message.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat");
-		AccessFile var6;
-		if (!var2 && var5.exists()) {
-			try {
-				var6 = new AccessFile(var5, "rw", 10000L);
 				return var6;
-			} catch (IOException var8) {
+			}
+		} else if (var0 instanceof AbstractByteArrayCopier) {
+			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
+			return var2.get();
+		} else {
+			throw new IllegalArgumentException();
 		}
 	}
 
-		try {
+	@ObfuscatedName("eg")
-			var6 = new AccessFile(var3, "rw", 10000L);
+	@ObfuscatedSignature(
-			return var6;
+		signature = "(B)V",
-		} catch (IOException var7) {
+		garbageValue = "35"
-			throw new RuntimeException();
+	)
+	static final void method139() {
+		Scene.Scene_isLowDetail = false;
+		Client.isLowDetail = false;
+	}
+
+	@ObfuscatedName("gl")
+	@ObfuscatedSignature(
+		signature = "(Lbi;B)Z",
+		garbageValue = "64"
+	)
+	static boolean method134(Player var0) {
+		if (Client.drawPlayerNames == 0) {
+			return false;
+		} else if (class223.localPlayer != var0) {
+			boolean var1 = (Client.drawPlayerNames & 4) != 0;
+			boolean var2 = var1;
+			boolean var3;
+			if (!var1) {
+				var3 = (Client.drawPlayerNames & 1) != 0;
+				var2 = var3 && var0.isFriend();
+			}
+
+			var3 = var2;
+			if (!var2) {
+				boolean var4 = (Client.drawPlayerNames & 2) != 0;
+				var3 = var4 && var0.isClanMember();
+			}
+
+			return var3;
+		} else {
+			return class16.method195();
 		}
 	}
 }

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

@@ -1,42 +1,23 @@
 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("u")
+@ObfuscatedName("p")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("sl")
+	@ObfuscatedName("qd")
-	@ObfuscatedGetter(
-		longValue = 7996115852397139965L
-	)
-	static long field25;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = 850096723
-	)
-	@Export("PcmPlayer_sampleRate")
-	public static int PcmPlayer_sampleRate;
-	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Llt;"
+		signature = "Ldv;"
 	)
-	@Export("options_buttons_0Sprite")
+	@Export("pcmPlayer1")
-	static IndexedSprite options_buttons_0Sprite;
+	static PcmPlayer pcmPlayer1;
-	@ObfuscatedName("i")
-	static String[] field30;
-	@ObfuscatedName("bt")
-	@ObfuscatedSignature(
-		signature = "Llt;"
-	)
-	static IndexedSprite field32;
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lv;Lv;I)I",
+		signature = "(Lm;Lm;I)I",
-		garbageValue = "2009087817"
+		garbageValue = "-1166584542"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -51,108 +32,206 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkz;I)Ljava/lang/String;",
+		signature = "(III)Lho;",
-		garbageValue = "-1287260544"
+		garbageValue = "-217608323"
 	)
-	public static String method60(Buffer var0) {
+	@Export("getWidgetChild")
-		String var1;
+	public static Widget getWidgetChild(int var0, int var1) {
-		try {
+		Widget var2 = Canvas.getWidget(var0);
-			int var2 = var0.readUShortSmart();
+		if (var1 == -1) {
-			if (var2 > 32767) {
+			return var2;
-				var2 = 32767;
+		} else {
+			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null;
+		}
 	}
 
-			byte[] var3 = new byte[var2];
+	@ObfuscatedName("p")
-			var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2);
-			String var4 = class51.decodeStringCp1252(var3, 0, var2);
-			var1 = var4;
-		} catch (Exception var6) {
-			var1 = "Cabbage";
-		}
-
-		return var1;
-	}
-
-	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(Lkl;IIIIIII)V",
-		garbageValue = "236963295"
+		garbageValue = "-109432634"
 	)
-	public static void method62() {
+	@Export("loadTerrain")
-		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
+	static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		int var7;
+		if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
+			Tiles.Tiles_renderFlags[var1][var2][var3] = 0;
+
+			while (true) {
+				var7 = var0.readUnsignedByte();
+				if (var7 == 0) {
+					if (var1 == 0) {
+						Tiles.Tiles_heights[0][var2][var3] = -WorldMapDecoration.method347(var2 + 932731 + var4, var5 + var3 + 556238) * 8;
+					} else {
+						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240;
+					}
+					break;
 				}
 
-	@ObfuscatedName("z")
+				if (var7 == 1) {
+					int var8 = var0.readUnsignedByte();
+					if (var8 == 1) {
+						var8 = 0;
+					}
+
+					if (var1 == 0) {
+						Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
+					} else {
+						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8;
+					}
+					break;
+				}
+
+				if (var7 <= 49) {
+					Tiles.field483[var1][var2][var3] = var0.readByte();
+					DevicePcmPlayerProvider.field393[var1][var2][var3] = (byte)((var7 - 2) / 4);
+					class287.field3634[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3);
+				} else if (var7 <= 81) {
+					Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49);
+				} else {
+					Tiles.field501[var1][var2][var3] = (byte)(var7 - 81);
+				}
+			}
+		} else {
+			while (true) {
+				var7 = var0.readUnsignedByte();
+				if (var7 == 0) {
+					break;
+				}
+
+				if (var7 == 1) {
+					var0.readUnsignedByte();
+					break;
+				}
+
+				if (var7 <= 49) {
+					var0.readUnsignedByte();
+				}
+			}
+		}
+
+	}
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "(IIIIIZI)Llf;",
-		garbageValue = "1642239877"
+		garbageValue = "-366639753"
 	)
-	@Export("SpriteBuffer_decode")
+	@Export("getItemSprite")
-	public static void SpriteBuffer_decode(byte[] var0) {
+	public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
-		Buffer var1 = new Buffer(var0);
+		if (var1 == -1) {
-		var1.offset = var0.length - 2;
+			var4 = 0;
-		class325.SpriteBuffer_spriteCount = var1.readUnsignedShort();
+		} else if (var4 == 2 && var1 != 1) {
-		class325.SpriteBuffer_xOffsets = new int[class325.SpriteBuffer_spriteCount];
+			var4 = 1;
-		SecureRandomCallable.SpriteBuffer_yOffsets = new int[class325.SpriteBuffer_spriteCount];
-		class325.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount];
-		SoundSystem.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount];
-		InvDefinition.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][];
-		var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8;
-		class325.SpriteBuffer_spriteWidth = var1.readUnsignedShort();
-		class325.SpriteBuffer_spriteHeight = var1.readUnsignedShort();
-		int var2 = (var1.readUnsignedByte() & 255) + 1;
-
-		int var3;
-		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
-			class325.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
 		}
 
-		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+		long var6 = ((long)var3 << 42) + ((long)var4 << 40) + ((long)var2 << 38) + (long)var0 + ((long)var1 << 16);
-			SecureRandomCallable.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
+		Sprite var8;
-		}
+		if (!var5) {
-
+			var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6);
-		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			if (var8 != null) {
-			class325.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort();
+				return var8;
-		}
-
-		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
-			SoundSystem.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort();
-		}
-
-		var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3;
-		class325.SpriteBuffer_spritePalette = new int[var2];
-
-		for (var3 = 1; var3 < var2; ++var3) {
-			class325.SpriteBuffer_spritePalette[var3] = var1.readMedium();
-			if (class325.SpriteBuffer_spritePalette[var3] == 0) {
-				class325.SpriteBuffer_spritePalette[var3] = 1;
 			}
 		}
 
-		var1.offset = 0;
+		ItemDefinition var9 = Occluder.ItemDefinition_get(var0);
+		if (var1 > 1 && var9.countobj != null) {
+			int var10 = -1;
 
-		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			for (int var11 = 0; var11 < 10; ++var11) {
-			int var4 = class325.SpriteBuffer_spriteWidths[var3];
+				if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) {
-			int var5 = SoundSystem.SpriteBuffer_spriteHeights[var3];
+					var10 = var9.countobj[var11];
-			int var6 = var5 * var4;
-			byte[] var7 = new byte[var6];
-			InvDefinition.SpriteBuffer_pixels[var3] = var7;
-			int var8 = var1.readUnsignedByte();
-			int var9;
-			if (var8 == 0) {
-				for (var9 = 0; var9 < var6; ++var9) {
-					var7[var9] = var1.readByte();
-				}
-			} else if (var8 == 1) {
-				for (var9 = 0; var9 < var4; ++var9) {
-					for (int var10 = 0; var10 < var5; ++var10) {
-						var7[var9 + var4 * var10] = var1.readByte();
-					}
-				}
 				}
 			}
 
+			if (var10 != -1) {
+				var9 = Occluder.ItemDefinition_get(var10);
+			}
+		}
+
+		Model var19 = var9.getModel(1);
+		if (var19 == null) {
+			return null;
+		} else {
+			Sprite var20 = null;
+			if (var9.noteTemplate != -1) {
+				var20 = getItemSprite(var9.note, 10, 1, 0, 0, true);
+				if (var20 == null) {
+					return null;
+				}
+			} else if (var9.notedId != -1) {
+				var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false);
+				if (var20 == null) {
+					return null;
+				}
+			} else if (var9.placeholderTemplate != -1) {
+				var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false);
+				if (var20 == null) {
+					return null;
+				}
+			}
+
+			int[] var12 = Rasterizer2D.Rasterizer2D_pixels;
+			int var13 = Rasterizer2D.Rasterizer2D_width;
+			int var14 = Rasterizer2D.Rasterizer2D_height;
+			int[] var15 = new int[4];
+			Rasterizer2D.Rasterizer2D_getClipArray(var15);
+			var8 = new Sprite(36, 32);
+			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
+			Rasterizer2D.Rasterizer2D_clear();
+			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+			Rasterizer3D.method2988(16, 16);
+			Rasterizer3D.field1754 = false;
+			if (var9.placeholderTemplate != -1) {
+				var20.drawTransBgAt(0, 0);
+			}
+
+			int var16 = var9.zoom2d;
+			if (var5) {
+				var16 = (int)(1.5D * (double)var16);
+			} else if (var2 == 2) {
+				var16 = (int)(1.04D * (double)var16);
+			}
+
+			int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16;
+			int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16;
+			var19.calculateBoundsCylinder();
+			var19.method2866(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
+			if (var9.notedId != -1) {
+				var20.drawTransBgAt(0, 0);
+			}
+
+			if (var2 >= 1) {
+				var8.outline(1);
+			}
+
+			if (var2 >= 2) {
+				var8.outline(16777215);
+			}
+
+			if (var3 != 0) {
+				var8.shadow(var3);
+			}
+
+			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
+			if (var9.noteTemplate != -1) {
+				var20.drawTransBgAt(0, 0);
+			}
+
+			if (var4 == 1 || var4 == 2 && var9.isStackable == 1) {
+				FaceNormal.ItemDefinition_fontPlain11.draw(class43.method839(var1), 0, 9, 16776960, 1);
+			}
+
+			if (!var5) {
+				ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6);
+			}
+
+			Rasterizer2D.Rasterizer2D_replace(var12, var13, var14);
+			Rasterizer2D.Rasterizer2D_setClipArray(var15);
+			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+			Rasterizer3D.field1754 = true;
+			return var8;
+		}
 	}
 }

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

@@ -4,96 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kk")
+@ObfuscatedName("kw")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("o")
+	@ObfuscatedName("fz")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = -1326295971
+		signature = "Lkn;"
 	)
-	@Export("canvasWidth")
+	@Export("fontPlain12")
-	public static int canvasWidth;
+	static Font fontPlain12;
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 743645305
+		intValue = 1913101075
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1263393423
+		intValue = -245940859
 	)
-	public int field3794;
+	public int field3797;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -222158885
+		intValue = 2030709025
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 293018585
+		intValue = 936076039
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 59968597
+		intValue = -1090087377
-	)
-	public int field3797;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 407705871
-	)
-	public int field3798;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = 24582741
 	)
 	public int field3800;
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1990585073
+		intValue = 1274199689
 	)
-	public int field3804;
+	public int field3796;
-	@ObfuscatedName("d")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 309369313
+		intValue = 423516137
-	)
-	public int field3801;
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = -328738669
 	)
 	public int field3802;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1048737749
+		intValue = 1649613365
 	)
-	public int field3799;
+	public int field3803;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = -1828299055
+	)
+	public int field3804;
+	@ObfuscatedName("i")
+	@ObfuscatedGetter(
+		intValue = 495147529
+	)
+	public int field3807;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1539500843
+	)
+	public int field3806;
 
 	public GraphicsDefaults() {
 		this.compass = -1;
-		this.field3794 = -1;
+		this.field3797 = -1;
 		this.mapScenes = -1;
 		this.headIconsPk = -1;
-		this.field3797 = -1;
-		this.field3798 = -1;
 		this.field3800 = -1;
-		this.field3804 = -1;
+		this.field3796 = -1;
-		this.field3801 = -1;
 		this.field3802 = -1;
-		this.field3799 = -1;
+		this.field3803 = -1;
+		this.field3804 = -1;
+		this.field3807 = -1;
+		this.field3806 = -1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lhz;I)V",
+		signature = "(Lhp;I)V",
-		garbageValue = "361058639"
+		garbageValue = "1722575536"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3792.group);
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3794.group);
 		Buffer var3 = new Buffer(var2);
 
 		while (true) {
@@ -107,67 +107,18 @@ public class GraphicsDefaults {
 				var3.readMedium();
 				break;
 			case 2:
-				this.compass = var3.method5623();
+				this.compass = var3.method5438();
-				this.field3794 = var3.method5623();
+				this.field3797 = var3.method5438();
-				this.mapScenes = var3.method5623();
+				this.mapScenes = var3.method5438();
-				this.headIconsPk = var3.method5623();
+				this.headIconsPk = var3.method5438();
-				this.field3797 = var3.method5623();
+				this.field3800 = var3.method5438();
-				this.field3798 = var3.method5623();
+				this.field3796 = var3.method5438();
-				this.field3800 = var3.method5623();
+				this.field3802 = var3.method5438();
-				this.field3804 = var3.method5623();
+				this.field3803 = var3.method5438();
-				this.field3801 = var3.method5623();
+				this.field3804 = var3.method5438();
-				this.field3802 = var3.method5623();
+				this.field3807 = var3.method5438();
-				this.field3799 = var3.method5623();
+				this.field3806 = var3.method5438();
 			}
 		}
 	}
-
-	@ObfuscatedName("ji")
-	@ObfuscatedSignature(
-		signature = "(IIII)Lbw;",
-		garbageValue = "-1376012645"
-	)
-	static final InterfaceParent method5875(int var0, int var1, int var2) {
-		InterfaceParent var3 = new InterfaceParent();
-		var3.group = var1;
-		var3.type = var2;
-		Client.interfaceParents.put(var3, (long)var0);
-		DevicePcmPlayerProvider.Widget_resetModelFrames(var1);
-		Widget var4 = Player.getWidget(var0);
-		WorldMapID.invalidateWidget(var4);
-		if (Client.meslayerContinueWidget != null) {
-			WorldMapID.invalidateWidget(Client.meslayerContinueWidget);
-			Client.meslayerContinueWidget = null;
-		}
-
-		for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
-			int var7 = Client.menuOpcodes[var5];
-			boolean var6 = var7 == 57 || var7 == 58 || var7 == 1007 || var7 == 25 || var7 == 30;
-			if (var6) {
-				if (var5 < Client.menuOptionsCount - 1) {
-					for (int var8 = var5; var8 < Client.menuOptionsCount - 1; ++var8) {
-						Client.menuActions[var8] = Client.menuActions[var8 + 1];
-						Client.menuTargets[var8] = Client.menuTargets[var8 + 1];
-						Client.menuOpcodes[var8] = Client.menuOpcodes[var8 + 1];
-						Client.menuIdentifiers[var8] = Client.menuIdentifiers[var8 + 1];
-						Client.menuArguments1[var8] = Client.menuArguments1[var8 + 1];
-						Client.menuArguments2[var8] = Client.menuArguments2[var8 + 1];
-						Client.menuShiftClick[var8] = Client.menuShiftClick[var8 + 1];
-					}
-				}
-
-				--var5;
-				--Client.menuOptionsCount;
-			}
-		}
-
-		WorldMapRegion.calculateMenuBounds();
-		class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var0 >> 16], var4, false);
-		Tile.runWidgetOnLoadListener(var1);
-		if (Client.rootInterface != -1) {
-			WorldMapRectangle.runIntfCloseListeners(Client.rootInterface, 1);
-		}
-
-		return var3;
-	}
 }

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

@@ -1,73 +1,71 @@
+import java.security.SecureRandom;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bq")
+@ObfuscatedName("bp")
 @Implements("GraphicsObject")
 public final class GraphicsObject extends Entity {
-	@ObfuscatedName("fa")
+	@ObfuscatedName("ec")
-	@ObfuscatedSignature(
+	@Export("secureRandom")
-		signature = "Lku;"
+	static SecureRandom secureRandom;
-	)
+	@ObfuscatedName("z")
-	@Export("WorldMapElement_fonts")
-	static Fonts WorldMapElement_fonts;
-	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -46719175
+		intValue = -725302413
-	)
-	@Export("id")
-	int id;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 824152429
-	)
-	@Export("y")
-	int y;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = -652492191
-	)
-	@Export("cycleStart")
-	int cycleStart;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -1299632507
-	)
-	@Export("plane")
-	int plane;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = -1087465937
-	)
-	@Export("x")
-	int x;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 12234547
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = 781452541
+	)
+	@Export("id")
+	int id;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 34616617
+	)
+	@Export("cycleStart")
+	int cycleStart;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = -1951259679
+	)
+	@Export("plane")
+	int plane;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 1240960337
+	)
+	@Export("x")
+	int x;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -1722241771
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Liw;"
+		signature = "Lix;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 353830109
+		intValue = 926579167
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1621269353
+		intValue = -1223841967
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@Export("isFinished")
 	boolean isFinished;
 
@@ -81,20 +79,20 @@ public final class GraphicsObject extends Entity {
 		this.y = var4;
 		this.height = var5;
 		this.cycleStart = var7 + var6;
-		int var8 = NetCache.SpotAnimationDefinition_get(this.id).sequence;
+		int var8 = InterfaceParent.SpotAnimationDefinition_get(this.id).sequence;
 		if (var8 != -1) {
 			this.isFinished = false;
-			this.sequenceDefinition = class83.SequenceDefinition_get(var8);
+			this.sequenceDefinition = GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var8);
 		} else {
 			this.isFinished = true;
 		}
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "477710925"
+		garbageValue = "-72"
 	)
 	@Export("advance")
 	final void advance(int var1) {
@@ -113,14 +111,14 @@ public final class GraphicsObject extends Entity {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(B)Ldr;",
+		signature = "(I)Ldh;",
-		garbageValue = "-35"
+		garbageValue = "-62237472"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = NetCache.SpotAnimationDefinition_get(this.id);
+		SpotAnimationDefinition var1 = InterfaceParent.SpotAnimationDefinition_get(this.id);
 		Model var2;
 		if (!this.isFinished) {
 			var2 = var1.getModel(this.frame);
@@ -130,66 +128,4 @@ public final class GraphicsObject extends Entity {
 
 		return var2 == null ? null : var2;
 	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "(Lkt;B)V",
-		garbageValue = "-5"
-	)
-	@Export("updatePlayer")
-	static final void updatePlayer(PacketBuffer var0) {
-		var0.importIndex();
-		int var1 = Client.localPlayerIndex;
-		Player var2 = Varps.localPlayer = Client.players[var1] = new Player();
-		var2.index = var1;
-		int var3 = var0.readBits(30);
-		byte var4 = (byte)(var3 >> 28);
-		int var5 = var3 >> 14 & 16383;
-		int var6 = var3 & 16383;
-		var2.pathX[0] = var5 - class4.baseX * 64;
-		var2.x = ((var2.pathX[0] << 7) + (var2.transformedSize() << 6)) * 62504387;
-		var2.pathY[0] = var6 - ScriptEvent.baseY;
-		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6);
-		MouseRecorder.plane = var2.plane = var4;
-		if (Players.field1221[var1] != null) {
-			var2.read(Players.field1221[var1]);
-		}
-
-		Players.Players_count = 0;
-		Players.Players_indices[++Players.Players_count - 1] = var1;
-		Players.field1217[var1] = 0;
-		Players.Players_emptyIdxCount = 0;
-
-		for (int var7 = 1; var7 < 2048; ++var7) {
-			if (var7 != var1) {
-				int var8 = var0.readBits(18);
-				int var9 = var8 >> 16;
-				int var10 = var8 >> 8 & 597;
-				int var11 = var8 & 597;
-				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28);
-				Players.Players_orientations[var7] = 0;
-				Players.Players_targetIndices[var7] = -1;
-				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7;
-				Players.field1217[var7] = 0;
-			}
-		}
-
-		var0.exportIndex();
-	}
-
-	@ObfuscatedName("hl")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "4"
-	)
-	@Export("addCancelMenuEntry")
-	static void addCancelMenuEntry() {
-		Client.menuOptionsCount = 0;
-		Client.isMenuOpen = false;
-		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

@@ -2,62 +2,41 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("cb")
+@ObfuscatedName("cz")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("j")
+	@ObfuscatedName("bu")
-	static byte[][][] field1089;
-	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "Llt;"
+		signature = "Llp;"
 	)
-	@Export("logoSprite")
+	@Export("worldSelectRightSprite")
-	static IndexedSprite logoSprite;
+	static IndexedSprite worldSelectRightSprite;
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lip;"
-	)
-	@Export("Widget_spritesArchive")
-	static AbstractArchive Widget_spritesArchive;
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		signature = "Lco;"
-	)
-	@Export("pcmPlayerProvider")
-	public static PcmPlayerProvider pcmPlayerProvider;
-	@ObfuscatedName("fp")
-	@ObfuscatedSignature(
-		signature = "Lkf;"
-	)
-	@Export("fontBold12")
-	static Font fontBold12;
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		signature = "Lix;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Ljd;"
+		signature = "Ljs;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
 
 	@ObfuscatedSignature(
-		signature = "(Lix;)V"
+		signature = "(Lip;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque();
 		this.definition = var1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
+		signature = "(IIIIB)V",
-		garbageValue = "-1491232381"
+		garbageValue = "1"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -90,10 +69,10 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(IB)Lbl;",
+		signature = "(IB)Lbq;",
-		garbageValue = "1"
+		garbageValue = "109"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -104,7 +83,7 @@ public class HealthBar extends Node {
 				var2 = var3;
 			}
 
-			if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) {
+			if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) {
 				return var2;
 			} else {
 				var2.remove();
@@ -115,195 +94,91 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-796562710"
+		garbageValue = "-783831173"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method4874();
+		return this.updates.method4763();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(CI)Z",
+		signature = "(Llb;III)I",
-		garbageValue = "-60300776"
+		garbageValue = "-1932083268"
 	)
-	@Export("isAlphaNumeric")
+	static int method2030(IterableNodeHashTable var0, int var1, int var2) {
-	public static boolean isAlphaNumeric(char var0) {
+		if (var0 == null) {
-		return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
+			return var2;
+		} else {
+			IntegerNode var3 = (IntegerNode)var0.get((long)var1);
+			return var3 == null ? var2 : var3.integer;
+		}
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(ILcu;ZI)I",
+		signature = "(IZI)Ljava/lang/String;",
-		garbageValue = "-1113312719"
+		garbageValue = "878473077"
 	)
-	static int method2006(int var0, Script var1, boolean var2) {
+	@Export("intToString")
-		int var3;
+	public static String intToString(int var0, boolean var1) {
-		int var4;
+		if (var1 && var0 >= 0) {
-		if (var0 == ScriptOpcodes.ADD) {
+			int var3 = var0;
-			class160.Interpreter_intStackSize -= 2;
+			String var2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+			if (var1 && var0 >= 0) {
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+				int var4 = 2;
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 + var4;
+
-			return 1;
+				for (int var5 = var0 / 10; var5 != 0; ++var4) {
-		} else if (var0 == ScriptOpcodes.SUB) {
+					var5 /= 10;
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 - var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.MULTIPLY) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 * var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.DIV) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 / var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.RANDOM) {
-			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.RANDOMINC) {
-			var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
-			return 1;
-		} else if (var0 == ScriptOpcodes.INTERPOLATE) {
-			class160.Interpreter_intStackSize -= 5;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			int var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
-			int var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3];
-			int var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 4];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
-			return 1;
-		} else if (var0 == ScriptOpcodes.ADDPERCENT) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100;
-			return 1;
-		} else if (var0 == ScriptOpcodes.SETBIT) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 | 1 << var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CLEARBIT) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
-			return 1;
-		} else if (var0 == ScriptOpcodes.TESTBIT) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
-			return 1;
-		} else if (var0 == ScriptOpcodes.MOD) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 % var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.POW) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			if (var3 == 0) {
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-			} else {
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
 				}
 
-			return 1;
+				char[] var6 = new char[var4];
-		} else if (var0 == ScriptOpcodes.INVPOW) {
+				var6[0] = '+';
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			if (var3 == 0) {
-				Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0;
-				return 1;
-			} else {
-				switch(var4) {
-				case 0:
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Integer.MAX_VALUE;
-					break;
-				case 1:
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3;
-					break;
-				case 2:
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3);
-					break;
-				case 3:
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3);
-					break;
-				case 4:
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3));
-					break;
-				default:
-					Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4);
-				}
 
-				return 1;
+				for (int var7 = var4 - 1; var7 > 0; --var7) {
-			}
+					int var8 = var3;
-		} else if (var0 == ScriptOpcodes.AND) {
+					var3 /= 10;
-			class160.Interpreter_intStackSize -= 2;
+					int var9 = var8 - var3 * 10;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
+					if (var9 >= 10) {
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
+						var6[var7] = (char)(var9 + 87);
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 & var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.OR) {
-			class160.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 | var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.SCALE) {
-			class160.Interpreter_intStackSize -= 3;
-			long var9 = (long)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize];
-			long var11 = (long)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1];
-			long var13 = (long)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2];
-			Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11);
-			return 1;
 					} else {
-			return 2;
+						var6[var7] = (char)(var9 + 48);
 					}
 				}
 
-	@ObfuscatedName("ab")
+				var2 = new String(var6);
+			} else {
+				var2 = Integer.toString(var0, 10);
+			}
+
+			return var2;
+		} else {
+			return Integer.toString(var0);
+		}
+	}
+
+	@ObfuscatedName("fr")
 	@ObfuscatedSignature(
-		signature = "(ILcu;ZB)I",
+		signature = "(Lby;I)V",
-		garbageValue = "-65"
+		garbageValue = "1394806934"
 	)
-	static int method1999(int var0, Script var1, boolean var2) {
+	static final void method2028(Actor var0) {
-		if (var0 == ScriptOpcodes.LOGOUT) {
+		if (var0.field976 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) {
-			Client.logoutTimer = 250;
+			int var1 = var0.field976 - var0.field948;
-			return 1;
+			int var2 = Client.cycle - var0.field948;
-		} else {
+			int var3 = var0.field932 * -527978816 + var0.field971 * 128;
-			return 2;
+			int var4 = var0.field932 * -527978816 + var0.field973 * 128;
-		}
+			int var5 = var0.field972 * 128 + var0.field932 * -527978816;
-	}
+			int var6 = var0.field932 * -527978816 + var0.field974 * 128;
-
+			var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1;
-	@ObfuscatedName("hy")
+			var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1 * -944175751;
-	@ObfuscatedSignature(
-		signature = "(IIIII)V",
-		garbageValue = "-1895452388"
-	)
-	static final void method2007(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.field827[var4] = true;
-			}
 		}
 
+		var0.field949 = 0;
+		var0.orientation = var0.field977;
+		var0.rotation = var0.orientation;
 	}
 }

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("ix")
+@ObfuscatedName("ip")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lhp;"
 	)
 	@Export("HealthBarDefinition_archive")
 	public static AbstractArchive HealthBarDefinition_archive;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lhp;"
 	)
 	@Export("HitSplatDefinition_spritesArchive")
 	static AbstractArchive HitSplatDefinition_spritesArchive;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Let;"
+		signature = "Lem;"
 	)
 	@Export("HealthBarDefinition_cached")
 	public static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Let;"
+		signature = "Lem;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
-	static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
+	public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1806671907
+		intValue = -2020710967
 	)
-	public int field3253;
+	public int field3258;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 379529355
+		intValue = 2073172143
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("d")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1016386229
+		intValue = 1672807375
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -565788357
+		intValue = -1245763213
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1008936631
+		intValue = 1160994935
 	)
 	@Export("int4")
 	public int int4;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1386850377
+		intValue = -2056406209
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1663965695
+		intValue = -1546985657
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("s")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1998724721
+		intValue = -1484247529
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1503683449
+		intValue = 2061624127
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 571878805
+		intValue = 1482399655
 	)
 	@Export("widthPadding")
 	public int widthPadding;
@@ -108,10 +108,10 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkz;B)V",
+		signature = "(Lkl;I)V",
-		garbageValue = "0"
+		garbageValue = "-1504288957"
 	)
 	@Export("decode")
 	public void decode(Buffer var1) {
@@ -125,10 +125,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkz;II)V",
+		signature = "(Lkl;IB)V",
-		garbageValue = "1787792869"
+		garbageValue = "2"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -145,9 +145,9 @@ public class HealthBarDefinition extends DualNode {
 		} else if (var2 == 6) {
 			var1.readUnsignedByte();
 		} else if (var2 == 7) {
-			this.frontSpriteID = var1.method5623();
+			this.frontSpriteID = var1.method5438();
 		} else if (var2 == 8) {
-			this.backSpriteID = var1.method5623();
+			this.backSpriteID = var1.method5438();
 		} else if (var2 == 11) {
 			this.int3 = var1.readUnsignedShort();
 		} else if (var2 == 14) {
@@ -158,10 +158,10 @@ public class HealthBarDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(B)Lli;",
+		signature = "(I)Llf;",
-		garbageValue = "-8"
+		garbageValue = "445043084"
 	)
 	@Export("getFrontSprite")
 	public Sprite getFrontSprite() {
@@ -172,7 +172,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FillMode.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
+				var1 = NPCDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 				}
@@ -182,10 +182,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(I)Lli;",
+		signature = "(B)Llf;",
-		garbageValue = "1663906218"
+		garbageValue = "-62"
 	)
 	@Export("getBackSprite")
 	public Sprite getBackSprite() {
@@ -196,7 +196,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FillMode.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
+				var1 = NPCDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 				}
@@ -205,19 +205,4 @@ public class HealthBarDefinition extends DualNode {
 			}
 		}
 	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "(CII)Ljava/lang/String;",
-		garbageValue = "-1190988008"
-	)
-	public static String method4481(char var0, int var1) {
-		char[] var2 = new char[var1];
-
-		for (int var3 = 0; var3 < var1; ++var3) {
-			var2[var3] = var0;
-		}
-
-		return new String(var2);
-	}
 }

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

@@ -1,34 +1,35 @@
-import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bl")
+@ObfuscatedName("bq")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("c")
+	@ObfuscatedName("f")
+	public static String field993;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 563892135
+		intValue = 2051178983
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1489030815
+		intValue = -670451385
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1355122563
+		intValue = -326291957
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -716904445
+		intValue = -809927427
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -40,10 +41,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "-1563848755"
+		garbageValue = "1094969728"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -53,34 +54,109 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("ga")
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		signature = "(III)Lbe;",
+		garbageValue = "776889337"
+	)
+	@Export("Messages_getByChannelAndID")
+	static Message Messages_getByChannelAndID(int var0, int var1) {
+		ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0);
+		return var2.getMessage(var1);
+	}
+
+	@ObfuscatedName("ff")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-330956579"
+		garbageValue = "146894465"
 	)
-	static void method1708() {
+	static final void method1765() {
-		if (Client.renderSelf) {
+		for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
-			GameObject.addPlayerToScene(Varps.localPlayer, false);
+			int var10002 = Client.queuedSoundEffectDelays[var0]--;
+			if (Client.queuedSoundEffectDelays[var0] >= -10) {
+				SoundEffect var9 = Client.soundEffects[var0];
+				if (var9 == null) {
+					Object var10000 = null;
+					var9 = SoundEffect.readSoundEffect(GrandExchangeOfferAgeComparator.archive4, Client.soundEffectIds[var0], 0);
+					if (var9 == null) {
+						continue;
 					}
 
+					int[] var13 = Client.queuedSoundEffectDelays;
+					var13[var0] += var9.calculateDelay();
+					Client.soundEffects[var0] = var9;
 				}
 
-	@ObfuscatedName("jy")
+				if (Client.queuedSoundEffectDelays[var0] < 0) {
-	@ObfuscatedSignature(
+					int var2;
-		signature = "(B)V",
+					if (Client.soundLocations[var0] != 0) {
-		garbageValue = "-86"
+						int var3 = (Client.soundLocations[var0] & 255) * 128;
-	)
+						int var4 = Client.soundLocations[var0] >> 16 & 255;
-	@Export("FriendSystem_invalidateIgnoreds")
+						int var5 = var4 * 128 + 64 - class223.localPlayer.x;
-	static final void FriendSystem_invalidateIgnoreds() {
+						if (var5 < 0) {
-		Iterator var0 = Messages.Messages_hashTable.iterator();
+							var5 = -var5;
-
-		while (var0.hasNext()) {
-			Message var1 = (Message)var0.next();
-			var1.clearIsFromIgnored();
 						}
 
-		if (GrandExchangeOfferUnitPriceComparator.clanChat != null) {
+						int var6 = Client.soundLocations[var0] >> 8 & 255;
-			GrandExchangeOfferUnitPriceComparator.clanChat.invalidateIgnoreds();
+						int var7 = var6 * 128 + 64 - class223.localPlayer.y * 682054857;
+						if (var7 < 0) {
+							var7 = -var7;
+						}
+
+						int var8 = var5 + var7 - 128;
+						if (var8 > var3) {
+							Client.queuedSoundEffectDelays[var0] = -100;
+							continue;
+						}
+
+						if (var8 < 0) {
+							var8 = 0;
+						}
+
+						var2 = (var3 - var8) * Client.field868 / var3;
+					} else {
+						var2 = Client.soundEffectVolume;
+					}
+
+					if (var2 > 0) {
+						RawSound var10 = var9.toRawSound().resample(Interpreter.decimator);
+						RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2);
+						var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
+						WorldMapLabelSize.pcmStreamMixer.addSubStream(var11);
+					}
+
+					Client.queuedSoundEffectDelays[var0] = -100;
+				}
+			} else {
+				--Client.soundEffectCount;
+
+				for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) {
+					Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1];
+					Client.soundEffects[var1] = Client.soundEffects[var1 + 1];
+					Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1];
+					Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1];
+					Client.soundLocations[var1] = Client.soundLocations[var1 + 1];
+				}
+
+				--var0;
+			}
+		}
+
+		if (Client.field759) {
+			boolean var12;
+			if (class197.field2386 != 0) {
+				var12 = true;
+			} else {
+				var12 = class49.midiPcmStream.isReady();
+			}
+
+			if (!var12) {
+				if (Client.field761 != 0 && Client.field666 != -1) {
+					class83.method2064(class225.archive6, Client.field666, 0, Client.field761, false);
+				}
+
+				Client.field759 = false;
+			}
 		}
 
 	}

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

@@ -4,114 +4,121 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ic")
+@ObfuscatedName("iv")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lhp;"
 	)
 	@Export("HitSplatDefinition_archive")
-	static AbstractArchive HitSplatDefinition_archive;
+	public static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lhp;"
 	)
-	static AbstractArchive field3300;
+	@Export("HitSplatDefinition_fontsArchive")
-	@ObfuscatedName("g")
+	static AbstractArchive HitSplatDefinition_fontsArchive;
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Let;"
+		signature = "Lem;"
 	)
 	@Export("HitSplatDefinition_cached")
-	static EvictingDualNodeHashTable HitSplatDefinition_cached;
+	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Let;"
+		signature = "Lem;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Let;"
+		signature = "Lem;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("h")
+	@ObfuscatedName("es")
 	@ObfuscatedGetter(
-		intValue = -357420585
+		intValue = 290330035
+	)
+	@Export("port1")
+	static int port1;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -135266261
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 327492087
+		intValue = -296610035
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("s")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -687651927
+		intValue = 31719475
 	)
-	public int field3306;
+	public int field3318;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 1048362973
-	)
-	int field3314;
 	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -224285899
+		intValue = -1509097345
 	)
-	int field3308;
+	int field3319;
-	@ObfuscatedName("i")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 163479341
+		intValue = -591877115
 	)
-	int field3312;
+	int field3332;
-	@ObfuscatedName("q")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 295694895
+		intValue = -2011301745
 	)
-	int field3313;
+	int field3321;
-	@ObfuscatedName("y")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1371594611
+		intValue = 1974829897
+	)
+	int field3322;
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = -87931297
+	)
+	public int field3323;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -577071813
 	)
 	public int field3311;
-	@ObfuscatedName("r")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1444212513
+		intValue = -1569661547
 	)
-	public int field3310;
+	public int field3325;
-	@ObfuscatedName("k")
+	@ObfuscatedName("f")
+	String field3316;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1563267253
+		intValue = 1618086973
 	)
-	public int field3307;
+	public int field3327;
-	@ObfuscatedName("w")
+	@ObfuscatedName("d")
-	String field3309;
-	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1065378437
+		intValue = 1970000523
 	)
-	public int field3315;
+	public int field3334;
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = -267578869
-	)
-	public int field3316;
-	@ObfuscatedName("a")
 	@Export("transforms")
 	public int[] transforms;
-	@ObfuscatedName("b")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -222601541
+		intValue = 354517383
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 158583145
+		intValue = -168749029
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -122,31 +129,31 @@ public class HitSplatDefinition extends DualNode {
 		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
 	}
 
-	HitSplatDefinition() {
+	public HitSplatDefinition() {
 		this.fontId = -1;
 		this.textColor = 16777215;
-		this.field3306 = 70;
+		this.field3318 = 70;
-		this.field3314 = -1;
+		this.field3319 = -1;
-		this.field3308 = -1;
+		this.field3332 = -1;
-		this.field3312 = -1;
+		this.field3321 = -1;
-		this.field3313 = -1;
+		this.field3322 = -1;
+		this.field3323 = 0;
 		this.field3311 = 0;
-		this.field3310 = 0;
+		this.field3325 = -1;
-		this.field3307 = -1;
+		this.field3316 = "";
-		this.field3309 = "";
+		this.field3327 = -1;
-		this.field3315 = -1;
+		this.field3334 = 0;
-		this.field3316 = 0;
 		this.transformVarbit = -1;
 		this.transformVarp = -1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lkz;I)V",
+		signature = "(Lkl;B)V",
-		garbageValue = "1961600783"
+		garbageValue = "-110"
 	)
 	@Export("decode")
-	void decode(Buffer var1) {
+	public void decode(Buffer var1) {
 		while (true) {
 			int var2 = var1.readUnsignedByte();
 			if (var2 == 0) {
@@ -157,41 +164,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkz;II)V",
+		signature = "(Lkl;II)V",
-		garbageValue = "138973037"
+		garbageValue = "1800631473"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) {
-			this.fontId = var1.method5623();
+			this.fontId = var1.method5438();
 		} else if (var2 == 2) {
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) {
-			this.field3314 = var1.method5623();
+			this.field3319 = var1.method5438();
 		} else if (var2 == 4) {
-			this.field3312 = var1.method5623();
+			this.field3321 = var1.method5438();
 		} else if (var2 == 5) {
-			this.field3308 = var1.method5623();
+			this.field3332 = var1.method5438();
 		} else if (var2 == 6) {
-			this.field3313 = var1.method5623();
+			this.field3322 = var1.method5438();
 		} else if (var2 == 7) {
-			this.field3311 = var1.readShort();
+			this.field3323 = var1.readShort();
 		} else if (var2 == 8) {
-			this.field3309 = var1.readStringCp1252NullCircumfixed();
+			this.field3316 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) {
-			this.field3306 = var1.readUnsignedShort();
+			this.field3318 = var1.readUnsignedShort();
 		} else if (var2 == 10) {
-			this.field3310 = var1.readShort();
+			this.field3311 = var1.readShort();
 		} else if (var2 == 11) {
-			this.field3307 = 0;
+			this.field3325 = 0;
 		} else if (var2 == 12) {
-			this.field3315 = var1.readUnsignedByte();
+			this.field3327 = var1.readUnsignedByte();
 		} else if (var2 == 13) {
-			this.field3316 = var1.readShort();
+			this.field3334 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field3307 = var1.readUnsignedShort();
+			this.field3325 = var1.readUnsignedShort();
 		} else if (var2 == 17 || var2 == 18) {
 			this.transformVarbit = var1.readUnsignedShort();
 			if (this.transformVarbit == 65535) {
@@ -226,16 +233,16 @@ public class HitSplatDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(I)Lic;",
+		signature = "(I)Liv;",
-		garbageValue = "-2043410275"
+		garbageValue = "723685"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
-			var1 = WorldMapCacheName.getVarbit(this.transformVarbit);
+			var1 = WorldMapSprite.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) {
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -247,17 +254,36 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? Interpreter.HitSplatDefinition_get(var2) : null;
+		if (var2 != -1) {
+			HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2);
+			HitSplatDefinition var3;
+			if (var4 != null) {
+				var3 = var4;
+			} else {
+				byte[] var5 = HitSplatDefinition_archive.takeFile(32, var2);
+				var4 = new HitSplatDefinition();
+				if (var5 != null) {
+					var4.decode(new Buffer(var5));
 				}
 
-	@ObfuscatedName("u")
+				HitSplatDefinition_cached.put(var4, (long)var2);
+				var3 = var4;
+			}
+
+			return var3;
+		} else {
+			return null;
+		}
+	}
+
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		signature = "(IB)Ljava/lang/String;",
-		garbageValue = "-7"
+		garbageValue = "13"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field3309;
+		String var2 = this.field3316;
 
 		while (true) {
 			int var3 = var2.indexOf("%1");
@@ -265,26 +291,26 @@ public class HitSplatDefinition extends DualNode {
 				return var2;
 			}
 
-			var2 = var2.substring(0, var3) + Skeleton.intToString(var1, false) + var2.substring(var3 + 2);
+			var2 = var2.substring(0, var3) + HealthBar.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)Lli;",
+		signature = "(I)Llf;",
-		garbageValue = "-1669943283"
+		garbageValue = "106816510"
 	)
-	public Sprite method4568() {
+	public Sprite method4508() {
-		if (this.field3314 < 0) {
+		if (this.field3319 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3314);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3319);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3314, 0);
+				var1 = NPCDefinition.SpriteBuffer_getSprite(GrandExchangeOfferNameComparator.field66, this.field3319, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3314);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3319);
 				}
 
 				return var1;
@@ -292,22 +318,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(I)Lli;",
+		signature = "(I)Llf;",
-		garbageValue = "-675719915"
+		garbageValue = "-123360505"
 	)
-	public Sprite method4581() {
+	public Sprite method4505() {
-		if (this.field3308 < 0) {
+		if (this.field3332 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3308);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3332);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3308, 0);
+				var1 = NPCDefinition.SpriteBuffer_getSprite(GrandExchangeOfferNameComparator.field66, this.field3332, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3308);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3332);
 				}
 
 				return var1;
@@ -315,22 +341,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)Lli;",
+		signature = "(B)Llf;",
-		garbageValue = "-1399773302"
+		garbageValue = "88"
 	)
-	public Sprite method4570() {
+	public Sprite method4506() {
-		if (this.field3312 < 0) {
+		if (this.field3321 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3312);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3321);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3312, 0);
+				var1 = NPCDefinition.SpriteBuffer_getSprite(GrandExchangeOfferNameComparator.field66, this.field3321, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3312);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3321);
 				}
 
 				return var1;
@@ -338,22 +364,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(S)Lli;",
+		signature = "(I)Llf;",
-		garbageValue = "-24882"
+		garbageValue = "750571201"
 	)
-	public Sprite method4561() {
+	public Sprite method4530() {
-		if (this.field3313 < 0) {
+		if (this.field3322 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3313);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3322);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3313, 0);
+				var1 = NPCDefinition.SpriteBuffer_getSprite(GrandExchangeOfferNameComparator.field66, this.field3322, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3313);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3322);
 				}
 
 				return var1;
@@ -361,10 +387,10 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)Lkf;",
+		signature = "(I)Lkn;",
-		garbageValue = "0"
+		garbageValue = "-1418238828"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -375,196 +401,13 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				AbstractArchive var3 = field3300;
+				var1 = ClanMate.method4964(GrandExchangeOfferNameComparator.field66, HitSplatDefinition_fontsArchive, this.fontId, 0);
-				AbstractArchive var4 = class189.HitSplatDefinition_fontsArchive;
+				if (var1 != null) {
-				int var5 = this.fontId;
+					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
-				byte[] var7 = var3.takeFile(var5, 0);
-				boolean var6;
-				if (var7 == null) {
-					var6 = false;
-				} else {
-					GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var7);
-					var6 = true;
 				}
 
-				Font var2;
+				return var1;
-				if (!var6) {
-					var2 = null;
-				} else {
-					byte[] var8 = var4.takeFile(var5, 0);
-					Font var10;
-					if (var8 == null) {
-						var10 = null;
-					} else {
-						Font var9 = new Font(var8, class325.SpriteBuffer_xOffsets, SecureRandomCallable.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, SoundSystem.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, InvDefinition.SpriteBuffer_pixels);
-						class192.SpriteBuffer_clear();
-						var10 = var9;
-					}
-
-					var2 = var10;
-				}
-
-				if (var2 != null) {
-					HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
-				}
-
-				return var2;
 			}
 		}
 	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "([BIII)Z",
-		garbageValue = "-240401517"
-	)
-	static final boolean method4589(byte[] var0, int var1, int var2) {
-		boolean var3 = true;
-		Buffer var4 = new Buffer(var0);
-		int var5 = -1;
-
-		label67:
-		while (true) {
-			int var6 = var4.method5480();
-			if (var6 == 0) {
-				return var3;
-			}
-
-			var5 += var6;
-			int var7 = 0;
-			boolean var8 = false;
-
-			while (true) {
-				int var9;
-				while (!var8) {
-					var9 = var4.readUShortSmart();
-					if (var9 == 0) {
-						continue label67;
-					}
-
-					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 = WallDecoration.getObjectDefinition(var5);
-						if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) {
-							if (!var15.needsModelFiles()) {
-								++Client.field676;
-								var3 = false;
-							}
-
-							var8 = true;
-						}
-					}
-				}
-
-				var9 = var4.readUShortSmart();
-				if (var9 == 0) {
-					break;
-				}
-
-				var4.readUnsignedByte();
-			}
-		}
-	}
-
-	@ObfuscatedName("fp")
-	@ObfuscatedSignature(
-		signature = "(Lbe;B)V",
-		garbageValue = "0"
-	)
-	static final void method4558(Actor var0) {
-		var0.isWalking = false;
-		SequenceDefinition var1;
-		if (var0.movementSequence != -1) {
-			var1 = class83.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;
-					WorldMapSectionType.addSequenceSoundEffect(var1, var0.movementFrame, var0.x * -78439701, var0.y);
-				}
-
-				if (var0.movementFrame >= var1.frameIds.length) {
-					var0.movementFrameCycle = 0;
-					var0.movementFrame = 0;
-					WorldMapSectionType.addSequenceSoundEffect(var1, var0.movementFrame, var0.x * -78439701, var0.y);
-				}
-			} else {
-				var0.movementSequence = -1;
-			}
-		}
-
-		if (var0.spotAnimation != -1 && Client.cycle >= var0.field957) {
-			if (var0.spotAnimationFrame < 0) {
-				var0.spotAnimationFrame = 0;
-			}
-
-			int var3 = NetCache.SpotAnimationDefinition_get(var0.spotAnimation).sequence;
-			if (var3 != -1) {
-				SequenceDefinition var2 = class83.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;
-						WorldMapSectionType.addSequenceSoundEffect(var2, var0.spotAnimationFrame, var0.x * -78439701, 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 = class83.SequenceDefinition_get(var0.sequence);
-			if (var1.field3496 == 1 && var0.field969 > 0 && var0.field963 <= Client.cycle && var0.field964 < Client.cycle) {
-				var0.sequenceDelay = 1;
-				return;
-			}
-		}
-
-		if (var0.sequence != -1 && var0.sequenceDelay == 0) {
-			var1 = class83.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;
-					WorldMapSectionType.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x * -78439701, var0.y);
-				}
-
-				if (var0.sequenceFrame >= var1.frameIds.length) {
-					var0.sequenceFrame -= var1.frameCount;
-					++var0.field924;
-					if (var0.field924 >= var1.field3492) {
-						var0.sequence = -1;
-					} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) {
-						WorldMapSectionType.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x * -78439701, var0.y);
-					} else {
-						var0.sequence = -1;
-					}
-				}
-
-				var0.isWalking = var1.field3495;
-			} else {
-				var0.sequence = -1;
-			}
-		}
-
-		if (var0.sequenceDelay > 0) {
-			--var0.sequenceDelay;
-		}
-
-	}
 }

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

@@ -4,35 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ie")
+@ObfuscatedName("in")
 @Implements("HorizontalAlignment")
 public enum HorizontalAlignment implements Enumerated {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "Lie;"
+		signature = "Lin;"
 	)
-	field3428(2, 0),
+	field3444(1, 0),
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lie;"
+		signature = "Lin;"
 	)
 	@Export("HorizontalAlignment_centered")
-	HorizontalAlignment_centered(1, 1),
+	HorizontalAlignment_centered(2, 1),
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lie;"
+		signature = "Lin;"
 	)
-	field3430(0, 2);
+	field3442(0, 2);
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("q")
+	public static short[] field3447;
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -490726387
+		intValue = 87636045
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 501971729
+		intValue = 1916297519
 	)
 	@Export("id")
 	final int id;
@@ -42,10 +44,10 @@ public enum HorizontalAlignment implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(S)I",
-		garbageValue = "-1410702910"
+		garbageValue = "221"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {

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

@@ -3,16 +3,16 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hq")
+@ObfuscatedName("ht")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@Export("keys")
 	int[] keys;
 
@@ -99,10 +99,10 @@ public class Huffman {
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "([BII[BII)I",
-		garbageValue = "-1468979642"
+		garbageValue = "2067037926"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -120,7 +120,7 @@ public class Huffman {
 			int var11 = var7 >> 3;
 			int var12 = var7 & 7;
 			var6 &= -var12 >> 31;
-			int var13 = (var10 + var12 - 1 >> 3) + var11;
+			int var13 = (var12 + var10 - 1 >> 3) + var11;
 			var12 += 24;
 			var4[var11] = (byte)(var6 |= var9 >>> var12);
 			if (var11 < var13) {
@@ -150,10 +150,10 @@ public class Huffman {
 		return (var7 + 7 >> 3) - var5;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "([BI[BIII)I",
-		garbageValue = "-103624284"
+		garbageValue = "98933619"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@@ -293,28 +293,4 @@ public class Huffman {
 			return var7 + 1 - var2;
 		}
 	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "(S)V",
-		garbageValue = "-31428"
-	)
-	static void method3942() {
-		Players.Players_count = 0;
-
-		for (int var0 = 0; var0 < 2048; ++var0) {
-			Players.field1221[var0] = null;
-			Players.field1220[var0] = 1;
-		}
-
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-434876538"
-	)
-	static final void method3943() {
-		WorldMapSection2.method283("You can't add yourself to your own ignore list");
-	}
 }

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

@@ -1,50 +1,57 @@
 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("ji")
+@ObfuscatedName("jw")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("t")
+	@ObfuscatedName("hg")
+	@ObfuscatedGetter(
+		intValue = 1294899127
+	)
+	@Export("cameraPitch")
+	static int cameraPitch;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lll;"
+		signature = "Lli;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
 
 	@ObfuscatedSignature(
-		signature = "(Lll;)V"
+		signature = "(Lli;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400);
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(I)Ljw;",
+		signature = "(B)Ljh;",
-		garbageValue = "-734254876"
+		garbageValue = "2"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Ignored();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljw;",
+		signature = "(II)[Ljh;",
-		garbageValue = "1353779565"
+		garbageValue = "951526901"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Ignored[var1];
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Lkz;IB)V",
+		signature = "(Lkl;IB)V",
-		garbageValue = "112"
+		garbageValue = "30"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -87,14 +94,4 @@ public class IgnoreList extends UserList {
 			return;
 		}
 	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;I)I",
-		garbageValue = "-317762275"
-	)
-	@Export("parseInt")
-	public static int parseInt(CharSequence var0) {
-		return class51.parseIntCustomRadix(var0, 10, true);
-	}
 }

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

@@ -4,17 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ja")
+@ObfuscatedName("jn")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -741331501
+		intValue = -2093810797
-	)
-	static int field3577;
-	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = 2731755
 	)
 	@Export("id")
 	int id;
@@ -22,20 +17,20 @@ public class Ignored extends User {
 	Ignored() {
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(Lja;I)I",
+		signature = "(Ljn;I)I",
-		garbageValue = "-1305970112"
+		garbageValue = "1947810954"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id;
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Ljw;B)I",
+		signature = "(Ljh;I)I",
-		garbageValue = "-92"
+		garbageValue = "-531306911"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {

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("lt")
+@ObfuscatedName("lp")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("u")
+	@ObfuscatedName("p")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("height")
 	public int height;
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@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("x")
+	@ObfuscatedName("n")
 	@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("t")
+	@ObfuscatedName("v")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset;
@@ -130,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
-	public void method6059(int var1, int var2, int var3, int var4) {
+	public void method6019(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("g")
+	@ObfuscatedName("u")
 	@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("u")
+	@ObfuscatedName("p")
 	@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;