project: rev 205

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

@@ -2,415 +2,26 @@ 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("je")
+@ObfuscatedName("jc")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
 	AbstractByteArrayCopier() {
 	} // L: 4
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)[B",
+		descriptor = "(B)[B",
-		garbageValue = "2035077648"
+		garbageValue = "70"
 	)
 	@Export("get")
 	abstract byte[] get();
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "([BI)V",
-		garbageValue = "-1279201457"
+		garbageValue = "-362326915"
 	)
 	@Export("set")
 	abstract void set(byte[] var1);
-
-	@ObfuscatedName("aw")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZB)I",
-		garbageValue = "-58"
-	)
-	static int method5506(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2341
-			if (Decimator.friendSystem.field805 == 0) { // L: 2342
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2;
-			} else if (Decimator.friendSystem.field805 == 1) { // L: 2343
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.friendsList.getSize(); // L: 2344
-			}
-
-			return 1; // L: 2345
-		} else {
-			int var3;
-			if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2348
-				if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.friendsList.getSize()) { // L: 2349
-					Friend var8 = (Friend)Decimator.friendSystem.friendsList.get(var3); // L: 2350
-					Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2351
-					Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2352
-				} else {
-					Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2355
-					Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2356
-				}
-
-				return 1; // L: 2358
-			} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2361
-				if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.friendsList.getSize()) { // L: 2362
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Decimator.friendSystem.friendsList.get(var3)).world; // L: 2363
-				} else {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2365
-				}
-
-				return 1; // L: 2366
-			} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
-				var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2369
-				if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.friendsList.getSize()) { // L: 2370
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Decimator.friendSystem.friendsList.get(var3)).rank; // L: 2371
-				} else {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2373
-				}
-
-				return 1; // L: 2374
-			} else {
-				String var5;
-				if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
-					var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2377
-					int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2378
-					WorldMapLabelSize.method3903(var5, var6); // L: 2379
-					return 1; // L: 2380
-				} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
-					var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2383
-					Decimator.friendSystem.addFriend(var5); // L: 2384
-					return 1; // L: 2385
-				} else if (var0 == ScriptOpcodes.FRIEND_DEL) {
-					var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2388
-					Decimator.friendSystem.removeFriend(var5); // L: 2389
-					return 1; // L: 2390
-				} else if (var0 == ScriptOpcodes.IGNORE_ADD) {
-					var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2393
-					Decimator.friendSystem.addIgnore(var5); // L: 2394
-					return 1; // L: 2395
-				} else if (var0 == ScriptOpcodes.IGNORE_DEL) {
-					var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2398
-					Decimator.friendSystem.removeIgnore(var5); // L: 2399
-					return 1; // L: 2400
-				} else if (var0 == ScriptOpcodes.FRIEND_TEST) {
-					var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2403
-					var5 = class160.method3280(var5); // L: 2404
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.isFriended(new Username(var5, class122.loginType), false) ? 1 : 0; // L: 2405
-					return 1; // L: 2406
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
-					if (ClientPacket.friendsChat != null) { // L: 2409
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ClientPacket.friendsChat.name; // L: 2410
-					} else {
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2412
-					}
-
-					return 1; // L: 2413
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
-					if (ClientPacket.friendsChat != null) { // L: 2416
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.friendsChat.getSize(); // L: 2417
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2419
-					}
-
-					return 1; // L: 2420
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2423
-					if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize()) { // L: 2424
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ClientPacket.friendsChat.get(var3).getUsername().getName(); // L: 2425
-					} else {
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2427
-					}
-
-					return 1; // L: 2428
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2431
-					if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize()) { // L: 2432
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)ClientPacket.friendsChat.get(var3)).getWorld(); // L: 2433
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2435
-					}
-
-					return 1; // L: 2436
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2439
-					if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize()) { // L: 2440
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)ClientPacket.friendsChat.get(var3)).rank; // L: 2441
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2443
-					}
-
-					return 1; // L: 2444
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.friendsChat != null ? ClientPacket.friendsChat.minKick : 0; // L: 2447
-					return 1; // L: 2448
-				} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
-					var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2451
-					MidiPcmStream.clanKickUser(var5); // L: 2452
-					return 1; // L: 2453
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPacket.friendsChat != null ? ClientPacket.friendsChat.rank * -1273194957 * 1318081787 : 0; // L: 2456
-					return 1; // L: 2457
-				} else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
-					var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2460
-					WorldMapElement.Clan_joinChat(var5); // L: 2461
-					return 1; // L: 2462
-				} else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
-					WorldMapSprite.Clan_leaveChat(); // L: 2465
-					return 1; // L: 2466
-				} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
-					if (!Decimator.friendSystem.method1681()) { // L: 2469
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.ignoreList.getSize(); // L: 2470
-					}
-
-					return 1; // L: 2471
-				} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2474
-					if (Decimator.friendSystem.method1681() && var3 >= 0 && var3 < Decimator.friendSystem.ignoreList.getSize()) { // L: 2475
-						Ignored var4 = (Ignored)Decimator.friendSystem.ignoreList.get(var3); // L: 2476
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2477
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2478
-					} else {
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2481
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2482
-					}
-
-					return 1; // L: 2484
-				} else if (var0 == ScriptOpcodes.IGNORE_TEST) {
-					var5 = Interpreter.Interpreter_stringStack[--class122.Interpreter_stringStackSize]; // L: 2487
-					var5 = class160.method3280(var5); // L: 2488
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.friendSystem.isIgnored(new Username(var5, class122.loginType)) ? 1 : 0; // L: 2489
-					return 1; // L: 2490
-				} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2493
-					if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize() && ClientPacket.friendsChat.get(var3).getUsername().equals(GrandExchangeEvents.localPlayer.username)) { // L: 2494
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2495
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2497
-					}
-
-					return 1; // L: 2498
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
-					if (ClientPacket.friendsChat != null && ClientPacket.friendsChat.owner != null) { // L: 2501
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ClientPacket.friendsChat.owner; // L: 2502
-					} else {
-						Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 2504
-					}
-
-					return 1; // L: 2505
-				} else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2508
-					if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize() && ((ClanMate)ClientPacket.friendsChat.get(var3)).isFriend()) { // L: 2509
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2510
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2512
-					}
-
-					return 1; // L: 2513
-				} else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
-					if (var0 == 3628) {
-						Decimator.friendSystem.friendsList.removeComparator(); // L: 2524
-						return 1; // L: 2525
-					} else {
-						boolean var7;
-						if (var0 == 3629) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2528
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2529
-							return 1; // L: 2530
-						} else if (var0 == 3630) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2533
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2534
-							return 1; // L: 2535
-						} else if (var0 == 3631) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2538
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2539
-							return 1; // L: 2540
-						} else if (var0 == 3632) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2543
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2544
-							return 1; // L: 2545
-						} else if (var0 == 3633) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2548
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2549
-							return 1; // L: 2550
-						} else if (var0 == 3634) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2553
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2554
-							return 1; // L: 2555
-						} else if (var0 == 3635) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2558
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2559
-							return 1; // L: 2560
-						} else if (var0 == 3636) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2563
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2564
-							return 1; // L: 2565
-						} else if (var0 == 3637) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2568
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2569
-							return 1; // L: 2570
-						} else if (var0 == 3638) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2573
-							Decimator.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2574
-							return 1; // L: 2575
-						} else if (var0 == 3639) {
-							Decimator.friendSystem.friendsList.sort(); // L: 2578
-							return 1; // L: 2579
-						} else if (var0 == 3640) {
-							Decimator.friendSystem.ignoreList.removeComparator(); // L: 2582
-							return 1; // L: 2583
-						} else if (var0 == 3641) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2586
-							Decimator.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2587
-							return 1; // L: 2588
-						} else if (var0 == 3642) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2591
-							Decimator.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2592
-							return 1; // L: 2593
-						} else if (var0 == 3643) {
-							Decimator.friendSystem.ignoreList.sort(); // L: 2596
-							return 1; // L: 2597
-						} else if (var0 == 3644) {
-							if (ClientPacket.friendsChat != null) { // L: 2600
-								ClientPacket.friendsChat.removeComparator(); // L: 2601
-							}
-
-							return 1; // L: 2603
-						} else if (var0 == 3645) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2606
-							if (ClientPacket.friendsChat != null) { // L: 2607
-								ClientPacket.friendsChat.addComparator(new UserComparator1(var7)); // L: 2608
-							}
-
-							return 1; // L: 2610
-						} else if (var0 == 3646) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2613
-							if (ClientPacket.friendsChat != null) { // L: 2614
-								ClientPacket.friendsChat.addComparator(new UserComparator2(var7)); // L: 2615
-							}
-
-							return 1; // L: 2617
-						} else if (var0 == 3647) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2620
-							if (ClientPacket.friendsChat != null) { // L: 2621
-								ClientPacket.friendsChat.addComparator(new UserComparator3(var7)); // L: 2622
-							}
-
-							return 1; // L: 2624
-						} else if (var0 == 3648) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2627
-							if (ClientPacket.friendsChat != null) { // L: 2628
-								ClientPacket.friendsChat.addComparator(new UserComparator4(var7)); // L: 2629
-							}
-
-							return 1; // L: 2631
-						} else if (var0 == 3649) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2634
-							if (ClientPacket.friendsChat != null) { // L: 2635
-								ClientPacket.friendsChat.addComparator(new UserComparator5(var7)); // L: 2636
-							}
-
-							return 1; // L: 2638
-						} else if (var0 == 3650) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2641
-							if (ClientPacket.friendsChat != null) { // L: 2642
-								ClientPacket.friendsChat.addComparator(new UserComparator6(var7)); // L: 2643
-							}
-
-							return 1; // L: 2645
-						} else if (var0 == 3651) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2648
-							if (ClientPacket.friendsChat != null) { // L: 2649
-								ClientPacket.friendsChat.addComparator(new UserComparator7(var7)); // L: 2650
-							}
-
-							return 1; // L: 2652
-						} else if (var0 == 3652) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2655
-							if (ClientPacket.friendsChat != null) { // L: 2656
-								ClientPacket.friendsChat.addComparator(new UserComparator8(var7)); // L: 2657
-							}
-
-							return 1; // L: 2659
-						} else if (var0 == 3653) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2662
-							if (ClientPacket.friendsChat != null) { // L: 2663
-								ClientPacket.friendsChat.addComparator(new UserComparator9(var7)); // L: 2664
-							}
-
-							return 1; // L: 2666
-						} else if (var0 == 3654) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2669
-							if (ClientPacket.friendsChat != null) { // L: 2670
-								ClientPacket.friendsChat.addComparator(new UserComparator10(var7)); // L: 2671
-							}
-
-							return 1; // L: 2673
-						} else if (var0 == 3655) {
-							if (ClientPacket.friendsChat != null) { // L: 2676
-								ClientPacket.friendsChat.sort(); // L: 2677
-							}
-
-							return 1; // L: 2679
-						} else if (var0 == 3656) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2682
-							Decimator.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2683
-							return 1; // L: 2684
-						} else if (var0 == 3657) {
-							var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2687
-							if (ClientPacket.friendsChat != null) { // L: 2688
-								ClientPacket.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2689
-							}
-
-							return 1; // L: 2691
-						} else {
-							return 2; // L: 2693
-						}
-					}
-				} else {
-					var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2516
-					if (ClientPacket.friendsChat != null && var3 < ClientPacket.friendsChat.getSize() && ((ClanMate)ClientPacket.friendsChat.get(var3)).isIgnored()) { // L: 2517
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2518
-					} else {
-						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2520
-					}
-
-					return 1; // L: 2521
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("jz")
-	@ObfuscatedSignature(
-		descriptor = "([Lky;Lky;ZI)V",
-		garbageValue = "1933510801"
-	)
-	@Export("revalidateWidgetScroll")
-	static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
-		int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -188983191 * -885606439 : var1.width * -1328038141 * -1237179477; // L: 10789
-		int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 153385713 * -1426770415 : var1.height * 191855667 * -686825733; // L: 10790
-		ModelData0.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10791
-		if (var1.children != null) { // L: 10792
-			ModelData0.resizeInterface(var1.children, var1.id, var3, var4, var2);
-		}
-
-		InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10793
-		if (var5 != null) { // L: 10794
-			int var6 = var5.group; // L: 10795
-			if (class155.loadInterface(var6)) { // L: 10797
-				ModelData0.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 10798
-			}
-		}
-
-		if (var1.contentType == 1337) { // L: 10801
-		}
-
-	} // L: 10802
 }

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("me")
+@ObfuscatedName("mo")
 @Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "[Lqq;"
+		descriptor = "[Lqd;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
 	@ObfuscatedName("w")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
-	@ObfuscatedName("d")
+	@ObfuscatedName("t")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("m")
+	@ObfuscatedName("g")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("x")
+	@ObfuscatedName("h")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("a")
+	@ObfuscatedName("f")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("widths")
 	int[] widths;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@Export("kerning")
 	byte[] kerning;
 
@@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.readMetrics(var1); // L: 54
 	} // L: 55
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("m")
 	@Export("readMetrics")
 	void readMetrics(byte[] var1) {
 		this.advances = new int[256]; // L: 58
@@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 				if (var13 != 32 && var13 != 160) { // L: 90
 					for (var8 = 0; var8 < 256; ++var8) { // L: 91
 						if (var8 != 32 && var8 != 160) { // L: 92
-							this.kerning[var8 + (var13 << 8)] = (byte)method6326(var11, var12, var4, this.advances, var10, var13, var8); // L: 93
+							this.kerning[var8 + (var13 << 8)] = (byte)method6212(var11, var12, var4, this.advances, var10, var13, var8); // L: 93
 						}
 					}
 				}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	} // L: 98
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("s")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) { // L: 123
 			var1 = ' ';
 		}
 
-		return this.advances[class327.charToByteCp1252(var1) & 255]; // L: 124
+		return this.advances[UserComparator5.charToByteCp1252(var1) & 255]; // L: 124
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("r")
 	@Export("stringWidth")
 	public int stringWidth(String var1) {
 		if (var1 == null) { // L: 128
@@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var7.equals("gt")) { // L: 142
 								if (var7.startsWith("img=")) { // L: 143
 									try {
-										int var8 = class19.method288(var7.substring(4)); // L: 145
+										int var8 = class92.method2373(var7.substring(4)); // L: 145
 										var4 += AbstractFont_modIconSprites[var8].width; // L: 146
 										var3 = -1; // L: 147
 									} catch (Exception var10) { // L: 149
@@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 					}
 
 					if (var2 == -1) { // L: 155
-						var4 += this.advances[(char)(class327.charToByteCp1252(var6) & 255)]; // L: 156
+						var4 += this.advances[(char)(UserComparator5.charToByteCp1252(var6) & 255)]; // L: 156
 						if (this.kerning != null && var3 != -1) { // L: 157
 							var4 += this.kerning[var6 + (var3 << 8)];
 						}
@@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("v")
 	@Export("breakLines")
 	public int breakLines(String var1, int[] var2, String[] var3) {
 		if (var1 == null) { // L: 165
@@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							var11 = '>'; // L: 204
 						} else if (var16.startsWith("img=")) { // L: 206
 							try {
-								int var17 = class19.method288(var16.substring(4)); // L: 208
+								int var17 = class92.method2373(var16.substring(4)); // L: 208
 								var4 += AbstractFont_modIconSprites[var17].width; // L: 209
 								var11 = 0; // L: 210
 							} catch (Exception var20) { // L: 212
@@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("y")
 	@Export("lineWidth")
 	public int lineWidth(String var1, int var2) {
 		int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 249
@@ -391,17 +391,17 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var4; // L: 255
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("c")
 	@Export("lineCount")
 	public int lineCount(String var1, int var2) {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 259
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IILjava/lang/String;II)Lnm;"
+		descriptor = "(IILjava/lang/String;II)Lne;"
 	)
-	public Bounds method6333(int var1, int var2, String var3, int var4, int var5) {
+	public Bounds method6219(int var1, int var2, String var3, int var4, int var5) {
 		if (var3 != null && var3.length() >= var2 + var1) { // L: 280
 			int var6 = var4 - this.stringWidth(var3) / 2; // L: 283
 			var6 += this.stringWidth(var3.substring(0, var1)); // L: 284
@@ -442,7 +442,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 308
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("n")
 	@Export("drawCentered")
 	public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) { // L: 311
@@ -451,7 +451,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 314
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("e")
 	@Export("drawLines")
 	public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
 		if (var1 == null) { // L: 317
@@ -512,7 +512,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("h")
 	@Export("drawCenteredWave")
 	public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) { // L: 352
@@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 357
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("f")
 	@Export("drawCenteredWave2")
 	public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) { // L: 360
@@ -544,7 +544,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 369
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("d")
 	@Export("drawCenteredShake")
 	public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var1 != null) { // L: 372
@@ -564,7 +564,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 379
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("j")
 	@Export("drawRandomAlphaAndSpacing")
 	public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) { // L: 382
@@ -585,7 +585,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 393
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("z")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1; // L: 396
@@ -599,28 +599,28 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_justificationCurrent = 0; // L: 402
 	} // L: 403
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("i")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
 			if (var1.startsWith("col=")) { // L: 407
-				AbstractFont_color = PcmPlayer.method746(var1.substring(4), 16);
+				AbstractFont_color = Canvas.method344(var1.substring(4), 16);
 			} else if (var1.equals("/col")) { // L: 408
 				AbstractFont_color = AbstractFont_previousColor;
 			} else if (var1.startsWith("str=")) { // L: 409
-				AbstractFont_strike = PcmPlayer.method746(var1.substring(4), 16);
+				AbstractFont_strike = Canvas.method344(var1.substring(4), 16);
 			} else if (var1.equals("str")) { // L: 410
 				AbstractFont_strike = 8388608;
 			} else if (var1.equals("/str")) { // L: 411
 				AbstractFont_strike = -1;
 			} else if (var1.startsWith("u=")) { // L: 412
-				AbstractFont_underline = PcmPlayer.method746(var1.substring(2), 16);
+				AbstractFont_underline = Canvas.method344(var1.substring(2), 16);
 			} else if (var1.equals("u")) { // L: 413
 				AbstractFont_underline = 0;
 			} else if (var1.equals("/u")) { // L: 414
 				AbstractFont_underline = -1;
 			} else if (var1.startsWith("shad=")) { // L: 415
-				AbstractFont_shadow = PcmPlayer.method746(var1.substring(5), 16);
+				AbstractFont_shadow = Canvas.method344(var1.substring(5), 16);
 			} else if (var1.equals("shad")) { // L: 416
 				AbstractFont_shadow = 0;
 			} else if (var1.equals("/shad")) { // L: 417
@@ -633,7 +633,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	} // L: 421
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("u")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
 		int var3 = 0; // L: 424
@@ -656,7 +656,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	} // L: 433
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ag")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
 		var3 -= this.ascent; // L: 436
@@ -665,7 +665,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 439
 			if (var1.charAt(var6) != 0) { // L: 440
-				char var7 = (char)(class327.charToByteCp1252(var1.charAt(var6)) & 255); // L: 441
+				char var7 = (char)(UserComparator5.charToByteCp1252(var1.charAt(var6)) & 255); // L: 441
 				if (var7 == '<') { // L: 442
 					var4 = var6; // L: 443
 				} else {
@@ -679,7 +679,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var8.equals("gt")) { // L: 450
 								if (var8.startsWith("img=")) { // L: 451
 									try {
-										var9 = class19.method288(var8.substring(4)); // L: 453
+										var9 = class92.method2373(var8.substring(4)); // L: 453
 										IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 454
 										var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 455
 										var2 += var10.width; // L: 456
@@ -745,7 +745,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	} // L: 496
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ar")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
 		var3 -= this.ascent; // L: 499
@@ -755,7 +755,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 503
 			if (var1.charAt(var9) != 0) { // L: 504
-				char var10 = (char)(class327.charToByteCp1252(var1.charAt(var9)) & 255); // L: 505
+				char var10 = (char)(UserComparator5.charToByteCp1252(var1.charAt(var9)) & 255); // L: 505
 				if (var10 == '<') { // L: 506
 					var6 = var9; // L: 507
 				} else {
@@ -784,7 +784,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 										}
 
 										++var8; // L: 523
-										var14 = class19.method288(var11.substring(4)); // L: 524
+										var14 = class92.method2373(var11.substring(4)); // L: 524
 										IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 525
 										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 526
 										var2 += var15.width; // L: 527
@@ -863,8 +863,8 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	} // L: 574
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("p")
-	static int method6326(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	static int method6212(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
 		int var7 = var2[var5]; // L: 101
 		int var8 = var7 + var4[var5]; // L: 102
 		int var9 = var2[var6]; // L: 103
@@ -899,7 +899,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return -var13; // L: 119
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("w")
 	@Export("escapeBrackets")
 	public static String escapeBrackets(String var0) {
 		int var1 = var0.length(); // L: 263
@@ -928,7 +928,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var6.toString(); // L: 276
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("am")
 	@Export("AbstractFont_drawGlyph")
 	static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) {
 		int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 580
@@ -970,7 +970,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 609
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ac")
 	@Export("AbstractFont_placeGlyph")
 	static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2); // L: 612
@@ -1018,7 +1018,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	} // L: 632
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ab")
 	@Export("AbstractFont_drawGlyphAlpha")
 	static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 635
@@ -1060,7 +1060,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 664
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("aj")
 	@Export("AbstractFont_placeGlyphAlpha")
 	static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
 		var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 667

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

@@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("qu")
+@ObfuscatedName("qi")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1418570525
+		intValue = 1186832289
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -845833355
+		intValue = 1838365041
 	)
 	@Export("height")
 	public int height;
@@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	} // L: 8
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(IIS)V",
+		descriptor = "(III)V",
-		garbageValue = "131"
+		garbageValue = "1511692839"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "-1598391098"
+		garbageValue = "-1899949578"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1263903710"
+		garbageValue = "1981530244"
 	)
 	@Export("apply")
 	public final void apply() {

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

@@ -1,95 +1,60 @@
 import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ny")
+@ObfuscatedName("nf")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
-	@ObfuscatedName("bk")
-	@ObfuscatedGetter(
-		intValue = 770576215
-	)
-	static int field4275;
-
 	protected AbstractSocket() {
 	} // L: 7
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
+		descriptor = "(I)V",
-		garbageValue = "-13138"
+		garbageValue = "731891927"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
+		descriptor = "(B)I",
-		garbageValue = "-891040314"
+		garbageValue = "18"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
+		descriptor = "(I)I",
-		garbageValue = "46"
+		garbageValue = "-1429957580"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
+		descriptor = "(II)Z",
-		garbageValue = "27"
+		garbageValue = "-15219997"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)I",
+		descriptor = "([BIII)I",
-		garbageValue = "-118"
+		garbageValue = "-642682113"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "-1359342670"
+		garbageValue = "257086671"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(Lln;Ljava/lang/String;Ljava/lang/String;B)Lqq;",
-		garbageValue = "3"
-	)
-	@Export("SpriteBuffer_getIndexedSpriteByName")
-	public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
-		int var3 = var0.getGroupId(var1); // L: 125
-		int var4 = var0.getFileId(var3, var2); // L: 126
-		byte[] var7 = var0.takeFile(var3, var4); // L: 131
-		boolean var6;
-		if (var7 == null) { // L: 132
-			var6 = false; // L: 133
-		} else {
-			WorldMapArea.SpriteBuffer_decode(var7); // L: 136
-			var6 = true; // L: 137
-		}
-
-		IndexedSprite var5;
-		if (!var6) { // L: 139
-			var5 = null; // L: 140
-		} else {
-			var5 = HorizontalAlignment.method3492(); // L: 143
-		}
-
-		return var5; // L: 145
-	}
 }

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("bm")
+@ObfuscatedName("bi")
 @Implements("AbstractSound")
 public abstract class AbstractSound extends Node {
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("position")
 	int position;
 

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

@@ -4,20 +4,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nz")
+@ObfuscatedName("ng")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("c")
+	@ObfuscatedName("ek")
+	@ObfuscatedSignature(
+		descriptor = "Lle;"
+	)
+	@Export("archive6")
+	static Archive archive6;
+	@ObfuscatedName("q")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	} // L: 8
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/Comparator;B)V",
-		garbageValue = "-80"
+		garbageValue = "-16"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -29,10 +35,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	} // L: 17
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lnn;Lnn;I)I",
+		descriptor = "(Lnb;Lnb;I)I",
-		garbageValue = "1222967356"
+		garbageValue = "1476396448"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
@@ -42,17 +48,4 @@ public abstract class AbstractUserComparator implements Comparator {
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 25
 	}
-
-	@ObfuscatedName("iz")
-	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-89739893"
-	)
-	static String method6736(int var0) {
-		if (var0 < 0) { // L: 9848
-			return "";
-		} else {
-			return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9849 9850
-		}
-	}
 }

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

@@ -1,122 +1,117 @@
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.LinkedList;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
 
-@ObfuscatedName("hz")
+@ObfuscatedName("ib")
 @Implements("AbstractWorldMapData")
 public abstract class AbstractWorldMapData {
-	@ObfuscatedName("gz")
+	@ObfuscatedName("tk")
-	@ObfuscatedSignature(
-		descriptor = "Lof;"
-	)
-	@Export("WorldMapElement_fonts")
-	static Fonts WorldMapElement_fonts;
-	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 406251203
+		intValue = -508466371
+	)
+	static int field2851;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = 1205484999
 	)
 	@Export("regionXLow")
 	int regionXLow;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -110127755
+		intValue = -1189289885
 	)
 	@Export("regionYLow")
 	int regionYLow;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 100910989
+		intValue = -1037344187
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 654356143
+		intValue = -1460800009
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 27961817
+		intValue = 716017053
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1476238073
+		intValue = -1555977189
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1237188241
+		intValue = -1656704067
 	)
 	@Export("groupId")
 	int groupId;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1492092043
+		intValue = 96165071
 	)
 	@Export("fileId")
 	int fileId;
 	@ObfuscatedName("w")
 	@Export("floorUnderlayIds")
 	short[][][] floorUnderlayIds;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@Export("floorOverlayIds")
 	short[][][] floorOverlayIds;
-	@ObfuscatedName("d")
+	@ObfuscatedName("t")
-	byte[][][] field2334;
+	byte[][][] field2845;
-	@ObfuscatedName("m")
+	@ObfuscatedName("g")
-	byte[][][] field2342;
+	byte[][][] field2847;
-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "[[[[Lhl;"
+		descriptor = "[[[[Liy;"
 	)
 	@Export("decorations")
 	WorldMapDecoration[][][][] decorations;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
-	boolean field2346;
+	boolean field2848;
-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
-	boolean field2347;
+	boolean field2850;
 
 	AbstractWorldMapData() {
 		this.groupId = -1; // L: 14
 		this.fileId = -1; // L: 15
 		new LinkedList();
-		this.field2346 = false;
+		this.field2848 = false; // L: 26
-		this.field2347 = false;
+		this.field2850 = false;
-	}
+	} // L: 29
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;I)V",
+		descriptor = "(Lpx;I)V",
-		garbageValue = "169222990"
+		garbageValue = "933342926"
 	)
 	@Export("readGeography")
 	abstract void readGeography(Buffer var1);
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "95"
+		garbageValue = "39"
 	)
 	@Export("isFullyLoaded")
 	boolean isFullyLoaded() {
-		return this.field2346 && this.field2347; // L: 32
+		return this.field2848 && this.field2850; // L: 32
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(Lln;B)V",
+		descriptor = "(Llp;B)V",
-		garbageValue = "-10"
+		garbageValue = "1"
 	)
 	@Export("loadGeography")
 	void loadGeography(AbstractArchive var1) {
@@ -124,53 +119,53 @@ public abstract class AbstractWorldMapData {
 			byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37
 			if (var2 != null) { // L: 38
 				this.readGeography(new Buffer(var2)); // L: 39
-				this.field2346 = true; // L: 40
+				this.field2848 = true; // L: 40
-				this.field2347 = true; // L: 41
+				this.field2850 = true; // L: 41
 			}
 
 		}
 	} // L: 43
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
+		descriptor = "(I)V",
-		garbageValue = "-50"
+		garbageValue = "2016462267"
 	)
 	@Export("reset")
 	void reset() {
 		this.floorUnderlayIds = null; // L: 46
 		this.floorOverlayIds = null; // L: 47
-		this.field2334 = null; // L: 48
+		this.field2845 = null; // L: 48
-		this.field2342 = null; // L: 49
+		this.field2847 = null; // L: 49
 		this.decorations = null; // L: 50
-		this.field2346 = false; // L: 51
+		this.field2848 = false; // L: 51
-		this.field2347 = false; // L: 52
+		this.field2850 = false; // L: 52
 	} // L: 53
 
 	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(IILpi;I)V",
+		descriptor = "(IILpx;I)V",
-		garbageValue = "289519849"
+		garbageValue = "1843686575"
 	)
 	@Export("readTile")
 	void readTile(int var1, int var2, Buffer var3) {
 		int var4 = var3.readUnsignedByte(); // L: 56
 		if (var4 != 0) { // L: 57
 			if ((var4 & 1) != 0) { // L: 60
-				this.method4319(var1, var2, var3, var4); // L: 61
+				this.method4769(var1, var2, var3, var4); // L: 61
 			} else {
-				this.method4320(var1, var2, var3, var4); // L: 64
+				this.method4770(var1, var2, var3, var4); // L: 64
 			}
 
 		}
 	} // L: 58 66
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(IILpi;II)V",
+		descriptor = "(IILpx;IB)V",
-		garbageValue = "-1881481092"
+		garbageValue = "18"
 	)
-	void method4319(int var1, int var2, Buffer var3, int var4) {
+	void method4769(int var1, int var2, Buffer var3, int var4) {
 		boolean var5 = (var4 & 2) != 0; // L: 69
 		if (var5) { // L: 70
 			this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71
@@ -179,12 +174,12 @@ public abstract class AbstractWorldMapData {
 		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73
 	} // L: 74
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(IILpi;IB)V",
+		descriptor = "(IILpx;IB)V",
-		garbageValue = "-121"
+		garbageValue = "44"
 	)
-	void method4320(int var1, int var2, Buffer var3, int var4) {
+	void method4770(int var1, int var2, Buffer var3, int var4) {
 		int var5 = ((var4 & 24) >> 3) + 1; // L: 77
 		boolean var6 = (var4 & 2) != 0; // L: 78
 		boolean var7 = (var4 & 4) != 0; // L: 79
@@ -200,8 +195,8 @@ public abstract class AbstractWorldMapData {
 				if (var14 != 0) { // L: 85
 					this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86
 					var11 = var3.readUnsignedByte(); // L: 87
-					this.field2334[var9][var1][var2] = (byte)(var11 >> 2); // L: 88
+					this.field2845[var9][var1][var2] = (byte)(var11 >> 2); // L: 88
-					this.field2342[var9][var1][var2] = (byte)(var11 & 3); // L: 89
+					this.field2847[var9][var1][var2] = (byte)(var11 & 3); // L: 89
 				}
 			}
 		}
@@ -213,7 +208,7 @@ public abstract class AbstractWorldMapData {
 					WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99
 
 					for (var11 = 0; var11 < var9; ++var11) { // L: 100
-						int var12 = var3.method7692(); // L: 101
+						int var12 = var3.method7532(); // L: 101
 						int var13 = var3.readUnsignedByte(); // L: 102
 						var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103
 					}
@@ -223,186 +218,149 @@ public abstract class AbstractWorldMapData {
 
 	} // L: 107
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "964749640"
+		garbageValue = "608097340"
 	)
 	@Export("getRegionX")
 	int getRegionX() {
-		return this.regionX;
+		return this.regionX; // L: 112
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1283249810"
+		garbageValue = "-2122627873"
 	)
 	@Export("getRegionY")
 	int getRegionY() {
-		return this.regionY;
+		return this.regionY; // L: 116
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lln;Lln;Lln;Lji;I)Z",
+		descriptor = "(II)Lkt;",
-		garbageValue = "1083179858"
+		garbageValue = "406038723"
 	)
-	public static boolean method4342(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) {
+	public static GameBuild method4799(int var0) {
-		class273.musicPatchesArchive = var0; // L: 26
+		GameBuild[] var1 = new GameBuild[]{GameBuild.LIVE, GameBuild.BUILDLIVE, GameBuild.WIP, GameBuild.RC}; // L: 21
-		class273.musicSamplesArchive = var1; // L: 27
+		GameBuild[] var2 = var1; // L: 23
-		class273.soundEffectsArchive = var2; // L: 28
+
-		class273.midiPcmStream = var3; // L: 29
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 24
-		return true; // L: 30
+			GameBuild var4 = var2[var3]; // L: 25
+			if (var0 == var4.buildId) { // L: 27
+				return var4;
+			}
 		}
 
-	@ObfuscatedName("i")
+		return null; // L: 31
+	}
+
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lca;",
+		descriptor = "(Llp;Llp;ZII)V",
-		garbageValue = "-1138182451"
+		garbageValue = "-598382128"
 	)
-	static ClientPreferences method4344() {
+	static void method4800(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
-		AccessFile var0 = null; // L: 112
+		if (Login.clearLoginScreen) { // L: 183
-		ClientPreferences var1 = new ClientPreferences(); // L: 113
+			if (var3 == 4) { // L: 184
-
+				class126.method2799(4); // L: 185
-		try {
-			var0 = ModeWhere.getPreferencesFile("", Messages.field1305.name, false); // L: 115
-			byte[] var2 = new byte[(int)var0.length()]; // L: 116
-
-			int var4;
-			for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 117 118 121
-				var4 = var0.read(var2, var3, var2.length - var3); // L: 119
-				if (var4 == -1) {
-					throw new IOException(); // L: 120
-				}
 			}
 
-			var1 = new ClientPreferences(new Buffer(var2)); // L: 123
-		} catch (Exception var6) { // L: 125
-		}
-
-		try {
-			if (var0 != null) { // L: 127
-				var0.close();
-			}
-		} catch (Exception var5) { // L: 129
-		}
-
-		return var1; // L: 130
-	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Lpi;II)V",
-		garbageValue = "-2052179879"
-	)
-	@Export("readReflectionCheck")
-	public static void readReflectionCheck(Buffer var0, int var1) {
-		ReflectionCheck var2 = new ReflectionCheck(); // L: 133
-		var2.size = var0.readUnsignedByte(); // L: 134
-		var2.id = var0.readInt(); // L: 135
-		var2.operations = new int[var2.size]; // L: 136
-		var2.creationErrors = new int[var2.size]; // L: 137
-		var2.fields = new Field[var2.size]; // L: 138
-		var2.intReplaceValues = new int[var2.size]; // L: 139
-		var2.methods = new Method[var2.size]; // L: 140
-		var2.arguments = new byte[var2.size][][]; // L: 141
-
-		for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142
-			try {
-				int var4 = var0.readUnsignedByte(); // L: 144
-				String var5;
-				String var6;
-				int var7;
-				if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145
-					if (var4 == 3 || var4 == 4) { // L: 155
-						var5 = var0.readStringCp1252NullTerminated(); // L: 156
-						var6 = var0.readStringCp1252NullTerminated(); // L: 157
-						var7 = var0.readUnsignedByte(); // L: 158
-						String[] var8 = new String[var7]; // L: 159
-
-						for (int var9 = 0; var9 < var7; ++var9) { // L: 160
-							var8[var9] = var0.readStringCp1252NullTerminated();
-						}
-
-						String var20 = var0.readStringCp1252NullTerminated(); // L: 161
-						byte[][] var10 = new byte[var7][]; // L: 162
-						int var12;
-						if (var4 == 3) { // L: 163
-							for (int var11 = 0; var11 < var7; ++var11) { // L: 164
-								var12 = var0.readInt(); // L: 165
-								var10[var11] = new byte[var12]; // L: 166
-								var0.readBytes(var10[var11], 0, var12); // L: 167
-							}
-						}
-
-						var2.operations[var3] = var4; // L: 170
-						Class[] var21 = new Class[var7]; // L: 171
-
-						for (var12 = 0; var12 < var7; ++var12) { // L: 172
-							var21[var12] = class430.loadClassFromDescriptor(var8[var12]);
-						}
-
-						Class var22 = class430.loadClassFromDescriptor(var20); // L: 173
-						if (class430.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174
-							throw new SecurityException();
-						}
-
-						Method[] var13 = class430.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175
-						Method[] var14 = var13; // L: 177
-
-						for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178
-							Method var16 = var14[var15]; // L: 179
-							if (Reflection.getMethodName(var16).equals(var6)) { // L: 181
-								Class[] var17 = Reflection.getParameterTypes(var16); // L: 182
-								if (var17.length == var21.length) { // L: 183
-									boolean var18 = true; // L: 184
-
-									for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185
-										if (var17[var19] != var21[var19]) { // L: 186
-											var18 = false; // L: 187
-											break; // L: 188
-										}
-									}
-
-									if (var18 && var22 == var16.getReturnType()) { // L: 191
-										var2.methods[var3] = var16; // L: 192
-									}
-								}
-							}
-						}
-
-						var2.arguments[var3] = var10; // L: 199
-					}
 		} else {
-					var5 = var0.readStringCp1252NullTerminated(); // L: 146
+			if (var3 == 0) { // L: 189
-					var6 = var0.readStringCp1252NullTerminated(); // L: 147
+				WorldMapData_1.method4706(var2); // L: 190
-					var7 = 0; // L: 148
+			} else {
-					if (var4 == 1) { // L: 149
+				class126.method2799(var3); // L: 193
-						var7 = var0.readInt();
 			}
 
-					var2.operations[var3] = var4; // L: 150
+			Rasterizer2D.Rasterizer2D_clear(); // L: 195
-					var2.intReplaceValues[var3] = var7; // L: 151
+			byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 196
-					if (class430.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152
+			UserComparator6.leftTitleSprite = Frames.method4217(var4); // L: 197
-						throw new SecurityException();
+			SecureRandomCallable.rightTitleSprite = UserComparator6.leftTitleSprite.mirrorHorizontally(); // L: 198
+			int var5 = Client.worldProperties; // L: 199
+			if ((var5 & 536870912) != 0) { // L: 201
+				Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 202
+			} else if ((var5 & 1073741824) != 0) { // L: 204
+				Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 205
+			} else {
+				Clock.logoSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 208
 			}
 
-					var2.fields[var3] = Reflection.findField(class430.loadClassFromDescriptor(var5), var6); // L: 153
+			Login.titleboxSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 211
+			Login.titlebuttonSprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 212
+			Clock.field1839 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 213
+			Login.field882 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 214
+			JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 215
+			int var7 = var1.getGroupId("runes"); // L: 218
+			int var8 = var1.getFileId(var7, ""); // L: 219
+			IndexedSprite[] var6 = ItemContainer.method2062(var1, var7, var8); // L: 220
+			Login.runesSprite = var6; // L: 222
+			var8 = var1.getGroupId("title_mute"); // L: 225
+			int var9 = var1.getFileId(var8, ""); // L: 226
+			IndexedSprite[] var11 = ItemContainer.method2062(var1, var8, var9); // L: 227
+			class358.title_muteSprite = var11; // L: 229
+			class67.options_buttons_0Sprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 230
+			Login.field888 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 231
+			class101.options_buttons_2Sprite = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 232
+			UrlRequester.field1354 = JagexCache.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 233
+			class16.field81 = class67.options_buttons_0Sprite.subWidth; // L: 234
+			class268.field3212 = class67.options_buttons_0Sprite.subHeight; // L: 235
+			class193.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 236
+			if (var2) { // L: 237
+				Login.Login_username = ""; // L: 238
+				Login.Login_password = ""; // L: 239
+				Login.field876 = new String[8]; // L: 240
+				Login.field896 = 0; // L: 241
 			}
-			} catch (ClassNotFoundException var24) { // L: 202
+
-				var2.creationErrors[var3] = -1; // L: 203
+			WorldMapCacheName.field2912 = 0; // L: 243
-			} catch (SecurityException var25) { // L: 205
+			class92.otp = ""; // L: 244
-				var2.creationErrors[var3] = -2; // L: 206
+			Login.field900 = true; // L: 245
-			} catch (NullPointerException var26) { // L: 208
+			Login.worldSelectOpen = false; // L: 246
-				var2.creationErrors[var3] = -3; // L: 209
+			if (!class12.clientPreferences.method2226()) { // L: 247
-			} catch (Exception var27) { // L: 211
+				Archive var12 = AbstractUserComparator.archive6; // L: 248
-				var2.creationErrors[var3] = -4; // L: 212
+				var9 = var12.getGroupId("scape main"); // L: 250
-			} catch (Throwable var28) { // L: 214
+				int var10 = var12.getFileId(var9, ""); // L: 251
-				var2.creationErrors[var3] = -5; // L: 215
+				UserComparator4.method2573(2, var12, var9, var10, 255, false); // L: 252
+			} else {
+				UrlRequester.method2538(2); // L: 255
+			}
+
+			MouseRecorder.method2088(false); // L: 256
+			Login.clearLoginScreen = true; // L: 257
+			Login.xPadding = (GraphicsObject.canvasWidth - 765) / 2; // L: 258
+			Login.loginBoxX = Login.xPadding + 202; // L: 259
+			Decimator.loginBoxCenter = Login.loginBoxX + 180; // L: 260
+			UserComparator6.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 261
+			SecureRandomCallable.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 262
+			Clock.logoSprite.drawAt(Login.xPadding + 382 - Clock.logoSprite.subWidth / 2, 18); // L: 263
+		}
+	} // L: 187 264
+
+	@ObfuscatedName("at")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-707674670"
+	)
+	@Export("runWidgetOnLoadListener")
+	static void runWidgetOnLoadListener(int var0) {
+		if (var0 != -1) { // L: 4722
+			if (WorldMapDecoration.loadInterface(var0)) { // L: 4723
+				Widget[] var1 = NetSocket.Widget_interfaceComponents[var0]; // L: 4724
+
+				for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4725
+					Widget var3 = var1[var2]; // L: 4726
+					if (var3.onLoad != null) { // L: 4727
+						ScriptEvent var4 = new ScriptEvent(); // L: 4728
+						var4.widget = var3; // L: 4729
+						var4.args = var3.onLoad; // L: 4730
+						class10.runScript(var4, 5000000, 0); // L: 4731
 					}
 				}
 
-		class54.reflectionChecks.addFirst(var2); // L: 218
+			}
-	} // L: 219
+		}
+	} // L: 4734
 }

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

@@ -1,149 +1,148 @@
-import java.io.File;
-import java.io.RandomAccessFile;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hq")
+@ObfuscatedName("iw")
 @Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Lkd;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Lkd;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 331814097
+		intValue = -1792317661
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -247318993
+		intValue = -1102368635
 	)
 	@Export("screenY")
 	int screenY;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lks;Lks;)V"
+		descriptor = "(Lkd;Lkd;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1; // L: 13
-		this.coord2 = var2;
+		this.coord2 = var2; // L: 14
 	} // L: 15
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
+		descriptor = "(B)I",
-		garbageValue = "364835409"
+		garbageValue = "16"
 	)
 	@Export("getElement")
 	public abstract int getElement();
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lho;",
+		descriptor = "(I)Lip;",
-		garbageValue = "-32"
+		garbageValue = "1420245554"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
+		descriptor = "(B)I",
-		garbageValue = "-915724910"
+		garbageValue = "102"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1982860019"
+		garbageValue = "-1663406998"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
+		descriptor = "(III)Z",
-		garbageValue = "-95"
+		garbageValue = "2104661633"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
 		if (this.elementFitsScreen(var1, var2)) { // L: 18
-			return true; // L: 19
+			return true;
 		} else {
-			return this.labelFitsScreen(var1, var2); // L: 21
+			return this.labelFitsScreen(var1, var2);
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1632005333"
+		garbageValue = "1482741220"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
 		return this.getElement() >= 0; // L: 33
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(III)Z",
+		descriptor = "(IIB)Z",
-		garbageValue = "845547829"
+		garbageValue = "19"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
-		if (!this.hasValidElement()) { // L: 37
+		if (!this.hasValidElement()) {
 			return false;
 		} else {
-			WorldMapElement var3 = UserComparator7.WorldMapElement_get(this.getElement()); // L: 38
+			WorldMapElement var3 = class120.WorldMapElement_get(this.getElement());
-			int var4 = this.getSubWidth(); // L: 39
+			int var4 = this.getSubWidth();
-			int var5 = this.getSubHeight(); // L: 40
+			int var5 = this.getSubHeight();
-			switch(var3.horizontalAlignment.value) { // L: 41
+			switch(var3.horizontalAlignment.value) {
 			case 0:
-				if (var1 >= this.screenX && var1 < var4 + this.screenX) { // L: 54
+				if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { // L: 54
 					break;
 				}
 
 				return false;
 			case 1:
-				if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 44
+				if (var1 >= this.screenX && var1 < var4 + this.screenX) {
-					return false;
-				}
 					break;
+				}
+
+				return false;
 			case 2:
-				if (var1 <= this.screenX - var4 || var1 > this.screenX) { // L: 49
+				if (var1 <= this.screenX - var4 || var1 > this.screenX) {
 					return false;
 				}
 			}
 
-			switch(var3.verticalAlignment.value) { // L: 58
+			switch(var3.verticalAlignment.value) {
 			case 0:
-				if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 61
+				if (var2 > this.screenY - var5 && var2 <= this.screenY) {
 					break;
 				}
 
 				return false;
 			case 1:
-				if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 66
+				if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) {
 					break;
 				}
 
 				return false;
 			case 2:
-				if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 71
+				if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 61
 					return false;
 				}
 			}
@@ -152,59 +151,162 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(III)Z",
+		descriptor = "(IIB)Z",
-		garbageValue = "-1755965847"
+		garbageValue = "49"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
-		WorldMapLabel var3 = this.getLabel(); // L: 79
+		WorldMapLabel var3 = this.getLabel();
-		if (var3 == null) { // L: 80
+		if (var3 == null) {
-			return false; // L: 81
+			return false;
-		} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83
+		} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
-			return var2 >= this.screenY && var2 <= var3.height + this.screenY; // L: 84
+			return var2 >= this.screenY && var2 <= this.screenY + var3.height;
 		} else {
-			return false; // L: 85
+			return false;
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
-	public static double method4415(double var0, double var2, double var4) {
-		double var8 = (var0 - var2) / var4; // L: 10
-		double var6 = Math.exp(-var8 * var8 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 12
-		return var6 / var4; // L: 14
-	}
-
-	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
+		descriptor = "(IILgw;Lgh;S)Z",
-		garbageValue = "-151614308"
+		garbageValue = "128"
 	)
-	static void method4429() {
+	public static final boolean method4863(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
-		WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 47
+		int var4 = var0; // L: 19
-	} // L: 48
+		int var5 = var1; // L: 20
+		byte var6 = 64; // L: 21
+		byte var7 = 64; // L: 22
+		int var8 = var0 - var6; // L: 23
+		int var9 = var1 - var7; // L: 24
+		class194.directions[var6][var7] = 99; // L: 25
+		class194.distances[var6][var7] = 0; // L: 26
+		byte var10 = 0; // L: 27
+		int var11 = 0; // L: 28
+		class194.bufferX[var10] = var0; // L: 29
+		byte var10001 = var10;
+		int var18 = var10 + 1;
+		class194.bufferY[var10001] = var1; // L: 30
+		int[][] var12 = var3.flags; // L: 31
 
-	@ObfuscatedName("f")
+		while (var18 != var11) { // L: 34
+			var4 = class194.bufferX[var11]; // L: 35
+			var5 = class194.bufferY[var11]; // L: 36
+			var11 = var11 + 1 & 4095; // L: 37
+			int var16 = var4 - var8; // L: 38
+			int var17 = var5 - var9; // L: 39
+			int var13 = var4 - var3.xInset; // L: 40
+			int var14 = var5 - var3.yInset; // L: 41
+			if (var2.hasArrived(1, var4, var5, var3)) { // L: 42
+				Varps.field3348 = var4; // L: 43
+				class194.field2255 = var5; // L: 44
+				return true; // L: 45
+			}
+
+			int var15 = class194.distances[var16][var17] + 1; // L: 47
+			if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 48
+				class194.bufferX[var18] = var4 - 1; // L: 49
+				class194.bufferY[var18] = var5; // L: 50
+				var18 = var18 + 1 & 4095; // L: 51
+				class194.directions[var16 - 1][var17] = 2; // L: 52
+				class194.distances[var16 - 1][var17] = var15; // L: 53
+			}
+
+			if (var16 < 127 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 55
+				class194.bufferX[var18] = var4 + 1; // L: 56
+				class194.bufferY[var18] = var5; // L: 57
+				var18 = var18 + 1 & 4095; // L: 58
+				class194.directions[var16 + 1][var17] = 8; // L: 59
+				class194.distances[var16 + 1][var17] = var15; // L: 60
+			}
+
+			if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 62
+				class194.bufferX[var18] = var4; // L: 63
+				class194.bufferY[var18] = var5 - 1; // L: 64
+				var18 = var18 + 1 & 4095; // L: 65
+				class194.directions[var16][var17 - 1] = 1; // L: 66
+				class194.distances[var16][var17 - 1] = var15; // L: 67
+			}
+
+			if (var17 < 127 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 69
+				class194.bufferX[var18] = var4; // L: 70
+				class194.bufferY[var18] = var5 + 1; // L: 71
+				var18 = var18 + 1 & 4095; // L: 72
+				class194.directions[var16][var17 + 1] = 4; // L: 73
+				class194.distances[var16][var17 + 1] = var15; // L: 74
+			}
+
+			if (var16 > 0 && var17 > 0 && class194.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 76
+				class194.bufferX[var18] = var4 - 1; // L: 77
+				class194.bufferY[var18] = var5 - 1; // L: 78
+				var18 = var18 + 1 & 4095; // L: 79
+				class194.directions[var16 - 1][var17 - 1] = 3; // L: 80
+				class194.distances[var16 - 1][var17 - 1] = var15; // L: 81
+			}
+
+			if (var16 < 127 && var17 > 0 && class194.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 83
+				class194.bufferX[var18] = var4 + 1; // L: 84
+				class194.bufferY[var18] = var5 - 1; // L: 85
+				var18 = var18 + 1 & 4095; // L: 86
+				class194.directions[var16 + 1][var17 - 1] = 9; // L: 87
+				class194.distances[var16 + 1][var17 - 1] = var15; // L: 88
+			}
+
+			if (var16 > 0 && var17 < 127 && class194.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 90
+				class194.bufferX[var18] = var4 - 1; // L: 91
+				class194.bufferY[var18] = var5 + 1; // L: 92
+				var18 = var18 + 1 & 4095; // L: 93
+				class194.directions[var16 - 1][var17 + 1] = 6; // L: 94
+				class194.distances[var16 - 1][var17 + 1] = var15; // L: 95
+			}
+
+			if (var16 < 127 && var17 < 127 && class194.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 97
+				class194.bufferX[var18] = var4 + 1; // L: 98
+				class194.bufferY[var18] = var5 + 1; // L: 99
+				var18 = var18 + 1 & 4095; // L: 100
+				class194.directions[var16 + 1][var17 + 1] = 12; // L: 101
+				class194.distances[var16 + 1][var17 + 1] = var15; // L: 102
+			}
+		}
+
+		Varps.field3348 = var4; // L: 105
+		class194.field2255 = var5; // L: 106
+		return false; // L: 107
+	}
+
+	@ObfuscatedName("hq")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/io/File;ZB)Z",
+		descriptor = "(IIII)V",
-		garbageValue = "-95"
+		garbageValue = "-94279171"
 	)
-	static boolean method4405(File var0, boolean var1) {
+	@Export("worldToScreen")
-		try {
+	static final void worldToScreen(int var0, int var1, int var2) {
-			RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 232
+		if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5460
-			int var3 = var2.read(); // L: 233
+			int var3 = class202.getTileHeight(var0, var1, class128.Client_plane) - var2; // L: 5465
-			var2.seek(0L); // L: 234
+			var0 -= class343.cameraX; // L: 5466
-			var2.write(var3); // L: 235
+			var3 -= class295.cameraY; // L: 5467
-			var2.seek(0L); // L: 236
+			var1 -= FaceNormal.cameraZ; // L: 5468
-			var2.close(); // L: 237
+			int var4 = Rasterizer3D.Rasterizer3D_sine[GameEngine.cameraPitch]; // L: 5469
-			if (var1) { // L: 238
+			int var5 = Rasterizer3D.Rasterizer3D_cosine[GameEngine.cameraPitch]; // L: 5470
-				var0.delete();
+			int var6 = Rasterizer3D.Rasterizer3D_sine[StudioGame.cameraYaw]; // L: 5471
+			int var7 = Rasterizer3D.Rasterizer3D_cosine[StudioGame.cameraYaw]; // L: 5472
+			int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5473
+			var1 = var7 * var1 - var0 * var6 >> 16; // L: 5474
+			var0 = var8; // L: 5475
+			var8 = var5 * var3 - var4 * var1 >> 16; // L: 5476
+			var1 = var5 * var1 + var3 * var4 >> 16; // L: 5477
+			if (var1 >= 50) { // L: 5479
+				Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5480
+				Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5481
+			} else {
+				Client.viewportTempX = -1; // L: 5484
+				Client.viewportTempY = -1; // L: 5485
 			}
 
-			return true; // L: 239
+		} else {
-		} catch (Exception var4) { // L: 241
+			Client.viewportTempX = -1; // L: 5461
-			return false; // L: 242
+			Client.viewportTempY = -1; // L: 5462
-		}
 		}
+	} // L: 5463 5487
 }

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

@@ -9,33 +9,27 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ph")
+@ObfuscatedName("pu")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("s")
+	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = -104839557
-	)
-	@Export("musicTrackGroupId")
-	public static int musicTrackGroupId;
-	@ObfuscatedName("v")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		longValue = -766606768005877029L
+		longValue = -3826011990097739857L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		longValue = 6664878474339586353L
+		longValue = -459654609599987919L
 	)
 	@Export("offset")
 	long offset;
 
 	public AccessFile(File var1, String var2, long var3) throws IOException {
-		if (var3 == -1L) { // L: 11
+		if (-1L == var3) { // L: 11
 			var3 = Long.MAX_VALUE;
 		}
 
@@ -55,17 +49,17 @@ public final class AccessFile {
 		this.file.seek(0L); // L: 23
 	} // L: 24
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1); // L: 27
 		this.offset = var1; // L: 28
 	} // L: 29
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "-26128943"
+		garbageValue = "133309999"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
@@ -79,20 +73,20 @@ public final class AccessFile {
 		}
 	} // L: 39
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
+		descriptor = "(B)V",
-		garbageValue = "1730487128"
+		garbageValue = "-16"
 	)
 	@Export("close")
 	public final void close() throws IOException {
 		this.closeSync(false); // L: 42
 	} // L: 43
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
+		descriptor = "(ZB)V",
-		garbageValue = "-1333706766"
+		garbageValue = "76"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -110,20 +104,20 @@ public final class AccessFile {
 
 	} // L: 56
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)J",
-		garbageValue = "1939570997"
+		garbageValue = "1020700652"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length(); // L: 59
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "([BIIB)I",
-		garbageValue = "-22"
+		garbageValue = "10"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {

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("hf")
+@ObfuscatedName("gu")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
-	static int[] field2515;
+	static int[] field2344;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
-	static int[] field2517;
+	static int[] field2342;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
-	static int[] field2516;
+	static int[] field2351;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
-	static int[] field2523;
+	static int[] field2345;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lha;"
+		descriptor = "Lgf;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field2515 = new int[500]; // L: 8
+		field2344 = new int[500]; // L: 8
-		field2517 = new int[500]; // L: 9
+		field2342 = new int[500]; // L: 9
-		field2516 = new int[500]; // L: 10
+		field2351 = new int[500]; // L: 10
-		field2523 = new int[500]; // L: 11
+		field2345 = new int[500]; // L: 11
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "([BLha;)V"
+		descriptor = "([BLgf;)V"
 	)
 	Animation(byte[] var1, Skeleton var2) {
 		this.skeleton = null; // L: 12
@@ -69,38 +69,38 @@ public class Animation {
 				if (this.skeleton.transformTypes[var8] != 0) { // L: 32
 					for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33
 						if (this.skeleton.transformTypes[var10] == 0) { // L: 34
-							field2515[var7] = var10; // L: 35
+							field2344[var7] = var10; // L: 35
-							field2517[var7] = 0; // L: 36
+							field2342[var7] = 0; // L: 36
-							field2516[var7] = 0; // L: 37
+							field2351[var7] = 0; // L: 37
-							field2523[var7] = 0; // L: 38
+							field2345[var7] = 0; // L: 38
 							++var7; // L: 39
 							break;
 						}
 					}
 				}
 
-				field2515[var7] = var8; // L: 44
+				field2344[var7] = var8; // L: 44
 				short var11 = 0; // L: 45
 				if (this.skeleton.transformTypes[var8] == 3) { // L: 46
 					var11 = 128;
 				}
 
 				if ((var9 & 1) != 0) { // L: 47
-					field2517[var7] = var4.readShortSmart();
+					field2342[var7] = var4.readShortSmart();
 				} else {
-					field2517[var7] = var11; // L: 48
+					field2342[var7] = var11; // L: 48
 				}
 
 				if ((var9 & 2) != 0) { // L: 49
-					field2516[var7] = var4.readShortSmart();
+					field2351[var7] = var4.readShortSmart();
 				} else {
-					field2516[var7] = var11; // L: 50
+					field2351[var7] = var11; // L: 50
 				}
 
 				if ((var9 & 4) != 0) { // L: 51
-					field2523[var7] = var4.readShortSmart();
+					field2345[var7] = var4.readShortSmart();
 				} else {
-					field2523[var7] = var11; // L: 52
+					field2345[var7] = var11; // L: 52
 				}
 
 				var6 = var8; // L: 53
@@ -121,10 +121,10 @@ public class Animation {
 			this.transformZs = new int[var7]; // L: 65
 
 			for (var8 = 0; var8 < var7; ++var8) { // L: 66
-				this.transformSkeletonLabels[var8] = field2515[var8]; // L: 67
+				this.transformSkeletonLabels[var8] = field2344[var8]; // L: 67
-				this.transformXs[var8] = field2517[var8]; // L: 68
+				this.transformXs[var8] = field2342[var8]; // L: 68
-				this.transformYs[var8] = field2516[var8]; // L: 69
+				this.transformYs[var8] = field2351[var8]; // L: 69
-				this.transformZs[var8] = field2523[var8]; // L: 70
+				this.transformZs[var8] = field2345[var8]; // L: 70
 			}
 
 		}

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

@@ -2,162 +2,130 @@ 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("bh")
+@ObfuscatedName("bl")
 @Implements("ApproximateRouteStrategy")
 public class ApproximateRouteStrategy extends RouteStrategy {
-	@ObfuscatedName("eg")
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
-		descriptor = "Llx;"
+		descriptor = "Lke;"
 	)
-	@Export("archive20")
+	static StudioGame field473;
-	static Archive archive20;
+	@ObfuscatedName("fw")
+	static String field471;
 
 	ApproximateRouteStrategy() {
-	} // L: 12726
+	} // L: 12776
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIILgv;I)Z",
+		descriptor = "(IIILgh;I)Z",
-		garbageValue = "773884525"
+		garbageValue = "-425355466"
 	)
 	@Export("hasArrived")
 	public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) {
-		return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12729
+		return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12780
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "([BB)Ljava/lang/String;",
+		descriptor = "(IIB)Lki;",
-		garbageValue = "79"
+		garbageValue = "-103"
 	)
-	public static String method1125(byte[] var0) {
+	@Export("getWidgetChild")
-		return WorldMapData_1.method4226(var0, 0, var0.length); // L: 58
+	public static Widget getWidgetChild(int var0, int var1) {
-	}
+		Widget var2 = class92.getWidget(var0); // L: 239
-
+		if (var1 == -1) { // L: 240
-	@ObfuscatedName("x")
+			return var2;
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "-227036396"
-	)
-	static int method1124(int var0, Script var1, boolean var2) {
-		Widget var3 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1312
-		if (var0 == ScriptOpcodes.IF_GETX) { // L: 1313
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1314
-			return 1; // L: 1315
-		} else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1317
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1318
-			return 1; // L: 1319
-		} else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1321
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1322
-			return 1; // L: 1323
-		} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1325
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1326
-			return 1; // L: 1327
-		} else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1329
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1330
-			return 1; // L: 1331
-		} else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1333
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1334
-			return 1; // L: 1335
 		} else {
-			return 2; // L: 1337
+			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 241 242
 		}
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZB)I",
+		descriptor = "(I)V",
-		garbageValue = "-54"
+		garbageValue = "-630623402"
 	)
-	static int method1123(int var0, Script var1, boolean var2) {
+	public static void method1110() {
-		if (var0 == 7400) { // L: 4670
+		class273.midiPcmStream.clear(); // L: 42
-			--Interpreter.Interpreter_intStackSize; // L: 4671
+		class273.musicPlayerStatus = 1; // L: 43
-			--class122.Interpreter_stringStackSize; // L: 4672
+		ClanChannelMember.musicTrackArchive = null; // L: 44
-			return 1; // L: 4673
+	} // L: 45
-		} else if (var0 == 7401) { // L: 4675
+
-			--Interpreter.Interpreter_intStackSize; // L: 4676
+	@ObfuscatedName("k")
-			--class122.Interpreter_stringStackSize; // L: 4677
+	@ObfuscatedSignature(
-			return 1; // L: 4678
+		descriptor = "(I)[Lcq;",
-		} else if (var0 == 7402) { // L: 4680
+		garbageValue = "768338863"
-			Interpreter.Interpreter_intStackSize -= 2; // L: 4681
+	)
-			--class122.Interpreter_stringStackSize; // L: 4682
+	static AttackOption[] method1108() {
-			return 1; // L: 4683
+		return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.field1285, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1283, AttackOption.AttackOption_dependsOnCombatLevels}; // L: 12729
-		} else if (var0 == 7403) { // L: 4685
+	}
-			Interpreter.Interpreter_intStackSize -= 2; // L: 4686
+
-			--class122.Interpreter_stringStackSize; // L: 4687
+	@ObfuscatedName("ir")
-			return 1; // L: 4688
+	@ObfuscatedSignature(
-		} else if (var0 == 7404) { // L: 4690
+		descriptor = "(Lca;IIII)V",
-			--Interpreter.Interpreter_intStackSize; // L: 4691
+		garbageValue = "611280226"
-			--class122.Interpreter_stringStackSize; // L: 4692
+	)
-			return 1; // L: 4693
+	@Export("addPlayerToMenu")
-		} else if (var0 == 7405) { // L: 4695
+	static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
-			Interpreter.Interpreter_intStackSize -= 2; // L: 4696
+		if (ModelData0.localPlayer != var0) { // L: 10138
-			return 1; // L: 4697
+			if (Client.menuOptionsCount < 400) { // L: 10139
-		} else if (var0 == 7406) { // L: 4699
+				String var4;
-			--Interpreter.Interpreter_intStackSize; // L: 4700
+				if (var0.skillLevel == 0) { // L: 10141
-			Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4701
+					var4 = var0.actions[0] + var0.username + var0.actions[1] + IgnoreList.method6430(var0.combatLevel, ModelData0.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
-			return 1; // L: 4702
-		} else if (var0 == 7407) { // L: 4704
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4705
-			return 1; // L: 4706
-		} else if (var0 == 7408) { // L: 4708
-			Interpreter.Interpreter_intStackSize -= 2; // L: 4709
-			--class122.Interpreter_stringStackSize; // L: 4710
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4711
-			return 1; // L: 4712
-		} else if (var0 == 7409) { // L: 4714
-			--Interpreter.Interpreter_intStackSize; // L: 4715
-			return 1; // L: 4716
 				} else {
-			return 2; // L: 4718
+					var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 10142
+				}
+
+				int var5;
+				if (Client.isItemSelected == 1) { // L: 10143
+					Projectile.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class166.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 10144
+				} else if (Client.isSpellSelected) { // L: 10147
+					if ((class113.selectedSpellFlags & 8) == 8) { // L: 10148
+						Projectile.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class166.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 10149
+					}
+				} else {
+					for (var5 = 7; var5 >= 0; --var5) { // L: 10154
+						if (Client.playerMenuActions[var5] != null) { // L: 10155
+							short var6 = 0; // L: 10156
+							if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { // L: 10157
+								if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 10158
+									continue;
+								}
+
+								if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > ModelData0.localPlayer.combatLevel) { // L: 10159
+									var6 = 2000; // L: 10160
+								}
+
+								if (ModelData0.localPlayer.team != 0 && var0.team != 0) { // L: 10162
+									if (var0.team == ModelData0.localPlayer.team) { // L: 10163
+										var6 = 2000;
+									} else {
+										var6 = 0; // L: 10164
+									}
+								} else if (AttackOption.field1283 == Client.playerAttackOption && var0.isClanMember()) { // L: 10166
+									var6 = 2000; // L: 10167
+								}
+							} else if (Client.playerOptionsPriorities[var5]) { // L: 10170
+								var6 = 2000;
+							}
+
+							boolean var7 = false; // L: 10171
+							int var8 = Client.playerMenuOpcodes[var5] + var6; // L: 10172
+							Projectile.insertMenuItemNoShift(Client.playerMenuActions[var5], class166.colorStartTag(16777215) + var4, var8, var1, var2, var3); // L: 10173
+						}
 					}
 				}
 
-	@ObfuscatedName("jw")
+				for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 10178
-	@ObfuscatedSignature(
+					if (Client.menuOpcodes[var5] == 23) { // L: 10179
-		descriptor = "(Lky;IIZI)V",
+						Client.menuTargets[var5] = class166.colorStartTag(16777215) + var4; // L: 10180
-		garbageValue = "229748808"
+						break;
-	)
+					}
-	@Export("alignWidgetSize")
-	static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
-		int var4 = var0.width; // L: 10820
-		int var5 = var0.height; // L: 10821
-		if (var0.widthAlignment == 0) { // L: 10822
-			var0.width = var0.rawWidth;
-		} else if (var0.widthAlignment == 1) { // L: 10823
-			var0.width = var1 - var0.rawWidth;
-		} else if (var0.widthAlignment == 2) { // L: 10824
-			var0.width = var0.rawWidth * var1 >> 14;
 				}
 
-		if (var0.heightAlignment == 0) { // L: 10825
-			var0.height = var0.rawHeight;
-		} else if (var0.heightAlignment == 1) { // L: 10826
-			var0.height = var2 - var0.rawHeight;
-		} else if (var0.heightAlignment == 2) { // L: 10827
-			var0.height = var2 * var0.rawHeight >> 14;
 			}
-
-		if (var0.widthAlignment == 4) { // L: 10828
-			var0.width = var0.field3352 * var0.height / var0.field3353;
 		}
-
+	} // L: 10184
-		if (var0.heightAlignment == 4) { // L: 10829
-			var0.height = var0.field3353 * var0.width / var0.field3352;
-		}
-
-		if (var0.contentType == 1337) { // L: 10830
-			Client.viewportWidget = var0;
-		}
-
-		if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10831
-			ScriptEvent var6 = new ScriptEvent(); // L: 10832
-			var6.widget = var0; // L: 10833
-			var6.args = var0.onResize; // L: 10834
-			Client.scriptEvents.addFirst(var6); // L: 10835
-		}
-
-	} // L: 10837
 }

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

@@ -6,38 +6,38 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nw")
+@ObfuscatedName("nc")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("sl")
+	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = 696721361
-	)
-	static int field4309;
-	@ObfuscatedName("v")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -1281452827
+	)
+	static int field4363;
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lpb;"
+		descriptor = "Lpz;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = 1094257697
-	)
-	@Export("archive")
-	int archive;
-	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lpb;"
+		descriptor = "Lpz;"
 	)
 	@Export("idxFile")
 	BufferedFile idxFile;
-	@ObfuscatedName("b")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1624557141
+		intValue = -54530023
+	)
+	@Export("archive")
+	int archive;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = -698225049
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -47,7 +47,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(ILpb;Lpb;I)V"
+		descriptor = "(ILpz;Lpz;I)V"
 	)
 	public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.datFile = null; // L: 8
@@ -55,14 +55,14 @@ public final class ArchiveDisk {
 		this.maxEntrySize = 65000; // L: 11
 		this.archive = var1; // L: 14
 		this.datFile = var2; // L: 15
-		this.idxFile = var3;
+		this.idxFile = var3; // L: 16
 		this.maxEntrySize = var4; // L: 17
 	} // L: 18
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(IB)[B",
-		garbageValue = "-3"
+		garbageValue = "-83"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -94,7 +94,7 @@ public final class ArchiveDisk {
 								return (byte[])var10000;
 							}
 
-							this.datFile.seek(520L * (long)var4); // L: 35
+							this.datFile.seek((long)var4 * 520L); // L: 35
 							int var8 = var3 - var6; // L: 36
 							int var9;
 							int var10;
@@ -107,7 +107,7 @@ public final class ArchiveDisk {
 								}
 
 								var13 = 10; // L: 44
-								this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 45
+								this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 45
 								var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 46
 								var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 47
 								var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); // L: 48
@@ -118,14 +118,14 @@ public final class ArchiveDisk {
 								}
 
 								var13 = 8; // L: 53
-								this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 54
+								this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 54
 								var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 55
 								var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 56
 								var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 57
 								var12 = ArchiveDisk_buffer[7] & 255; // L: 58
 							}
 
-							if (var9 == var1 && var7 == var10 && var12 == this.archive) { // L: 60
+							if (var9 == var1 && var10 == var7 && var12 == this.archive) { // L: 60
 								if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { // L: 61
 									int var14 = var13 + var8; // L: 62
 
@@ -156,18 +156,18 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I[BIB)Z",
+		descriptor = "(I[BII)Z",
-		garbageValue = "38"
+		garbageValue = "-1867257059"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
 		synchronized(this.datFile) { // L: 76
 			if (var3 >= 0 && var3 <= this.maxEntrySize) { // L: 77
 				boolean var5 = this.write0(var1, var2, var3, true); // L: 80
-				if (!var5) {
+				if (!var5) { // L: 81
-					var5 = this.write0(var1, var2, var3, false); // L: 81
+					var5 = this.write0(var1, var2, var3, false);
 				}
 
 				return var5; // L: 82
@@ -177,10 +177,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I[BIZI)Z",
-		garbageValue = "-2063908509"
+		garbageValue = "-802708417"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -221,18 +221,18 @@ public final class ArchiveDisk {
 
 				while (true) {
 					if (var7 < var3) { // L: 111
-						label169: {
+						label170: {
 							int var9 = 0; // L: 112
 							int var10;
 							if (var4) { // L: 113
-								this.datFile.seek((long)var6 * 520L); // L: 114
+								this.datFile.seek(520L * (long)var6); // L: 114
 								int var11;
 								int var12;
 								if (var1 > 65535) { // L: 118
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120
 									} catch (EOFException var17) { // L: 122
-										break label169; // L: 123
+										break label170; // L: 123
 									}
 
 									var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125
@@ -243,7 +243,7 @@ public final class ArchiveDisk {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132
 									} catch (EOFException var16) { // L: 134
-										break label169; // L: 135
+										break label170; // L: 135
 									}
 
 									var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137
@@ -252,7 +252,7 @@ public final class ArchiveDisk {
 									var12 = ArchiveDisk_buffer[7] & 255; // L: 140
 								}
 
-								if (var10 != var1 || var11 != var8 || var12 != this.archive) { // L: 142
+								if (var10 != var1 || var8 != var11 || var12 != this.archive) { // L: 142
 									var10000 = false;
 									return var10000;
 								}
@@ -270,7 +270,7 @@ public final class ArchiveDisk {
 									++var9;
 								}
 
-								if (var6 == var9) { // L: 149
+								if (var9 == var6) { // L: 149
 									++var9;
 								}
 							}
@@ -312,7 +312,7 @@ public final class ArchiveDisk {
 								ArchiveDisk_buffer[5] = (byte)(var9 >> 8); // L: 177
 								ArchiveDisk_buffer[6] = (byte)var9; // L: 178
 								ArchiveDisk_buffer[7] = (byte)this.archive; // L: 179
-								this.datFile.seek(520L * (long)var6); // L: 180
+								this.datFile.seek((long)var6 * 520L); // L: 180
 								this.datFile.write(ArchiveDisk_buffer, 0, 8); // L: 181
 								var10 = var3 - var7; // L: 182
 								if (var10 > 512) { // L: 183
@@ -341,13 +341,4 @@ public final class ArchiveDisk {
 	public String toString() {
 		return "" + this.archive; // L: 198
 	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Lcv;",
-		garbageValue = "1346835105"
-	)
-	static class82[] method6935() {
-		return new class82[]{class82.field1057, class82.field1059, class82.field1055, class82.field1056, class82.field1053}; // L: 16
-	}
 }

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

@@ -4,27 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kz")
+@ObfuscatedName("ky")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
+	@Export("PcmPlayer_stereo")
+	protected static boolean PcmPlayer_stereo;
+	@ObfuscatedName("ca")
+	@ObfuscatedSignature(
+		descriptor = "Lqd;"
+	)
+	static IndexedSprite field3997;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 502285257
+		intValue = 834168287
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("data")
 	public byte[] data;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lnw;"
+		descriptor = "Lnc;"
 	)
 	@Export("archiveDisk")
 	public ArchiveDisk archiveDisk;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Llx;"
+		descriptor = "Lle;"
 	)
 	@Export("archive")
 	public Archive archive;

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

@@ -1,46 +1,45 @@
+import java.io.DataInputStream;
+import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lg")
+@ObfuscatedName("lf")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lld;"
+		descriptor = "Llv;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
 	public static NodeDeque ArchiveDiskActionHandler_requestQueue;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lld;"
+		descriptor = "Llv;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
 	public static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1344367175
+		intValue = 996764791
 	)
-	public static int field3945;
+	static int field3998;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("ArchiveDiskActionHandler_lock")
-	public static Object ArchiveDiskActionHandler_lock;
+	static Object ArchiveDiskActionHandler_lock;
-	@ObfuscatedName("b")
+	@ObfuscatedName("nc")
-	@Export("ArchiveDiskActionHandler_thread")
+	@ObfuscatedGetter(
-	static Thread ArchiveDiskActionHandler_thread;
+		intValue = 1167654825
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lju;"
 	)
-	@Export("musicTrack")
+	@Export("selectedSpellWidget")
-	public static MusicTrack musicTrack;
+	static int selectedSpellWidget;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10
-		field3945 = 0; // L: 11
+		field3998 = 0; // L: 11
 		ArchiveDiskActionHandler_lock = new Object();
 	} // L: 12
 
@@ -51,226 +50,162 @@ public class ArchiveDiskActionHandler implements Runnable {
 		try {
 			while (true) {
 				ArchiveDiskAction var1;
-				synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 51
-					var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 52
-				} // L: 53
-
-				if (var1 != null) { // L: 54
-					if (var1.type == 0) { // L: 55
-						var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 56
-						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 57
-							var1.remove(); // L: 58
-						} // L: 59
-					} else if (var1.type == 1) { // L: 61
-						var1.data = var1.archiveDisk.read((int)var1.key); // L: 62
 				synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 63
-							ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 64
+					var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 64
-						} // L: 65
 				}
 
-					synchronized(ArchiveDiskActionHandler_lock) { // L: 67
+				if (var1 != null) { // L: 66
-						if (field3945 <= 1) { // L: 68
+					if (var1.type == 0) {
-							field3945 = 0; // L: 69
+						var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 68
-							ArchiveDiskActionHandler_lock.notifyAll(); // L: 70
+						synchronized(ArchiveDiskActionHandler_requestQueue) {
-							return; // L: 71
+							var1.remove(); // L: 70
+						} // L: 71
+					} else if (var1.type == 1) {
+						var1.data = var1.archiveDisk.read((int)var1.key);
+						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 75
+							ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 76
+						}
 					}
 
-						field3945 = 600; // L: 73
+					synchronized(ArchiveDiskActionHandler_lock) {
+						if (field3998 <= 1) { // L: 80
+							field3998 = 0; // L: 81
+							ArchiveDiskActionHandler_lock.notifyAll();
+							return; // L: 83
+						}
+
+						field3998 = 600; // L: 85
 					}
 				} else {
-					class93.method2384(100L); // L: 77
+					class241.method4815(100L); // L: 89
-					synchronized(ArchiveDiskActionHandler_lock) { // L: 78
+					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3945 <= 1) { // L: 79
+						if (field3998 <= 1) {
-							field3945 = 0; // L: 80
+							field3998 = 0;
-							ArchiveDiskActionHandler_lock.notifyAll(); // L: 81
+							ArchiveDiskActionHandler_lock.notifyAll();
-							return; // L: 82
+							return;
 						}
 
-						--field3945; // L: 84
+						--field3998;
 					}
 				}
 			}
-		} catch (Exception var13) { // L: 89
+		} catch (Exception var13) { // L: 101
-			Widget.RunException_sendStackTrace((String)null, var13); // L: 90
+			RunException_sendStackTrace((String)null, var13); // L: 102
 		}
-	} // L: 92
+	} // L: 104
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(II)[B",
+		descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V",
-		garbageValue = "-64972529"
+		garbageValue = "9"
 	)
-	@Export("ByteArrayPool_getArray")
+	@Export("RunException_sendStackTrace")
-	public static synchronized byte[] ByteArrayPool_getArray(int var0) {
+	public static void RunException_sendStackTrace(String var0, Throwable var1) {
-		return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 112
+		if (var1 != null) {
+			var1.printStackTrace();
+		} else {
+			try {
+				String var2 = ""; // L: 33
+				if (var1 != null) { // L: 34
+					var2 = class427.method7379(var1);
+				}
+
+				if (var0 != null) { // L: 35
+					if (var1 != null) {
+						var2 = var2 + " | ";
+					}
+
+					var2 = var2 + var0;
+				}
+
+				System.out.println("Error: " + var2); // L: 39
+				var2 = var2.replace(':', '.'); // L: 40
+				var2 = var2.replace('@', '_');
+				var2 = var2.replace('&', '_'); // L: 42
+				var2 = var2.replace('#', '_');
+				if (RunException.RunException_applet == null) { // L: 44
+					return;
+				}
+
+				URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + class385.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + class430.clientType + "&e=" + var2);
+				DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46
+				var4.read();
+				var4.close(); // L: 48
+			} catch (Exception var5) { // L: 50
+			}
+
+		}
 	}
 
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lky;I[B[BB)V",
+		descriptor = "(Ljava/lang/CharSequence;Lpj;B)Ljava/lang/String;",
-		garbageValue = "1"
+		garbageValue = "-25"
 	)
-	@Export("Widget_setKey")
+	public static String method5612(CharSequence var0, LoginType var1) {
-	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
+		if (var0 == null) { // L: 36
-		if (var0.field3415 == null) { // L: 988
+			return null;
-			if (var2 == null) { // L: 989
-				return; // L: 995
-			}
-
-			var0.field3415 = new byte[11][]; // L: 990
-			var0.field3485 = new byte[11][]; // L: 991
-			var0.field3417 = new int[11]; // L: 992
-			var0.field3418 = new int[11]; // L: 993
-		}
-
-		var0.field3415[var1] = var2; // L: 997
-		if (var2 != null) {
-			var0.field3414 = true; // L: 998
 		} else {
-			var0.field3414 = false; // L: 1000
+			int var2 = 0; // L: 37
 
-			for (int var4 = 0; var4 < var0.field3415.length; ++var4) { // L: 1001
+			int var3;
-				if (var0.field3415[var4] != null) { // L: 1002
+			boolean var4;
-					var0.field3414 = true; // L: 1003
+			char var5;
-					break; // L: 1004
+			for (var3 = var0.length(); var2 < var3; ++var2) { // L: 38 41 51
-				}
+				var5 = var0.charAt(var2); // L: 43
+				var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 45
+				if (!var4) { // L: 47
+					break;
 				}
 			}
 
-		var0.field3485[var1] = var3; // L: 1008
+			while (var3 > var2) { // L: 55
-	} // L: 1009
+				var5 = var0.charAt(var3 - 1); // L: 57
-
+				var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; // L: 59
-	@ObfuscatedName("r")
+				if (!var4) { // L: 61
-	@ObfuscatedSignature(
+					break;
-		descriptor = "(I)V",
-		garbageValue = "-433593353"
-	)
-	public static void method5813() {
-		class451.SpriteBuffer_xOffsets = null; // L: 239
-		class271.SpriteBuffer_yOffsets = null; // L: 240
-		class451.SpriteBuffer_spriteWidths = null; // L: 241
-		class451.SpriteBuffer_spriteHeights = null; // L: 242
-		NetFileRequest.SpriteBuffer_spritePalette = null; // L: 243
-		FriendLoginUpdate.SpriteBuffer_pixels = null; // L: 244
-	} // L: 245
-
-	@ObfuscatedName("kv")
-	@ObfuscatedSignature(
-		descriptor = "(Lky;IIIB)V",
-		garbageValue = "-122"
-	)
-	@Export("drawMinimap")
-	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
-		class116.playPcmPlayers(); // L: 12220
-		SpriteMask var4 = var0.getSpriteMask(false); // L: 12221
-		if (var4 != null) { // L: 12222
-			Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 12223
-			if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 12224
-				int var5 = Client.camAngleY & 2047; // L: 12225
-				int var6 = GrandExchangeEvents.localPlayer.x / 32 + 48; // L: 12226
-				int var7 = 464 - GrandExchangeEvents.localPlayer.y / 32; // L: 12227
-				HealthBarUpdate.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 12228
-
-				int var8;
-				int var10;
-				int var16;
-				for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 12229
-					var16 = Client.mapIconXs[var8] * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12230
-					var10 = Client.mapIconYs[var8] * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12231
-					ReflectionCheck.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 12232
 				}
 
-				int var11;
+				--var3; // L: 65
-				int var12;
-				for (var8 = 0; var8 < 104; ++var8) { // L: 12234
-					for (var16 = 0; var16 < 104; ++var16) { // L: 12235
-						NodeDeque var14 = Client.groundItems[class18.Client_plane][var8][var16]; // L: 12236
-						if (var14 != null) { // L: 12237
-							var11 = var8 * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12238
-							var12 = var16 * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12239
-							ReflectionCheck.drawSpriteOnMinimap(var1, var2, var11, var12, class54.mapDotSprites[0], var4); // L: 12240
-						}
-					}
 			}
 
-				for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 12244
+			int var10 = var3 - var2; // L: 67
-					NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 12245
+			if (var10 >= 1) { // L: 69
-					if (var9 != null && var9.isVisible()) { // L: 12246
+				byte var6;
-						NPCComposition var18 = var9.definition; // L: 12247
+				if (var1 == null) { // L: 73
-						if (var18 != null && var18.transforms != null) { // L: 12248
+					var6 = 12; // L: 74
-							var18 = var18.transform();
-						}
-
-						if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 12249
-							var11 = var9.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12250
-							var12 = var9.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12251
-							ReflectionCheck.drawSpriteOnMinimap(var1, var2, var11, var12, class54.mapDotSprites[1], var4); // L: 12252
-						}
-					}
-				}
-
-				var8 = Players.Players_count; // L: 12256
-				int[] var17 = Players.Players_indices; // L: 12257
-
-				for (var10 = 0; var10 < var8; ++var10) { // L: 12258
-					Player var15 = Client.players[var17[var10]]; // L: 12259
-					if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != GrandExchangeEvents.localPlayer) { // L: 12260
-						var12 = var15.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12261
-						int var13 = var15.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12262
-						if (var15.isFriend()) { // L: 12263
-							ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[3], var4);
-						} else if (GrandExchangeEvents.localPlayer.team != 0 && var15.team != 0 && var15.team == GrandExchangeEvents.localPlayer.team) { // L: 12264
-							ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[4], var4);
-						} else if (var15.isFriendsChatMember()) { // L: 12265
-							ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[5], var4);
-						} else if (var15.isClanMember()) { // L: 12266
-							ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[6], var4);
 				} else {
-							ReflectionCheck.drawSpriteOnMinimap(var1, var2, var12, var13, class54.mapDotSprites[2], var4); // L: 12267
+					switch(var1.field4617) { // L: 77
+					case 0:
+						var6 = 20; // L: 82
+						break;
+					default:
+						var6 = 12; // L: 79
+					}
+				}
+
+				if (var10 <= var6) { // L: 86
+					StringBuilder var9 = new StringBuilder(var10); // L: 90
+
+					for (int var11 = var2; var11 < var3; ++var11) { // L: 91
+						char var7 = var0.charAt(var11); // L: 92
+						if (BufferedSource.method6702(var7)) { // L: 93
+							char var8 = Language.method5877(var7); // L: 94
+							if (var8 != 0) { // L: 95
+								var9.append(var8); // L: 96
 							}
 						}
 					}
 
-				if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 12270
+					if (var9.length() == 0) { // L: 98
-					if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 12271
+						return null;
-						NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 12272
+					}
-						if (var19 != null) { // L: 12273
+
-							var11 = var19.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12274
+					return var9.toString(); // L: 99
-							var12 = var19.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12275
-							ReflectionCheck.worldToMinimap(var1, var2, var11, var12, WorldMapLabelSize.mapMarkerSprites[1], var4); // L: 12276
 				}
 			}
 
-					if (Client.hintArrowType == 2) { // L: 12279
+			return null; // L: 88
-						var10 = Client.hintArrowX * 4 - GrandExchangeOfferOwnWorldComparator.baseX * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12280
-						var11 = Client.hintArrowY * 4 - VarcInt.baseY * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12281
-						ReflectionCheck.worldToMinimap(var1, var2, var10, var11, WorldMapLabelSize.mapMarkerSprites[1], var4); // L: 12282
-					}
-
-					if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 12284
-						Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 12285
-						if (var20 != null) { // L: 12286
-							var11 = var20.x / 32 - GrandExchangeEvents.localPlayer.x / 32; // L: 12287
-							var12 = var20.y / 32 - GrandExchangeEvents.localPlayer.y / 32; // L: 12288
-							ReflectionCheck.worldToMinimap(var1, var2, var11, var12, WorldMapLabelSize.mapMarkerSprites[1], var4); // L: 12289
 		}
 	}
 }
-
-				if (Client.destinationX != 0) { // L: 12293
-					var10 = Client.destinationX * 4 + 2 - GrandExchangeEvents.localPlayer.x / 32; // L: 12294
-					var11 = Client.destinationY * 4 + 2 - GrandExchangeEvents.localPlayer.y / 32; // L: 12295
-					ReflectionCheck.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapLabelSize.mapMarkerSprites[0], var4); // L: 12296
-				}
-
-				if (!GrandExchangeEvents.localPlayer.isHidden) { // L: 12298
-					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); // L: 12300
-			}
-
-			Client.field716[var3] = true; // L: 12301
-		}
-	} // L: 12302
-}

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

@@ -1,40 +1,34 @@
-import java.util.Collections;
 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("bz")
+@ObfuscatedName("bp")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("hg")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lhv;"
+		descriptor = "Lle;"
-	)
-	@Export("scene")
-	static Scene scene;
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "Llx;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 711415979
+		intValue = -404162061
 	)
 	@Export("groupCount")
 	final int groupCount;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -905507323
+		intValue = -1950157047
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		descriptor = "(Llx;Ljava/lang/String;)V"
+		descriptor = "(Lle;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0; // L: 9
@@ -42,17 +36,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount(); // L: 13
 	} // L: 14
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
+		descriptor = "(I)Z",
-		garbageValue = "0"
+		garbageValue = "-1365376212"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0; // L: 17
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18
-			if (!this.archive.method5824(var1) || this.archive.method5814(var1)) {
+			if (!this.archive.method5634(var1) || this.archive.method5633(var1)) {
 				++this.loadedCount; // L: 19
 			}
 		}
@@ -60,111 +54,578 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount; // L: 21
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "([I[II)V",
+		descriptor = "(ILbb;ZB)I",
-		garbageValue = "-1372726492"
+		garbageValue = "-59"
 	)
-	public static void method2061(int[] var0, int[] var1) {
+	static int method2041(int var0, Script var1, boolean var2) {
-		if (var0 != null && var1 != null) { // L: 43
+		Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1248
-			FloorOverlayDefinition.ByteArrayPool_alternativeSizes = var0; // L: 50
+		if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1249
-			class128.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 51
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapSection1.Widget_unpackTargetMask(UrlRequester.getWidgetFlags(var3)); // L: 1250
-			BoundaryObject.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 52
+			return 1; // L: 1251
-
+		} else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1253
-			for (int var2 = 0; var2 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 53
+			if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1260
-				BoundaryObject.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 54
+				if (var3.dataText == null) { // L: 1261
-				ByteArrayPool.field4167.add(var0[var2]); // L: 55
+					Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = "";
-			}
-
-			Collections.sort(ByteArrayPool.field4167); // L: 57
 				} else {
-			FloorOverlayDefinition.ByteArrayPool_alternativeSizes = null; // L: 44
+					Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1262
-			class128.ByteArrayPool_altSizeArrayCounts = null; // L: 45
-			BoundaryObject.ByteArrayPool_arrays = null; // L: 46
-			Login.method1960(); // L: 47
-		}
-	} // L: 48 58
-
-	@ObfuscatedName("gr")
-	@ObfuscatedSignature(
-		descriptor = "(Lcz;ZI)V",
-		garbageValue = "784160741"
-	)
-	@Export("addPlayerToScene")
-	static void addPlayerToScene(Player var0, boolean var1) {
-		if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4782
-			var0.isUnanimated = false; // L: 4783
-			if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4784 4785
-				var0.isUnanimated = true;
 				}
 
-			int var2 = var0.x >> 7; // L: 4787
+				return 1; // L: 1263
-			int var3 = var0.y >> 7; // L: 4788
-			if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4789
-				long var4 = GameObject.calculateTag(0, 0, 0, false, var0.index); // L: 4790
-				if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4791
-					var0.isUnanimated = false; // L: 4792
-					var0.tileHeight = WorldMapLabel.getTileHeight(var0.x, var0.y, class18.Client_plane); // L: 4793
-					var0.playerCycle = Client.cycle; // L: 4794
-					scene.addNullableObject(class18.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4795
 			} else {
-					if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4798
+				return 2; // L: 1265
-						if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4799
+			}
-							return;
+		} else {
+			int var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1254
+			--var4; // L: 1255
+			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1256
+				Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1257
+			} else {
+				Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = "";
 			}
 
-						Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4800
+			return 1; // L: 1258
-					}
-
-					var0.tileHeight = WorldMapLabel.getTileHeight(var0.x, var0.y, class18.Client_plane); // L: 4802
-					var0.playerCycle = Client.cycle; // L: 4803
-					scene.drawEntity(class18.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4804
-				}
 		}
 	}
 
-	} // L: 4808
+	@ObfuscatedName("h")
-
-	@ObfuscatedName("ja")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
+		descriptor = "(IIII)I",
-		garbageValue = "1332589491"
+		garbageValue = "664108386"
 	)
-	static boolean method2062(int var0) {
+	@Export("hslToRgb")
-		for (int var1 = 0; var1 < Client.field731; ++var1) { // L: 11711
+	static final int hslToRgb(int var0, int var1, int var2) {
-			if (Client.field733[var1] == var0) { // L: 11712
+		if (var2 > 179) { // L: 990
-				return true;
+			var1 /= 2;
-			}
 		}
 
-		return false; // L: 11714
+		if (var2 > 192) { // L: 991
+			var1 /= 2;
 		}
 
-	@ObfuscatedName("ls")
+		if (var2 > 217) { // L: 992
+			var1 /= 2;
+		}
+
+		if (var2 > 243) { // L: 993
+			var1 /= 2;
+		}
+
+		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 994
+		return var3; // L: 995
+	}
+
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;",
+		descriptor = "(ILbb;ZB)I",
-		garbageValue = "-1401650476"
+		garbageValue = "-74"
 	)
-	static String method2063(String var0, boolean var1) {
+	static int method2045(int var0, Script var1, boolean var2) {
-		String var2 = var1 ? "https://" : "http://"; // L: 12488
+		int var3;
-		if (Client.gameBuild == 1) { // L: 12489
+		if (var0 == 3500) { // L: 2322
-			var0 = var0 + "-wtrc";
+			var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2323
-		} else if (Client.gameBuild == 2) { // L: 12490
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator8.method2581(var3) ? 1 : 0; // L: 2324
-			var0 = var0 + "-wtqa";
+			return 1; // L: 2325
-		} else if (Client.gameBuild == 3) { // L: 12491
+		} else if (var0 == 3501) { // L: 2327
-			var0 = var0 + "-wtwip";
+			var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2328
-		} else if (Client.gameBuild == 5) { // L: 12492
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WorldMapAreaData.method4880(var3) ? 1 : 0; // L: 2329
-			var0 = var0 + "-wti";
+			return 1; // L: 2330
-		} else if (Client.gameBuild == 4) { // L: 12493
+		} else if (var0 == 3502) { // L: 2332
-			var0 = "local";
+			var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 2333
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class19.method257(var3) ? 1 : 0; // L: 2334
+			return 1; // L: 2335
+		} else {
+			return 2; // L: 2337
+		}
 	}
 
-		String var3 = ""; // L: 12494
+	@ObfuscatedName("fj")
-		if (class65.field868 != null) { // L: 12495
+	@ObfuscatedSignature(
-			var3 = "/p=" + class65.field868;
+		descriptor = "(I)V",
+		garbageValue = "-1781905177"
+	)
+	@Export("playPcmPlayers")
+	static final void playPcmPlayers() {
+		if (Fonts.pcmPlayer1 != null) { // L: 3757
+			Fonts.pcmPlayer1.run();
 		}
 
-		String var4 = "runescape.com"; // L: 12496
+		if (SecureRandomCallable.pcmPlayer0 != null) { // L: 3758
-		return var2 + var0 + "." + var4 + "/l=" + Skills.clientLanguage + "/a=" + GrandExchangeOfferOwnWorldComparator.field483 + var3 + "/"; // L: 12497
+			SecureRandomCallable.pcmPlayer0.run();
+		}
+
+	} // L: 3759
+
+	@ObfuscatedName("gn")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "-440186297"
+	)
+	@Export("drawEntities")
+	static final void drawEntities(int var0, int var1, int var2, int var3) {
+		++Client.viewportDrawCount; // L: 4584
+		if (ModelData0.localPlayer.x >> 7 == Client.destinationX && ModelData0.localPlayer.y >> 7 == Client.destinationY) { // L: 4586
+			Client.destinationX = 0; // L: 4587
+		}
+
+		CollisionMap.method3778(); // L: 4590
+		if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4592
+			class263.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4593
+		}
+
+		class137.addNpcsToScene(true); // L: 4596
+		int var4 = Players.Players_count; // L: 4598
+		int[] var5 = Players.Players_indices; // L: 4599
+
+		int var6;
+		for (var6 = 0; var6 < var4; ++var6) { // L: 4600
+			if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4601
+				class263.addPlayerToScene(Client.players[var5[var6]], true); // L: 4602
 			}
 		}
+
+		class137.addNpcsToScene(false); // L: 4605
+
+		for (Projectile var30 = (Projectile)Client.projectiles.last(); var30 != null; var30 = (Projectile)Client.projectiles.previous()) { // L: 4607 4608 4625
+			if (var30.plane == class128.Client_plane && Client.cycle <= var30.cycleEnd) { // L: 4609
+				if (Client.cycle >= var30.cycleStart) { // L: 4610
+					if (var30.targetIndex > 0) { // L: 4611
+						NPC var34 = Client.npcs[var30.targetIndex - 1]; // L: 4612
+						if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { // L: 4613
+							var30.setDestination(var34.x, var34.y, class202.getTileHeight(var34.x, var34.y, var30.plane) - var30.endHeight, Client.cycle);
+						}
+					}
+
+					if (var30.targetIndex < 0) { // L: 4615
+						var6 = -var30.targetIndex - 1; // L: 4617
+						Player var35;
+						if (var6 == Client.localPlayerIndex) { // L: 4618
+							var35 = ModelData0.localPlayer;
+						} else {
+							var35 = Client.players[var6]; // L: 4619
+						}
+
+						if (var35 != null && var35.x >= 0 && var35.x < 13312 && var35.y >= 0 && var35.y < 13312) { // L: 4620
+							var30.setDestination(var35.x, var35.y, class202.getTileHeight(var35.x, var35.y, var30.plane) - var30.endHeight, Client.cycle);
+						}
+					}
+
+					var30.advance(Client.field727); // L: 4622
+					class175.scene.drawEntity(class128.Client_plane, (int)var30.x, (int)var30.y, (int)var30.z, 60, var30, var30.yaw, -1L, false); // L: 4623
+				}
+			} else {
+				var30.remove();
+			}
+		}
+
+		for (GraphicsObject var37 = (GraphicsObject)Client.graphicsObjects.last(); var37 != null; var37 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4629 4630 4637
+			if (var37.plane == class128.Client_plane && !var37.isFinished) { // L: 4631
+				if (Client.cycle >= var37.cycleStart) { // L: 4632
+					var37.advance(Client.field727); // L: 4633
+					if (var37.isFinished) { // L: 4634
+						var37.remove();
+					} else {
+						class175.scene.drawEntity(var37.plane, var37.x, var37.y, var37.z, 60, var37, 0, -1L, false); // L: 4635
+					}
+				}
+			} else {
+				var37.remove();
+			}
+		}
+
+		GrandExchangeOfferOwnWorldComparator.setViewportShape(var0, var1, var2, var3, true); // L: 4640
+		var0 = Client.viewportOffsetX; // L: 4641
+		var1 = Client.viewportOffsetY; // L: 4642
+		var2 = Client.viewportWidth; // L: 4643
+		var3 = Client.viewportHeight; // L: 4644
+		Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4645
+		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4646
+		var4 = Client.camAngleX; // L: 4647
+		if (Client.field578 / 256 > var4) { // L: 4648
+			var4 = Client.field578 / 256;
+		}
+
+		if (Client.field743[4] && Client.field745[4] + 128 > var4) { // L: 4649
+			var4 = Client.field745[4] + 128;
+		}
+
+		int var31 = Client.camAngleY & 2047; // L: 4650
+		User.method6523(HorizontalAlignment.oculusOrbFocalPointX, class140.field1666, class28.oculusOrbFocalPointY, var4, var31, class10.method94(var4), var3); // L: 4651
+		int var7;
+		int var8;
+		int var9;
+		int var10;
+		int var11;
+		int var12;
+		int var13;
+		int var14;
+		int var16;
+		if (!Client.isCameraLocked) { // L: 4653
+			if (class12.clientPreferences.method2222()) { // L: 4656
+				var7 = class128.Client_plane; // L: 4657
+			} else {
+				label630: {
+					var8 = 3; // L: 4660
+					if (GameEngine.cameraPitch < 310) { // L: 4661
+						label622: {
+							if (Client.oculusOrbState == 1) { // L: 4664
+								var9 = HorizontalAlignment.oculusOrbFocalPointX >> 7; // L: 4665
+								var10 = class28.oculusOrbFocalPointY >> 7; // L: 4666
+							} else {
+								var9 = ModelData0.localPlayer.x >> 7; // L: 4669
+								var10 = ModelData0.localPlayer.y >> 7; // L: 4670
+							}
+
+							var11 = class343.cameraX >> 7; // L: 4672
+							var12 = FaceNormal.cameraZ >> 7; // L: 4673
+							if (var11 >= 0 && var12 >= 0 && var11 < 104 && var12 < 104) { // L: 4674
+								if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104) { // L: 4678
+									if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4682
+										var8 = class128.Client_plane;
+									}
+
+									if (var9 > var11) { // L: 4684
+										var13 = var9 - var11;
+									} else {
+										var13 = var11 - var9; // L: 4685
+									}
+
+									if (var10 > var12) { // L: 4687
+										var14 = var10 - var12;
+									} else {
+										var14 = var12 - var10; // L: 4688
+									}
+
+									int var15;
+									if (var13 > var14) { // L: 4689
+										var15 = var14 * 65536 / var13; // L: 4690
+										var16 = 32768; // L: 4691
+
+										while (true) {
+											if (var9 == var11) { // L: 4692
+												break label622;
+											}
+
+											if (var11 < var9) { // L: 4693
+												++var11;
+											} else if (var11 > var9) { // L: 4694
+												--var11;
+											}
+
+											if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4695
+												var8 = class128.Client_plane;
+											}
+
+											var16 += var15; // L: 4696
+											if (var16 >= 65536) { // L: 4697
+												var16 -= 65536; // L: 4698
+												if (var12 < var10) { // L: 4699
+													++var12;
+												} else if (var12 > var10) { // L: 4700
+													--var12;
+												}
+
+												if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4701
+													var8 = class128.Client_plane;
+												}
+											}
+										}
+									} else {
+										if (var14 > 0) { // L: 4705
+											var15 = var13 * 65536 / var14; // L: 4706
+											var16 = 32768; // L: 4707
+
+											while (var12 != var10) { // L: 4708
+												if (var12 < var10) { // L: 4709
+													++var12;
+												} else if (var12 > var10) { // L: 4710
+													--var12;
+												}
+
+												if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4711
+													var8 = class128.Client_plane;
+												}
+
+												var16 += var15; // L: 4712
+												if (var16 >= 65536) { // L: 4713
+													var16 -= 65536; // L: 4714
+													if (var11 < var9) { // L: 4715
+														++var11;
+													} else if (var11 > var9) { // L: 4716
+														--var11;
+													}
+
+													if ((Tiles.Tiles_renderFlags[class128.Client_plane][var11][var12] & 4) != 0) { // L: 4717
+														var8 = class128.Client_plane;
+													}
+												}
+											}
+										}
+										break label622;
+									}
+								}
+
+								var7 = class128.Client_plane; // L: 4679
+								break label630; // L: 4680
+							}
+
+							var7 = class128.Client_plane; // L: 4675
+							break label630; // L: 4676
+						}
+					}
+
+					if (ModelData0.localPlayer.x >= 0 && ModelData0.localPlayer.y >= 0 && ModelData0.localPlayer.x < 13312 && ModelData0.localPlayer.y < 13312) { // L: 4722
+						if ((Tiles.Tiles_renderFlags[class128.Client_plane][ModelData0.localPlayer.x >> 7][ModelData0.localPlayer.y >> 7] & 4) != 0) { // L: 4726
+							var8 = class128.Client_plane;
+						}
+
+						var7 = var8; // L: 4727
+					} else {
+						var7 = class128.Client_plane; // L: 4723
+					}
+				}
+			}
+
+			var6 = var7; // L: 4729
+		} else {
+			var6 = class101.method2551(); // L: 4731
+		}
+
+		var7 = class343.cameraX; // L: 4732
+		var8 = class295.cameraY; // L: 4733
+		var9 = FaceNormal.cameraZ; // L: 4734
+		var10 = GameEngine.cameraPitch; // L: 4735
+		var11 = StudioGame.cameraYaw; // L: 4736
+
+		for (var12 = 0; var12 < 5; ++var12) { // L: 4737
+			if (Client.field743[var12]) { // L: 4738
+				var13 = (int)(Math.random() * (double)(Client.field744[var12] * 2 + 1) - (double)Client.field744[var12] + Math.sin((double)Client.field714[var12] / 100.0D * (double)Client.field677[var12]) * (double)Client.field745[var12]); // L: 4739
+				if (var12 == 0) { // L: 4740
+					class343.cameraX += var13;
+				}
+
+				if (var12 == 1) { // L: 4741
+					class295.cameraY += var13;
+				}
+
+				if (var12 == 2) { // L: 4742
+					FaceNormal.cameraZ += var13;
+				}
+
+				if (var12 == 3) { // L: 4743
+					StudioGame.cameraYaw = var13 + StudioGame.cameraYaw & 2047;
+				}
+
+				if (var12 == 4) { // L: 4744
+					GameEngine.cameraPitch += var13; // L: 4745
+					if (GameEngine.cameraPitch < 128) { // L: 4746
+						GameEngine.cameraPitch = 128;
+					}
+
+					if (GameEngine.cameraPitch > 383) { // L: 4747
+						GameEngine.cameraPitch = 383;
+					}
+				}
+			}
+		}
+
+		var12 = MouseHandler.MouseHandler_x; // L: 4751
+		var13 = MouseHandler.MouseHandler_y; // L: 4752
+		if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4753
+			var12 = MouseHandler.MouseHandler_lastPressedX; // L: 4754
+			var13 = MouseHandler.MouseHandler_lastPressedY; // L: 4755
+		}
+
+		if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { // L: 4757
+			class136.method2865(var12 - var0, var13 - var1); // L: 4758
+		} else {
+			ViewportMouse.ViewportMouse_isInViewport = false; // L: 4762
+			ViewportMouse.ViewportMouse_entityCount = 0; // L: 4763
+		}
+
+		playPcmPlayers(); // L: 4766
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4767
+		playPcmPlayers(); // L: 4768
+		var14 = Rasterizer3D.Rasterizer3D_zoom; // L: 4769
+		Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4770
+		class175.scene.draw(class343.cameraX, class295.cameraY, FaceNormal.cameraZ, GameEngine.cameraPitch, StudioGame.cameraYaw, var6); // L: 4771
+		Rasterizer3D.Rasterizer3D_zoom = var14; // L: 4772
+		playPcmPlayers(); // L: 4773
+		class175.scene.clearTempGameObjects(); // L: 4774
+		Client.overheadTextCount = 0; // L: 4776
+		boolean var36 = false; // L: 4777
+		var16 = -1; // L: 4778
+		int var17 = -1; // L: 4779
+		int var18 = Players.Players_count; // L: 4780
+		int[] var19 = Players.Players_indices; // L: 4781
+
+		int var20;
+		for (var20 = 0; var20 < var18 + Client.npcCount; ++var20) { // L: 4782
+			Object var33;
+			if (var20 < var18) { // L: 4784
+				var33 = Client.players[var19[var20]]; // L: 4785
+				if (var19[var20] == Client.combatTargetPlayerIndex) { // L: 4786
+					var36 = true; // L: 4787
+					var16 = var20; // L: 4788
+					continue;
+				}
+
+				if (var33 == ModelData0.localPlayer) { // L: 4791
+					var17 = var20; // L: 4792
+					continue; // L: 4793
+				}
+			} else {
+				var33 = Client.npcs[Client.npcIndices[var20 - var18]]; // L: 4796
+			}
+
+			Client.drawActor2d((Actor)var33, var20, var0, var1, var2, var3); // L: 4797
+		}
+
+		if (Client.renderSelf && var17 != -1) { // L: 4799
+			Client.drawActor2d(ModelData0.localPlayer, var17, var0, var1, var2, var3); // L: 4800
+		}
+
+		if (var36) { // L: 4802
+			Client.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var16, var0, var1, var2, var3); // L: 4803
+		}
+
+		for (var20 = 0; var20 < Client.overheadTextCount; ++var20) { // L: 4805
+			int var21 = Client.overheadTextXs[var20]; // L: 4806
+			int var22 = Client.overheadTextYs[var20]; // L: 4807
+			int var23 = Client.overheadTextXOffsets[var20]; // L: 4808
+			int var24 = Client.overheadTextAscents[var20]; // L: 4809
+			boolean var25 = true; // L: 4810
+
+			while (var25) {
+				var25 = false; // L: 4812
+
+				for (int var32 = 0; var32 < var20; ++var32) { // L: 4813
+					if (var22 + 2 > Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] && var22 - var24 < Client.overheadTextYs[var32] + 2 && var21 - var23 < Client.overheadTextXOffsets[var32] + Client.overheadTextXs[var32] && var21 + var23 > Client.overheadTextXs[var32] - Client.overheadTextXOffsets[var32] && Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] < var22) { // L: 4814 4815
+						var22 = Client.overheadTextYs[var32] - Client.overheadTextAscents[var32]; // L: 4816
+						var25 = true; // L: 4817
+					}
+				}
+			}
+
+			Client.viewportTempX = Client.overheadTextXs[var20]; // L: 4822
+			Client.viewportTempY = Client.overheadTextYs[var20] = var22; // L: 4823
+			String var26 = Client.overheadText[var20]; // L: 4824
+			if (Client.chatEffects == 0) { // L: 4825
+				int var27 = 16776960; // L: 4826
+				if (Client.overheadTextColors[var20] < 6) { // L: 4827
+					var27 = Client.field769[Client.overheadTextColors[var20]];
+				}
+
+				if (Client.overheadTextColors[var20] == 6) { // L: 4828
+					var27 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
+				}
+
+				if (Client.overheadTextColors[var20] == 7) { // L: 4829
+					var27 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
+				}
+
+				if (Client.overheadTextColors[var20] == 8) { // L: 4830
+					var27 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
+				}
+
+				int var28;
+				if (Client.overheadTextColors[var20] == 9) { // L: 4831
+					var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4832
+					if (var28 < 50) { // L: 4833
+						var27 = var28 * 1280 + 16711680;
+					} else if (var28 < 100) { // L: 4834
+						var27 = 16776960 - (var28 - 50) * 327680;
+					} else if (var28 < 150) { // L: 4835
+						var27 = (var28 - 100) * 5 + 65280;
+					}
+				}
+
+				if (Client.overheadTextColors[var20] == 10) { // L: 4837
+					var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4838
+					if (var28 < 50) { // L: 4839
+						var27 = var28 * 5 + 16711680;
+					} else if (var28 < 100) { // L: 4840
+						var27 = 16711935 - (var28 - 50) * 327680;
+					} else if (var28 < 150) { // L: 4841
+						var27 = (var28 - 100) * 327680 + 255 - (var28 - 100) * 5;
+					}
+				}
+
+				if (Client.overheadTextColors[var20] == 11) { // L: 4843
+					var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4844
+					if (var28 < 50) { // L: 4845
+						var27 = 16777215 - var28 * 327685;
+					} else if (var28 < 100) { // L: 4846
+						var27 = (var28 - 50) * 327685 + 65280;
+					} else if (var28 < 150) {
+						var27 = 16777215 - (var28 - 100) * 327680; // L: 4847
+					}
+				}
+
+				if (Client.overheadTextEffects[var20] == 0) { // L: 4849
+					ChatChannel.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0);
+				}
+
+				if (Client.overheadTextEffects[var20] == 1) { // L: 4850
+					ChatChannel.fontBold12.drawCenteredWave(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount);
+				}
+
+				if (Client.overheadTextEffects[var20] == 2) { // L: 4851
+					ChatChannel.fontBold12.drawCenteredWave2(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount);
+				}
+
+				if (Client.overheadTextEffects[var20] == 3) { // L: 4852
+					ChatChannel.fontBold12.drawCenteredShake(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var20]);
+				}
+
+				if (Client.overheadTextEffects[var20] == 4) { // L: 4853
+					var28 = (150 - Client.overheadTextCyclesRemaining[var20]) * (ChatChannel.fontBold12.stringWidth(var26) + 100) / 150; // L: 4854
+					Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4855
+					ChatChannel.fontBold12.draw(var26, var0 + Client.viewportTempX + 50 - var28, Client.viewportTempY + var1, var27, 0); // L: 4856
+					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4857
+				}
+
+				if (Client.overheadTextEffects[var20] == 5) { // L: 4859
+					var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 4860
+					int var29 = 0; // L: 4861
+					if (var28 < 25) { // L: 4862
+						var29 = var28 - 25;
+					} else if (var28 > 125) { // L: 4863
+						var29 = var28 - 125;
+					}
+
+					Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - ChatChannel.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4864
+					ChatChannel.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, var29 + Client.viewportTempY + var1, var27, 0); // L: 4865
+					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4866
+				}
+			} else {
+				ChatChannel.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4870
+			}
+		}
+
+		if (Client.hintArrowType == 2) { // L: 4875
+			AbstractWorldMapIcon.worldToScreen((Client.hintArrowX - SecureRandomCallable.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - GrandExchangeOfferOwnWorldComparator.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4876
+			if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4877
+				class21.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
+			}
+		}
+
+		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field727); // L: 4879
+		class360.method6393(); // L: 4881
+		class343.cameraX = var7; // L: 4883
+		class295.cameraY = var8; // L: 4884
+		FaceNormal.cameraZ = var9; // L: 4885
+		GameEngine.cameraPitch = var10; // L: 4886
+		StudioGame.cameraYaw = var11; // L: 4887
+		if (Client.isLoading && HealthBarUpdate.method2181(true, false) == 0) { // L: 4888
+			Client.isLoading = false;
+		}
+
+		if (Client.isLoading) { // L: 4889
+			Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4890
+			class259.drawLoadingMessage("Loading - please wait.", false); // L: 4891
+		}
+
+	} // L: 4893
+}

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

@@ -4,73 +4,97 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cn")
+@ObfuscatedName("cq")
 @Implements("AttackOption")
 public enum AttackOption implements MouseWheel {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lcn;"
+		descriptor = "Lcq;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lcn;"
+		descriptor = "Lcq;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lcn;"
+		descriptor = "Lcq;"
 	)
-	field1257(2),
+	field1285(2),
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lcn;"
+		descriptor = "Lcq;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3),
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lcn;"
+		descriptor = "Lcq;"
 	)
-	field1263(4);
+	field1283(4);
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("fn")
-	@ObfuscatedSignature(
-		descriptor = "Lln;"
-	)
-	@Export("ItemDefinition_modelArchive")
-	static AbstractArchive ItemDefinition_modelArchive;
-	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -2042861585
+		intValue = 1045451155
 	)
-	static int field1255;
+	static int field1290;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "Lqq;"
-	)
-	@Export("worldSelectRightSprite")
-	static IndexedSprite worldSelectRightSprite;
-	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -887019937
+		intValue = 1694685345
 	)
 	@Export("id")
 	final int id;
 
 	AttackOption(int var3) {
-		this.id = var3; // L: 12684
+		this.id = var3; // L: 12733
-	} // L: 12685
+	} // L: 12734
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "16"
+		garbageValue = "30"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 12688
+		return this.id; // L: 12738
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)I",
+		garbageValue = "-59"
+	)
+	public static int method2401(int var0, int var1) {
+		int var2;
+		for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28
+			if ((var1 & 1) != 0) { // L: 26
+				var2 = var0 * var2;
+			}
+
+			var0 *= var0; // L: 27
+		}
+
+		if (var1 == 1) { // L: 30
+			return var0 * var2;
+		} else {
+			return var2; // L: 31
+		}
+	}
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		descriptor = "(Lpt;ILjava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "-1761568873"
+	)
+	static String method2393(IterableNodeHashTable var0, int var1, String var2) {
+		if (var0 == null) { // L: 41
+			return var2;
+		} else {
+			ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 42
+			return var3 == null ? var2 : (String)var3.obj; // L: 43 44
+		}
 	}
 }

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

@@ -3,154 +3,154 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("aa")
+@ObfuscatedName("ba")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
-	static float[][] field407;
+	static float[][] field410;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
-	static float field409;
+	static float field417;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
-	int[][][] field412;
+	int[][][] field415;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
-	int[][][] field402;
+	int[][][] field413;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
-	int[] field413;
+	int[] field412;
 
 	static {
-		field407 = new float[2][8]; // L: 13
+		field410 = new float[2][8]; // L: 13
 		coefficients = new int[2][8]; // L: 14
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2]; // L: 8
-		this.field412 = new int[2][2][4]; // L: 10
+		this.field415 = new int[2][2][4]; // L: 10
-		this.field402 = new int[2][2][4]; // L: 11
+		this.field413 = new int[2][2][4]; // L: 11
-		this.field413 = new int[2]; // L: 12
+		this.field412 = new int[2]; // L: 12
 	} // L: 21
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
-	float method1040(int var1, int var2, float var3) {
+	float method1042(int var1, int var2, float var3) {
-		float var4 = (float)this.field402[var1][0][var2] + var3 * (float)(this.field402[var1][1][var2] - this.field402[var1][0][var2]); // L: 24
+		float var4 = (float)this.field413[var1][0][var2] + var3 * (float)(this.field413[var1][1][var2] - this.field413[var1][0][var2]); // L: 24
 		var4 *= 0.0015258789F; // L: 25
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); // L: 26
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
-	float method1056(int var1, int var2, float var3) {
+	float method1040(int var1, int var2, float var3) {
-		float var4 = (float)this.field412[var1][0][var2] + var3 * (float)(this.field412[var1][1][var2] - this.field412[var1][0][var2]); // L: 35
+		float var4 = (float)this.field415[var1][0][var2] + var3 * (float)(this.field415[var1][1][var2] - this.field415[var1][0][var2]); // L: 35
 		var4 *= 1.2207031E-4F; // L: 36
 		return normalize(var4); // L: 37
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) { // L: 41
-			var3 = (float)this.field413[0] + (float)(this.field413[1] - this.field413[0]) * var2; // L: 42
+			var3 = (float)this.field412[0] + (float)(this.field412[1] - this.field412[0]) * var2; // L: 42
 			var3 *= 0.0030517578F; // L: 43
-			field409 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44
+			field417 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44
-			forwardMultiplier = (int)(field409 * 65536.0F); // L: 45
+			forwardMultiplier = (int)(field417 * 65536.0F); // L: 45
 		}
 
 		if (this.pairs[var1] == 0) { // L: 47
 			return 0;
 		} else {
-			var3 = this.method1040(var1, 0, var2); // L: 48
+			var3 = this.method1042(var1, 0, var2); // L: 48
-			field407[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1056(var1, 0, var2)); // L: 49
+			field410[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1040(var1, 0, var2)); // L: 49
-			field407[var1][1] = var3 * var3; // L: 50
+			field410[var1][1] = var3 * var3; // L: 50
 
 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51
-				var3 = this.method1040(var1, var4, var2); // L: 52
+				var3 = this.method1042(var1, var4, var2); // L: 52
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1056(var1, var4, var2)); // L: 53
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1040(var1, var4, var2)); // L: 53
 				float var6 = var3 * var3; // L: 54
-				field407[var1][var4 * 2 + 1] = field407[var1][var4 * 2 - 1] * var6; // L: 55
+				field410[var1][var4 * 2 + 1] = field410[var1][var4 * 2 - 1] * var6; // L: 55
-				field407[var1][var4 * 2] = field407[var1][var4 * 2 - 1] * var5 + field407[var1][var4 * 2 - 2] * var6; // L: 56
+				field410[var1][var4 * 2] = field410[var1][var4 * 2 - 1] * var5 + field410[var1][var4 * 2 - 2] * var6; // L: 56
 
 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57
-					var10000 = field407[var1];
+					var10000 = field410[var1];
-					var10000[var7] += field407[var1][var7 - 1] * var5 + field407[var1][var7 - 2] * var6;
+					var10000[var7] += field410[var1][var7 - 1] * var5 + field410[var1][var7 - 2] * var6;
 				}
 
-				var10000 = field407[var1]; // L: 58
+				var10000 = field410[var1]; // L: 58
-				var10000[1] += field407[var1][0] * var5 + var6;
+				var10000[1] += field410[var1][0] * var5 + var6;
-				var10000 = field407[var1]; // L: 59
+				var10000 = field410[var1]; // L: 59
 				var10000[0] += var5;
 			}
 
 			if (var1 == 0) { // L: 61
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field407[0];
+					var10000 = field410[0];
-					var10000[var4] *= field409;
+					var10000[var4] *= field417;
 				}
 			}
 
 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62
-				coefficients[var1][var4] = (int)(field407[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field410[var1][var4] * 65536.0F);
 			}
 
 			return this.pairs[var1] * 2; // L: 63
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;Lag;)V"
+		descriptor = "(Lpx;Laq;)V"
 	)
 	final void method1044(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte(); // L: 67
 		this.pairs[0] = var3 >> 4; // L: 68
 		this.pairs[1] = var3 & 15; // L: 69
 		if (var3 != 0) { // L: 70
-			this.field413[0] = var1.readUnsignedShort(); // L: 71
+			this.field412[0] = var1.readUnsignedShort(); // L: 71
-			this.field413[1] = var1.readUnsignedShort(); // L: 72
+			this.field412[1] = var1.readUnsignedShort(); // L: 72
 			int var7 = var1.readUnsignedByte(); // L: 73
 
 			int var5;
 			int var6;
 			for (var5 = 0; var5 < 2; ++var5) { // L: 74
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75
-					this.field412[var5][0][var6] = var1.readUnsignedShort(); // L: 76
+					this.field415[var5][0][var6] = var1.readUnsignedShort(); // L: 76
-					this.field402[var5][0][var6] = var1.readUnsignedShort(); // L: 77
+					this.field413[var5][0][var6] = var1.readUnsignedShort(); // L: 77
 				}
 			}
 
 			for (var5 = 0; var5 < 2; ++var5) { // L: 80
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 81
 					if ((var7 & 1 << var5 * 4 << var6) != 0) { // L: 82
-						this.field412[var5][1][var6] = var1.readUnsignedShort(); // L: 83
+						this.field415[var5][1][var6] = var1.readUnsignedShort(); // L: 83
-						this.field402[var5][1][var6] = var1.readUnsignedShort(); // L: 84
+						this.field413[var5][1][var6] = var1.readUnsignedShort(); // L: 84
 					} else {
-						this.field412[var5][1][var6] = this.field412[var5][0][var6]; // L: 87
+						this.field415[var5][1][var6] = this.field415[var5][0][var6]; // L: 87
-						this.field402[var5][1][var6] = this.field402[var5][0][var6]; // L: 88
+						this.field413[var5][1][var6] = this.field413[var5][0][var6]; // L: 88
 					}
 				}
 			}
 
-			if (var7 != 0 || this.field413[1] != this.field413[0]) { // L: 92
+			if (var7 != 0 || this.field412[1] != this.field412[0]) { // L: 92
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var4 = this.field413; // L: 95
+			int[] var4 = this.field412; // L: 95
-			this.field413[1] = 0; // L: 96
+			this.field412[1] = 0; // L: 96
 			var4[0] = 0; // L: 97
 		}
 
 	} // L: 99
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("normalize")
 	static float normalize(float var0) {
 		float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30

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("pm")
+@ObfuscatedName("ph")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lpr;"
+		descriptor = "Lpy;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State(); // L: 13
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("BZip2Decompressor_decompress")
 	public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
 		synchronized(BZip2Decompressor_state) { // L: 20
@@ -29,7 +29,7 @@ public final class BZip2Decompressor {
 			BZip2Decompressor_state.bsLive = 0; // L: 26
 			BZip2Decompressor_state.bsBuff = 0; // L: 27
 			BZip2Decompressor_state.nextBit_unused = 0; // L: 28
-			BZip2Decompressor_state.field4636 = 0; // L: 29
+			BZip2Decompressor_state.field4715 = 0; // L: 29
 			BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30
 			var1 -= BZip2Decompressor_state.outputLength; // L: 31
 			BZip2Decompressor_state.inputArray = null; // L: 32
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lpr;)V"
+		descriptor = "(Lpy;)V"
 	)
-	static void method7902(BZip2State var0) {
+	static void method7758(BZip2State var0) {
 		byte var2 = var0.out_char; // L: 40
 		int var3 = var0.su_rNToGo; // L: 41
 		int var4 = var0.nblocks_used; // L: 42
 		int var5 = var0.su_ch2; // L: 43
-		int[] var6 = GrandExchangeOffer.BZip2Decompressor_block; // L: 44
+		int[] var6 = class6.BZip2Decompressor_block; // L: 44
-		int var7 = var0.field4643; // L: 45
+		int var7 = var0.field4714; // L: 45
 		byte[] var8 = var0.outputArray; // L: 46
 		int var9 = var0.next_out; // L: 47
 		int var10 = var0.outputLength; // L: 48
-		int var12 = var0.field4661 + 1; // L: 50
+		int var12 = var0.field4720 + 1; // L: 50
 
 		label70:
 		while (true) {
@@ -148,25 +148,25 @@ public final class BZip2Decompressor {
 			break; // L: 73
 		}
 
-		int var13 = var0.field4636; // L: 133
+		int var13 = var0.field4715; // L: 133
-		var0.field4636 += var10 - var10; // L: 134
+		var0.field4715 += var10 - var10; // L: 134
-		if (var0.field4636 < var13) { // L: 135
+		if (var0.field4715 < var13) { // L: 135
 		}
 
 		var0.out_char = var2; // L: 136
 		var0.su_rNToGo = var3; // L: 137
 		var0.nblocks_used = var4; // L: 138
 		var0.su_ch2 = var5; // L: 139
-		GrandExchangeOffer.BZip2Decompressor_block = var6; // L: 140
+		class6.BZip2Decompressor_block = var6; // L: 140
-		var0.field4643 = var7; // L: 141
+		var0.field4714 = var7; // L: 141
 		var0.outputArray = var8; // L: 142
 		var0.next_out = var9; // L: 143
 		var0.outputLength = var10; // L: 144
 	} // L: 145
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lpr;)V"
+		descriptor = "(Lpy;)V"
 	)
 	@Export("BZip2Decompressor_decompress")
 	static void BZip2Decompressor_decompress(BZip2State var0) {
@@ -192,9 +192,9 @@ public final class BZip2Decompressor {
 		int[] var23 = null; // L: 170
 		int[] var24 = null; // L: 171
 		int[] var25 = null; // L: 172
-		var0.blockSize100k = -1776360451; // L: 173
+		var0.blockSize100k = 1097769777; // L: 173
-		if (GrandExchangeOffer.BZip2Decompressor_block == null) { // L: 174
+		if (class6.BZip2Decompressor_block == null) { // L: 174
-			GrandExchangeOffer.BZip2Decompressor_block = new int[var0.blockSize100k * -2059250912];
+			class6.BZip2Decompressor_block = new int[var0.blockSize100k * -1117648736];
 		}
 
 		boolean var26 = true; // L: 175
@@ -430,7 +430,7 @@ public final class BZip2Decompressor {
 							}
 
 							var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396
-							GrandExchangeOffer.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397
+							class6.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397
 							++var47; // L: 398
 							if (var45 == 0) { // L: 399
 								++var43; // L: 400
@@ -489,7 +489,7 @@ public final class BZip2Decompressor {
 							var10000 = var0.unzftab; // L: 332
 
 							for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336
-								GrandExchangeOffer.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
+								class6.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
 								++var47; // L: 335
 							}
 						}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
 					}
 
 					for (var36 = 0; var36 < var47; ++var36) { // L: 426
-						var1 = (byte)(GrandExchangeOffer.BZip2Decompressor_block[var36] & 255); // L: 427
+						var1 = (byte)(class6.BZip2Decompressor_block[var36] & 255); // L: 427
-						var10000 = GrandExchangeOffer.BZip2Decompressor_block; // L: 428
+						var10000 = class6.BZip2Decompressor_block; // L: 428
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++; // L: 429
 					}
 
-					var0.field4643 = GrandExchangeOffer.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
+					var0.field4714 = class6.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
 					var0.nblocks_used = 0; // L: 432
-					var0.field4643 = GrandExchangeOffer.BZip2Decompressor_block[var0.field4643]; // L: 433
+					var0.field4714 = class6.BZip2Decompressor_block[var0.field4714]; // L: 433
-					var0.su_ch2 = (byte)(var0.field4643 & 255); // L: 434
+					var0.su_ch2 = (byte)(var0.field4714 & 255); // L: 434
-					var0.field4643 >>= 8; // L: 436
+					var0.field4714 >>= 8; // L: 436
 					++var0.nblocks_used; // L: 437
-					var0.field4661 = var47; // L: 438
+					var0.field4720 = var47; // L: 438
-					method7902(var0); // L: 439
+					method7758(var0); // L: 439
-					if (var0.field4661 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440
+					if (var0.field4720 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440
 						var26 = true;
 						break;
 					}
@@ -538,27 +538,27 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lpr;)B"
+		descriptor = "(Lpy;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0); // L: 447
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(Lpr;)B"
+		descriptor = "(Lpy;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0); // L: 451
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(ILpr;)I"
+		descriptor = "(ILpy;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
 		return var2; // L: 460
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lpr;)V"
+		descriptor = "(Lpy;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
 
 	} // L: 479
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@Export("BZip2Decompressor_createHuffmanTables")
 	static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) {
 		int var7 = 0; // L: 486

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

@@ -3,169 +3,164 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("pr")
+@ObfuscatedName("py")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("sg")
+	@ObfuscatedName("o")
-	@ObfuscatedGetter(
+	final int field4689;
-		intValue = -1129469843
+	@ObfuscatedName("q")
-	)
+	final int field4684;
-	static int field4662;
+	@ObfuscatedName("l")
-	@ObfuscatedName("v")
+	final int field4685;
-	final int field4655;
+	@ObfuscatedName("k")
-	@ObfuscatedName("c")
+	final int field4702;
-	final int field4627;
+	@ObfuscatedName("a")
-	@ObfuscatedName("i")
+	final int field4687;
-	final int field4626;
+	@ObfuscatedName("m")
-	@ObfuscatedName("f")
+	final int field4688;
-	final int field4633;
+	@ObfuscatedName("p")
-	@ObfuscatedName("b")
-	final int field4628;
-	@ObfuscatedName("n")
-	final int field4634;
-	@ObfuscatedName("s")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1322812601
+		intValue = -1006289449
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -430087741
+		intValue = 213678345
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -175215317
+		intValue = -230908601
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1039446447
+		intValue = 2001230231
 	)
 	@Export("outputLength")
 	int outputLength;
 	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1120084063
+		intValue = 541649199
 	)
-	int field4636;
+	int field4715;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("d")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 18493607
+		intValue = -540019141
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("m")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -837008917
+		intValue = 790421793
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -694773855
+		intValue = -1354808017
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 482261833
+		intValue = 1115223461
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("x")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1004484133
+		intValue = 888729529
 	)
-	int field4643;
+	int field4714;
-	@ObfuscatedName("a")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1457960971
+		intValue = 1393554365
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@Export("unzftab")
 	int[] unzftab;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 2064048971
+		intValue = 1338159051
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("h")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 180562183
+		intValue = -1217769335
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ag")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ar")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("am")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ac")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ab")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aj")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("al")
+	@ObfuscatedName("az")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("av")
+	@ObfuscatedName("ap")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("at")
+	@ObfuscatedName("as")
 	@Export("base")
 	int[][] base;
-	@ObfuscatedName("an")
+	@ObfuscatedName("au")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ak")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = -1169026527
+		intValue = -412410727
 	)
-	int field4661;
+	int field4720;
 
 	BZip2State() {
-		this.field4655 = 4096; // L: 4
+		this.field4689 = 4096; // L: 4
-		this.field4627 = 16; // L: 5
+		this.field4684 = 16; // L: 5
-		this.field4626 = 258; // L: 6
+		this.field4685 = 258; // L: 6
-		this.field4633 = 6; // L: 7
+		this.field4702 = 6; // L: 7
-		this.field4628 = 50; // L: 8
+		this.field4687 = 50; // L: 8
-		this.field4634 = 18002; // L: 9
+		this.field4688 = 18002; // L: 9
 		this.nextByte = 0; // L: 11
 		this.next_out = 0; // L: 14
 		this.unzftab = new int[256]; // L: 25

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

@@ -4,63 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ij")
+@ObfuscatedName("hc")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("g")
+	@ObfuscatedName("o")
-	@Export("ByteArrayPool_arrays")
-	static byte[][][] ByteArrayPool_arrays;
-	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1523942229
+		intValue = 1657313425
 	)
 	@Export("z")
 	int z;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -361735633
+		intValue = -1880399519
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 436509427
+		intValue = -1024241781
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1245875017
+		intValue = 291661833
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1804141061
+		intValue = -40246503
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lgx;"
 	)
 	@Export("renderable1")
 	public Renderable renderable1;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lgx;"
 	)
 	@Export("renderable2")
 	public Renderable renderable2;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		longValue = -3781054410051402755L
+		longValue = 5476522096528305987L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 2053587143
+		intValue = -214248861
 	)
 	@Export("flags")
 	int flags;

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("nm")
+@ObfuscatedName("ne")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1496433009
+		intValue = -2084018151
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1348899275
+		intValue = 1161874723
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 2132855023
+		intValue = -1792451045
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1258662357
+		intValue = -347299673
 	)
 	@Export("highY")
 	public int highY;
@@ -35,16 +35,16 @@ public class Bounds {
 	public Bounds(int var1, int var2, int var3, int var4) {
 		this.setLow(var1, var2); // L: 14
 		this.setHigh(var3, var4); // L: 15
-	}
+	} // L: 16
 
 	public Bounds(int var1, int var2) {
 		this(0, 0, var1, var2); // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
+		descriptor = "(IIB)V",
-		garbageValue = "691768070"
+		garbageValue = "76"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -52,10 +52,10 @@ public class Bounds {
 		this.lowY = var2; // L: 20
 	} // L: 21
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "1684494436"
+		garbageValue = "-2014864213"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -63,40 +63,40 @@ public class Bounds {
 		this.highY = var2; // L: 25
 	} // L: 26
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "2065555787"
+		garbageValue = "1837557842"
 	)
-	public boolean method6944(int var1, int var2) {
+	public boolean method6742(int var1, int var2) {
-		return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; // L: 29
+		return var1 >= this.lowX && var1 < this.highX + this.lowX && var2 >= this.lowY && var2 < this.lowY + this.highY; // L: 29
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lnm;Lnm;I)V",
+		descriptor = "(Lne;Lne;I)V",
-		garbageValue = "1872281468"
+		garbageValue = "683766141"
 	)
-	public void method6945(Bounds var1, Bounds var2) {
+	public void method6758(Bounds var1, Bounds var2) {
-		this.method6946(var1, var2); // L: 37
+		this.method6739(var1, var2); // L: 37
-		this.method6947(var1, var2); // L: 38
+		this.method6746(var1, var2); // L: 38
 	} // L: 39
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(Lnm;Lnm;S)V",
+		descriptor = "(Lne;Lne;B)V",
-		garbageValue = "3154"
+		garbageValue = "-80"
 	)
-	void method6946(Bounds var1, Bounds var2) {
+	void method6739(Bounds var1, Bounds var2) {
 		var2.lowX = this.lowX; // L: 42
 		var2.highX = this.highX; // L: 43
 		if (this.lowX < var1.lowX) { // L: 44
-			var2.highX = (var2.highX * 1363895823 - (var1.lowX * 1363895823 - this.lowX * 1363895823)) * 2132855023; // L: 45
+			var2.highX = (var2.highX * -1176876013 - (var1.lowX * -1176876013 - this.lowX * -1176876013)) * -1792451045; // L: 45
 			var2.lowX = var1.lowX; // L: 46
 		}
 
-		if (var2.method6965() > var1.method6965()) { // L: 48
+		if (var2.method6747() > var1.method6747()) { // L: 48
-			var2.highX -= var2.method6965() - var1.method6965(); // L: 49
+			var2.highX -= var2.method6747() - var1.method6747(); // L: 49
 		}
 
 		if (var2.highX < 0) { // L: 51
@@ -105,21 +105,21 @@ public class Bounds {
 
 	} // L: 52
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnm;Lnm;B)V",
+		descriptor = "(Lne;Lne;B)V",
-		garbageValue = "0"
+		garbageValue = "83"
 	)
-	void method6947(Bounds var1, Bounds var2) {
+	void method6746(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY; // L: 55
 		var2.highY = this.highY; // L: 56
 		if (this.lowY < var1.lowY) { // L: 57
-			var2.highY = (var2.highY * 446318461 - (var1.lowY * 446318461 - this.lowY * 446318461)) * 1258662357; // L: 58
+			var2.highY = (var2.highY * -1533081833 - (var1.lowY * -1533081833 - this.lowY * -1533081833)) * -347299673; // L: 58
 			var2.lowY = var1.lowY; // L: 59
 		}
 
-		if (var2.method6949() > var1.method6949()) { // L: 61
+		if (var2.method6745() > var1.method6745()) { // L: 61
-			var2.highY -= var2.method6949() - var1.method6949(); // L: 62
+			var2.highY -= var2.method6745() - var1.method6745(); // L: 62
 		}
 
 		if (var2.highY < 0) { // L: 64
@@ -128,33 +128,25 @@ public class Bounds {
 
 	} // L: 65
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "44"
-	)
-	int method6965() {
-		return this.highX + this.lowX; // L: 68
-	}
-
-	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1934877561"
+		garbageValue = "1397499342"
 	)
-	int method6949() {
+	int method6747() {
-		return this.highY + this.lowY; // L: 72
+		return this.lowX + this.highX; // L: 68
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1908652212"
+	)
+	int method6745() {
+		return this.lowY + this.highY; // L: 72
 	}
 
 	public String toString() {
 		return null; // L: 33
 	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Lln;I)V",
-		garbageValue = "1725122550"
-	)
-	public static void method6969(AbstractArchive var0) {
-	} // L: 16
 }

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

@@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nf")
+@ObfuscatedName("ns")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1194347475
+		intValue = 1598252079
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1261040891
+		intValue = 960063137
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1639181057
+		intValue = -497613841
 	)
 	@Export("rank")
 	public int rank;
@@ -30,10 +30,10 @@ public class Buddy extends User {
 		this.world = -1; // L: 4
 	} // L: 8
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
+		descriptor = "(III)V",
-		garbageValue = "-7"
+		garbageValue = "-1257664324"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -41,20 +41,20 @@ public class Buddy extends User {
 		this.int2 = var2; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
+		descriptor = "(I)I",
-		garbageValue = "49"
+		garbageValue = "975020511"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world; // L: 16
 	}
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
+		descriptor = "(B)Z",
-		garbageValue = "-2071809224"
+		garbageValue = "-87"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {

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

@@ -1,12 +1,24 @@
 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("dx")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("mk")
+	@ObfuscatedGetter(
+		intValue = 1073207223
+	)
+	@Export("menuX")
+	static int menuX;
+	@ObfuscatedName("pi")
+	@ObfuscatedSignature(
+		descriptor = "[Lki;"
+	)
+	static Widget[] field1408;
+	@ObfuscatedName("o")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -14,10 +26,10 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnf;Lnf;I)I",
+		descriptor = "(Lns;Lns;I)I",
-		garbageValue = "-2004445607"
+		garbageValue = "84512734"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -29,25 +41,16 @@ public class BuddyRankComparator extends AbstractUserComparator {
 	}
 
 	public int compare(Object var1, Object var2) {
-		return this.compareBuddy((Buddy)var1, (Buddy)var2);
+		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;ZI)[B",
+		descriptor = "(I)[Ljg;",
-		garbageValue = "606932016"
+		garbageValue = "-369068324"
 	)
-	public static byte[] method2633(Object var0, boolean var1) {
+	@Export("ServerPacket_values")
-		if (var0 == null) { // L: 21
+	public static ServerPacket[] ServerPacket_values() {
-			return null;
+		return new ServerPacket[]{ServerPacket.field3166, ServerPacket.field3085, ServerPacket.field3152, ServerPacket.field3087, ServerPacket.field3088, ServerPacket.field3170, ServerPacket.field3090, ServerPacket.field3179, ServerPacket.field3149, ServerPacket.field3140, ServerPacket.field3093, ServerPacket.field3112, ServerPacket.field3096, ServerPacket.field3092, ServerPacket.field3089, ServerPacket.field3099, ServerPacket.field3100, ServerPacket.field3101, ServerPacket.field3102, ServerPacket.field3103, ServerPacket.field3187, ServerPacket.field3105, ServerPacket.field3106, ServerPacket.field3107, ServerPacket.field3108, ServerPacket.field3109, ServerPacket.field3139, ServerPacket.field3111, ServerPacket.field3182, ServerPacket.field3084, ServerPacket.field3183, ServerPacket.field3115, ServerPacket.field3091, ServerPacket.field3117, ServerPacket.field3118, ServerPacket.field3119, ServerPacket.field3120, ServerPacket.field3121, ServerPacket.field3122, ServerPacket.field3123, ServerPacket.field3161, ServerPacket.field3125, ServerPacket.field3124, ServerPacket.field3127, ServerPacket.field3154, ServerPacket.field3129, ServerPacket.field3130, ServerPacket.field3131, ServerPacket.field3188, ServerPacket.field3133, ServerPacket.field3142, ServerPacket.field3110, ServerPacket.field3114, ServerPacket.field3137, ServerPacket.field3094, ServerPacket.field3190, ServerPacket.field3126, ServerPacket.field3141, ServerPacket.field3180, ServerPacket.field3143, ServerPacket.field3144, ServerPacket.field3153, ServerPacket.field3146, ServerPacket.field3116, ServerPacket.field3148, ServerPacket.field3097, ServerPacket.field3150, ServerPacket.field3151, ServerPacket.field3134, ServerPacket.field3147, ServerPacket.field3162, ServerPacket.field3155, ServerPacket.field3156, ServerPacket.field3157, ServerPacket.field3158, ServerPacket.field3159, ServerPacket.field3160, ServerPacket.field3098, ServerPacket.field3113, ServerPacket.field3163, ServerPacket.field3164, ServerPacket.field3165, ServerPacket.field3104, ServerPacket.field3167, ServerPacket.field3168, ServerPacket.field3169, ServerPacket.field3135, ServerPacket.field3171, ServerPacket.field3172, ServerPacket.field3173, ServerPacket.field3174, ServerPacket.field3175, ServerPacket.field3176, ServerPacket.field3177, ServerPacket.field3132, ServerPacket.field3086, ServerPacket.field3145, ServerPacket.field3181, ServerPacket.field3095, ServerPacket.field3186, ServerPacket.field3184, ServerPacket.field3185, ServerPacket.field3178, ServerPacket.field3136}; // L: 113
-		} else if (var0 instanceof byte[]) { // L: 22
-			byte[] var3 = (byte[])((byte[])var0); // L: 23
-			return var1 ? SoundSystem.method764(var3) : var3; // L: 24
-		} else if (var0 instanceof AbstractByteArrayCopier) { // L: 27
-			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28
-			return var2.get(); // L: 29
-		} else {
-			throw new IllegalArgumentException(); // L: 31
-		}
 	}
 }

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("pb")
+@ObfuscatedName("pz")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lph;"
+		descriptor = "Lpu;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		longValue = -8920442284336145207L
+		longValue = 4178581375858547737L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 959546987
+		intValue = 1786515893
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		longValue = -5995632714871070967L
+		longValue = 6839484550665134849L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -694187419
+		intValue = -701786655
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		longValue = -7698547287886108579L
+		longValue = -2293352918490760827L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = -6174188026311387211L
+		longValue = 7360496597180127129L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = 2714224379906109785L
+		longValue = -2587246494180126439L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = -8095417685979246741L
+		longValue = -8363977910986430751L
 	)
 	@Export("fileOffset")
 	long fileOffset;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lph;II)V"
+		descriptor = "(Lpu;II)V"
 	)
 	public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
 		this.readBufferOffset = -1L; // L: 9
@@ -84,10 +84,10 @@ public class BufferedFile {
 		this.offset = 0L; // L: 24
 	} // L: 25
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
+		descriptor = "(I)V",
-		garbageValue = "78"
+		garbageValue = "983004264"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +95,7 @@ public class BufferedFile {
 		this.accessFile.close(); // L: 29
 	} // L: 30
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) { // L: 33
@@ -105,30 +105,30 @@ public class BufferedFile {
 		}
 	} // L: 35
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)J",
+		descriptor = "(S)J",
-		garbageValue = "-776750742"
+		garbageValue = "185"
 	)
 	@Export("length")
 	public long length() {
 		return this.length; // L: 38
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "([BI)V",
-		garbageValue = "1551073346"
+		garbageValue = "-2124163169"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length); // L: 42
 	} // L: 43
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)V",
+		descriptor = "([BIII)V",
-		garbageValue = "0"
+		garbageValue = "2088441068"
 	)
 	@Export("read")
 	public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -137,7 +137,7 @@ public class BufferedFile {
 				throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
 			}
 
-			if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 48
+			if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48
 				System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49
 				this.offset += (long)var3; // L: 50
 				return; // L: 51
@@ -146,7 +146,7 @@ public class BufferedFile {
 			long var4 = this.offset; // L: 53
 			int var7 = var3; // L: 55
 			int var8;
-			if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56
+			if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56
 				var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57
 				if (var8 > var3) { // L: 58
 					var8 = var3;
@@ -206,9 +206,9 @@ public class BufferedFile {
 					var13 = var4; // L: 101
 				}
 
-				if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) { // L: 103
+				if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (long)var7 + var4) { // L: 103
-					var10 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 104
+					var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104
-				} else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106
+				} else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106
 					var10 = var4 + (long)var7; // L: 107
 				}
 
@@ -231,10 +231,10 @@ public class BufferedFile {
 		}
 	} // L: 125
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
+		descriptor = "(I)V",
-		garbageValue = "4"
+		garbageValue = "-1238511464"
 	)
 	@Export("load")
 	void load() throws IOException {
@@ -261,23 +261,23 @@ public class BufferedFile {
 
 	} // L: 142
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "-1226704883"
+		garbageValue = "-1049933636"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
 		try {
 			if ((long)var3 + this.offset > this.length) { // L: 146
-				this.length = (long)var3 + this.offset;
+				this.length = this.offset + (long)var3;
 			}
 
 			if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147
 				this.flush(); // L: 148
 			}
 
-			if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150
+			if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150
 				int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151
 				System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152
 				this.offset += (long)var4; // L: 153
@@ -301,7 +301,7 @@ public class BufferedFile {
 
 				}
 			} else {
-				if (this.fileOffset != this.offset) { // L: 160
+				if (this.offset != this.fileOffset) { // L: 160
 					this.accessFile.seek(this.offset); // L: 161
 					this.fileOffset = this.offset; // L: 162
 				}
@@ -316,14 +316,14 @@ public class BufferedFile {
 				long var6 = -1L; // L: 168
 				if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169
 					var9 = this.offset; // L: 170
-				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172
+				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172
 					var9 = this.readBufferOffset; // L: 173
 				}
 
-				if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175
+				if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175
 					var6 = (long)var3 + this.offset; // L: 176
 				} else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { // L: 178
-					var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179
+					var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179
 				}
 
 				if (var9 > -1L && var6 > var9) { // L: 181
@@ -339,10 +339,10 @@ public class BufferedFile {
 		}
 	} // L: 186 193 200
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "352436768"
+		garbageValue = "-692867927"
 	)
 	@Export("flush")
 	void flush() throws IOException {
@@ -353,23 +353,23 @@ public class BufferedFile {
 			}
 
 			this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208
-			this.fileOffset += (long)this.writeBufferLength * 1276428477523820545L; // L: 209
+			this.fileOffset += (long)this.writeBufferLength * 714010520226627585L; // L: 209
 			if (this.fileOffset > this.fileLength) { // L: 210
 				this.fileLength = this.fileOffset;
 			}
 
 			long var1 = -1L; // L: 211
 			long var3 = -1L; // L: 212
-			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { // L: 213
+			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { // L: 213
 				var1 = this.writeBufferOffset; // L: 214
-			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 216
+			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 216
 				var1 = this.readBufferOffset; // L: 217
 			}
 
-			if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219
+			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219
 				var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220
 			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 222
-				var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223
+				var3 = this.readBufferOffset + (long)this.readBufferLength; // L: 223
 			}
 
 			if (var1 > -1L && var3 > var1) { // L: 225

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

@@ -5,30 +5,21 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("no")
+@ObfuscatedName("ni")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
 	@ObfuscatedName("o")
-	@Export("Tiles_hue")
-	static int[] Tiles_hue;
-	@ObfuscatedName("ei")
-	@ObfuscatedSignature(
-		descriptor = "Llx;"
-	)
-	@Export("archive3")
-	static Archive archive3;
-	@ObfuscatedName("v")
 	@Export("socket")
 	Socket socket;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lnx;"
+		descriptor = "Lnp;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lnd;"
+		descriptor = "Lno;"
 	)
 	@Export("sink")
 	BufferedSink sink;
@@ -43,74 +34,74 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18
 	} // L: 19
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
+		descriptor = "(I)V",
-		garbageValue = "-13138"
+		garbageValue = "731891927"
 	)
 	@Export("close")
 	public void close() {
-		this.sink.close(); // L: 42
+		this.sink.close(); // L: 48
 
 		try {
-			this.socket.close(); // L: 44
+			this.socket.close(); // L: 50
-		} catch (IOException var2) { // L: 46
+		} catch (IOException var2) { // L: 52
 		}
 
-		this.source.close(); // L: 47
+		this.source.close(); // L: 53
-	} // L: 48
+	} // L: 54
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
+		descriptor = "(B)I",
-		garbageValue = "-891040314"
+		garbageValue = "18"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
-		return this.source.readUnsignedByte(); // L: 30
+		return this.source.readUnsignedByte(); // L: 33
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
+		descriptor = "(I)I",
-		garbageValue = "46"
+		garbageValue = "-1429957580"
 	)
 	@Export("available")
 	public int available() throws IOException {
-		return this.source.available(); // L: 26
+		return this.source.available(); // L: 28
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
+		descriptor = "(II)Z",
-		garbageValue = "27"
+		garbageValue = "-15219997"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
-		return this.source.isAvailable(var1); // L: 22
+		return this.source.isAvailable(var1); // L: 23
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)I",
+		descriptor = "([BIII)I",
-		garbageValue = "-118"
+		garbageValue = "-642682113"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
-		return this.source.read(var1, var2, var3); // L: 34
+		return this.source.read(var1, var2, var3); // L: 38
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "-1359342670"
+		garbageValue = "257086671"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
-		this.sink.write(var1, var2, var3); // L: 38
+		this.sink.write(var1, var2, var3); // L: 43
-	} // L: 39
+	} // L: 44
 
 	protected void finalize() {
-		this.close(); // L: 51
+		this.close(); // L: 58
-	} // L: 52
+	} // L: 59
 }

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

@@ -5,219 +5,196 @@ 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("nd")
+@ObfuscatedName("no")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 661494899
+		intValue = -424160887
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1189133375
+		intValue = -1137203181
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 542048211
+		intValue = -649579149
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@Export("closed")
 	boolean closed;
 
 	BufferedSink(OutputStream var1, int var2) {
-		this.position = 0; // L: 186
+		this.position = 0; // L: 193
-		this.limit = 0; // L: 187
+		this.limit = 0; // L: 194
-		this.outputStream = var1; // L: 192
+		this.outputStream = var1; // L: 199
-		this.capacity = var2 + 1; // L: 193
+		this.capacity = var2 + 1; // L: 200
-		this.buffer = new byte[this.capacity]; // L: 194
+		this.buffer = new byte[this.capacity]; // L: 201
-		this.thread = new Thread(this); // L: 195
+		this.thread = new Thread(this); // L: 202
-		this.thread.setDaemon(true); // L: 196
+		this.thread.setDaemon(true); // L: 203
-		this.thread.start(); // L: 197
+		this.thread.start(); // L: 204
-	} // L: 198
+	} // L: 205
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-268247836"
+		garbageValue = "2078615402"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
-		if (this.closed) { // L: 201
+		if (this.closed) { // L: 208
 			try {
-				this.outputStream.close(); // L: 203
+				this.outputStream.close(); // L: 210
 				if (this.exception == null) {
-					this.exception = new IOException(""); // L: 204
+					this.exception = new IOException(""); // L: 211
 				}
-			} catch (IOException var2) { // L: 206
+			} catch (IOException var2) { // L: 213
-				if (this.exception == null) { // L: 207
+				if (this.exception == null) { // L: 214
 					this.exception = new IOException(var2);
 				}
 			}
 
-			return true; // L: 209
+			return true; // L: 216
 		} else {
-			return false; // L: 211
+			return false; // L: 218
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "1071414878"
+		garbageValue = "1828248430"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
-		if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 261
+		if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 268
-			synchronized(this) { // L: 262
+			synchronized(this) { // L: 269
-				if (this.exception != null) { // L: 263
+				if (this.exception != null) { // L: 270
 					throw new IOException(this.exception.toString());
 				} else {
 					int var5;
-					if (this.position <= this.limit) { // L: 265
+					if (this.position <= this.limit) { // L: 272
 						var5 = this.capacity - this.limit + this.position - 1;
 					} else {
-						var5 = this.position - this.limit - 1; // L: 266
+						var5 = this.position - this.limit - 1; // L: 273
 					}
 
-					if (var5 < var3) { // L: 267
+					if (var5 < var3) { // L: 274
 						throw new IOException("");
 					} else {
-						if (var3 + this.limit <= this.capacity) { // L: 268
+						if (var3 + this.limit <= this.capacity) { // L: 275
-							System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 269
+							System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 276
 						} else {
-							int var6 = this.capacity - this.limit; // L: 272
+							int var6 = this.capacity - this.limit; // L: 279
-							System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 273
+							System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 280
-							System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 274
+							System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 281
 						}
 
-						this.limit = (var3 + this.limit) % this.capacity; // L: 276
+						this.limit = (var3 + this.limit) % this.capacity; // L: 283
-						this.notifyAll(); // L: 277
+						this.notifyAll(); // L: 284
 					}
 				}
 			}
 		} else {
 			throw new IOException();
 		}
-	} // L: 279
+	} // L: 286
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1649898800"
+		garbageValue = "-1738399063"
 	)
 	@Export("close")
 	void close() {
-		synchronized(this) { // L: 282
+		synchronized(this) { // L: 289
-			this.closed = true; // L: 283
+			this.closed = true; // L: 290
-			this.notifyAll(); // L: 284
+			this.notifyAll(); // L: 291
-		} // L: 285
+		} // L: 292
 
 		try {
-			this.thread.join(); // L: 287
+			this.thread.join(); // L: 294
-		} catch (InterruptedException var3) { // L: 289
+		} catch (InterruptedException var3) { // L: 296
 		}
 
-	} // L: 290
+	} // L: 297
 
 	public void run() {
 		do {
 			int var1;
-			synchronized(this) { // L: 217
+			synchronized(this) { // L: 224
 				while (true) {
-					if (this.exception != null) { // L: 219
+					if (this.exception != null) { // L: 226
 						return;
 					}
 
-					if (this.position <= this.limit) { // L: 220
+					if (this.position <= this.limit) { // L: 227
 						var1 = this.limit - this.position;
 					} else {
-						var1 = this.capacity - this.position + this.limit; // L: 221
+						var1 = this.capacity - this.position + this.limit; // L: 228
 					}
 
-					if (var1 > 0) { // L: 222
+					if (var1 > 0) { // L: 229
 						break;
 					}
 
 					try {
-						this.outputStream.flush(); // L: 224
+						this.outputStream.flush(); // L: 231
-					} catch (IOException var11) { // L: 226
+					} catch (IOException var11) { // L: 233
-						this.exception = var11; // L: 227
+						this.exception = var11; // L: 234
-						return; // L: 228
+						return; // L: 235
 					}
 
-					if (this.isClosed()) { // L: 230
+					if (this.isClosed()) { // L: 237
 						return;
 					}
 
 					try {
-						this.wait(); // L: 232
+						this.wait(); // L: 239
-					} catch (InterruptedException var12) { // L: 234
+					} catch (InterruptedException var12) { // L: 241
 					}
 				}
 			}
 
 			try {
-				if (var1 + this.position <= this.capacity) { // L: 238
+				if (var1 + this.position <= this.capacity) { // L: 245
-					this.outputStream.write(this.buffer, this.position, var1); // L: 239
+					this.outputStream.write(this.buffer, this.position, var1); // L: 246
 				} else {
-					int var7 = this.capacity - this.position; // L: 242
+					int var7 = this.capacity - this.position; // L: 249
-					this.outputStream.write(this.buffer, this.position, var7); // L: 243
+					this.outputStream.write(this.buffer, this.position, var7); // L: 250
-					this.outputStream.write(this.buffer, 0, var1 - var7); // L: 244
+					this.outputStream.write(this.buffer, 0, var1 - var7); // L: 251
 				}
-			} catch (IOException var10) { // L: 247
+			} catch (IOException var10) { // L: 254
 				IOException var2 = var10;
-				synchronized(this) { // L: 248
+				synchronized(this) { // L: 255
-					this.exception = var2; // L: 249
+					this.exception = var2; // L: 256
-					return; // L: 250
+					return; // L: 257
 				}
 			}
 
-			synchronized(this) { // L: 253
+			synchronized(this) { // L: 260
-				this.position = (var1 + this.position) % this.capacity; // L: 254
+				this.position = (var1 + this.position) % this.capacity; // L: 261
-			} // L: 255
+			} // L: 262
-		} while(!this.isClosed()); // L: 256
+		} while(!this.isClosed()); // L: 263
 
 	}
-
-	@ObfuscatedName("ag")
-	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
-		garbageValue = "402033310"
-	)
-	static int method6911(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.LOGOUT) { // L: 3821
-			Client.logoutTimer = 250; // L: 3822
-			return 1; // L: 3823
-		} else if (var0 != 5631 && var0 != 5633) { // L: 3825
-			if (var0 == 5632) { // L: 3829
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 26; // L: 3830
-				return 1; // L: 3831
-			} else {
-				return 2; // L: 3833
-			}
-		} else {
-			class122.Interpreter_stringStackSize -= 2; // L: 3826
-			return 1; // L: 3827
-		}
-	}
 }

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

@@ -7,78 +7,87 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nx")
+@ObfuscatedName("np")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("uf")
+	@ObfuscatedSignature(
+		descriptor = "Lbd;"
+	)
+	@Export("friendSystem")
+	public static FriendSystem friendSystem;
+	@ObfuscatedName("j")
+	@Export("userHomeDirectory")
+	static String userHomeDirectory;
+	@ObfuscatedName("o")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1631784043
+		intValue = 1611590211
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1349825787
+		intValue = 1886855287
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1219370145
+		intValue = 360959185
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("exception")
 	IOException exception;
 
 	BufferedSource(InputStream var1, int var2) {
-		this.position = 0;
+		this.position = 0; // L: 66
-		this.limit = 0;
+		this.limit = 0; // L: 67
-		this.inputStream = var1;
+		this.inputStream = var1; // L: 71
-		this.capacity = var2 + 1;
+		this.capacity = var2 + 1; // L: 72
-		this.buffer = new byte[this.capacity]; // L: 66
+		this.buffer = new byte[this.capacity]; // L: 73
-		this.thread = new Thread(this);
+		this.thread = new Thread(this); // L: 74
-		this.thread.setDaemon(true);
+		this.thread.setDaemon(true); // L: 75
-		this.thread.start();
+		this.thread.start(); // L: 76
-	} // L: 70
+	} // L: 77
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
+		descriptor = "(II)Z",
-		garbageValue = "0"
+		garbageValue = "-916314557"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
-		if (var1 == 0) {
+		if (var1 == 0) { // L: 113
 			return true;
-		} else if (var1 > 0 && var1 < this.capacity) { // L: 107
+		} else if (var1 > 0 && var1 < this.capacity) { // L: 114
-			synchronized(this) {
+			synchronized(this) { // L: 115
 				int var3;
-				if (this.position <= this.limit) {
+				if (this.position <= this.limit) { // L: 117
 					var3 = this.limit - this.position;
 				} else {
-					var3 = this.capacity - this.position + this.limit; // L: 111
+					var3 = this.capacity - this.position + this.limit; // L: 118
 				}
 
-				if (var3 < var1) {
+				if (var3 < var1) { // L: 119
-					if (this.exception != null) {
+					if (this.exception != null) { // L: 120
 						throw new IOException(this.exception.toString());
 					} else {
-						this.notifyAll();
+						this.notifyAll(); // L: 121
-						return false; // L: 115
+						return false; // L: 122
 					}
 				} else {
-					return true;
+					return true; // L: 124
 				}
 			}
 		} else {
@@ -86,87 +95,87 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "412570779"
+		garbageValue = "377483853"
 	)
 	@Export("available")
 	int available() throws IOException {
-		synchronized(this) {
+		synchronized(this) { // L: 129
 			int var2;
-			if (this.position <= this.limit) {
+			if (this.position <= this.limit) { // L: 131
 				var2 = this.limit - this.position;
 			} else {
-				var2 = this.capacity - this.position + this.limit;
+				var2 = this.capacity - this.position + this.limit; // L: 132
 			}
 
-			if (var2 <= 0 && this.exception != null) { // L: 126
+			if (var2 <= 0 && this.exception != null) { // L: 133
-				throw new IOException(this.exception.toString());
+				throw new IOException(this.exception.toString()); // L: 134
 			} else {
-				this.notifyAll();
+				this.notifyAll(); // L: 136
-				return var2; // L: 130
+				return var2; // L: 137
 			}
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
+		descriptor = "(B)I",
-		garbageValue = "-1010089751"
+		garbageValue = "-18"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
-		synchronized(this) {
+		synchronized(this) { // L: 142
-			if (this.position == this.limit) {
+			if (this.limit == this.position) { // L: 143
-				if (this.exception != null) {
+				if (this.exception != null) { // L: 144
 					throw new IOException(this.exception.toString());
 				} else {
-					return -1; // L: 138
+					return -1; // L: 145
 				}
 			} else {
-				int var2 = this.buffer[this.position] & 255;
+				int var2 = this.buffer[this.position] & 255; // L: 147
-				this.position = (this.position + 1) % this.capacity;
+				this.position = (this.position + 1) % this.capacity; // L: 148
-				this.notifyAll(); // L: 142
+				this.notifyAll(); // L: 149
-				return var2;
+				return var2; // L: 150
 			}
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)I",
-		garbageValue = "-2005340605"
+		garbageValue = "-720858367"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
-		if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) {
+		if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 155
-			synchronized(this) {
+			synchronized(this) { // L: 156
 				int var5;
-				if (this.position <= this.limit) { // L: 151
+				if (this.position <= this.limit) { // L: 158
 					var5 = this.limit - this.position;
 				} else {
-					var5 = this.capacity - this.position + this.limit;
+					var5 = this.capacity - this.position + this.limit; // L: 159
 				}
 
-				if (var3 > var5) {
+				if (var3 > var5) { // L: 160
 					var3 = var5;
 				}
 
-				if (var3 == 0 && this.exception != null) {
+				if (var3 == 0 && this.exception != null) { // L: 161
 					throw new IOException(this.exception.toString());
 				} else {
-					if (var3 + this.position <= this.capacity) { // L: 155
+					if (var3 + this.position <= this.capacity) { // L: 162
-						System.arraycopy(this.buffer, this.position, var1, var2, var3);
+						System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 163
 					} else {
-						int var6 = this.capacity - this.position; // L: 159
+						int var6 = this.capacity - this.position; // L: 166
-						System.arraycopy(this.buffer, this.position, var1, var2, var6);
+						System.arraycopy(this.buffer, this.position, var1, var2, var6); // L: 167
-						System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6);
+						System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); // L: 168
 					}
 
-					this.position = (var3 + this.position) % this.capacity; // L: 163
+					this.position = (var3 + this.position) % this.capacity; // L: 170
-					this.notifyAll(); // L: 164
+					this.notifyAll(); // L: 171
-					return var3;
+					return var3; // L: 172
 				}
 			}
 		} else {
@@ -174,380 +183,108 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "202162946"
+		garbageValue = "-1309478376"
 	)
 	@Export("close")
 	void close() {
-		synchronized(this) { // L: 170
+		synchronized(this) { // L: 177
 			if (this.exception == null) {
-				this.exception = new IOException("");
+				this.exception = new IOException(""); // L: 178
 			}
 
-			this.notifyAll();
+			this.notifyAll(); // L: 179
 		}
 
 		try {
-			this.thread.join(); // L: 175
+			this.thread.join(); // L: 182
-		} catch (InterruptedException var3) { // L: 177
+		} catch (InterruptedException var3) { // L: 184
 		}
 
-	} // L: 178
+	} // L: 185
 
 	public void run() {
 		while (true) {
 			int var1;
-			synchronized(this) { // L: 75
+			synchronized(this) { // L: 82
 				while (true) {
-					if (this.exception != null) {
+					if (this.exception != null) { // L: 84
 						return;
 					}
 
-					if (this.position == 0) {
+					if (this.position == 0) { // L: 85
 						var1 = this.capacity - this.limit - 1;
-					} else if (this.position <= this.limit) { // L: 79
+					} else if (this.position <= this.limit) { // L: 86
 						var1 = this.capacity - this.limit;
 					} else {
-						var1 = this.position - this.limit - 1;
+						var1 = this.position - this.limit - 1; // L: 87
 					}
 
-					if (var1 > 0) {
+					if (var1 > 0) { // L: 88
 						break;
 					}
 
 					try {
-						this.wait(); // L: 83
+						this.wait(); // L: 90
-					} catch (InterruptedException var10) {
+					} catch (InterruptedException var10) { // L: 92
 					}
 				}
 			}
 
 			int var7;
 			try {
-				var7 = this.inputStream.read(this.buffer, this.limit, var1);
+				var7 = this.inputStream.read(this.buffer, this.limit, var1); // L: 97
 				if (var7 == -1) {
-					throw new EOFException(); // L: 91
+					throw new EOFException(); // L: 98
 				}
-			} catch (IOException var11) {
+			} catch (IOException var11) { // L: 100
 				IOException var3 = var11;
-				synchronized(this) {
+				synchronized(this) { // L: 101
-					this.exception = var3; // L: 95
+					this.exception = var3; // L: 102
-					return;
+					return; // L: 103
 				}
 			}
 
-			synchronized(this) { // L: 99
+			synchronized(this) { // L: 106
-				this.limit = (var7 + this.limit) % this.capacity;
+				this.limit = (var7 + this.limit) % this.capacity; // L: 107
-			}
+			} // L: 108
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Llo;II)Ljd;",
+		descriptor = "(CI)Z",
-		garbageValue = "1218587295"
+		garbageValue = "-1918735565"
 	)
-	public static PacketBufferNode method6908(int var0, String var1, Language var2, int var3) {
+	static final boolean method6702(char var0) {
-		PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2918, Client.packetWriter.isaacCipher); // L: 17
+		if (Character.isISOControl(var0)) { // L: 16
-		var4.packetBuffer.writeByte(0); // L: 18
+			return false;
-		int var5 = var4.packetBuffer.offset; // L: 19
+		} else if (class78.isAlphaNumeric(var0)) { // L: 17
-		var4.packetBuffer.writeByte(var0); // L: 20
+			return true;
-		String var6 = var1.toLowerCase(); // L: 21
-		byte var7 = 0; // L: 22
-		if (var6.startsWith("yellow:")) { // L: 23
-			var7 = 0; // L: 24
-			var1 = var1.substring("yellow:".length()); // L: 25
-		} else if (var6.startsWith("red:")) { // L: 27
-			var7 = 1; // L: 28
-			var1 = var1.substring("red:".length()); // L: 29
-		} else if (var6.startsWith("green:")) { // L: 31
-			var7 = 2; // L: 32
-			var1 = var1.substring("green:".length()); // L: 33
-		} else if (var6.startsWith("cyan:")) { // L: 35
-			var7 = 3; // L: 36
-			var1 = var1.substring("cyan:".length()); // L: 37
-		} else if (var6.startsWith("purple:")) { // L: 39
-			var7 = 4; // L: 40
-			var1 = var1.substring("purple:".length()); // L: 41
-		} else if (var6.startsWith("white:")) { // L: 43
-			var7 = 5; // L: 44
-			var1 = var1.substring("white:".length()); // L: 45
-		} else if (var6.startsWith("flash1:")) { // L: 47
-			var7 = 6; // L: 48
-			var1 = var1.substring("flash1:".length()); // L: 49
-		} else if (var6.startsWith("flash2:")) { // L: 51
-			var7 = 7; // L: 52
-			var1 = var1.substring("flash2:".length()); // L: 53
-		} else if (var6.startsWith("flash3:")) { // L: 55
-			var7 = 8; // L: 56
-			var1 = var1.substring("flash3:".length()); // L: 57
-		} else if (var6.startsWith("glow1:")) { // L: 59
-			var7 = 9; // L: 60
-			var1 = var1.substring("glow1:".length()); // L: 61
-		} else if (var6.startsWith("glow2:")) { // L: 63
-			var7 = 10; // L: 64
-			var1 = var1.substring("glow2:".length()); // L: 65
-		} else if (var6.startsWith("glow3:")) { // L: 67
-			var7 = 11; // L: 68
-			var1 = var1.substring("glow3:".length()); // L: 69
-		} else if (var2 != Language.Language_EN) { // L: 71
-			if (var6.startsWith("yellow:")) { // L: 72
-				var7 = 0; // L: 73
-				var1 = var1.substring("yellow:".length()); // L: 74
-			} else if (var6.startsWith("red:")) { // L: 76
-				var7 = 1; // L: 77
-				var1 = var1.substring("red:".length()); // L: 78
-			} else if (var6.startsWith("green:")) { // L: 80
-				var7 = 2; // L: 81
-				var1 = var1.substring("green:".length()); // L: 82
-			} else if (var6.startsWith("cyan:")) { // L: 84
-				var7 = 3; // L: 85
-				var1 = var1.substring("cyan:".length()); // L: 86
-			} else if (var6.startsWith("purple:")) { // L: 88
-				var7 = 4; // L: 89
-				var1 = var1.substring("purple:".length()); // L: 90
-			} else if (var6.startsWith("white:")) { // L: 92
-				var7 = 5; // L: 93
-				var1 = var1.substring("white:".length()); // L: 94
-			} else if (var6.startsWith("flash1:")) { // L: 96
-				var7 = 6; // L: 97
-				var1 = var1.substring("flash1:".length()); // L: 98
-			} else if (var6.startsWith("flash2:")) { // L: 100
-				var7 = 7; // L: 101
-				var1 = var1.substring("flash2:".length()); // L: 102
-			} else if (var6.startsWith("flash3:")) { // L: 104
-				var7 = 8; // L: 105
-				var1 = var1.substring("flash3:".length()); // L: 106
-			} else if (var6.startsWith("glow1:")) { // L: 108
-				var7 = 9; // L: 109
-				var1 = var1.substring("glow1:".length()); // L: 110
-			} else if (var6.startsWith("glow2:")) { // L: 112
-				var7 = 10; // L: 113
-				var1 = var1.substring("glow2:".length()); // L: 114
-			} else if (var6.startsWith("glow3:")) { // L: 116
-				var7 = 11; // L: 117
-				var1 = var1.substring("glow3:".length()); // L: 118
-			}
-		}
-
-		var6 = var1.toLowerCase(); // L: 121
-		byte var8 = 0; // L: 122
-		if (var6.startsWith("wave:")) { // L: 123
-			var8 = 1; // L: 124
-			var1 = var1.substring("wave:".length()); // L: 125
-		} else if (var6.startsWith("wave2:")) { // L: 127
-			var8 = 2; // L: 128
-			var1 = var1.substring("wave2:".length()); // L: 129
-		} else if (var6.startsWith("shake:")) { // L: 131
-			var8 = 3; // L: 132
-			var1 = var1.substring("shake:".length()); // L: 133
-		} else if (var6.startsWith("scroll:")) { // L: 135
-			var8 = 4; // L: 136
-			var1 = var1.substring("scroll:".length()); // L: 137
-		} else if (var6.startsWith("slide:")) { // L: 139
-			var8 = 5; // L: 140
-			var1 = var1.substring("slide:".length()); // L: 141
-		} else if (var2 != Language.Language_EN) { // L: 143
-			if (var6.startsWith("wave:")) { // L: 144
-				var8 = 1; // L: 145
-				var1 = var1.substring("wave:".length()); // L: 146
-			} else if (var6.startsWith("wave2:")) { // L: 148
-				var8 = 2; // L: 149
-				var1 = var1.substring("wave2:".length()); // L: 150
-			} else if (var6.startsWith("shake:")) { // L: 152
-				var8 = 3; // L: 153
-				var1 = var1.substring("shake:".length()); // L: 154
-			} else if (var6.startsWith("scroll:")) { // L: 156
-				var8 = 4; // L: 157
-				var1 = var1.substring("scroll:".length()); // L: 158
-			} else if (var6.startsWith("slide:")) { // L: 160
-				var8 = 5; // L: 161
-				var1 = var1.substring("slide:".length()); // L: 162
-			}
-		}
-
-		var4.packetBuffer.writeByte(var7); // L: 165
-		var4.packetBuffer.writeByte(var8); // L: 166
-		class282.method5489(var4.packetBuffer, var1); // L: 167
-		if (var0 == class296.field3492.rsOrdinal()) { // L: 168
-			var4.packetBuffer.writeByte(var3); // L: 169
-		}
-
-		var4.packetBuffer.method7774(var4.packetBuffer.offset - var5); // L: 171
-		return var4; // L: 172
-	}
-
-	@ObfuscatedName("jb")
-	@ObfuscatedSignature(
-		descriptor = "(Lky;II)I",
-		garbageValue = "-965040804"
-	)
-	static final int method6907(Widget var0, int var1) {
-		if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10924
-			try {
-				int[] var2 = var0.cs1Instructions[var1]; // L: 10926
-				int var3 = 0; // L: 10927
-				int var4 = 0; // L: 10928
-				byte var5 = 0; // L: 10929
-
-				while (true) {
-					int var6 = var2[var4++]; // L: 10931
-					int var7 = 0; // L: 10932
-					byte var8 = 0; // L: 10933
-					if (var6 == 0) { // L: 10934
-						return var3;
-					}
-
-					if (var6 == 1) { // L: 10935
-						var7 = Client.currentLevels[var2[var4++]];
-					}
-
-					if (var6 == 2) { // L: 10936
-						var7 = Client.levels[var2[var4++]];
-					}
-
-					if (var6 == 3) { // L: 10937
-						var7 = Client.experience[var2[var4++]];
-					}
-
-					int var9;
-					Widget var10;
-					int var11;
-					int var12;
-					if (var6 == 4) { // L: 10938
-						var9 = var2[var4++] << 16; // L: 10939
-						var9 += var2[var4++]; // L: 10940
-						var10 = class127.getWidget(var9); // L: 10941
-						var11 = var2[var4++]; // L: 10942
-						if (var11 != -1 && (!class19.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10943
-							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10944
-								if (var11 + 1 == var10.itemIds[var12]) { // L: 10945
-									var7 += var10.itemQuantities[var12];
-								}
-							}
-						}
-					}
-
-					if (var6 == 5) { // L: 10949
-						var7 = Varps.Varps_main[var2[var4++]];
-					}
-
-					if (var6 == 6) { // L: 10950
-						var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
-					}
-
-					if (var6 == 7) { // L: 10951
-						var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
-					}
-
-					if (var6 == 8) { // L: 10952
-						var7 = GrandExchangeEvents.localPlayer.combatLevel;
-					}
-
-					if (var6 == 9) { // L: 10953
-						for (var9 = 0; var9 < 25; ++var9) { // L: 10954
-							if (Skills.Skills_enabled[var9]) { // L: 10955
-								var7 += Client.levels[var9];
-							}
-						}
-					}
-
-					if (var6 == 10) { // L: 10958
-						var9 = var2[var4++] << 16; // L: 10959
-						var9 += var2[var4++]; // L: 10960
-						var10 = class127.getWidget(var9); // L: 10961
-						var11 = var2[var4++]; // L: 10962
-						if (var11 != -1 && (!class19.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10963
-							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10964
-								if (var11 + 1 == var10.itemIds[var12]) { // L: 10965
-									var7 = 999999999; // L: 10966
-									break; // L: 10967
-								}
-							}
-						}
-					}
-
-					if (var6 == 11) { // L: 10972
-						var7 = Client.runEnergy;
-					}
-
-					if (var6 == 12) { // L: 10973
-						var7 = Client.weight;
-					}
-
-					if (var6 == 13) { // L: 10974
-						var9 = Varps.Varps_main[var2[var4++]]; // L: 10975
-						int var13 = var2[var4++]; // L: 10976
-						var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10977
-					}
-
-					if (var6 == 14) { // L: 10979
-						var9 = var2[var4++]; // L: 10980
-						var7 = SecureRandomCallable.getVarbit(var9); // L: 10981
-					}
-
-					if (var6 == 15) { // L: 10983
-						var8 = 1;
-					}
-
-					if (var6 == 16) { // L: 10984
-						var8 = 2;
-					}
-
-					if (var6 == 17) { // L: 10985
-						var8 = 3;
-					}
-
-					if (var6 == 18) { // L: 10986
-						var7 = (GrandExchangeEvents.localPlayer.x >> 7) + GrandExchangeOfferOwnWorldComparator.baseX;
-					}
-
-					if (var6 == 19) { // L: 10987
-						var7 = (GrandExchangeEvents.localPlayer.y >> 7) + VarcInt.baseY;
-					}
-
-					if (var6 == 20) { // L: 10988
-						var7 = var2[var4++];
-					}
-
-					if (var8 == 0) { // L: 10989
-						if (var5 == 0) { // L: 10990
-							var3 += var7;
-						}
-
-						if (var5 == 1) { // L: 10991
-							var3 -= var7;
-						}
-
-						if (var5 == 2 && var7 != 0) { // L: 10992
-							var3 /= var7;
-						}
-
-						if (var5 == 3) { // L: 10993
-							var3 *= var7;
-						}
-
-						var5 = 0; // L: 10994
 		} else {
-						var5 = var8; // L: 10996
+			char[] var1 = class424.field4621; // L: 19
-					}
+
-				}
+			int var2;
-			} catch (Exception var14) { // L: 10999
+			char var3;
-				return -1; // L: 11000
+			for (var2 = 0; var2 < var1.length; ++var2) { // L: 20
-			}
+				var3 = var1[var2]; // L: 21
-		} else {
+				if (var0 == var3) { // L: 22
-			return -2;
+					return true;
 				}
 			}
 
-	@ObfuscatedName("mn")
+			var1 = class424.field4623; // L: 26
-	@ObfuscatedSignature(
+
-		descriptor = "(I)Z",
+			for (var2 = 0; var2 < var1.length; ++var2) { // L: 27
-		garbageValue = "-1931509382"
+				var3 = var1[var2]; // L: 28
-	)
+				if (var0 == var3) { // L: 29
-	static boolean method6889() {
+					return true;
-		return class131.clientPreferences.method2249() >= Client.field617; // L: 12661
+				}
+			}
+
+			return false; // L: 32
+		}
 	}
 }

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("ol")
+@ObfuscatedName("oc")
 @Implements("ByteArrayNode")
 public class ByteArrayNode extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("byteArray")
 	public byte[] byteArray;
 

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

@@ -6,94 +6,98 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("my")
+@ObfuscatedName("mk")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 2043697785
+		intValue = -88837057
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1060831441
+		intValue = 1039424223
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1175962597
+		intValue = 1336676741
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1771611339
+		intValue = -1169134273
 	)
-	static int field4163;
+	static int field4217;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = -321282309
-	)
-	static int field4159;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = -178630953
-	)
-	static int field4160;
 	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -308081175
+		intValue = -957559945
 	)
-	static int field4161;
+	static int field4210;
-	@ObfuscatedName("p")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 889627885
+		intValue = 1701731071
 	)
-	static int field4152;
+	static int field4219;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 1660116295
+	)
+	static int field4220;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1383703933
+	)
+	static int field4221;
 	@ObfuscatedName("w")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("d")
+	@ObfuscatedName("t")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("m")
+	@ObfuscatedName("g")
-	static byte[][] field4162;
+	static byte[][] field4225;
-	@ObfuscatedName("x")
+	@ObfuscatedName("h")
-	static ArrayList field4167;
+	static ArrayList field4212;
-	@ObfuscatedName("mh")
-	@ObfuscatedGetter(
-		intValue = 1658529089
-	)
-	@Export("menuHeight")
-	static int menuHeight;
 
 	static {
 		ByteArrayPool_smallCount = 0; // L: 13
 		ByteArrayPool_mediumCount = 0; // L: 14
 		ByteArrayPool_largeCount = 0; // L: 15
-		field4163 = 0; // L: 16
+		field4217 = 0; // L: 16
-		field4159 = 1000; // L: 17
+		field4210 = 1000; // L: 17
-		field4160 = 250; // L: 18
+		field4219 = 250; // L: 18
-		field4161 = 100; // L: 19
+		field4220 = 100; // L: 19
-		field4152 = 50; // L: 20
+		field4221 = 50; // L: 20
 		ByteArrayPool_small = new byte[1000][]; // L: 21
 		ByteArrayPool_medium = new byte[250][]; // L: 22
 		ByteArrayPool_large = new byte[100][]; // L: 23
-		field4162 = new byte[50][]; // L: 24
+		field4225 = new byte[50][];
-		field4167 = new ArrayList(); // L: 28
+		field4212 = new ArrayList(); // L: 28
-		Login.method1960(); // L: 31
+		LoginScreenAnimation.method2217(); // L: 31
 		new HashMap();
 	} // L: 36
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IZB)[B",
+		descriptor = "(IB)F",
-		garbageValue = "-82"
+		garbageValue = "1"
+	)
+	public static float method6364(int var0) {
+		var0 &= 16383; // L: 24
+		return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); // L: 25
+	}
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		descriptor = "(IZI)[B",
+		garbageValue = "957663499"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
@@ -128,20 +132,20 @@ public class ByteArrayPool {
 		if (var0 != 30000) { // L: 85
 			if (var0 < 30000) {
 			}
-		} else if (field4163 > 0) {
+		} else if (field4217 > 0) {
-			var4 = field4162[--field4163]; // L: 86
+			var4 = field4225[--field4217]; // L: 86
-			field4162[field4163] = null; // L: 87
+			field4225[field4217] = null; // L: 87
 			return var4; // L: 88
 		}
 
-		if (BoundaryObject.ByteArrayPool_arrays != null) { // L: 90
+		if (class131.ByteArrayPool_arrays != null) { // L: 90
-			for (int var2 = 0; var2 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 91
+			for (int var2 = 0; var2 < FileSystem.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 91
-				if (FloorOverlayDefinition.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 92
+				if (FileSystem.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 92
-					if (var0 < FloorOverlayDefinition.ByteArrayPool_alternativeSizes[var2]) {
+					if (var0 < FileSystem.ByteArrayPool_alternativeSizes[var2]) {
 					}
-				} else if (class128.ByteArrayPool_altSizeArrayCounts[var2] > 0) {
+				} else if (GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var2] > 0) {
-					byte[] var3 = BoundaryObject.ByteArrayPool_arrays[var2][--class128.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 93
+					byte[] var3 = class131.ByteArrayPool_arrays[var2][--GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 93
-					BoundaryObject.ByteArrayPool_arrays[var2][class128.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 94
+					class131.ByteArrayPool_arrays[var2][GrandExchangeEvents.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 94
 					return var3; // L: 95
 				}
 			}
@@ -150,19 +154,37 @@ public class ByteArrayPool {
 		return new byte[var0]; // L: 108
 	}
 
-	@ObfuscatedName("it")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
+		descriptor = "(I)Lqr;",
-		garbageValue = "-1492106780"
+		garbageValue = "1594784812"
 	)
-	@Export("addCancelMenuEntry")
+	static SpritePixels method6365() {
-	static void addCancelMenuEntry() {
+		SpritePixels var0 = new SpritePixels(); // L: 149
-		Client.menuOptionsCount = 0; // L: 8607
+		var0.width = class453.SpriteBuffer_spriteWidth; // L: 150
-		Client.isMenuOpen = false; // L: 8608
+		var0.height = class453.SpriteBuffer_spriteHeight; // L: 151
-		Client.menuActions[0] = "Cancel"; // L: 8610
+		var0.xOffset = class453.SpriteBuffer_xOffsets[0]; // L: 152
-		Client.menuTargets[0] = ""; // L: 8611
+		var0.yOffset = class453.SpriteBuffer_yOffsets[0]; // L: 153
-		Client.menuOpcodes[0] = 1006; // L: 8612
+		var0.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[0]; // L: 154
-		Client.menuShiftClick[0] = false; // L: 8613
+		var0.subHeight = class453.SpriteBuffer_spriteHeights[0]; // L: 155
-		Client.menuOptionsCount = 1; // L: 8614
+		int var1 = var0.subHeight * var0.subWidth; // L: 156
-	} // L: 8615
+		byte[] var2 = class127.SpriteBuffer_pixels[0]; // L: 157
+		var0.pixels = new int[var1]; // L: 158
+
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 159
+			var0.pixels[var3] = Decimator.SpriteBuffer_spritePalette[var2[var3] & 255];
+		}
+
+		VarcInt.method3325(); // L: 160
+		return var0; // L: 161
+	}
+
+	@ObfuscatedName("hi")
+	@ObfuscatedSignature(
+		descriptor = "(Lcx;II)V",
+		garbageValue = "-376973471"
+	)
+	static final void method6357(Actor var0, int var1) {
+		AbstractWorldMapIcon.worldToScreen(var0.x, var0.y, var1); // L: 5456
+	} // L: 5457
 }

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

@@ -3,24 +3,20 @@ 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("ja")
+@ObfuscatedName("jz")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
 	public static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("DAYS_OF_THE_WEEK")
 	public static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("Calendar_calendar")
 	public static java.util.Calendar Calendar_calendar;
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "Lex;"
-	)
-	static ClanSettings field3269;
 
 	static {
 		MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; // L: 8
@@ -29,110 +25,164 @@ public class Calendar {
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 23
 	} // L: 24
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IILgt;Lgv;I)Z",
+		descriptor = "(II)Lfc;",
-		garbageValue = "-692039603"
+		garbageValue = "-1123951030"
 	)
-	public static final boolean method5507(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
+	@Export("getEnum")
-		int var4 = var0; // L: 111
+	public static EnumComposition getEnum(int var0) {
-		int var5 = var1; // L: 112
+		EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25
-		byte var6 = 64; // L: 113
+		if (var1 != null) { // L: 26
-		byte var7 = 64; // L: 114
+			return var1;
-		int var8 = var0 - var6; // L: 115
+		} else {
-		int var9 = var1 - var7; // L: 116
+			byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27
-		class194.directions[var6][var7] = 99; // L: 117
+			var1 = new EnumComposition(); // L: 28
-		class194.distances[var6][var7] = 0; // L: 118
+			if (var2 != null) { // L: 29
-		byte var10 = 0; // L: 119
+				var1.decode(new Buffer(var2));
-		int var11 = 0; // L: 120
-		class194.bufferX[var10] = var0; // L: 121
-		byte var10001 = var10;
-		int var18 = var10 + 1;
-		class194.bufferY[var10001] = var1; // L: 122
-		int[][] var12 = var3.flags; // L: 123
-
-		while (var18 != var11) { // L: 124
-			var4 = class194.bufferX[var11]; // L: 125
-			var5 = class194.bufferY[var11]; // L: 126
-			var11 = var11 + 1 & 4095; // L: 127
-			int var16 = var4 - var8; // L: 128
-			int var17 = var5 - var9; // L: 129
-			int var13 = var4 - var3.xInset; // L: 130
-			int var14 = var5 - var3.yInset; // L: 131
-			if (var2.hasArrived(2, var4, var5, var3)) { // L: 132
-				HealthBarUpdate.field1189 = var4; // L: 133
-				StructComposition.field1988 = var5; // L: 134
-				return true; // L: 135
 			}
 
-			int var15 = class194.distances[var16][var17] + 1; // L: 137
+			EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30
-			if (var16 > 0 && class194.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 138 139 140 141
+			return var1; // L: 31
-				class194.bufferX[var18] = var4 - 1; // L: 142
-				class194.bufferY[var18] = var5; // L: 143
-				var18 = var18 + 1 & 4095; // L: 144
-				class194.directions[var16 - 1][var17] = 2; // L: 145
-				class194.distances[var16 - 1][var17] = var15; // L: 146
-			}
-
-			if (var16 < 126 && class194.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 148 149 150 151
-				class194.bufferX[var18] = var4 + 1; // L: 152
-				class194.bufferY[var18] = var5; // L: 153
-				var18 = var18 + 1 & 4095; // L: 154
-				class194.directions[var16 + 1][var17] = 8; // L: 155
-				class194.distances[var16 + 1][var17] = var15; // L: 156
-			}
-
-			if (var17 > 0 && class194.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 158 159 160 161
-				class194.bufferX[var18] = var4; // L: 162
-				class194.bufferY[var18] = var5 - 1; // L: 163
-				var18 = var18 + 1 & 4095; // L: 164
-				class194.directions[var16][var17 - 1] = 1; // L: 165
-				class194.distances[var16][var17 - 1] = var15; // L: 166
-			}
-
-			if (var17 < 126 && class194.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 168 169 170 171
-				class194.bufferX[var18] = var4; // L: 172
-				class194.bufferY[var18] = var5 + 1; // L: 173
-				var18 = var18 + 1 & 4095; // L: 174
-				class194.directions[var16][var17 + 1] = 4; // L: 175
-				class194.distances[var16][var17 + 1] = var15; // L: 176
-			}
-
-			if (var16 > 0 && var17 > 0 && class194.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { // L: 178 179 180 181 182
-				class194.bufferX[var18] = var4 - 1; // L: 183
-				class194.bufferY[var18] = var5 - 1; // L: 184
-				var18 = var18 + 1 & 4095; // L: 185
-				class194.directions[var16 - 1][var17 - 1] = 3; // L: 186
-				class194.distances[var16 - 1][var17 - 1] = var15; // L: 187
-			}
-
-			if (var16 < 126 && var17 > 0 && class194.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { // L: 189 190 191 192 193
-				class194.bufferX[var18] = var4 + 1; // L: 194
-				class194.bufferY[var18] = var5 - 1; // L: 195
-				var18 = var18 + 1 & 4095; // L: 196
-				class194.directions[var16 + 1][var17 - 1] = 9; // L: 197
-				class194.distances[var16 + 1][var17 - 1] = var15; // L: 198
-			}
-
-			if (var16 > 0 && var17 < 126 && class194.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { // L: 200 201 202 203 204
-				class194.bufferX[var18] = var4 - 1; // L: 205
-				class194.bufferY[var18] = var5 + 1; // L: 206
-				var18 = var18 + 1 & 4095; // L: 207
-				class194.directions[var16 - 1][var17 + 1] = 6; // L: 208
-				class194.distances[var16 - 1][var17 + 1] = var15; // L: 209
-			}
-
-			if (var16 < 126 && var17 < 126 && class194.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { // L: 211 212 213 214 215
-				class194.bufferX[var18] = var4 + 1; // L: 216
-				class194.bufferY[var18] = var5 + 1; // L: 217
-				var18 = var18 + 1 & 4095; // L: 218
-				class194.directions[var16 + 1][var17 + 1] = 12; // L: 219
-				class194.distances[var16 + 1][var17 + 1] = var15; // L: 220
 		}
 	}
 
-		HealthBarUpdate.field1189 = var4; // L: 223
+	@ObfuscatedName("s")
-		StructComposition.field1988 = var5; // L: 224
+	@ObfuscatedSignature(
-		return false; // L: 225
+		descriptor = "(ILbb;ZB)I",
+		garbageValue = "73"
+	)
+	static int method5349(int var0, Script var1, boolean var2) {
+		boolean var3 = true; // L: 858
+		Widget var4;
+		if (var0 >= 2000) { // L: 860
+			var0 -= 1000; // L: 861
+			var4 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 862
+			var3 = false; // L: 863
+		} else {
+			var4 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 865
+		}
+
+		int var11;
+		if (var0 == ScriptOpcodes.CC_SETOP) { // L: 866
+			var11 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] - 1; // L: 867
+			if (var11 >= 0 && var11 <= 9) { // L: 868
+				var4.setAction(var11, Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]); // L: 872
+				return 1; // L: 873
+			} else {
+				--class9.Interpreter_stringStackSize; // L: 869
+				return 1; // L: 870
+			}
+		} else {
+			int var6;
+			if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 875
+				class12.Interpreter_intStackSize -= 2; // L: 876
+				var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 877
+				var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 878
+				var4.parent = ApproximateRouteStrategy.getWidgetChild(var11, var6); // L: 879
+				return 1; // L: 880
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 882
+				var4.isScrollBar = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 883
+				return 1; // L: 884
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 886
+				var4.dragZoneSize = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 887
+				return 1; // L: 888
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 890
+				var4.dragThreshold = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 891
+				return 1; // L: 892
+			} else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 894
+				var4.dataText = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 895
+				return 1; // L: 896
+			} else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 898
+				var4.spellActionName = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 899
+				return 1; // L: 900
+			} else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 902
+				var4.actions = null; // L: 903
+				return 1; // L: 904
+			} else if (var0 == 1308) { // L: 906
+				var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 907
+				return 1; // L: 908
+			} else if (var0 == 1309) { // L: 910
+				--class12.Interpreter_intStackSize; // L: 911
+				return 1; // L: 912
+			} else {
+				int var7;
+				byte[] var8;
+				if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 914
+					byte var5;
+					if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 944
+						class12.Interpreter_intStackSize -= 2; // L: 945
+						var5 = 10; // L: 946
+						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]}; // L: 947
+						byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]}; // L: 948
+						class363.Widget_setKey(var4, var5, var8, var9); // L: 949
+						return 1; // L: 950
+					} else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 952
+						class12.Interpreter_intStackSize -= 3; // L: 953
+						var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] - 1; // L: 954
+						var6 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 955
+						var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 956
+						if (var11 >= 0 && var11 <= 9) { // L: 957
+							class152.Widget_setKeyRate(var4, var11, var6, var7); // L: 960
+							return 1; // L: 961
+						} else {
+							throw new RuntimeException(); // L: 958
+						}
+					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 963
+						var5 = 10; // L: 964
+						var6 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 965
+						var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 966
+						class152.Widget_setKeyRate(var4, var5, var6, var7); // L: 967
+						return 1; // L: 968
+					} else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 970
+						--class12.Interpreter_intStackSize; // L: 971
+						var11 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize] - 1; // L: 972
+						if (var11 >= 0 && var11 <= 9) { // L: 973
+							Script.Widget_setKeyIgnoreHeld(var4, var11); // L: 976
+							return 1; // L: 977
+						} else {
+							throw new RuntimeException(); // L: 974
+						}
+					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 979
+						var5 = 10; // L: 980
+						Script.Widget_setKeyIgnoreHeld(var4, var5); // L: 981
+						return 1; // L: 982
+					} else {
+						return 2; // L: 984
+					}
+				} else {
+					byte[] var10 = null; // L: 915
+					var8 = null; // L: 916
+					if (var3) { // L: 917
+						class12.Interpreter_intStackSize -= 10; // L: 918
+
+						for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class12.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 920 921
+						}
+
+						if (var7 > 0) { // L: 923
+							var10 = new byte[var7 / 2]; // L: 924
+							var8 = new byte[var7 / 2]; // L: 925
+
+							for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 926
+								var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class12.Interpreter_intStackSize]; // L: 927
+								var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class12.Interpreter_intStackSize + 1]; // L: 928
+							}
+						}
+					} else {
+						class12.Interpreter_intStackSize -= 2; // L: 933
+						var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]}; // L: 934
+						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]}; // L: 935
+					}
+
+					var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] - 1; // L: 937
+					if (var7 >= 0 && var7 <= 9) { // L: 938
+						class363.Widget_setKey(var4, var7, var10, var8); // L: 941
+						return 1; // L: 942
+					} else {
+						throw new RuntimeException(); // L: 939
+					}
+				}
+			}
+		}
 	}
 }

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

@@ -5,16 +5,16 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("h")
+@ObfuscatedName("u")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("im")
+	@ObfuscatedName("lf")
 	@ObfuscatedSignature(
-		descriptor = "Lqi;"
+		descriptor = "Lki;"
 	)
-	@Export("redHintArrowSprite")
+	@Export("dragInventoryWidget")
-	static SpritePixels redHintArrowSprite;
+	static Widget dragInventoryWidget;
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("component")
 	Component component;
 
@@ -30,21 +30,23 @@ public final class Canvas extends java.awt.Canvas {
 		this.component.paint(var1); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(Lln;I)V",
+		descriptor = "(Ljava/lang/CharSequence;II)I",
-		garbageValue = "-1197200273"
+		garbageValue = "-989845700"
 	)
-	public static void method357(AbstractArchive var0) {
+	public static int method344(CharSequence var0, int var1) {
-		EnumComposition.EnumDefinition_archive = var0; // L: 25
+		return class202.method4016(var0, var1, true); // L: 72
-	} // L: 26
+	}
-
+
-	@ObfuscatedName("o")
+	@ObfuscatedName("lr")
-	@ObfuscatedSignature(
+	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
+		descriptor = "(IB)V",
-		garbageValue = "209833748"
+		garbageValue = "-35"
-	)
+	)
-	static final void method359(String var0) {
+	static void method347(int var0) {
-		class149.method3138("Please remove " + var0 + " from your ignore list first"); // L: 106
+		if (var0 != Client.loginState) { // L: 12714
-	} // L: 107
+			Client.loginState = var0; // L: 12715
+		}
+	} // L: 12716
 }

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

@@ -3,111 +3,175 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
-@ObfuscatedName("bp")
+@ObfuscatedName("by")
 @Implements("ChatChannel")
 public class ChatChannel {
 	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -2004549905
+	)
+	static int field973;
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "[Lbe;"
+		descriptor = "Lne;"
+	)
+	static Bounds field976;
+	@ObfuscatedName("aa")
+	@ObfuscatedSignature(
+		descriptor = "Lne;"
+	)
+	static Bounds field977;
+	@ObfuscatedName("hl")
+	@ObfuscatedSignature(
+		descriptor = "Lmx;"
+	)
+	@Export("fontBold12")
+	static Font fontBold12;
+	@ObfuscatedName("ii")
+	@ObfuscatedSignature(
+		descriptor = "[Lqr;"
+	)
+	@Export("headIconPrayerSprites")
+	static SpritePixels[] headIconPrayerSprites;
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "[Lbo;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 417639835
+		intValue = -247324107
 	)
 	@Export("count")
 	int count;
 
 	ChatChannel() {
-		this.messages = new Message[100]; // L: 95
+		this.messages = new Message[100]; // L: 72
-	} // L: 98
+	} // L: 75
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbe;",
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbo;",
-		garbageValue = "1370316995"
+		garbageValue = "54"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
-		Message var5 = this.messages[99]; // L: 101
+		Message var5 = this.messages[99]; // L: 78
 
-		for (int var6 = this.count; var6 > 0; --var6) { // L: 102
+		for (int var6 = this.count; var6 > 0; --var6) { // L: 79
-			if (var6 != 100) { // L: 103
+			if (var6 != 100) { // L: 80
-				this.messages[var6] = this.messages[var6 - 1]; // L: 104
+				this.messages[var6] = this.messages[var6 - 1]; // L: 81
 			}
 		}
 
-		if (var5 == null) { // L: 106
+		if (var5 == null) { // L: 83
 			var5 = new Message(var1, var2, var4, var3);
 		} else {
-			var5.remove(); // L: 108
+			var5.remove(); // L: 85
-			var5.removeDual(); // L: 109
+			var5.removeDual(); // L: 86
-			var5.set(var1, var2, var4, var3); // L: 110
+			var5.set(var1, var2, var4, var3); // L: 87
 		}
 
-		this.messages[0] = var5; // L: 112
+		this.messages[0] = var5; // L: 89
-		if (this.count < 100) { // L: 113
+		if (this.count < 100) { // L: 90
 			++this.count;
 		}
 
-		return var5; // L: 114
+		return var5; // L: 91
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lbe;",
+		descriptor = "(II)Lbo;",
-		garbageValue = "-53"
+		garbageValue = "-345084723"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
-		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 118 119
+		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 95 96
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
+		descriptor = "(I)I",
-		garbageValue = "5"
+		garbageValue = "-2082093822"
 	)
 	@Export("size")
 	int size() {
-		return this.count; // L: 123
+		return this.count; // L: 100
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
+		descriptor = "(IB)Z",
-		garbageValue = "1242212689"
+		garbageValue = "-17"
 	)
-	@Export("itemContainerSetItem")
+	public static boolean method1968(int var0) {
-	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
+		return var0 >= WorldMapDecorationType.field3562.id && var0 <= WorldMapDecorationType.field3577.id; // L: 47
-		ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39
-		if (var4 == null) { // L: 40
-			var4 = new ItemContainer(); // L: 41
-			ItemContainer.itemContainers.put(var4, (long)var0); // L: 42
 	}
 
-		if (var4.ids.length <= var1) { // L: 44
+	@ObfuscatedName("n")
-			int[] var5 = new int[var1 + 1]; // L: 45
+	@ObfuscatedSignature(
-			int[] var6 = new int[var1 + 1]; // L: 46
+		descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;I)[F",
+		garbageValue = "-1029057430"
+	)
+	static float[] method1965(JSONObject var0, String var1) throws JSONException {
+		float[] var2 = new float[4]; // L: 279
 
-			int var7;
+		try {
-			for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47
+			JSONArray var3 = var0.getJSONArray(var1); // L: 281
-				var5[var7] = var4.ids[var7]; // L: 48
+			var2[0] = (float)var3.optDouble(0, 0.0D); // L: 282
-				var6[var7] = var4.quantities[var7]; // L: 49
+			var2[1] = (float)var3.optDouble(1, 0.0D); // L: 283
+			var2[2] = (float)var3.optDouble(2, 1.0D); // L: 284
+			var2[3] = (float)var3.optDouble(3, 1.0D); // L: 285
+		} catch (JSONException var4) { // L: 287
+			var2[0] = 0.0F; // L: 288
+			var2[1] = 0.0F; // L: 289
+			var2[2] = 1.0F; // L: 290
+			var2[3] = 1.0F; // L: 291
 		}
 
-			for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51
+		return var2; // L: 293
-				var5[var7] = -1; // L: 52
-				var6[var7] = 0; // L: 53
 	}
 
-			var4.ids = var5; // L: 55
+	@ObfuscatedName("ju")
-			var4.quantities = var6; // L: 56
+	@ObfuscatedSignature(
+		descriptor = "(Lki;III)V",
+		garbageValue = "-1619686813"
+	)
+	@Export("alignWidgetPosition")
+	static void alignWidgetPosition(Widget var0, int var1, int var2) {
+		if (var0.xAlignment == 0) { // L: 10816
+			var0.x = var0.rawX;
+		} else if (var0.xAlignment == 1) { // L: 10817
+			var0.x = var0.rawX + (var1 - var0.width) / 2;
+		} else if (var0.xAlignment == 2) { // L: 10818
+			var0.x = var1 - var0.width - var0.rawX;
+		} else if (var0.xAlignment == 3) { // L: 10819
+			var0.x = var0.rawX * var1 >> 14;
+		} else if (var0.xAlignment == 4) { // L: 10820
+			var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2;
+		} else {
+			var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10821
 		}
 
-		var4.ids[var1] = var2; // L: 58
+		if (var0.yAlignment == 0) { // L: 10822
-		var4.quantities[var1] = var3; // L: 59
+			var0.y = var0.rawY;
-	} // L: 60
+		} else if (var0.yAlignment == 1) { // L: 10823
+			var0.y = (var2 - var0.height) / 2 + var0.rawY;
+		} else if (var0.yAlignment == 2) { // L: 10824
+			var0.y = var2 - var0.height - var0.rawY;
+		} else if (var0.yAlignment == 3) {
+			var0.y = var2 * var0.rawY >> 14; // L: 10825
+		} else if (var0.yAlignment == 4) { // L: 10826
+			var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14);
+		} else {
+			var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10827
+		}
+
+	} // L: 10828
 }

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

@@ -7,504 +7,165 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ea")
+@ObfuscatedName("et")
 @Implements("ClanChannel")
 public class ClanChannel extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
-	boolean field1653;
+	boolean field1712;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
-	boolean field1658;
+	boolean field1705;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("members")
 	public List members;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("sortedMembers")
 	int[] sortedMembers;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		longValue = -6213414464527549047L
+		longValue = 1835319440432000381L
 	)
-	long field1656;
+	long field1709;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("name")
 	public String name;
+	@ObfuscatedName("p")
+	public byte field1711;
 	@ObfuscatedName("s")
-	public byte field1654;
+	public byte field1706;
-	@ObfuscatedName("l")
-	public byte field1659;
 
 	static {
 		new BitSet(65536); // L: 22
 	} // L: 23
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;)V"
+		descriptor = "(Lpx;)V"
 	)
 	public ClanChannel(Buffer var1) {
-		this.field1658 = true; // L: 13
+		this.field1705 = true; // L: 13
 		this.name = null; // L: 17
-		this.method3117(var1);
+		this.method3010(var1); // L: 26
-	}
+	} // L: 27
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(B)[I",
-		garbageValue = "-75"
+		garbageValue = "57"
 	)
 	@Export("getSortedMembers")
 	public int[] getSortedMembers() {
-		if (this.sortedMembers == null) {
+		if (this.sortedMembers == null) { // L: 30
 			String[] var1 = new String[this.members.size()]; // L: 31
-			this.sortedMembers = new int[this.members.size()];
+			this.sortedMembers = new int[this.members.size()]; // L: 32
 
-			for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 35
+			for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 33 35
-				var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method8243();
+				var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method8148(); // L: 34
 			}
 
-			int[] var3 = this.sortedMembers; // L: 37
+			class113.method2625(var1, this.sortedMembers); // L: 37
-			class433.method7605(var1, var3, 0, var1.length - 1); // L: 39
 		}
 
-		return this.sortedMembers; // L: 42
+		return this.sortedMembers; // L: 39
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lec;B)V",
+		descriptor = "(Lem;I)V",
-		garbageValue = "6"
+		garbageValue = "42890757"
 	)
 	@Export("addMember")
 	void addMember(ClanChannelMember var1) {
-		this.members.add(var1); // L: 46
+		this.members.add(var1); // L: 43
-		this.sortedMembers = null; // L: 47
+		this.sortedMembers = null; // L: 44
-	} // L: 48
+	} // L: 45
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-911825702"
+		garbageValue = "2089960192"
 	)
 	@Export("removeMember")
 	void removeMember(int var1) {
-		this.members.remove(var1); // L: 51
+		this.members.remove(var1); // L: 48
-		this.sortedMembers = null; // L: 52
+		this.sortedMembers = null; // L: 49
-	} // L: 53
+	} // L: 50
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
+		descriptor = "(B)I",
-		garbageValue = "-251884744"
+		garbageValue = "41"
 	)
-	public int method3119() {
+	public int method3005() {
-		return this.members.size(); // L: 56
+		return this.members.size(); // L: 53
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)I",
+		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "75"
+		garbageValue = "1345436984"
 	)
-	public int method3116(String var1) {
+	public int method3023(String var1) {
-		if (!this.field1658) { // L: 60
+		if (!this.field1705) { // L: 57
 			throw new RuntimeException("Displaynames not available");
 		} else {
-			for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 61
+			for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 58
 				if (((ClanChannelMember)this.members.get(var2)).username.getName().equalsIgnoreCase(var1)) {
-					return var2; // L: 62
+					return var2; // L: 59
 				}
 			}
 
-			return -1; // L: 64
+			return -1; // L: 61
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;S)V",
+		descriptor = "(Lpx;I)V",
-		garbageValue = "-10005"
+		garbageValue = "-423085826"
 	)
-	void method3117(Buffer var1) {
+	void method3010(Buffer var1) {
-		int var2 = var1.readUnsignedByte(); // L: 68
+		int var2 = var1.readUnsignedByte(); // L: 65
-		if ((var2 & 1) != 0) { // L: 69
+		if ((var2 & 1) != 0) { // L: 66
-			this.field1653 = true;
+			this.field1712 = true;
 		}
 
-		if ((var2 & 2) != 0) { // L: 70
+		if ((var2 & 2) != 0) { // L: 67
-			this.field1658 = true;
+			this.field1705 = true;
 		}
 
-		int var3 = 2; // L: 71
+		int var3 = 2; // L: 68
-		if ((var2 & 4) != 0) { // L: 72
+		if ((var2 & 4) != 0) { // L: 69
 			var3 = var1.readUnsignedByte();
 		}
 
-		super.key = var1.readLong(); // L: 73
+		super.key = var1.readLong(); // L: 70
-		this.field1656 = var1.readLong(); // L: 74
+		this.field1709 = var1.readLong(); // L: 71
-		this.name = var1.readStringCp1252NullTerminated(); // L: 75
+		this.name = var1.readStringCp1252NullTerminated(); // L: 72
-		var1.readBoolean(); // L: 76
+		var1.readBoolean(); // L: 73
-		this.field1659 = var1.readByte(); // L: 77
+		this.field1706 = var1.readByte(); // L: 74
-		this.field1654 = var1.readByte(); // L: 78
+		this.field1711 = var1.readByte(); // L: 75
-		int var4 = var1.readUnsignedShort(); // L: 79
+		int var4 = var1.readUnsignedShort(); // L: 76
-		if (var4 > 0) { // L: 80
+		if (var4 > 0) { // L: 77
-			this.members = new ArrayList(var4); // L: 81
+			this.members = new ArrayList(var4); // L: 78
 
-			for (int var5 = 0; var5 < var4; ++var5) { // L: 82
+			for (int var5 = 0; var5 < var4; ++var5) { // L: 79
-				ClanChannelMember var6 = new ClanChannelMember(); // L: 83
+				ClanChannelMember var6 = new ClanChannelMember(); // L: 80
-				if (this.field1653) { // L: 84
+				if (this.field1712) { // L: 81
-					var1.readLong(); // L: 85
+					var1.readLong(); // L: 82
 				}
 
-				if (this.field1658) { // L: 87
+				if (this.field1705) { // L: 84
 					var6.username = new Username(var1.readStringCp1252NullTerminated());
 				}
 
-				var6.rank = var1.readByte(); // L: 88
+				var6.rank = var1.readByte(); // L: 85
-				var6.world = var1.readUnsignedShort(); // L: 89
+				var6.world = var1.readUnsignedShort(); // L: 86
-				if (var3 >= 3) { // L: 90
+				if (var3 >= 3) { // L: 87
-					var1.readBoolean(); // L: 91
+					var1.readBoolean(); // L: 88
 				}
 
-				this.members.add(var5, var6); // L: 94
+				this.members.add(var5, var6); // L: 91
 			}
 		}
 
-	} // L: 97
+	} // L: 94
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lbd;",
-		garbageValue = "-23"
-	)
-	@Export("getScript")
-	static Script getScript(int var0) {
-		Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26
-		if (var1 != null) { // L: 27
-			return var1;
-		} else {
-			byte[] var2 = class152.archive12.takeFile(var0, 0); // L: 28
-			if (var2 == null) { // L: 29
-				return null; // L: 30
-			} else {
-				var1 = PcmPlayer.newScript(var2); // L: 32
-				Script.Script_cached.put(var1, (long)var0); // L: 33
-				return var1; // L: 34
-			}
-		}
-	}
-
-	@ObfuscatedName("ha")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIII)V",
-		garbageValue = "-1683816578"
-	)
-	@Export("addPendingSpawnToScene")
-	static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 7800
-			if (Client.isLowDetail && var0 != class18.Client_plane) { // L: 7801
-				return;
-			}
-
-			long var7 = 0L; // L: 7802
-			boolean var9 = true; // L: 7803
-			boolean var10 = false; // L: 7804
-			boolean var11 = false; // L: 7805
-			if (var1 == 0) { // L: 7806
-				var7 = ArchiveLoader.scene.getBoundaryObjectTag(var0, var2, var3);
-			}
-
-			if (var1 == 1) { // L: 7807
-				var7 = ArchiveLoader.scene.getWallDecorationTag(var0, var2, var3);
-			}
-
-			if (var1 == 2) { // L: 7808
-				var7 = ArchiveLoader.scene.getGameObjectTag(var0, var2, var3);
-			}
-
-			if (var1 == 3) { // L: 7809
-				var7 = ArchiveLoader.scene.getFloorDecorationTag(var0, var2, var3);
-			}
-
-			int var12;
-			if (var7 != 0L) { // L: 7810
-				var12 = ArchiveLoader.scene.getObjectFlags(var0, var2, var3, var7); // L: 7811
-				int var38 = FileSystem.Entity_unpackID(var7); // L: 7812
-				int var39 = var12 & 31; // L: 7813
-				int var40 = var12 >> 6 & 3; // L: 7814
-				ObjectComposition var13;
-				if (var1 == 0) { // L: 7815
-					ArchiveLoader.scene.removeBoundaryObject(var0, var2, var3); // L: 7816
-					var13 = class146.getObjectDefinition(var38); // L: 7817
-					if (var13.interactType != 0) { // L: 7818
-						Client.collisionMaps[var0].method3853(var2, var3, var39, var40, var13.boolean1);
-					}
-				}
-
-				if (var1 == 1) { // L: 7820
-					ArchiveLoader.scene.removeWallDecoration(var0, var2, var3);
-				}
-
-				if (var1 == 2) { // L: 7821
-					ArchiveLoader.scene.removeGameObject(var0, var2, var3); // L: 7822
-					var13 = class146.getObjectDefinition(var38); // L: 7823
-					if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7824
-						return;
-					}
-
-					if (var13.interactType != 0) { // L: 7825
-						Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1);
-					}
-				}
-
-				if (var1 == 3) { // L: 7827
-					ArchiveLoader.scene.removeFloorDecoration(var0, var2, var3); // L: 7828
-					var13 = class146.getObjectDefinition(var38); // L: 7829
-					if (var13.interactType == 1) { // L: 7830
-						Client.collisionMaps[var0].method3847(var2, var3);
-					}
-				}
-			}
-
-			if (var4 >= 0) { // L: 7833
-				var12 = var0; // L: 7834
-				if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7835
-					var12 = var0 + 1;
-				}
-
-				Scene var41 = ArchiveLoader.scene; // L: 7836
-				CollisionMap var14 = Client.collisionMaps[var0]; // L: 7837
-				ObjectComposition var15 = class146.getObjectDefinition(var4); // L: 7839
-				int var16;
-				int var17;
-				if (var5 != 1 && var5 != 3) { // L: 7842
-					var16 = var15.sizeX; // L: 7847
-					var17 = var15.sizeY; // L: 7848
-				} else {
-					var16 = var15.sizeY; // L: 7843
-					var17 = var15.sizeX; // L: 7844
-				}
-
-				int var18;
-				int var19;
-				if (var16 + var2 <= 104) { // L: 7854
-					var18 = (var16 >> 1) + var2; // L: 7855
-					var19 = var2 + (var16 + 1 >> 1); // L: 7856
-				} else {
-					var18 = var2; // L: 7859
-					var19 = var2 + 1; // L: 7860
-				}
-
-				int var20;
-				int var21;
-				if (var3 + var17 <= 104) { // L: 7862
-					var20 = var3 + (var17 >> 1); // L: 7863
-					var21 = var3 + (var17 + 1 >> 1); // L: 7864
-				} else {
-					var20 = var3; // L: 7867
-					var21 = var3 + 1; // L: 7868
-				}
-
-				int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7870
-				int var23 = var22[var19][var20] + var22[var18][var20] + var22[var18][var21] + var22[var19][var21] >> 2; // L: 7871
-				int var24 = (var2 << 7) + (var16 << 6); // L: 7872
-				int var25 = (var3 << 7) + (var17 << 6); // L: 7873
-				long var26 = GameObject.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7874
-				int var28 = (var5 << 6) + var6; // L: 7875
-				if (var15.int3 == 1) { // L: 7876
-					var28 += 256;
-				}
-
-				Object var36;
-				if (var6 == 22) { // L: 7877
-					if (var15.animationId == -1 && var15.transforms == null) { // L: 7879
-						var36 = var15.getModel(22, var5, var22, var24, var23, var25);
-					} else {
-						var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7880
-					}
-
-					var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7881
-					if (var15.interactType == 1) { // L: 7882
-						var14.setBlockedByFloorDec(var2, var3);
-					}
-				} else if (var6 != 10 && var6 != 11) { // L: 7885
-					if (var6 >= 12) { // L: 7893
-						if (var15.animationId == -1 && var15.transforms == null) { // L: 7895
-							var36 = var15.getModel(var6, var5, var22, var24, var23, var25);
-						} else {
-							var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7896
-						}
-
-						var41.method4882(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7897
-						if (var15.interactType != 0) { // L: 7898
-							var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
-						}
-					} else if (var6 == 0) { // L: 7901
-						if (var15.animationId == -1 && var15.transforms == null) { // L: 7903
-							var36 = var15.getModel(0, var5, var22, var24, var23, var25);
-						} else {
-							var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7904
-						}
-
-						var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field990[var5], 0, var26, var28); // L: 7905
-						if (var15.interactType != 0) { // L: 7906
-							var14.method3872(var2, var3, var6, var5, var15.boolean1);
-						}
-					} else if (var6 == 1) { // L: 7909
-						if (var15.animationId == -1 && var15.transforms == null) {
-							var36 = var15.getModel(1, var5, var22, var24, var23, var25); // L: 7911
-						} else {
-							var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7912
-						}
-
-						var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7913
-						if (var15.interactType != 0) { // L: 7914
-							var14.method3872(var2, var3, var6, var5, var15.boolean1);
-						}
-					} else {
-						int var29;
-						if (var6 == 2) { // L: 7917
-							var29 = var5 + 1 & 3; // L: 7918
-							Object var31;
-							Object var37;
-							if (var15.animationId == -1 && var15.transforms == null) { // L: 7921
-								var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7922
-								var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7923
-							} else {
-								var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7926
-								var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7927
-							}
-
-							var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field990[var5], Tiles.field990[var29], var26, var28); // L: 7929
-							if (var15.interactType != 0) { // L: 7930
-								var14.method3872(var2, var3, var6, var5, var15.boolean1);
-							}
-						} else if (var6 == 3) { // L: 7933
-							if (var15.animationId == -1 && var15.transforms == null) { // L: 7935
-								var36 = var15.getModel(3, var5, var22, var24, var23, var25);
-							} else {
-								var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7936
-							}
-
-							var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field989[var5], 0, var26, var28); // L: 7937
-							if (var15.interactType != 0) { // L: 7938
-								var14.method3872(var2, var3, var6, var5, var15.boolean1);
-							}
-						} else if (var6 == 9) { // L: 7941
-							if (var15.animationId == -1 && var15.transforms == null) { // L: 7943
-								var36 = var15.getModel(var6, var5, var22, var24, var23, var25);
-							} else {
-								var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7944
-							}
-
-							var41.method4882(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7945
-							if (var15.interactType != 0) { // L: 7946
-								var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
-							}
-						} else if (var6 == 4) { // L: 7949
-							if (var15.animationId == -1 && var15.transforms == null) { // L: 7951
-								var36 = var15.getModel(4, var5, var22, var24, var23, var25);
-							} else {
-								var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7952
-							}
-
-							var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field990[var5], 0, 0, 0, var26, var28); // L: 7953
-						} else {
-							long var30;
-							Object var32;
-							if (var6 == 5) { // L: 7956
-								var29 = 16; // L: 7957
-								var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7958
-								if (0L != var30) { // L: 7959
-									var29 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var30)).int2;
-								}
-
-								if (var15.animationId == -1 && var15.transforms == null) { // L: 7961
-									var32 = var15.getModel(4, var5, var22, var24, var23, var25);
-								} else {
-									var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7962
-								}
-
-								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field990[var5], 0, var29 * Tiles.field992[var5], var29 * Tiles.field993[var5], var26, var28); // L: 7963
-							} else if (var6 == 6) { // L: 7966
-								var29 = 8; // L: 7967
-								var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7968
-								if (0L != var30) { // L: 7969
-									var29 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var30)).int2 / 2;
-								}
-
-								if (var15.animationId == -1 && var15.transforms == null) { // L: 7971
-									var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25);
-								} else {
-									var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7972
-								}
-
-								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field997[var5], var29 * Tiles.field995[var5], var26, var28); // L: 7973
-							} else if (var6 == 7) { // L: 7976
-								int var35 = var5 + 2 & 3; // L: 7978
-								if (var15.animationId == -1 && var15.transforms == null) { // L: 7979
-									var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25);
-								} else {
-									var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7980
-								}
-
-								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7981
-							} else if (var6 == 8) { // L: 7984
-								var29 = 8; // L: 7985
-								var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7986
-								if (var30 != 0L) { // L: 7987
-									var29 = class146.getObjectDefinition(FileSystem.Entity_unpackID(var30)).int2 / 2;
-								}
-
-								int var34 = var5 + 2 & 3; // L: 7990
-								Object var33;
-								if (var15.animationId == -1 && var15.transforms == null) { // L: 7991
-									var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7992
-									var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7993
-								} else {
-									var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7996
-									var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7997
-								}
-
-								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field997[var5], var29 * Tiles.field995[var5], var26, var28); // L: 7999
-							}
-						}
-					}
-				} else {
-					if (var15.animationId == -1 && var15.transforms == null) { // L: 7887
-						var36 = var15.getModel(10, var5, var22, var24, var23, var25);
-					} else {
-						var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7888
-					}
-
-					if (var36 != null) { // L: 7889
-						var41.method4882(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28);
-					}
-
-					if (var15.interactType != 0) { // L: 7890
-						var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
-					}
-				}
-			}
-		}
-
-	} // L: 8004
-
-	@ObfuscatedName("lp")
-	@ObfuscatedSignature(
-		descriptor = "(IIZB)V",
-		garbageValue = "61"
-	)
-	static final void method3137(int var0, int var1, boolean var2) {
-		if (Client.currentClanChannels[var0] != null) { // L: 12436
-			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method3119()) { // L: 12437
-				ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12438
-				PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2967, Client.packetWriter.isaacCipher); // L: 12439
-				var4.packetBuffer.writeByte(4 + class425.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 12440
-				var4.packetBuffer.writeByte(var0); // L: 12441
-				var4.packetBuffer.writeShort(var1); // L: 12442
-				var4.packetBuffer.writeBoolean(var2); // L: 12443
-				var4.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 12444
-				Client.packetWriter.addNode(var4); // L: 12445
-			}
-		}
-	} // L: 12446
 }

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

@@ -4,21 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ec")
+@ObfuscatedName("em")
 @Implements("ClanChannelMember")
 public class ClanChannelMember {
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Llp;"
+	)
+	@Export("musicTrackArchive")
+	public static AbstractArchive musicTrackArchive;
+	@ObfuscatedName("o")
 	@Export("rank")
 	public byte rank;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -113610011
+		intValue = -594954787
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lqb;"
+		descriptor = "Lqv;"
 	)
 	@Export("username")
 	public Username username;
@@ -26,53 +32,22 @@ public class ClanChannelMember {
 	ClanChannelMember() {
 	} // L: 10
 
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lfv;",
-		garbageValue = "111"
-	)
-	public static HealthBarDefinition method2870(int var0) {
-		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 37
-		if (var1 != null) { // L: 38
-			return var1;
-		} else {
-			byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 39
-			var1 = new HealthBarDefinition(); // L: 40
-			if (var2 != null) { // L: 41
-				var1.decode(new Buffer(var2));
-			}
-
-			HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 42
-			return var1; // L: 43
-		}
-	}
-
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
+		descriptor = "(IB)I",
-		garbageValue = "-704026744"
+		garbageValue = "98"
 	)
-	public static int method2869(int var0) {
+	public static int method2819(int var0) {
-		if (var0 > 0) { // L: 182
+		return ScriptEvent.method2085(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 64
-			return 1;
-		} else {
-			return var0 < 0 ? -1 : 0; // L: 183 184
-		}
 	}
 
-	@ObfuscatedName("fc")
+	@ObfuscatedName("gc")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
+		descriptor = "(B)I",
-		garbageValue = "0"
+		garbageValue = "-113"
 	)
-	static final void method2868() {
+	@Export("getWindowedMode")
-		if (Client.logoutTimer > 0) { // L: 2967
+	static int getWindowedMode() {
-			ItemLayer.logOut(); // L: 2968
+		return Client.isResizable ? 2 : 1; // L: 4341
-		} else {
-			Client.timer.method6562(); // L: 2971
-			Decimator.updateGameState(40); // L: 2972
-			ModeWhere.field4073 = Client.packetWriter.getSocket(); // L: 2973
-			Client.packetWriter.removeSocket(); // L: 2974
 	}
-	} // L: 2969 2975
 }

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

@@ -3,18 +3,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ne")
+@ObfuscatedName("nm")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Lnq;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Lnq;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -24,20 +24,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown; // L: 7
 	} // L: 9
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "131518086"
+		garbageValue = "-990800587"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1955315992"
+		garbageValue = "-107862662"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -48,30 +48,30 @@ public class ClanMate extends Buddy {
 		return this.friend == TriBool.TriBool_true; // L: 19
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1874980316"
+		garbageValue = "1082249344"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = Decimator.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23
+		this.friend = BufferedSource.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23
 	} // L: 24
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
+		descriptor = "(B)V",
-		garbageValue = "-23167"
+		garbageValue = "25"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown; // L: 27
 	} // L: 28
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
+		descriptor = "(I)Z",
-		garbageValue = "0"
+		garbageValue = "2107172617"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -82,527 +82,13 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true; // L: 34
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
+		descriptor = "(B)V",
-		garbageValue = "374210417"
+		garbageValue = "-45"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = Decimator.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38
+		this.ignored = BufferedSource.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38
 	} // L: 39
-
-	@ObfuscatedName("hg")
-	@ObfuscatedSignature(
-		descriptor = "(Ljp;I)V",
-		garbageValue = "1119895393"
-	)
-	static final void method6700(class263 var0) {
-		PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7425
-		int var2;
-		int var3;
-		int var4;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		if (class263.field3012 == var0) { // L: 7426
-			var2 = var1.method7742(); // L: 7427
-			var3 = (var2 >> 4 & 7) + PlayerComposition.field3307; // L: 7428
-			var4 = (var2 & 7) + class29.field181; // L: 7429
-			var5 = var1.readUnsignedByte(); // L: 7430
-			var6 = var5 >> 2; // L: 7431
-			var7 = var5 & 3; // L: 7432
-			var8 = Client.field748[var6]; // L: 7433
-			if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7434
-				GrandExchangeOfferWorldComparator.updatePendingSpawn(class18.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); // L: 7435
-			}
-
-		} else {
-			int var9;
-			int var10;
-			if (class263.field3006 == var0) { // L: 7439
-				var2 = var1.method7742(); // L: 7440
-				var3 = var1.method7875(); // L: 7441
-				var4 = (var3 >> 4 & 7) + PlayerComposition.field3307; // L: 7442
-				var5 = (var3 & 7) + class29.field181; // L: 7443
-				var6 = var1.method7742(); // L: 7444
-				var7 = var6 >> 4 & 15; // L: 7445
-				var8 = var6 & 7; // L: 7446
-				var9 = var1.method7713(); // L: 7447
-				if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7448
-					var10 = var7 + 1; // L: 7449
-					if (GrandExchangeEvents.localPlayer.pathX[0] >= var4 - var10 && GrandExchangeEvents.localPlayer.pathX[0] <= var10 + var4 && GrandExchangeEvents.localPlayer.pathY[0] >= var5 - var10 && GrandExchangeEvents.localPlayer.pathY[0] <= var10 + var5 && class131.clientPreferences.method2270() != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 7450 7451
-						Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7452
-						Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 7453
-						Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 7454
-						Client.soundEffects[Client.soundEffectCount] = null; // L: 7455
-						Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var4 << 16); // L: 7456
-						++Client.soundEffectCount; // L: 7457
-					}
-				}
-			}
-
-			TileItem var31;
-			if (class263.field3009 == var0) { // L: 7462
-				var2 = var1.method7875(); // L: 7463
-				var3 = (var2 >> 4 & 7) + PlayerComposition.field3307; // L: 7464
-				var4 = (var2 & 7) + class29.field181; // L: 7465
-				var5 = var1.method7714(); // L: 7466
-				if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7467
-					NodeDeque var36 = Client.groundItems[class18.Client_plane][var3][var4]; // L: 7468
-					if (var36 != null) { // L: 7469
-						for (var31 = (TileItem)var36.last(); var31 != null; var31 = (TileItem)var36.previous()) { // L: 7470 7471 7476
-							if ((var5 & 32767) == var31.id) { // L: 7472
-								var31.remove(); // L: 7473
-								break;
-							}
-						}
-
-						if (var36.last() == null) { // L: 7478
-							Client.groundItems[class18.Client_plane][var3][var4] = null;
-						}
-
-						UserComparator3.updateItemPile(var3, var4); // L: 7479
-					}
-				}
-
-			} else {
-				int var11;
-				int var12;
-				int var13;
-				int var14;
-				if (class263.field3004 == var0) { // L: 7484
-					byte var37 = var1.readByte(); // L: 7485
-					var3 = var1.readUnsignedShort(); // L: 7486
-					byte var38 = var1.method7707(); // L: 7487
-					byte var39 = var1.readByte(); // L: 7488
-					var6 = var1.method7715(); // L: 7489
-					byte var40 = var1.method7707(); // L: 7490
-					var8 = var1.method7714(); // L: 7491
-					var9 = var1.method7773(); // L: 7492
-					var10 = var9 >> 2; // L: 7493
-					var11 = var9 & 3; // L: 7494
-					var12 = Client.field748[var10]; // L: 7495
-					var13 = var1.method7773(); // L: 7496
-					var14 = (var13 >> 4 & 7) + PlayerComposition.field3307; // L: 7497
-					int var15 = (var13 & 7) + class29.field181; // L: 7498
-					int var16 = var1.method7714(); // L: 7499
-					Player var17;
-					if (var3 == Client.localPlayerIndex) { // L: 7501
-						var17 = GrandExchangeEvents.localPlayer;
-					} else {
-						var17 = Client.players[var3]; // L: 7502
-					}
-
-					if (var17 != null) { // L: 7503
-						ObjectComposition var18 = class146.getObjectDefinition(var8); // L: 7504
-						int var19;
-						int var20;
-						if (var11 != 1 && var11 != 3) { // L: 7507
-							var19 = var18.sizeX; // L: 7512
-							var20 = var18.sizeY; // L: 7513
-						} else {
-							var19 = var18.sizeY; // L: 7508
-							var20 = var18.sizeX; // L: 7509
-						}
-
-						int var21 = var14 + (var19 >> 1); // L: 7515
-						int var22 = var14 + (var19 + 1 >> 1); // L: 7516
-						int var23 = var15 + (var20 >> 1); // L: 7517
-						int var24 = var15 + (var20 + 1 >> 1); // L: 7518
-						int[][] var25 = Tiles.Tiles_heights[class18.Client_plane]; // L: 7519
-						int var26 = var25[var21][var24] + var25[var22][var23] + var25[var21][var23] + var25[var22][var24] >> 2; // L: 7520
-						int var27 = (var14 << 7) + (var19 << 6); // L: 7521
-						int var28 = (var15 << 7) + (var20 << 6); // L: 7522
-						Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); // L: 7523
-						if (var29 != null) { // L: 7524
-							GrandExchangeOfferWorldComparator.updatePendingSpawn(class18.Client_plane, var14, var15, var12, -1, 0, 0, var16 + 1, var6 + 1); // L: 7525
-							var17.animationCycleStart = var16 + Client.cycle; // L: 7526
-							var17.animationCycleEnd = var6 + Client.cycle; // L: 7527
-							var17.model0 = var29; // L: 7528
-							var17.field1080 = var19 * 64 + var14 * 128; // L: 7529
-							var17.field1082 = var20 * 64 + var15 * 128; // L: 7530
-							var17.tileHeight2 = var26; // L: 7531
-							byte var30;
-							if (var38 > var40) { // L: 7532
-								var30 = var38; // L: 7533
-								var38 = var40; // L: 7534
-								var40 = var30; // L: 7535
-							}
-
-							if (var39 > var37) { // L: 7537
-								var30 = var39; // L: 7538
-								var39 = var37; // L: 7539
-								var37 = var30; // L: 7540
-							}
-
-							var17.minX = var38 + var14; // L: 7542
-							var17.maxX = var14 + var40; // L: 7543
-							var17.minY = var15 + var39; // L: 7544
-							var17.maxY = var37 + var15; // L: 7545
-						}
-					}
-				}
-
-				if (class263.field3007 == var0) { // L: 7549
-					var2 = var1.readUnsignedShort(); // L: 7550
-					var3 = var1.readUnsignedByte(); // L: 7551
-					var4 = (var3 >> 4 & 7) + PlayerComposition.field3307; // L: 7552
-					var5 = (var3 & 7) + class29.field181; // L: 7553
-					var6 = var1.method7713(); // L: 7554
-					var7 = var1.method7713(); // L: 7555
-					if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7556
-						NodeDeque var46 = Client.groundItems[class18.Client_plane][var4][var5]; // L: 7557
-						if (var46 != null) { // L: 7558
-							for (TileItem var35 = (TileItem)var46.last(); var35 != null; var35 = (TileItem)var46.previous()) { // L: 7559 7560 7565
-								if ((var2 & 32767) == var35.id && var6 == var35.quantity) { // L: 7561
-									var35.quantity = var7; // L: 7562
-									break;
-								}
-							}
-
-							UserComparator3.updateItemPile(var4, var5); // L: 7567
-						}
-					}
-
-				} else if (class263.field3015 == var0) { // L: 7572
-					var2 = var1.method7773(); // L: 7573
-					var3 = var1.readUnsignedShort(); // L: 7574
-					var4 = var1.method7715(); // L: 7575
-					var5 = var1.method7875(); // L: 7576
-					var6 = (var5 >> 4 & 7) + PlayerComposition.field3307; // L: 7577
-					var7 = (var5 & 7) + class29.field181; // L: 7578
-					if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7579
-						var6 = var6 * 128 + 64; // L: 7580
-						var7 = var7 * 128 + 64; // L: 7581
-						GraphicsObject var34 = new GraphicsObject(var3, class18.Client_plane, var6, var7, WorldMapLabel.getTileHeight(var6, var7, class18.Client_plane) - var2, var4, Client.cycle); // L: 7582
-						Client.graphicsObjects.addFirst(var34); // L: 7583
-					}
-
-				} else if (class263.field3013 == var0) { // L: 7587
-					var2 = var1.method7742(); // L: 7588
-					var3 = (var2 >> 4 & 7) + PlayerComposition.field3307; // L: 7589
-					var4 = (var2 & 7) + class29.field181; // L: 7590
-					var5 = var1.method7742(); // L: 7591
-					var6 = var5 >> 2; // L: 7592
-					var7 = var5 & 3; // L: 7593
-					var8 = Client.field748[var6]; // L: 7594
-					var9 = var1.method7714(); // L: 7595
-					if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7596
-						GrandExchangeOfferWorldComparator.updatePendingSpawn(class18.Client_plane, var3, var4, var8, var9, var6, var7, 0, -1); // L: 7597
-					}
-
-				} else if (class263.field3011 == var0) { // L: 7601
-					var2 = var1.method7875() * 4; // L: 7602
-					var3 = var1.method7714(); // L: 7603
-					var4 = var1.method7717(); // L: 7604
-					var5 = var1.method7773(); // L: 7605
-					var6 = (var5 >> 4 & 7) + PlayerComposition.field3307; // L: 7606
-					var7 = (var5 & 7) + class29.field181; // L: 7607
-					var8 = var1.method7714(); // L: 7608
-					byte var41 = var1.method7708(); // L: 7609
-					var10 = var1.method7742(); // L: 7610
-					byte var42 = var1.method7885(); // L: 7611
-					var12 = var1.readUnsignedByte() * 4; // L: 7612
-					var13 = var1.method7773(); // L: 7613
-					var14 = var1.method7714(); // L: 7614
-					var9 = var41 + var6; // L: 7615
-					var11 = var42 + var7; // L: 7616
-					if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var9 >= 0 && var11 >= 0 && var9 < 104 && var11 < 104 && var14 != 65535) { // L: 7617
-						var6 = var6 * 128 + 64; // L: 7618
-						var7 = var7 * 128 + 64; // L: 7619
-						var9 = var9 * 128 + 64; // L: 7620
-						var11 = var11 * 128 + 64; // L: 7621
-						Projectile var33 = new Projectile(var14, class18.Client_plane, var6, var7, WorldMapLabel.getTileHeight(var6, var7, class18.Client_plane) - var2, var3 + Client.cycle, var8 + Client.cycle, var10, var13, var4, var12); // L: 7622
-						var33.setDestination(var9, var11, WorldMapLabel.getTileHeight(var9, var11, class18.Client_plane) - var12, var3 + Client.cycle); // L: 7623
-						Client.projectiles.addFirst(var33); // L: 7624
-					}
-
-				} else if (class263.field3005 != var0) { // L: 7628
-					if (class263.field3008 == var0) { // L: 7674
-						var2 = var1.method7714(); // L: 7675
-						var3 = var1.readUnsignedByte(); // L: 7676
-						var4 = (var3 >> 4 & 7) + PlayerComposition.field3307; // L: 7677
-						var5 = (var3 & 7) + class29.field181; // L: 7678
-						var6 = var1.method7714(); // L: 7679
-						if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7680
-							var31 = new TileItem(); // L: 7681
-							var31.id = var2; // L: 7682
-							var31.quantity = var6; // L: 7683
-							if (Client.groundItems[class18.Client_plane][var4][var5] == null) { // L: 7684
-								Client.groundItems[class18.Client_plane][var4][var5] = new NodeDeque();
-							}
-
-							Client.groundItems[class18.Client_plane][var4][var5].addFirst(var31); // L: 7685
-							UserComparator3.updateItemPile(var4, var5); // L: 7686
-						}
-
-					}
-				} else {
-					var2 = var1.method7714(); // L: 7629
-					var3 = var1.method7773(); // L: 7630
-					var4 = var3 >> 2; // L: 7631
-					var5 = var3 & 3; // L: 7632
-					var6 = Client.field748[var4]; // L: 7633
-					var7 = var1.method7875(); // L: 7634
-					var8 = (var7 >> 4 & 7) + PlayerComposition.field3307; // L: 7635
-					var9 = (var7 & 7) + class29.field181; // L: 7636
-					if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 7637
-						if (var6 == 0) { // L: 7638
-							BoundaryObject var32 = ArchiveLoader.scene.method4754(class18.Client_plane, var8, var9); // L: 7639
-							if (var32 != null) { // L: 7640
-								var11 = FileSystem.Entity_unpackID(var32.tag); // L: 7641
-								if (var4 == 2) { // L: 7642
-									var32.renderable1 = new DynamicObject(var11, 2, var5 + 4, class18.Client_plane, var8, var9, var2, false, var32.renderable1); // L: 7643
-									var32.renderable2 = new DynamicObject(var11, 2, var5 + 1 & 3, class18.Client_plane, var8, var9, var2, false, var32.renderable2); // L: 7644
-								} else {
-									var32.renderable1 = new DynamicObject(var11, var4, var5, class18.Client_plane, var8, var9, var2, false, var32.renderable1); // L: 7646
-								}
-							}
-						}
-
-						if (var6 == 1) { // L: 7649
-							WallDecoration var43 = ArchiveLoader.scene.method4860(class18.Client_plane, var8, var9); // L: 7650
-							if (var43 != null) { // L: 7651
-								var11 = FileSystem.Entity_unpackID(var43.tag); // L: 7652
-								if (var4 != 4 && var4 != 5) { // L: 7653
-									if (var4 == 6) { // L: 7654
-										var43.renderable1 = new DynamicObject(var11, 4, var5 + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable1);
-									} else if (var4 == 7) { // L: 7655
-										var43.renderable1 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable1);
-									} else if (var4 == 8) { // L: 7656
-										var43.renderable1 = new DynamicObject(var11, 4, var5 + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable1); // L: 7657
-										var43.renderable2 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, class18.Client_plane, var8, var9, var2, false, var43.renderable2); // L: 7658
-									}
-								} else {
-									var43.renderable1 = new DynamicObject(var11, 4, var5, class18.Client_plane, var8, var9, var2, false, var43.renderable1);
-								}
-							}
-						}
-
-						if (var6 == 2) { // L: 7662
-							GameObject var44 = ArchiveLoader.scene.getGameObject(class18.Client_plane, var8, var9); // L: 7663
-							if (var4 == 11) { // L: 7664
-								var4 = 10;
-							}
-
-							if (var44 != null) { // L: 7665
-								var44.renderable = new DynamicObject(FileSystem.Entity_unpackID(var44.tag), var4, var5, class18.Client_plane, var8, var9, var2, false, var44.renderable);
-							}
-						}
-
-						if (var6 == 3) { // L: 7667
-							FloorDecoration var45 = ArchiveLoader.scene.getFloorDecoration(class18.Client_plane, var8, var9); // L: 7668
-							if (var45 != null) { // L: 7669
-								var45.renderable = new DynamicObject(FileSystem.Entity_unpackID(var45.tag), 22, var5, class18.Client_plane, var8, var9, var2, false, var45.renderable);
-							}
-						}
-					}
-
-				}
-			}
-		}
-	} // L: 7437 7482 7570 7585 7599 7626 7672 7688 7690
-
-	@ObfuscatedName("ih")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIB)V",
-		garbageValue = "83"
-	)
-	@Export("addSceneMenuOptions")
-	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
-		if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9854
-			class21.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9855
-		}
-
-		long var4 = -1L; // L: 9858
-		long var6 = -1L; // L: 9859
-
-		int var8;
-		for (var8 = 0; var8 < StructComposition.method3618(); ++var8) { // L: 9860
-			long var25 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9863
-			if (var25 != var6) { // L: 9866
-				var6 = var25; // L: 9867
-				int var13 = World.method1673(var8); // L: 9868
-				long var16 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9872
-				int var15 = (int)(var16 >>> 7 & 127L); // L: 9874
-				var15 = var15; // L: 9878
-				int var29 = FloorDecoration.method4592(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9881
-				int var18 = Frames.method4934(var8); // L: 9884
-				if (var29 == 2 && ArchiveLoader.scene.getObjectFlags(class18.Client_plane, var13, var15, var25) >= 0) { // L: 9885 9886
-					ObjectComposition var19 = class146.getObjectDefinition(var18); // L: 9887
-					if (var19.transforms != null) { // L: 9888
-						var19 = var19.transform();
-					}
-
-					if (var19 == null) { // L: 9889
-						continue;
-					}
-
-					if (Client.isItemSelected == 1) { // L: 9890
-						class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(65535) + var19.name, 1, var18, var13, var15); // L: 9891
-					} else if (Client.isSpellSelected) { // L: 9894
-						if ((class17.selectedSpellFlags & 4) == 4) { // L: 9895
-							class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(65535) + var19.name, 2, var18, var13, var15); // L: 9896
-						}
-					} else {
-						String[] var20 = var19.actions; // L: 9901
-						if (var20 != null) { // L: 9902
-							for (int var21 = 4; var21 >= 0; --var21) { // L: 9903
-								if (var20[var21] != null) { // L: 9904
-									short var22 = 0; // L: 9905
-									if (var21 == 0) { // L: 9906
-										var22 = 3;
-									}
-
-									if (var21 == 1) { // L: 9907
-										var22 = 4;
-									}
-
-									if (var21 == 2) { // L: 9908
-										var22 = 5;
-									}
-
-									if (var21 == 3) { // L: 9909
-										var22 = 6;
-									}
-
-									if (var21 == 4) { // L: 9910
-										var22 = 1001;
-									}
-
-									class21.insertMenuItemNoShift(var20[var21], UserComparator9.colorStartTag(65535) + var19.name, var22, var18, var13, var15); // L: 9911
-								}
-							}
-						}
-
-						class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(65535) + var19.name, 1002, var19.id, var13, var15); // L: 9916
-					}
-				}
-
-				Player var23;
-				int var30;
-				NPC var31;
-				int var38;
-				int[] var39;
-				if (var29 == 1) { // L: 9921
-					NPC var34 = Client.npcs[var18]; // L: 9922
-					if (var34 == null) { // L: 9923
-						continue;
-					}
-
-					if (var34.definition.size == 1 && (var34.x & 127) == 64 && (var34.y & 127) == 64) { // L: 9924
-						for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9925
-							var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9926
-							if (var31 != null && var31 != var34 && var31.definition.size == 1 && var31.x == var34.x && var31.y == var34.y) { // L: 9927
-								class12.addNpcToMenu(var31, Client.npcIndices[var30], var13, var15);
-							}
-						}
-
-						var30 = Players.Players_count; // L: 9929
-						var39 = Players.Players_indices; // L: 9930
-
-						for (var38 = 0; var38 < var30; ++var38) { // L: 9931
-							var23 = Client.players[var39[var38]]; // L: 9932
-							if (var23 != null && var23.x == var34.x && var34.y == var23.y) { // L: 9933
-								class20.addPlayerToMenu(var23, var39[var38], var13, var15);
-							}
-						}
-					}
-
-					class12.addNpcToMenu(var34, var18, var13, var15); // L: 9936
-				}
-
-				if (var29 == 0) { // L: 9938
-					Player var35 = Client.players[var18]; // L: 9939
-					if (var35 == null) { // L: 9940
-						continue;
-					}
-
-					if ((var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 9941
-						for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9942
-							var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9943
-							if (var31 != null && var31.definition.size == 1 && var31.x == var35.x && var35.y == var31.y) { // L: 9944
-								class12.addNpcToMenu(var31, Client.npcIndices[var30], var13, var15);
-							}
-						}
-
-						var30 = Players.Players_count; // L: 9946
-						var39 = Players.Players_indices; // L: 9947
-
-						for (var38 = 0; var38 < var30; ++var38) { // L: 9948
-							var23 = Client.players[var39[var38]]; // L: 9949
-							if (var23 != null && var35 != var23 && var23.x == var35.x && var35.y == var23.y) { // L: 9950
-								class20.addPlayerToMenu(var23, var39[var38], var13, var15);
-							}
-						}
-					}
-
-					if (var18 != Client.combatTargetPlayerIndex) { // L: 9953
-						class20.addPlayerToMenu(var35, var18, var13, var15);
-					} else {
-						var4 = var25; // L: 9954
-					}
-				}
-
-				if (var29 == 3) { // L: 9956
-					NodeDeque var37 = Client.groundItems[class18.Client_plane][var13][var15]; // L: 9957
-					if (var37 != null) { // L: 9958
-						for (TileItem var36 = (TileItem)var37.first(); var36 != null; var36 = (TileItem)var37.next()) { // L: 9959 9960 9993
-							ItemComposition var40 = class19.ItemDefinition_get(var36.id); // L: 9961
-							if (Client.isItemSelected == 1) { // L: 9962
-								class21.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var40.name, 16, var36.id, var13, var15); // L: 9963
-							} else if (Client.isSpellSelected) { // L: 9966
-								if ((class17.selectedSpellFlags & 1) == 1) { // L: 9967
-									class21.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator9.colorStartTag(16748608) + var40.name, 17, var36.id, var13, var15); // L: 9968
-								}
-							} else {
-								String[] var32 = var40.groundActions; // L: 9973
-
-								for (int var33 = 4; var33 >= 0; --var33) { // L: 9974
-									if (var32 != null && var32[var33] != null) { // L: 9975
-										byte var24 = 0; // L: 9976
-										if (var33 == 0) { // L: 9977
-											var24 = 18;
-										}
-
-										if (var33 == 1) { // L: 9978
-											var24 = 19;
-										}
-
-										if (var33 == 2) { // L: 9979
-											var24 = 20;
-										}
-
-										if (var33 == 3) { // L: 9980
-											var24 = 21;
-										}
-
-										if (var33 == 4) { // L: 9981
-											var24 = 22;
-										}
-
-										class21.insertMenuItemNoShift(var32[var33], UserComparator9.colorStartTag(16748608) + var40.name, var24, var36.id, var13, var15); // L: 9982
-									} else if (var33 == 2) { // L: 9985
-										class21.insertMenuItemNoShift("Take", UserComparator9.colorStartTag(16748608) + var40.name, 20, var36.id, var13, var15); // L: 9986
-									}
-								}
-
-								class21.insertMenuItemNoShift("Examine", UserComparator9.colorStartTag(16748608) + var40.name, 1004, var36.id, var13, var15); // L: 9990
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (-1L != var4) { // L: 9998
-			var8 = (int)(var4 >>> 0 & 127L); // L: 10001
-			int var10 = (int)(var4 >>> 7 & 127L); // L: 10006
-			Player var12 = Client.players[Client.combatTargetPlayerIndex]; // L: 10009
-			class20.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); // L: 10010
-		}
-
-	} // L: 10012
 }

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

@@ -1,3 +1,4 @@
+import java.net.URL;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
@@ -7,68 +8,68 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ca")
+@ObfuscatedName("cy")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -587272659
+		intValue = 1127997151
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("displayFps")
 	boolean displayFps;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1845230803
+		intValue = 698831053
 	)
-	int field1218;
+	int field1252;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@Export("brightness")
 	double brightness;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1402013239
+		intValue = -1690436583
 	)
 	@Export("musicVolume")
 	int musicVolume;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -2075315825
+		intValue = 1205613435
 	)
 	@Export("soundEffectsVolume")
 	int soundEffectsVolume;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1548024689
+		intValue = -1618721713
 	)
 	@Export("areaSoundEffectsVolume")
 	int areaSoundEffectsVolume;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1754436801
+		intValue = -1550048415
 	)
-	int field1215;
+	int field1249;
 	@ObfuscatedName("w")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -2110885389
+		intValue = 1272591553
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("d")
+	@ObfuscatedName("t")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
@@ -83,15 +84,15 @@ public class ClientPreferences {
 		this.musicVolume = 127;
 		this.soundEffectsVolume = 127;
 		this.areaSoundEffectsVolume = 127;
-		this.field1215 = -1;
+		this.field1249 = -1;
 		this.rememberedUsername = null;
 		this.windowMode = 1;
 		this.parameters = new LinkedHashMap();
-		this.method2226(true); // L: 28
+		this.method2318(true); // L: 28
 	} // L: 29
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;)V"
+		descriptor = "(Lpx;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.hideUsername = false; // L: 14
@@ -100,37 +101,37 @@ public class ClientPreferences {
 		this.musicVolume = 127; // L: 19
 		this.soundEffectsVolume = 127; // L: 20
 		this.areaSoundEffectsVolume = 127; // L: 21
-		this.field1215 = -1; // L: 22
+		this.field1249 = -1; // L: 22
 		this.rememberedUsername = null; // L: 23
 		this.windowMode = 1; // L: 24
 		this.parameters = new LinkedHashMap(); // L: 25
-		if (var1 != null && var1.array != null) {
+		if (var1 != null && var1.array != null) { // L: 32
 			int var2 = var1.readUnsignedByte();
 			if (var2 >= 0 && var2 <= ClientPreferences_optionCount) {
 				if (var1.readUnsignedByte() == 1) {
-					this.roofsHidden = true; // L: 42
+					this.roofsHidden = true;
 				}
 
-				if (var2 > 1) { // L: 44
+				if (var2 > 1) {
-					this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 45
+					this.titleMusicDisabled = var1.readUnsignedByte() == 1;
 				}
 
-				if (var2 > 3) { // L: 47
+				if (var2 > 3) {
 					this.windowMode = var1.readUnsignedByte(); // L: 48
 				}
 
-				if (var2 > 2) { // L: 50
+				if (var2 > 2) {
-					int var3 = var1.readUnsignedByte(); // L: 51
+					int var3 = var1.readUnsignedByte();
 
 					for (int var4 = 0; var4 < var3; ++var4) { // L: 52
 						int var5 = var1.readInt(); // L: 53
 						int var6 = var1.readInt(); // L: 54
-						this.parameters.put(var5, var6); // L: 55
+						this.parameters.put(var5, var6);
 					}
 				}
 
 				if (var2 > 4) { // L: 58
-					this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 59
+					this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull();
 				}
 
 				if (var2 > 5) { // L: 61
@@ -145,7 +146,7 @@ public class ClientPreferences {
 				}
 
 				if (var2 > 7) { // L: 70
-					this.field1215 = var1.readUnsignedByte(); // L: 71
+					this.field1249 = var1.readUnsignedByte(); // L: 71
 				}
 
 				if (var2 > 8) { // L: 73
@@ -153,29 +154,29 @@ public class ClientPreferences {
 				}
 
 				if (var2 > 9) { // L: 76
-					this.field1218 = var1.readInt(); // L: 77
+					this.field1252 = var1.readInt(); // L: 77
 				}
 			} else {
-				this.method2226(true);
+				this.method2318(true);
 			}
 		} else {
-			this.method2226(true);
+			this.method2318(true);
 		}
 
 	} // L: 81
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
+		descriptor = "(ZI)V",
-		garbageValue = "-37"
+		garbageValue = "-1505304764"
 	)
-	void method2226(boolean var1) {
+	void method2318(boolean var1) {
 	} // L: 83
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lpi;",
+		descriptor = "(I)Lpx;",
-		garbageValue = "-779178440"
+		garbageValue = "1983267736"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -199,303 +200,294 @@ public class ClientPreferences {
 		var1.writeByte(this.musicVolume); // L: 102
 		var1.writeByte(this.soundEffectsVolume); // L: 103
 		var1.writeByte(this.areaSoundEffectsVolume); // L: 104
-		var1.writeByte(this.field1215); // L: 105
+		var1.writeByte(this.field1249); // L: 105
 		var1.writeByte(this.displayFps ? 1 : 0); // L: 106
-		var1.writeInt(this.field1218); // L: 107
+		var1.writeInt(this.field1252); // L: 107
 		return var1; // L: 108
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)V",
-		garbageValue = "1690911744"
+		garbageValue = "1415859216"
 	)
-	void method2246(boolean var1) {
+	void method2219(boolean var1) {
-		this.roofsHidden = var1; // L: 150
+		this.roofsHidden = var1; // L: 128
-		GameEngine.savePreferences(); // L: 151
+		class270.savePreferences(); // L: 129
-	} // L: 152
+	} // L: 130
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-51084929"
+		garbageValue = "-1094538117"
 	)
-	boolean method2263() {
+	boolean method2222() {
-		return this.roofsHidden; // L: 155
+		return this.roofsHidden; // L: 133
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "1823199962"
+	)
+	void method2223(boolean var1) {
+		this.hideUsername = var1; // L: 137
+		class270.savePreferences(); // L: 138
+	} // L: 139
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "242395257"
+	)
+	boolean method2257() {
+		return this.hideUsername; // L: 142
 	}
 
 	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)V",
-		garbageValue = "-1567835423"
+		garbageValue = "-2129317630"
 	)
-	void method2230(boolean var1) {
+	void method2305(boolean var1) {
-		this.hideUsername = var1; // L: 159
+		this.titleMusicDisabled = var1; // L: 146
-		GameEngine.savePreferences(); // L: 160
+		class270.savePreferences(); // L: 147
-	} // L: 161
+	} // L: 148
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "266836426"
+		garbageValue = "-1061667438"
 	)
-	boolean method2317() {
+	boolean method2226() {
-		return this.hideUsername; // L: 164
+		return this.titleMusicDisabled; // L: 151
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)V",
-		garbageValue = "944518633"
+		garbageValue = "-1459067556"
 	)
-	void method2237(boolean var1) {
+	void method2227(boolean var1) {
-		this.titleMusicDisabled = var1; // L: 168
+		this.displayFps = var1; // L: 155
-		GameEngine.savePreferences(); // L: 169
+		class270.savePreferences(); // L: 156
-	} // L: 170
+	} // L: 157
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "96"
+	)
+	void method2228() {
+		this.method2227(!this.displayFps); // L: 160
+	} // L: 161
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
 		garbageValue = "6"
 	)
-	boolean method2279() {
+	boolean method2229() {
-		return this.titleMusicDisabled; // L: 173
+		return this.displayFps; // L: 164
 	}
 
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "618524190"
-	)
-	void method2234(boolean var1) {
-		this.displayFps = var1;
-		GameEngine.savePreferences(); // L: 178
-	} // L: 179
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "82"
-	)
-	void method2302() {
-		this.method2234(!this.displayFps); // L: 182
-	} // L: 183
-
 	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-509682647"
-	)
-	boolean method2236() {
-		return this.displayFps; // L: 186
-	}
-
-	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1989585984"
+		garbageValue = "936974237"
 	)
-	void method2260(int var1) {
+	void method2230(int var1) {
-		this.field1218 = var1; // L: 190
+		this.field1252 = var1; // L: 168
-		GameEngine.savePreferences(); // L: 191
+		class270.savePreferences(); // L: 169
-	} // L: 192
+	} // L: 170
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
+		descriptor = "(I)I",
-		garbageValue = "117"
+		garbageValue = "2093496919"
 	)
-	int method2238() {
+	int method2231() {
-		return this.field1218; // L: 195
+		return this.field1252; // L: 173
-	}
-
-	@ObfuscatedName("m")
-	void method2239(double var1) {
-		this.brightness = var1; // L: 199
-		GameEngine.savePreferences(); // L: 200
-	} // L: 201
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(B)D",
-		garbageValue = "23"
-	)
-	double method2240() {
-		return this.brightness; // L: 204
 	}
 
 	@ObfuscatedName("t")
-	@ObfuscatedSignature(
+	void method2232(double var1) {
-		descriptor = "(IB)V",
+		this.brightness = var1; // L: 177
-		garbageValue = "-14"
+		class270.savePreferences(); // L: 178
-	)
+	} // L: 179
-	void method2241(int var1) {
-		this.musicVolume = var1; // L: 208
-		GameEngine.savePreferences(); // L: 209
-	} // L: 210
 
 	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
+		descriptor = "(I)D",
-		garbageValue = "-1354418976"
+		garbageValue = "-2107962943"
 	)
-	int method2321() {
+	double method2225() {
-		return this.musicVolume; // L: 213
+		return this.brightness; // L: 182
 	}
 
 	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "15"
-	)
-	@Export("updateSoundEffectVolume")
-	void updateSoundEffectVolume(int var1) {
-		this.soundEffectsVolume = var1; // L: 217
-		GameEngine.savePreferences(); // L: 218
-	} // L: 219
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "38"
-	)
-	int method2243() {
-		return this.soundEffectsVolume; // L: 222
-	}
-
-	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1931510599"
+		garbageValue = "1172859341"
 	)
-	void method2244(int var1) {
+	void method2234(int var1) {
-		this.areaSoundEffectsVolume = var1; // L: 226
+		this.musicVolume = var1; // L: 186
-		GameEngine.savePreferences(); // L: 227
+		class270.savePreferences(); // L: 187
-	} // L: 228
+	} // L: 188
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "681521036"
+		garbageValue = "-874911160"
 	)
-	int method2270() {
+	int method2248() {
-		return this.areaSoundEffectsVolume; // L: 231
+		return this.musicVolume; // L: 191
 	}
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
+		descriptor = "(II)V",
-		garbageValue = "2038280864"
+		garbageValue = "-1131698297"
 	)
-	void method2286(String var1) {
+	@Export("updateSoundEffectVolume")
-		this.rememberedUsername = var1; // L: 235
+	void updateSoundEffectVolume(int var1) {
-		GameEngine.savePreferences(); // L: 236
+		this.soundEffectsVolume = var1; // L: 195
-	} // L: 237
+		class270.savePreferences(); // L: 196
-
+	} // L: 197
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		descriptor = "(S)Ljava/lang/String;",
-		garbageValue = "7053"
-	)
-	String method2247() {
-		return this.rememberedUsername; // L: 240
-	}
 
 	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-91"
-	)
-	void method2248(int var1) {
-		this.field1215 = var1; // L: 244
-		GameEngine.savePreferences(); // L: 245
-	} // L: 246
-
-	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-858252444"
+		garbageValue = "-971935263"
 	)
-	int method2249() {
+	int method2244() {
-		return this.field1215; // L: 249
+		return this.soundEffectsVolume; // L: 200
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1789378363"
+		garbageValue = "-1856408650"
 	)
-	void method2250(int var1) {
+	void method2278(int var1) {
-		this.windowMode = var1; // L: 253
+		this.areaSoundEffectsVolume = var1; // L: 204
-		GameEngine.savePreferences(); // L: 254
+		class270.savePreferences(); // L: 205
-	} // L: 255
+	} // L: 206
-
-	@ObfuscatedName("aw")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "114"
-	)
-	int method2251() {
-		return this.windowMode; // L: 258
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lfh;",
-		garbageValue = "-2074828092"
-	)
-	@Export("SpotAnimationDefinition_get")
-	public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) {
-		SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34
-			var1 = new SpotAnimationDefinition();
-			var1.id = var0;
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38
-			return var1; // L: 39
-		}
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1889189967"
-	)
-	static void method2259() {
-		for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30
-			if (var0.stream1 != null) { // L: 31
-				StructComposition.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32
-				var0.stream1 = null; // L: 33
-			}
-
-			if (var0.stream2 != null) { // L: 35
-				StructComposition.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36
-				var0.stream2 = null; // L: 37
-			}
-		}
-
-		ObjectSound.objectSounds.clear(); // L: 40
-	} // L: 41
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
+		descriptor = "(I)I",
-		garbageValue = "441769737"
+		garbageValue = "750592599"
 	)
-	@Export("isCharPrintable")
+	int method2239() {
-	public static boolean isCharPrintable(char var0) {
+		return this.areaSoundEffectsVolume; // L: 209
-		if (var0 >= ' ' && var0 <= '~') { // L: 175
+	}
-			return true;
+
-		} else if (var0 >= 160 && var0 <= 255) {
+	@ObfuscatedName("j")
-			return true; // L: 176
+	@ObfuscatedSignature(
-		} else {
+		descriptor = "(Ljava/lang/String;I)V",
-			return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 177
+		garbageValue = "-64324606"
-		}
+	)
+	void method2297(String var1) {
+		this.rememberedUsername = var1; // L: 213
+		class270.savePreferences(); // L: 214
+	} // L: 215
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "2088208815"
+	)
+	String method2241() {
+		return this.rememberedUsername; // L: 218
+	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-586904848"
+	)
+	void method2306(int var1) {
+		this.field1249 = var1; // L: 222
+		class270.savePreferences(); // L: 223
+	} // L: 224
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(S)I",
+		garbageValue = "19888"
+	)
+	int method2243() {
+		return this.field1249; // L: 227
+	}
+
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "54"
+	)
+	void method2245(int var1) {
+		this.windowMode = var1; // L: 231
+		class270.savePreferences(); // L: 232
+	} // L: 233
+
+	@ObfuscatedName("ar")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "82"
+	)
+	int method2274() {
+		return this.windowMode; // L: 236
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "-66"
+	)
+	@Export("loadWorlds")
+	static boolean loadWorlds() {
+		try {
+			if (NPC.World_request == null) { // L: 31
+				NPC.World_request = UserComparator7.urlRequester.request(new URL(class93.field1280));
+			} else if (NPC.World_request.isDone()) { // L: 33
+				byte[] var0 = NPC.World_request.getResponse(); // L: 34
+				Buffer var1 = new Buffer(var0); // L: 35
+				var1.readInt(); // L: 36
+				World.World_count = var1.readUnsignedShort(); // L: 37
+				World.World_worlds = new World[World.World_count]; // L: 38
+
+				World var3;
+				for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47
+					var3 = World.World_worlds[var2] = new World(); // L: 40
+					var3.id = var1.readUnsignedShort(); // L: 41
+					var3.properties = var1.readInt(); // L: 42
+					var3.host = var1.readStringCp1252NullTerminated(); // L: 43
+					var3.activity = var1.readStringCp1252NullTerminated(); // L: 44
+					var3.location = var1.readUnsignedByte(); // L: 45
+					var3.population = var1.readShort(); // L: 46
+				}
+
+				UserComparator8.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49
+				NPC.World_request = null; // L: 50
+				return true; // L: 51
+			}
+		} catch (Exception var4) { // L: 55
+			var4.printStackTrace(); // L: 56
+			NPC.World_request = null; // L: 57
+		}
+
+		return false; // L: 59
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(I)Lbx;",
+		garbageValue = "-1660202002"
+	)
+	@Export("worldListStart")
+	static World worldListStart() {
+		World.World_listCount = 0; // L: 247
+		return class146.getNextWorldListWorld(); // L: 248
 	}
 }

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

@@ -1,49 +1,96 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fr")
+@ObfuscatedName("fo")
 @Implements("Clock")
 public abstract class Clock {
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lqd;"
+	)
+	static IndexedSprite field1839;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -440159509
+	)
+	@Export("musicTrackVolume")
+	public static int musicTrackVolume;
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "Lqd;"
+	)
+	@Export("logoSprite")
+	static IndexedSprite logoSprite;
+	@ObfuscatedName("eb")
+	@ObfuscatedSignature(
+		descriptor = "Lle;"
+	)
+	@Export("archive1")
+	static Archive archive1;
+	@ObfuscatedName("qu")
+	@ObfuscatedSignature(
+		descriptor = "Lfy;"
+	)
+	@Export("mouseWheel")
+	static class158 mouseWheel;
+
 	Clock() {
 	} // L: 4
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1350330504"
+		garbageValue = "-1993169750"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "2026134141"
+		garbageValue = "1389334721"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lgc;",
+		descriptor = "([BIIB)I",
-		garbageValue = "1"
+		garbageValue = "43"
 	)
-	public static FloorOverlayDefinition method3349(int var0) {
+	public static int method3249(byte[] var0, int var1, int var2) {
-		FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 26
+		int var3 = -1; // L: 47
-		if (var1 != null) { // L: 27
+
-			return var1;
+		for (int var4 = var1; var4 < var2; ++var4) { // L: 48
-		} else {
+			var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49
-			byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 28
-			var1 = new FloorOverlayDefinition(); // L: 29
-			if (var2 != null) { // L: 30
-				var1.decode(new Buffer(var2), var0);
 		}
 
-			var1.postDecode(); // L: 31
+		var3 = ~var3; // L: 51
-			FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32
+		return var3; // L: 52
-			return var1; // L: 33
+	}
+
+	@ObfuscatedName("jd")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Lki;I)Ljava/lang/String;",
+		garbageValue = "2108423281"
+	)
+	static String method3248(String var0, Widget var1) {
+		if (var0.indexOf("%") != -1) { // L: 10716
+			for (int var2 = 1; var2 <= 5; ++var2) { // L: 10717
+				while (true) {
+					int var3 = var0.indexOf("%" + var2); // L: 10719
+					if (var3 == -1) { // L: 10720
+						break;
+					}
+
+					var0 = var0.substring(0, var3) + class14.method165(Players.method2413(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10721
 				}
 			}
 		}
+
+		return var0; // L: 10725
+	}
+}

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

@@ -4,34 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gv")
+@ObfuscatedName("gh")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("al")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -2036334399
+		intValue = -676684941
 	)
 	@Export("xInset")
 	public int xInset;
-	@ObfuscatedName("av")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 248145697
+		intValue = 1940639369
 	)
 	@Export("yInset")
 	public int yInset;
-	@ObfuscatedName("at")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = -1443603637
+		intValue = -1585012931
 	)
 	@Export("xSize")
 	int xSize;
-	@ObfuscatedName("an")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -322616853
+		intValue = -515009777
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ak")
 	@Export("flags")
 	public int[][] flags;
 
@@ -44,10 +44,10 @@ public class CollisionMap {
 		this.clear(); // L: 49
 	} // L: 50
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
+		descriptor = "(I)V",
-		garbageValue = "41"
+		garbageValue = "788330087"
 	)
 	@Export("clear")
 	public void clear() {
@@ -63,12 +63,12 @@ public class CollisionMap {
 
 	} // L: 59
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIZI)V",
-		garbageValue = "41761614"
+		garbageValue = "1519045367"
 	)
-	public void method3872(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3749(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset; // L: 62
 		var2 -= this.yInset; // L: 63
 		if (var3 == 0) { // L: 64
@@ -215,10 +215,10 @@ public class CollisionMap {
 
 	} // L: 182
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIZB)V",
+		descriptor = "(IIIIZI)V",
-		garbageValue = "-49"
+		garbageValue = "-1626418421"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -242,10 +242,10 @@ public class CollisionMap {
 
 	} // L: 196
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
+		descriptor = "(III)V",
-		garbageValue = "122"
+		garbageValue = "-402472734"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
@@ -255,10 +255,10 @@ public class CollisionMap {
 		var10000[var2] |= 2097152;
 	} // L: 202
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "577213527"
+		garbageValue = "-1395781534"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
@@ -268,10 +268,10 @@ public class CollisionMap {
 		var10000[var2] |= 262144;
 	} // L: 208
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)V",
+		descriptor = "(IIII)V",
-		garbageValue = "-85"
+		garbageValue = "-1322228791"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
@@ -279,12 +279,12 @@ public class CollisionMap {
 		var10000[var2] |= var3;
 	} // L: 212
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIZI)V",
-		garbageValue = "-1937676600"
+		garbageValue = "1406016066"
 	)
-	public void method3853(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3756(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset; // L: 215
 		var2 -= this.yInset; // L: 216
 		if (var3 == 0) { // L: 217
@@ -431,10 +431,10 @@ public class CollisionMap {
 
 	} // L: 335
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIZI)V",
-		garbageValue = "1357982372"
+		garbageValue = "1684782174"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -464,10 +464,10 @@ public class CollisionMap {
 
 	} // L: 354
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(IIIB)V",
-		garbageValue = "-35"
+		garbageValue = "1"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -475,15 +475,36 @@ public class CollisionMap {
 		var10000[var2] &= ~var3;
 	} // L: 358
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
+		descriptor = "(III)V",
-		garbageValue = "-18"
+		garbageValue = "-1586126857"
 	)
-	public void method3847(int var1, int var2) {
+	public void method3759(int var1, int var2) {
 		var1 -= this.xInset; // L: 361
 		var2 -= this.yInset; // L: 362
 		int[] var10000 = this.flags[var1]; // L: 363
 		var10000[var2] &= -262145;
 	} // L: 364
+
+	@ObfuscatedName("gb")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "2105208583"
+	)
+	static void method3778() {
+		if (Client.renderSelf) { // L: 4947
+			class263.addPlayerToScene(ModelData0.localPlayer, false); // L: 4948
+		}
+
+	} // L: 4950
+
+	@ObfuscatedName("ix")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "1996457670"
+	)
+	static final boolean method3788() {
+		return Client.isMenuOpen; // L: 8711
+	}
 }

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

@@ -4,32 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ks")
+@ObfuscatedName("kd")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("w")
+	@ObfuscatedName("ui")
-	public static boolean field3289;
-	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1984638055
+		intValue = 98471251
+	)
+	@Export("foundItemIndex")
+	static int foundItemIndex;
+	@ObfuscatedName("r")
+	public static short[] field3352;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 1023382847
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1078309335
+		intValue = 1531148769
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -585894477
+		intValue = -991712687
 	)
 	@Export("y")
 	public int y;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lks;)V"
+		descriptor = "(Lkd;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane; // L: 15
@@ -54,86 +60,78 @@ public class Coord {
 
 	} // L: 27
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-78"
+		garbageValue = "60"
 	)
 	@Export("packed")
 	public int packed() {
-		return class341.method6280(this.plane, this.x, this.y); // L: 30
+		int var2 = this.plane; // L: 31
+		int var3 = this.x; // L: 32
+		int var4 = this.y; // L: 33
+		int var1 = var2 << 28 | var3 << 14 | var4; // L: 35
+		return var1; // L: 37
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lks;B)Z",
+		descriptor = "(Lkd;I)Z",
-		garbageValue = "53"
+		garbageValue = "-95969340"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
-		if (this.plane != var1.plane) { // L: 44
+		if (this.plane != var1.plane) { // L: 48
 			return false;
-		} else if (this.x != var1.x) { // L: 45
+		} else if (this.x != var1.x) { // L: 49
 			return false;
 		} else {
-			return this.y == var1.y; // L: 46
+			return this.y == var1.y; // L: 50
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)Ljava/lang/String;",
+		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "74"
+		garbageValue = "959391461"
 	)
 	@Export("toString")
 	String toString(String var1) {
-		return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 59
+		return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 64
 	}
 
 	public boolean equals(Object var1) {
-		if (this == var1) { // L: 38
+		if (this == var1) { // L: 42
 			return true;
 		} else {
-			return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 39 40
+			return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 43 44
 		}
 	}
 
-	public int hashCode() {
-		return this.packed(); // L: 51
-	}
-
 	public String toString() {
-		return this.toString(","); // L: 55
+		return this.toString(","); // L: 60
 	}
 
-	@ObfuscatedName("iq")
+	public int hashCode() {
+		return this.packed(); // L: 56
+	}
+
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
+		descriptor = "(I)Z",
-		garbageValue = "1"
+		garbageValue = "474672865"
 	)
-	static final void method5531() {
+	public static boolean method5370() {
-		int var0 = class138.menuX; // L: 8630
+		return class273.musicPlayerStatus != 0 ? true : class273.midiPcmStream.isReady(); // L: 68 69
-		int var1 = class1.menuY; // L: 8631
-		int var2 = ItemComposition.menuWidth; // L: 8632
-		int var3 = ByteArrayPool.menuHeight; // L: 8633
-		int var4 = 6116423; // L: 8634
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 8635
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 8636
-		Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 8637
-		RouteStrategy.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 8638
-		int var5 = MouseHandler.MouseHandler_x; // L: 8639
-		int var6 = MouseHandler.MouseHandler_y; // L: 8640
-
-		for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 8641
-			int var8 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; // L: 8642
-			int var9 = 16777215; // L: 8643
-			if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 8644
-				var9 = 16776960;
 	}
 
-			RouteStrategy.fontBold12.draw(AbstractUserComparator.method6736(var7), var0 + 3, var8, var9, 0); // L: 8645
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(CI)Z",
+		garbageValue = "1630457870"
+	)
+	@Export("isDigit")
+	public static boolean isDigit(char var0) {
+		return var0 >= '0' && var0 <= '9'; // L: 150
 	}
-
-		ScriptEvent.method2092(class138.menuX, class1.menuY, ItemComposition.menuWidth, ByteArrayPool.menuHeight); // L: 8647
-	} // L: 8648
 }

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

@@ -4,225 +4,147 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("as")
+@ObfuscatedName("br")
 @Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("ur")
+	@ObfuscatedName("re")
-	@ObfuscatedSignature(
+	@Export("ClanChat_inClanChat")
-		descriptor = "Lbw;"
+	static boolean ClanChat_inClanChat;
-	)
+	@ObfuscatedName("s")
-	@Export("friendSystem")
+	@Export("SpriteBuffer_spritePalette")
-	public static FriendSystem friendSystem;
+	public static int[] SpriteBuffer_spritePalette;
-	@ObfuscatedName("r")
+	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lqq;"
-	)
-	@Export("logoSprite")
-	static IndexedSprite logoSprite;
-	@ObfuscatedName("dq")
-	@ObfuscatedSignature(
-		descriptor = "Lny;"
-	)
-	@Export("js5Socket")
-	static AbstractSocket js5Socket;
-	@ObfuscatedName("jf")
 	@ObfuscatedGetter(
-		intValue = 1220605689
+		intValue = 1552308037
 	)
-	static int field397;
+	@Export("loginBoxCenter")
-	@ObfuscatedName("f")
+	static int loginBoxCenter;
+	@ObfuscatedName("ft")
+	static String field406;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1215193119
+		intValue = -1371041797
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -871732017
+		intValue = 327497787
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("table")
 	int[][] table;
 
 	public Decimator(int var1, int var2) {
 		if (var2 != var1) { // L: 14
-			int var4 = var1; // L: 16
+			int var3 = class343.method6137(var1, var2); // L: 15
-			int var5 = var2; // L: 17
+			var1 /= var3; // L: 16
-			if (var2 > var1) { // L: 19
+			var2 /= var3; // L: 17
-				var4 = var2; // L: 21
+			this.inputRate = var1; // L: 18
-				var5 = var1; // L: 22
+			this.outputRate = var2; // L: 19
+			this.table = new int[var1][14]; // L: 20
+
+			for (int var4 = 0; var4 < var1; ++var4) { // L: 21
+				int[] var5 = this.table[var4]; // L: 22
+				double var6 = 6.0D + (double)var4 / (double)var1; // L: 23
+				int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); // L: 24
+				if (var8 < 0) { // L: 25
+					var8 = 0;
 				}
 
-			while (var5 != 0) { // L: 24
+				int var9 = (int)Math.ceil(var6 + 7.0D); // L: 26
-				int var6 = var4 % var5; // L: 25
+				if (var9 > 14) { // L: 27
-				var4 = var5; // L: 26
+					var9 = 14;
-				var5 = var6; // L: 27
 				}
 
-			var1 /= var4; // L: 32
+				for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { // L: 28 29
-			var2 /= var4; // L: 33
+					double var12 = 3.141592653589793D * ((double)var8 - var6); // L: 30
-			this.inputRate = var1; // L: 34
+					double var14 = var10; // L: 31
-			this.outputRate = var2; // L: 35
+					if (var12 < -1.0E-4D || var12 > 1.0E-4D) { // L: 32
-			this.table = new int[var1][14]; // L: 36
+						var14 = var10 * (Math.sin(var12) / var12);
-
-			for (int var7 = 0; var7 < var1; ++var7) { // L: 37
-				int[] var8 = this.table[var7]; // L: 38
-				double var9 = (double)var7 / (double)var1 + 6.0D; // L: 39
-				int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); // L: 40
-				if (var11 < 0) { // L: 41
-					var11 = 0;
 					}
 
-				int var12 = (int)Math.ceil(var9 + 7.0D); // L: 42
+					var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); // L: 33
-				if (var12 > 14) { // L: 43
+					var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D); // L: 34
-					var12 = 14;
-				}
-
-				for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { // L: 44 45
-					double var15 = 3.141592653589793D * ((double)var11 - var9); // L: 46
-					double var17 = var13; // L: 47
-					if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48
-						var17 = var13 * (Math.sin(var15) / var15);
-					}
-
-					var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); // L: 49
-					var8[var11] = (int)Math.floor(0.5D + 65536.0D * var17); // L: 50
 				}
 			}
 
 		}
-	} // L: 53
+	} // L: 37
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "([BI)[B",
-		garbageValue = "-84367819"
+		garbageValue = "1041792317"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
-		if (this.table != null) { // L: 56
+		if (this.table != null) { // L: 40
-			int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 57
+			int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 41
-			int[] var3 = new int[var2]; // L: 58
+			int[] var3 = new int[var2]; // L: 42
-			int var4 = 0; // L: 59
+			int var4 = 0; // L: 43
-			int var5 = 0; // L: 60
+			int var5 = 0; // L: 44
 
 			int var6;
-			for (var6 = 0; var6 < var1.length; ++var6) { // L: 61
+			for (var6 = 0; var6 < var1.length; ++var6) { // L: 45
-				byte var7 = var1[var6]; // L: 62
+				byte var7 = var1[var6]; // L: 46
-				int[] var8 = this.table[var5]; // L: 63
+				int[] var8 = this.table[var5]; // L: 47
 
 				int var9;
-				for (var9 = 0; var9 < 14; ++var9) { // L: 64
+				for (var9 = 0; var9 < 14; ++var9) { // L: 48
 					var3[var9 + var4] += var8[var9] * var7;
 				}
 
-				var5 += this.outputRate; // L: 65
+				var5 += this.outputRate; // L: 49
-				var9 = var5 / this.inputRate; // L: 66
+				var9 = var5 / this.inputRate; // L: 50
-				var4 += var9; // L: 67
+				var4 += var9; // L: 51
-				var5 -= var9 * this.inputRate; // L: 68
+				var5 -= var9 * this.inputRate; // L: 52
 			}
 
-			var1 = new byte[var2]; // L: 70
+			var1 = new byte[var2]; // L: 54
 
-			for (var6 = 0; var6 < var2; ++var6) { // L: 71
+			for (var6 = 0; var6 < var2; ++var6) { // L: 55
-				int var10 = var3[var6] + 32768 >> 16; // L: 72
+				int var10 = var3[var6] + 32768 >> 16; // L: 56
-				if (var10 < -128) { // L: 73
+				if (var10 < -128) { // L: 57
 					var1[var6] = -128;
-				} else if (var10 > 127) { // L: 74
+				} else if (var10 > 127) { // L: 58
 					var1[var6] = 127;
 				} else {
-					var1[var6] = (byte)var10; // L: 75
+					var1[var6] = (byte)var10; // L: 59
 				}
 			}
 		}
 
-		return var1; // L: 78
+		return var1; // L: 62
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(IB)I",
-		garbageValue = "25"
+		garbageValue = "69"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
-		if (this.table != null) {
+		if (this.table != null) { // L: 66
-			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); // L: 82
+			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate);
 		}
 
-		return var1; // L: 83
+		return var1; // L: 67
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "1943827297"
+		garbageValue = "814340508"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
-		if (this.table != null) { // L: 87
+		if (this.table != null) { // L: 71
 			var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6;
 		}
 
-		return var1; // L: 88
+		return var1; // L: 72
-	}
-
-	@ObfuscatedName("ff")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-13"
-	)
-	@Export("updateGameState")
-	static void updateGameState(int var0) {
-		if (var0 != Client.gameState) { // L: 1075
-			if (Client.gameState == 0) { // L: 1076
-				class127.client.method520();
-			}
-
-			if (var0 == 20 || var0 == 40 || var0 == 45 || var0 == 50) { // L: 1077
-				ModeWhere.method6099(0); // L: 1078
-				Client.field528 = 0; // L: 1079
-				Client.field661 = 0; // L: 1080
-				Client.timer.method6563(var0); // L: 1081
-				if (var0 != 20) { // L: 1082
-					class302.method5766(false);
 	}
 }
-
-			if (var0 != 20 && var0 != 40 && ModeWhere.field4073 != null) { // L: 1084 1085
-				ModeWhere.field4073.close(); // L: 1086
-				ModeWhere.field4073 = null; // L: 1087
-			}
-
-			if (Client.gameState == 25) { // L: 1090
-				Client.field560 = 0; // L: 1091
-				Client.field747 = 0; // L: 1092
-				Client.field608 = 1; // L: 1093
-				Client.field558 = 0; // L: 1094
-				Client.field758 = 1; // L: 1095
-			}
-
-			int var1;
-			if (var0 != 5 && var0 != 10) { // L: 1097
-				if (var0 == 20) { // L: 1101
-					var1 = Client.gameState == 11 ? 4 : 0; // L: 1102
-					class144.method3080(JagexCache.archive10, class145.archive8, false, var1); // L: 1103
-				} else if (var0 == 11) { // L: 1105
-					class144.method3080(JagexCache.archive10, class145.archive8, false, 4); // L: 1106
-				} else if (var0 == 50) { // L: 1108
-					class4.setLoginResponseString("", "Updating date of birth...", ""); // L: 1109
-					class144.method3080(JagexCache.archive10, class145.archive8, false, 7); // L: 1110
-				} else {
-					WorldMapSprite.method4351(); // L: 1112
-				}
-			} else {
-				var1 = BufferedSource.method6889() ? 0 : 12; // L: 1098
-				class144.method3080(JagexCache.archive10, class145.archive8, true, var1); // L: 1099
-			}
-
-			Client.gameState = var0; // L: 1113
-		}
-	} // L: 1114
-}

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

@@ -4,43 +4,26 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nu")
+@ObfuscatedName("ny")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lnu;"
+		descriptor = "Lny;"
 	)
-	static final DefaultsGroup field4311;
+	static final DefaultsGroup field4370;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1482438781
+		intValue = 1549368493
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field4311 = new DefaultsGroup(3); // L: 4
+		field4370 = new DefaultsGroup(3); // L: 4
 	}
 
 	DefaultsGroup(int var1) {
 		this.group = var1; // L: 8
 	} // L: 9
-
-	@ObfuscatedName("lj")
-	@ObfuscatedSignature(
-		descriptor = "(Lpi;II)V",
-		garbageValue = "1715985756"
-	)
-	static void method6936(Buffer var0, int var1) {
-		UserComparator6.method2646(var0.array, var1); // L: 12572
-		if (JagexCache.JagexCache_randomDat != null) { // L: 12574
-			try {
-				JagexCache.JagexCache_randomDat.seek(0L); // L: 12576
-				JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 12577
-			} catch (Exception var3) { // L: 12579
-			}
-		}
-
-	} // L: 12582
 }

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("ie")
+@ObfuscatedName("ic")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "Lpt;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lma;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lii;"
+		descriptor = "Liu;"
 	)
-	class253 field2877;
+	class253 field2932;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue(); // L: 11
@@ -46,7 +46,7 @@ public final class DemotingHashTable {
 		this(var1, var1); // L: 15
 	} // L: 16
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27
@@ -77,16 +77,16 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52
 		this.removeWrapper(var3); // L: 53
 	} // L: 54
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Liz;)V"
+		descriptor = "(Lim;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -98,12 +98,12 @@ public final class DemotingHashTable {
 
 	} // L: 62
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
-	public void method5124(Object var1, long var2) {
+	public void method4942(Object var1, long var2) {
 		this.put(var1, var2, 1); // L: 65
 	} // L: 66
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@Export("put")
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) { // L: 69
@@ -122,8 +122,8 @@ public final class DemotingHashTable {
 				}
 
 				this.removeWrapper(var5); // L: 78
-				if (this.field2877 != null) { // L: 79
+				if (this.field2932 != null) { // L: 79
-					this.field2877.method5114(var5.get()); // L: 80
+					this.field2932.method4937(var5.get()); // L: 80
 				}
 			}
 
@@ -134,7 +134,7 @@ public final class DemotingHashTable {
 		}
 	} // L: 87
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("demote")
 	public void demote(int var1) {
 		for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 90
@@ -155,7 +155,7 @@ public final class DemotingHashTable {
 
 	} // L: 109
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear(); // L: 112

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

@@ -4,201 +4,211 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("od")
+@ObfuscatedName("of")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = 175576615
-	)
-	int field4413;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = 551847099
-	)
-	int field4412;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -212427447
-	)
-	int field4416;
-
 	@ObfuscatedName("v")
+	public static short[][] field4469;
+	@ObfuscatedName("k")
+	@ObfuscatedGetter(
+		intValue = 673826891
+	)
+	int field4468;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = 1902875041
+	)
+	int field4472;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 658179341
+	)
+	int field4473;
+
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Loj;",
+		descriptor = "(B)Lom;",
-		garbageValue = "2004856383"
+		garbageValue = "-12"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (class128.formattedOperatingSystemName.startsWith("win")) { // L: 15
+		if (WorldMapArea.formattedOperatingSystemName.startsWith("win")) { // L: 16
 			var1 = 1;
-		} else if (class128.formattedOperatingSystemName.startsWith("mac")) { // L: 16
+		} else if (WorldMapArea.formattedOperatingSystemName.startsWith("mac")) { // L: 17
 			var1 = 2;
-		} else if (class128.formattedOperatingSystemName.startsWith("linux")) { // L: 17
+		} else if (WorldMapArea.formattedOperatingSystemName.startsWith("linux")) { // L: 18
 			var1 = 3;
 		} else {
-			var1 = 4; // L: 18
+			var1 = 4; // L: 19
 		}
 
 		String var2;
 		try {
-			var2 = System.getProperty("os.arch").toLowerCase(); // L: 22
+			var2 = System.getProperty("os.arch").toLowerCase(); // L: 23
-		} catch (Exception var27) { // L: 24
+		} catch (Exception var30) { // L: 25
-			var2 = ""; // L: 25
+			var2 = ""; // L: 26
 		}
 
 		String var3;
 		try {
-			var3 = System.getProperty("os.version").toLowerCase(); // L: 28
+			var3 = System.getProperty("os.version").toLowerCase(); // L: 29
-		} catch (Exception var26) { // L: 30
+		} catch (Exception var29) { // L: 31
-			var3 = ""; // L: 31
+			var3 = ""; // L: 32
 		}
 
-		String var4 = "Unknown"; // L: 33
+		String var4 = "Unknown"; // L: 34
-		String var5 = "1.1"; // L: 34
+		String var5 = "1.1"; // L: 35
 
 		try {
-			var4 = System.getProperty("java.vendor"); // L: 36
+			var4 = System.getProperty("java.vendor"); // L: 37
-			var5 = System.getProperty("java.version"); // L: 37
+			var5 = System.getProperty("java.version"); // L: 38
-		} catch (Exception var25) { // L: 39
+		} catch (Exception var28) { // L: 40
 		}
 
-		boolean var24;
+		boolean var27;
-		if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 41
+		if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 42
-			var24 = false; // L: 42
+			var27 = false; // L: 43
 		} else {
-			var24 = true;
+			var27 = true;
 		}
 
-		byte var7 = 0; // L: 43
+		byte var7 = 0; // L: 44
-		if (var1 == 1) { // L: 44
+		if (var1 == 1) { // L: 45
-			if (var3.indexOf("4.0") != -1) { // L: 45
+			if (var3.indexOf("4.0") != -1) { // L: 46
 				var7 = 1;
-			} else if (var3.indexOf("4.1") != -1) { // L: 46
+			} else if (var3.indexOf("4.1") != -1) { // L: 47
 				var7 = 2;
-			} else if (var3.indexOf("4.9") != -1) { // L: 47
+			} else if (var3.indexOf("4.9") != -1) { // L: 48
 				var7 = 3;
-			} else if (var3.indexOf("5.0") != -1) { // L: 48
+			} else if (var3.indexOf("5.0") != -1) { // L: 49
 				var7 = 4;
-			} else if (var3.indexOf("5.1") != -1) { // L: 49
+			} else if (var3.indexOf("5.1") != -1) { // L: 50
 				var7 = 5;
-			} else if (var3.indexOf("5.2") != -1) { // L: 50
+			} else if (var3.indexOf("5.2") != -1) { // L: 51
 				var7 = 8;
-			} else if (var3.indexOf("6.0") != -1) { // L: 51
+			} else if (var3.indexOf("6.0") != -1) { // L: 52
 				var7 = 6;
-			} else if (var3.indexOf("6.1") != -1) { // L: 52
+			} else if (var3.indexOf("6.1") != -1) { // L: 53
 				var7 = 7;
-			} else if (var3.indexOf("6.2") != -1) { // L: 53
+			} else if (var3.indexOf("6.2") != -1) { // L: 54
 				var7 = 9;
-			} else if (var3.indexOf("6.3") != -1) { // L: 54
+			} else if (var3.indexOf("6.3") != -1) { // L: 55
 				var7 = 10;
-			} else if (var3.indexOf("10.0") != -1) { // L: 55
+			} else if (var3.indexOf("10.0") != -1) { // L: 56
 				var7 = 11;
 			}
-		} else if (var1 == 2) { // L: 57
+		} else if (var1 == 2) { // L: 58
-			if (var3.indexOf("10.4") != -1) { // L: 58
+			if (var3.indexOf("10.4") != -1) { // L: 59
 				var7 = 20;
-			} else if (var3.indexOf("10.5") != -1) { // L: 59
+			} else if (var3.indexOf("10.5") != -1) { // L: 60
 				var7 = 21;
-			} else if (var3.indexOf("10.6") != -1) { // L: 60
+			} else if (var3.indexOf("10.6") != -1) { // L: 61
 				var7 = 22;
-			} else if (var3.indexOf("10.7") != -1) { // L: 61
+			} else if (var3.indexOf("10.7") != -1) { // L: 62
 				var7 = 23;
-			} else if (var3.indexOf("10.8") != -1) { // L: 62
+			} else if (var3.indexOf("10.8") != -1) { // L: 63
 				var7 = 24;
-			} else if (var3.indexOf("10.9") != -1) { // L: 63
+			} else if (var3.indexOf("10.9") != -1) { // L: 64
 				var7 = 25;
 			} else if (var3.indexOf("10.10") != -1) {
-				var7 = 26; // L: 64
+				var7 = 26; // L: 65
-			} else if (var3.indexOf("10.11") != -1) { // L: 65
+			} else if (var3.indexOf("10.11") != -1) { // L: 66
 				var7 = 27;
-			} else if (var3.indexOf("10.12") != -1) { // L: 66
+			} else if (var3.indexOf("10.12") != -1) { // L: 67
 				var7 = 28;
-			} else if (var3.indexOf("10.13") != -1) { // L: 67
+			} else if (var3.indexOf("10.13") != -1) { // L: 68
 				var7 = 29;
 			}
 		}
 
 		byte var8;
-		if (var4.toLowerCase().indexOf("sun") != -1) { // L: 70
+		if (var4.toLowerCase().indexOf("sun") != -1) { // L: 71
 			var8 = 1;
-		} else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 71
+		} else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 72
 			var8 = 2;
-		} else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 72
+		} else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 73
 			var8 = 3;
-		} else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 73
+		} else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 74
 			var8 = 5;
 		} else {
-			var8 = 4; // L: 74
+			var8 = 4; // L: 75
 		}
 
-		this.method7178(var5); // L: 75
+		this.method6988(var5); // L: 76
-		int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77
+		boolean var9 = false; // L: 77
+		int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 78
 		int var11;
-		if (this.field4413 > 3) { // L: 80
+		if (this.field4468 > 3) { // L: 81
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
-			var11 = 0; // L: 81
+			var11 = 0; // L: 82
 		}
 
-		byte var12 = 0; // L: 82
+		byte var12 = 0; // L: 83
-		String var13 = ""; // L: 83
+		String var13 = ""; // L: 84
-		String var14 = ""; // L: 84
+		String var14 = ""; // L: 85
-		String var15 = ""; // L: 85
+		String var15 = ""; // L: 86
-		String var16 = ""; // L: 86
+		String var16 = ""; // L: 87
-		String var17 = ""; // L: 87
+		String var17 = ""; // L: 88
-		String var18 = ""; // L: 88
+		String var18 = ""; // L: 89
-		int[] var23 = new int[3]; // L: 93
+		boolean var19 = false; // L: 90
-		return new PlatformInfo(var1, var24, var7, var8, this.field4413, this.field4412, this.field4416, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97
+		boolean var20 = false; // L: 91
+		boolean var21 = false; // L: 92
+		boolean var22 = false; // L: 93
+		int[] var23 = new int[3]; // L: 94
+		boolean var24 = false; // L: 95
+		String var25 = ""; // L: 96
+		boolean var26 = false; // L: 97
+		return new PlatformInfo(var1, var27, var7, var8, this.field4468, this.field4472, this.field4473, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 98
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "559180637"
-	)
-	void method7178(String var1) {
-		if (var1.startsWith("1.")) { // L: 101
-			this.method7179(var1); // L: 102
-		} else {
-			this.method7177(var1); // L: 105
-		}
-
-	} // L: 107
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "435492533"
-	)
-	void method7179(String var1) {
-		String[] var2 = var1.split("\\."); // L: 110
-
-		try {
-			this.field4413 = Integer.parseInt(var2[1]); // L: 112
-			var2 = var2[2].split("_"); // L: 113
-			this.field4412 = Integer.parseInt(var2[0]); // L: 114
-			this.field4416 = Integer.parseInt(var2[1]); // L: 115
-		} catch (Exception var4) { // L: 117
-		}
-
-	} // L: 118
-
-	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "120"
+		garbageValue = "99"
 	)
-	void method7177(String var1) {
+	void method6988(String var1) {
-		String[] var2 = var1.split("\\."); // L: 121
+		if (var1.startsWith("1.")) { // L: 102
+			this.method6991(var1); // L: 103
+		} else {
+			this.method6996(var1); // L: 106
+		}
+
+	} // L: 108
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-380169429"
+	)
+	void method6991(String var1) {
+		String[] var2 = var1.split("\\."); // L: 111
 
 		try {
-			this.field4413 = Integer.parseInt(var2[0]); // L: 123
+			this.field4468 = Integer.parseInt(var2[1]); // L: 113
-			this.field4412 = Integer.parseInt(var2[1]); // L: 124
+			var2 = var2[2].split("_"); // L: 114
-			this.field4416 = Integer.parseInt(var2[2]); // L: 125
+			this.field4472 = Integer.parseInt(var2[0]); // L: 115
-		} catch (Exception var4) { // L: 127
+			this.field4473 = Integer.parseInt(var2[1]); // L: 116
+		} catch (Exception var4) { // L: 118
 		}
 
-	} // L: 128
+	} // L: 119
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "-68"
+	)
+	void method6996(String var1) {
+		String[] var2 = var1.split("\\."); // L: 122
+
+		try {
+			this.field4468 = Integer.parseInt(var2[0]); // L: 124
+			this.field4472 = Integer.parseInt(var2[1]); // L: 125
+			this.field4473 = Integer.parseInt(var2[2]); // L: 126
+		} catch (Exception var4) { // L: 128
+		}
+
+	} // L: 129
 }

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

@@ -9,114 +9,114 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ae")
+@ObfuscatedName("ag")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1556714099
+		intValue = 30092841
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("byteSamples")
 	byte[] byteSamples;
 
 	DevicePcmPlayer() {
 	} // L: 18
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-843995592"
+		garbageValue = "-125708948"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)PcmPlayer.field268, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21
+		this.format = new AudioFormat((float)PcmPlayer.field300, 16, ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1, true, false); // L: 22
-		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22
+		this.byteSamples = new byte[256 << (ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1)]; // L: 23
-	} // L: 23
+	} // L: 24
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
+		descriptor = "(IS)V",
-		garbageValue = "1651380399"
+		garbageValue = "-30840"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
 		try {
-			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 27
+			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1)); // L: 29
-			this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 28
+			this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 30
-			this.line.open(); // L: 29
+			this.line.open(); // L: 31
-			this.line.start(); // L: 30
+			this.line.start(); // L: 32
-			this.capacity2 = var1; // L: 31
+			this.capacity2 = var1; // L: 33
-		} catch (LineUnavailableException var3) { // L: 33
+		} catch (LineUnavailableException var3) { // L: 35
-			if (class150.method3150(var1) != 1) { // L: 34
+			if (VarcInt.method3324(var1) != 1) { // L: 36
-				this.open(class67.method1909(var1)); // L: 35
+				this.open(FontName.method7228(var1)); // L: 37
 			} else {
-				this.line = null; // L: 38
+				this.line = null; // L: 40
-				throw var3; // L: 39
+				throw var3; // L: 41
 			}
 		}
-	} // L: 36 41
+	} // L: 38 43
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
+		descriptor = "(S)I",
-		garbageValue = "244839095"
+		garbageValue = "181"
 	)
 	@Export("position")
 	protected int position() {
-		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 44
+		return this.capacity2 - (this.line.available() >> (ArchiveDiskAction.PcmPlayer_stereo ? 2 : 1)); // L: 47
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("write")
 	protected void write() {
-		int var1 = 256; // L: 49
+		int var1 = 256; // L: 53
-		if (PcmPlayer.PcmPlayer_stereo) { // L: 50
+		if (ArchiveDiskAction.PcmPlayer_stereo) { // L: 54
 			var1 <<= 1;
 		}
 
-		for (int var2 = 0; var2 < var1; ++var2) { // L: 51
+		for (int var2 = 0; var2 < var1; ++var2) { // L: 55
-			int var3 = super.samples[var2]; // L: 52
+			int var3 = super.samples[var2]; // L: 56
-			if ((var3 + 8388608 & -16777216) != 0) { // L: 53
+			if ((var3 + 8388608 & -16777216) != 0) { // L: 57
-				var3 = 8388607 ^ var3 >> 31; // L: 54
+				var3 = 8388607 ^ var3 >> 31; // L: 58
 			}
 
-			this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 56
+			this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 60
-			this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 57
+			this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 61
 		}
 
-		this.line.write(this.byteSamples, 0, var1 << 1); // L: 59
+		this.line.write(this.byteSamples, 0, var1 << 1); // L: 63
-	} // L: 60
+	} // L: 64
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
+		descriptor = "(B)V",
-		garbageValue = "-1662003992"
+		garbageValue = "25"
 	)
 	@Export("close")
 	protected void close() {
-		if (this.line != null) { // L: 63
+		if (this.line != null) { // L: 68
-			this.line.close(); // L: 64
+			this.line.close(); // L: 69
-			this.line = null; // L: 65
+			this.line = null; // L: 70
 		}
 
-	} // L: 67
+	} // L: 72
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1137884684"
+		garbageValue = "207475579"
 	)
 	@Export("discard")
 	protected void discard() {
-		this.line.flush(); // L: 70
+		this.line.flush(); // L: 76
-	} // L: 71
+	} // L: 77
 }

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

@@ -1,43 +1,121 @@
 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("z")
+@ObfuscatedName("i")
 @Implements("DevicePcmPlayerProvider")
-public class DevicePcmPlayerProvider implements class45 {
+public class DevicePcmPlayerProvider implements class47 {
-	@ObfuscatedName("sx")
+	@ObfuscatedName("aq")
-	@ObfuscatedGetter(
-		intValue = 1132145401
-	)
-	static int field154;
-	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "[Lbb;"
+		descriptor = "Lqi;"
 	)
-	@Export("World_worlds")
+	@Export("rasterProvider")
-	static World[] World_worlds;
+	public static AbstractRasterProvider rasterProvider;
-	@ObfuscatedName("l")
-	@Export("ItemDefinition_inMembersWorld")
-	static boolean ItemDefinition_inMembersWorld;
-	@ObfuscatedName("ns")
-	@ObfuscatedSignature(
-		descriptor = "Lky;"
-	)
-	@Export("mousedOverWidgetIf1")
-	static Widget mousedOverWidgetIf1;
 
 	DevicePcmPlayerProvider() {
 	} // L: 7
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lay;",
+		descriptor = "(I)Lal;",
-		garbageValue = "-262480710"
+		garbageValue = "-1051033843"
 	)
 	@Export("player")
 	public PcmPlayer player() {
-		return new DevicePcmPlayer(); // L: 10
+		return new DevicePcmPlayer(); // L: 11
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Llp;Llp;I)I",
+		garbageValue = "654375877"
+	)
+	static int method338(AbstractArchive var0, AbstractArchive var1) {
+		int var2 = 0;
+		String[] var3 = Login.field910;
+
+		int var4;
+		String var5;
+		for (var4 = 0; var4 < var3.length; ++var4) { // L: 162
+			var5 = var3[var4]; // L: 163
+			if (var0.tryLoadFileByNames(var5, "")) { // L: 165
+				++var2;
+			}
+		}
+
+		var3 = Login.field911; // L: 170
+
+		for (var4 = 0; var4 < var3.length; ++var4) { // L: 171
+			var5 = var3[var4]; // L: 172
+			if (var1.tryLoadFileByNames(var5, "")) { // L: 174
+				++var2;
+			}
+		}
+
+		return var2; // L: 178
+	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "296751671"
+	)
+	static void method336(int var0, int var1) {
+		long var2 = (long)((var0 << 16) + var1); // L: 157
+		NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 158
+		if (var4 != null) { // L: 159
+			NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 160
+		}
+	} // L: 161
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)I",
+		garbageValue = "7"
+	)
+	static final int method340(int var0, int var1) {
+		if (var0 == -1) { // L: 969
+			return 12345678;
+		} else {
+			var1 = (var0 & 127) * var1 / 128; // L: 970
+			if (var1 < 2) { // L: 971
+				var1 = 2;
+			} else if (var1 > 126) { // L: 972
+				var1 = 126;
+			}
+
+			return (var0 & 65408) + var1; // L: 973
+		}
+	}
+
+	@ObfuscatedName("ao")
+	@ObfuscatedSignature(
+		descriptor = "(ILbb;ZI)I",
+		garbageValue = "1672362230"
+	)
+	static int method335(int var0, Script var1, boolean var2) {
+		if (var0 == 6800) { // L: 4511
+			Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4512
+			return 1; // L: 4513
+		} else if (var0 != 6801 && var0 != 6802) { // L: 4515
+			if (var0 == 6850) { // L: 4519
+				Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 4520
+				return 1; // L: 4521
+			} else if (var0 != 6851 && var0 != 6852) { // L: 4523
+				if (var0 == 6853) { // L: 4527
+					Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 4528
+					return 1; // L: 4529
+				} else {
+					return 2; // L: 4531
+				}
+			} else {
+				Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4524
+				return 1; // L: 4525
+			}
+		} else {
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 4516
+			return 1; // L: 4517
+		}
 	}
 }

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

@@ -4,26 +4,25 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("js")
+@ObfuscatedName("jl")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("pf")
+	@ObfuscatedName("gx")
 	@ObfuscatedSignature(
-		descriptor = "Lpj;"
+		descriptor = "Lnf;"
 	)
-	@Export("HitSplatDefinition_cached")
+	static AbstractSocket field3337;
-	static class426 HitSplatDefinition_cached;
+	@ObfuscatedName("o")
-	@ObfuscatedName("v")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
 	DirectByteArrayCopier() {
 	} // L: 10
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)[B",
+		descriptor = "(B)[B",
-		garbageValue = "2035077648"
+		garbageValue = "70"
 	)
 	@Export("get")
 	byte[] get() {
@@ -33,24 +32,37 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		return var1; // L: 16
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "([BI)V",
-		garbageValue = "-1279201457"
+		garbageValue = "-362326915"
 	)
 	@Export("set")
 	void set(byte[] var1) {
-		this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20
+		this.directBuffer = ByteBuffer.allocateDirect(var1.length);
-		this.directBuffer.position(0); // L: 21
+		this.directBuffer.position(0);
-		this.directBuffer.put(var1); // L: 22
+		this.directBuffer.put(var1);
-	} // L: 23
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
+		descriptor = "(IB)Lft;",
-		garbageValue = "1117680233"
+		garbageValue = "12"
 	)
-	public static boolean method5516(int var0) {
+	@Export("getInvDefinition")
-		return (var0 >> 20 & 1) != 0; // L: 17
+	public static InvDefinition getInvDefinition(int var0) {
+		InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 17
+		if (var1 != null) { // L: 18
+			return var1;
+		} else {
+			byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 19
+			var1 = new InvDefinition(); // L: 20
+			if (var2 != null) { // L: 21
+				var1.decode(new Buffer(var2));
+			}
+
+			InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 22
+			return var1; // L: 23
+		}
 	}
 }

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("id")
+@ObfuscatedName("il")
 @Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("obj")
 	Object obj;
 
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1; // L: 8
 	} // L: 9
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("get")
 	Object get() {
 		return this.obj; // L: 12
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("isSoft")
 	boolean isSoft() {
 		return false; // L: 16

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("oz")
+@ObfuscatedName("oq")
 @Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("cd")
+	@ObfuscatedName("dh")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("cw")
+	@ObfuscatedName("dj")
 	@ObfuscatedSignature(
-		descriptor = "Loz;"
+		descriptor = "Loq;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cx")
+	@ObfuscatedName("dx")
 	@ObfuscatedSignature(
-		descriptor = "Loz;"
+		descriptor = "Loq;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("de")
+	@ObfuscatedName("dx")
 	@Export("removeDual")
 	public void removeDual() {
 		if (this.nextDual != null) { // L: 9

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("la")
+@ObfuscatedName("lr")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Loz;"
+		descriptor = "Loq;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Loz;)V"
+		descriptor = "(Loq;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1; // L: 18
 	} // L: 19
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Loz;)V"
+		descriptor = "(Loq;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1; // L: 26
 	} // L: 27
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "()Loz;"
+		descriptor = "()Loq;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {

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

@@ -3,76 +3,68 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bc")
+@ObfuscatedName("bm")
 @Implements("DynamicObject")
 public class DynamicObject extends Renderable {
-	@ObfuscatedName("gx")
+	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lfx;"
-	)
-	@Export("socketTask")
-	static Task socketTask;
-	@ObfuscatedName("hp")
-	@Export("regionMapArchives")
-	static byte[][] regionMapArchives;
-	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 920193097
+		intValue = 393913769
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1286565411
+		intValue = 992153197
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -971153847
+		intValue = 849198695
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 326052965
+		intValue = 2111003401
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1315093071
+		intValue = -1849101915
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 255854397
+		intValue = 1844772961
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lgw;"
+		descriptor = "Lgq;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 896717489
+		intValue = 1649346091
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 131494325
+		intValue = -1098148309
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIZLix;)V"
+		descriptor = "(IIIIIIIZLgx;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) {
 		this.id = var1; // L: 20
@@ -82,10 +74,10 @@ public class DynamicObject extends Renderable {
 		this.x = var5; // L: 24
 		this.y = var6; // L: 25
 		if (var7 != -1) { // L: 26
-			this.sequenceDefinition = class163.SequenceDefinition_get(var7); // L: 27
+			this.sequenceDefinition = class114.SequenceDefinition_get(var7); // L: 27
 			this.frame = 0; // L: 28
 			this.cycleStart = Client.cycle - 1; // L: 29
-			if (this.sequenceDefinition.field2161 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
+			if (this.sequenceDefinition.field2208 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
 				DynamicObject var10 = (DynamicObject)var9; // L: 31
 				if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32
 					this.frame = var10.frame; // L: 33
@@ -99,17 +91,17 @@ public class DynamicObject extends Renderable {
 					this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); // L: 40
 					this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); // L: 41
 				} else {
-					this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3844()); // L: 44
+					this.frame = (int)(Math.random() * (double)this.sequenceDefinition.method3729()); // L: 44
 				}
 			}
 		}
 
 	} // L: 48
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(B)Liq;",
+		descriptor = "(I)Lhv;",
-		garbageValue = "103"
+		garbageValue = "-238822980"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -121,7 +113,7 @@ public class DynamicObject extends Renderable {
 			}
 
 			if (this.sequenceDefinition.isCachedModelIdSet()) { // L: 54
-				var2 = this.sequenceDefinition.method3844(); // L: 68
+				var2 = this.sequenceDefinition.method3729(); // L: 68
 				this.frame += var1; // L: 69
 				var1 = 0; // L: 70
 				if (this.frame >= var2) { // L: 71
@@ -131,11 +123,11 @@ public class DynamicObject extends Renderable {
 					}
 				}
 			} else {
-				label79: {
+				label81: {
 					do {
 						do {
 							if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 55
-								break label79;
+								break label81;
 							}
 
 							var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 56
@@ -152,9 +144,9 @@ public class DynamicObject extends Renderable {
 			this.cycleStart = Client.cycle - var1; // L: 78
 		}
 
-		ObjectComposition var12 = class146.getObjectDefinition(this.id); // L: 80
+		ObjectComposition var12 = class82.getObjectDefinition(this.id); // L: 80
-		if (var12.transforms != null) {
+		if (var12.transforms != null) { // L: 81
-			var12 = var12.transform(); // L: 81
+			var12 = var12.transform();
 		}
 
 		if (var12 == null) { // L: 82
@@ -181,45 +173,432 @@ public class DynamicObject extends Renderable {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
+		descriptor = "(IIII)I",
-		garbageValue = "57"
+		garbageValue = "-1327477180"
 	)
-	static void method2003() {
+	public static int method1957(int var0, int var1, int var2) {
-		Login.Login_username = Login.Login_username.trim(); // L: 1152
+		int var3 = class147.method3000(var2 - var1 + 1); // L: 62
-		if (Login.Login_username.length() == 0) { // L: 1153
+		var3 <<= var1; // L: 63
-			class4.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 1154
+		return var0 & ~var3; // L: 64
-		} else {
-			long var1 = World.method1678(); // L: 1158
-			int var0;
-			if (0L == var1) { // L: 1159
-				var0 = 5;
-			} else {
-				var0 = WorldMapSectionType.method4312(var1, Login.Login_username); // L: 1160
 	}
 
-			switch(var0) { // L: 1161
+	@ObfuscatedName("z")
-			case 2:
+	@ObfuscatedSignature(
-				class4.setLoginResponseString(Strings.field3628, Strings.field3870, Strings.field3646); // L: 1169
+		descriptor = "(ILbb;ZI)I",
-				Ignored.method6828(6); // L: 1170
+		garbageValue = "2018004509"
-				break; // L: 1171
+	)
-			case 3:
+	static int method1963(int var0, Script var1, boolean var2) {
-				class4.setLoginResponseString("", "Error connecting to server.", ""); // L: 1173
+		String var7;
-				break; // L: 1174
+		if (var0 == ScriptOpcodes.MES) { // L: 1470
-			case 4:
+			var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1471
-				class4.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 1166
+			WorldMapEvent.addGameMessage(0, "", var7); // L: 1472
-				break; // L: 1167
+			return 1; // L: 1473
-			case 5:
+		} else if (var0 == ScriptOpcodes.ANIM) {
-				class4.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 1163
+			class12.Interpreter_intStackSize -= 2; // L: 1476
-				break;
+			JagexCache.performPlayerAnimation(ModelData0.localPlayer, Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 1477
-			case 6:
+			return 1; // L: 1478
-				class4.setLoginResponseString("", "Error connecting to server.", ""); // L: 1179
+		} else if (var0 == ScriptOpcodes.IF_CLOSE) {
-				break;
+			if (!Interpreter.field833) { // L: 1481
-			case 7:
+				Interpreter.field835 = true; // L: 1482
-				class4.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 1176
 			}
 
+			return 1; // L: 1484
+		} else {
+			int var15;
+			if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
+				var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1487
+				var15 = 0; // L: 1488
+				if (NetFileRequest.isNumber(var7)) { // L: 1489
+					var15 = class92.method2373(var7);
 				}
-	} // L: 1155 1182
+
+				PacketBufferNode var13 = WallDecoration.getPacketBufferNode(ClientPacket.field2972, Client.packetWriter.isaacCipher); // L: 1491
+				var13.packetBuffer.writeInt(var15); // L: 1492
+				Client.packetWriter.addNode(var13); // L: 1493
+				return 1; // L: 1494
+			} else {
+				PacketBufferNode var11;
+				if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
+					var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1497
+					var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3048, Client.packetWriter.isaacCipher); // L: 1499
+					var11.packetBuffer.writeByte(var7.length() + 1); // L: 1500
+					var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1501
+					Client.packetWriter.addNode(var11); // L: 1502
+					return 1; // L: 1503
+				} else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
+					var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1506
+					var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3033, Client.packetWriter.isaacCipher); // L: 1508
+					var11.packetBuffer.writeByte(var7.length() + 1); // L: 1509
+					var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1510
+					Client.packetWriter.addNode(var11); // L: 1511
+					return 1; // L: 1512
+				} else {
+					String var4;
+					int var10;
+					if (var0 == ScriptOpcodes.OPPLAYER) {
+						var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1515
+						var4 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1516
+						method1964(var10, var4); // L: 1517
+						return 1; // L: 1518
+					} else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
+						class12.Interpreter_intStackSize -= 3; // L: 1521
+						var10 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1522
+						var15 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1523
+						int var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 1524
+						Widget var14 = class92.getWidget(var9); // L: 1525
+						class10.clickWidget(var14, var10, var15); // L: 1526
+						return 1; // L: 1527
+					} else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
+						class12.Interpreter_intStackSize -= 2; // L: 1530
+						var10 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1531
+						var15 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1532
+						Widget var12 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1533
+						class10.clickWidget(var12, var10, var15); // L: 1534
+						return 1; // L: 1535
+					} else if (var0 == ScriptOpcodes.MOUSECAM) {
+						Login.mouseCam = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1538
+						return 1; // L: 1539
+					} else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2222() ? 1 : 0; // L: 1542
+						return 1; // L: 1543
+					} else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
+						class12.clientPreferences.method2219(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1); // L: 1546
+						return 1; // L: 1547
+					} else if (var0 == ScriptOpcodes.OPENURL) {
+						var7 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 1550
+						boolean var8 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1551
+						ScriptEvent.openURL(var7, var8, false); // L: 1552
+						return 1; // L: 1553
+					} else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
+						var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1556
+						var11 = WallDecoration.getPacketBufferNode(ClientPacket.field3017, Client.packetWriter.isaacCipher); // L: 1558
+						var11.packetBuffer.writeShort(var10); // L: 1559
+						Client.packetWriter.addNode(var11); // L: 1560
+						return 1; // L: 1561
+					} else if (var0 == ScriptOpcodes.BUG_REPORT) {
+						var10 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1564
+						class9.Interpreter_stringStackSize -= 2; // L: 1565
+						var4 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 1566
+						String var5 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 1567
+						if (var4.length() > 500) { // L: 1568
+							return 1;
+						} else if (var5.length() > 500) { // L: 1569
+							return 1;
+						} else {
+							PacketBufferNode var6 = WallDecoration.getPacketBufferNode(ClientPacket.field3044, Client.packetWriter.isaacCipher); // L: 1570
+							var6.packetBuffer.writeShort(1 + class392.stringCp1252NullTerminatedByteSize(var4) + class392.stringCp1252NullTerminatedByteSize(var5)); // L: 1571
+							var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1572
+							var6.packetBuffer.method7687(var10); // L: 1573
+							var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1574
+							Client.packetWriter.addNode(var6); // L: 1575
+							return 1; // L: 1576
+						}
+					} else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
+						Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1579
+						return 1; // L: 1580
+					} else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
+						Client.showMouseOverText = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1583
+						return 1; // L: 1584
+					} else if (var0 == ScriptOpcodes.RENDERSELF) {
+						Client.renderSelf = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1587
+						return 1; // L: 1588
+					} else if (var0 == 3120) {
+						if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1591
+							Client.drawPlayerNames |= 1;
+						} else {
+							Client.drawPlayerNames &= -2; // L: 1592
+						}
+
+						return 1; // L: 1593
+					} else if (var0 == 3121) {
+						if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1596
+							Client.drawPlayerNames |= 2;
+						} else {
+							Client.drawPlayerNames &= -3; // L: 1597
+						}
+
+						return 1; // L: 1598
+					} else if (var0 == 3122) {
+						if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1601
+							Client.drawPlayerNames |= 4;
+						} else {
+							Client.drawPlayerNames &= -5; // L: 1602
+						}
+
+						return 1; // L: 1603
+					} else if (var0 == 3123) {
+						if (Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1) { // L: 1606
+							Client.drawPlayerNames |= 8;
+						} else {
+							Client.drawPlayerNames &= -9; // L: 1607
+						}
+
+						return 1; // L: 1608
+					} else if (var0 == 3124) {
+						Client.drawPlayerNames = 0; // L: 1611
+						return 1; // L: 1612
+					} else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
+						Client.showMouseCross = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1615
+						return 1; // L: 1616
+					} else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
+						Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1619
+						return 1; // L: 1620
+					} else if (var0 == ScriptOpcodes.SETTAPTODROP) {
+						class33.setTapToDrop(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1); // L: 1623
+						return 1; // L: 1624
+					} else if (var0 == ScriptOpcodes.GETTAPTODROP) {
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = WallDecoration.getTapToDrop() ? 1 : 0; // L: 1627
+						return 1; // L: 1628
+					} else if (var0 == 3129) {
+						class12.Interpreter_intStackSize -= 2; // L: 1631
+						Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1632
+						Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1633
+						return 1; // L: 1634
+					} else if (var0 == 3130) {
+						class12.Interpreter_intStackSize -= 2; // L: 1637
+						return 1; // L: 1638
+					} else if (var0 == 3131) {
+						--class12.Interpreter_intStackSize; // L: 1641
+						return 1; // L: 1642
+					} else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = GraphicsObject.canvasWidth; // L: 1645
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class433.canvasHeight; // L: 1646
+						return 1; // L: 1647
+					} else if (var0 == ScriptOpcodes.MOBILE_SETFPS) {
+						--class12.Interpreter_intStackSize; // L: 1650
+						return 1; // L: 1651
+					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) {
+						return 1; // L: 1654
+					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) {
+						class12.Interpreter_intStackSize -= 2; // L: 1657
+						return 1; // L: 1658
+					} else if (var0 == 3136) {
+						Client.field487 = 3; // L: 1661
+						Client.field657 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1662
+						return 1; // L: 1663
+					} else if (var0 == 3137) {
+						Client.field487 = 2; // L: 1666
+						Client.field657 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1667
+						return 1; // L: 1668
+					} else if (var0 == 3138) {
+						Client.field487 = 0; // L: 1671
+						return 1; // L: 1672
+					} else if (var0 == 3139) {
+						Client.field487 = 1; // L: 1675
+						return 1; // L: 1676
+					} else if (var0 == 3140) {
+						Client.field487 = 3; // L: 1679
+						Client.field657 = var2 ? Interpreter.scriptDotWidget.id * 1115174973 * -203153643 : KeyHandler.scriptActiveWidget.id * 1115174973 * -203153643; // L: 1680
+						return 1; // L: 1681
+					} else {
+						boolean var3;
+						if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
+							var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1684
+							class12.clientPreferences.method2223(var3); // L: 1685
+							return 1; // L: 1686
+						} else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2257() ? 1 : 0; // L: 1689
+							return 1; // L: 1690
+						} else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
+							var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1693
+							Client.Login_isUsernameRemembered = var3; // L: 1694
+							if (!var3) { // L: 1695
+								class12.clientPreferences.method2297(""); // L: 1696
+							}
+
+							return 1; // L: 1698
+						} else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1701
+							return 1; // L: 1702
+						} else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) {
+							return 1; // L: 1705
+						} else if (var0 == 3146) {
+							var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1; // L: 1708
+							class12.clientPreferences.method2305(!var3); // L: 1709
+							return 1; // L: 1710
+						} else if (var0 == 3147) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class12.clientPreferences.method2226() ? 0 : 1; // L: 1713
+							return 1; // L: 1714
+						} else if (var0 == 3148) {
+							return 1; // L: 1717
+						} else if (var0 == 3149) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1720
+							return 1; // L: 1721
+						} else if (var0 == 3150) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1724
+							return 1; // L: 1725
+						} else if (var0 == 3151) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1728
+							return 1; // L: 1729
+						} else if (var0 == 3152) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1732
+							return 1; // L: 1733
+						} else if (var0 == 3153) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1736
+							return 1; // L: 1737
+						} else if (var0 == 3154) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class136.method2868(); // L: 1740
+							return 1; // L: 1741
+						} else if (var0 == 3155) {
+							--class9.Interpreter_stringStackSize; // L: 1744
+							return 1; // L: 1745
+						} else if (var0 == 3156) {
+							return 1; // L: 1748
+						} else if (var0 == 3157) {
+							class12.Interpreter_intStackSize -= 2; // L: 1751
+							return 1; // L: 1752
+						} else if (var0 == 3158) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1755
+							return 1; // L: 1756
+						} else if (var0 == 3159) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1759
+							return 1; // L: 1760
+						} else if (var0 == 3160) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1763
+							return 1; // L: 1764
+						} else if (var0 == 3161) {
+							--class12.Interpreter_intStackSize; // L: 1767
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1768
+							return 1; // L: 1769
+						} else if (var0 == 3162) {
+							--class12.Interpreter_intStackSize; // L: 1772
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1773
+							return 1; // L: 1774
+						} else if (var0 == 3163) {
+							--class9.Interpreter_stringStackSize; // L: 1777
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1778
+							return 1; // L: 1779
+						} else if (var0 == 3164) {
+							--class12.Interpreter_intStackSize; // L: 1782
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1783
+							return 1; // L: 1784
+						} else if (var0 == 3165) {
+							--class12.Interpreter_intStackSize; // L: 1787
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1788
+							return 1; // L: 1789
+						} else if (var0 == 3166) {
+							class12.Interpreter_intStackSize -= 2; // L: 1792
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1793
+							return 1; // L: 1794
+						} else if (var0 == 3167) {
+							class12.Interpreter_intStackSize -= 2; // L: 1797
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1798
+							return 1; // L: 1799
+						} else if (var0 == 3168) {
+							class12.Interpreter_intStackSize -= 2; // L: 1802
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1803
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1804
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1805
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1806
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1807
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1808
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1809
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1810
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 1811
+							return 1; // L: 1812
+						} else if (var0 == 3169) {
+							return 1; // L: 1815
+						} else if (var0 == 3170) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1818
+							return 1; // L: 1819
+						} else if (var0 == 3171) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1822
+							return 1; // L: 1823
+						} else if (var0 == 3172) {
+							--class12.Interpreter_intStackSize; // L: 1826
+							return 1; // L: 1827
+						} else if (var0 == 3173) {
+							--class12.Interpreter_intStackSize; // L: 1830
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1831
+							return 1; // L: 1832
+						} else if (var0 == 3174) {
+							--class12.Interpreter_intStackSize; // L: 1835
+							return 1; // L: 1836
+						} else if (var0 == 3175) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 1839
+							return 1; // L: 1840
+						} else if (var0 == 3176) {
+							return 1; // L: 1843
+						} else if (var0 == 3177) {
+							return 1; // L: 1846
+						} else if (var0 == 3178) {
+							--class9.Interpreter_stringStackSize; // L: 1849
+							return 1; // L: 1850
+						} else if (var0 == 3179) {
+							return 1; // L: 1853
+						} else if (var0 == 3180) {
+							--class9.Interpreter_stringStackSize; // L: 1856
+							return 1; // L: 1857
+						} else if (var0 == 3181) {
+							World.method1664(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1860
+							return 1; // L: 1861
+						} else if (var0 == 3182) {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = GameBuild.method5586(); // L: 1864
+							return 1; // L: 1865
+						} else if (var0 != 3183 && var0 != 3184) {
+							if (var0 == 3187) {
+								class9.Interpreter_stringStackSize -= 2; // L: 1872
+								return 1; // L: 1873
+							} else {
+								return var0 == 3188 ? 1 : 2; // L: 1876 1878
+							}
+						} else {
+							--class12.Interpreter_intStackSize; // L: 1868
+							return 1; // L: 1869
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("ii")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/String;I)V",
+		garbageValue = "424896925"
+	)
+	static void method1964(int var0, String var1) {
+		int var2 = Players.Players_count; // L: 9727
+		int[] var3 = Players.Players_indices; // L: 9728
+		boolean var4 = false; // L: 9729
+		Username var5 = new Username(var1, class391.loginType); // L: 9730
+
+		for (int var6 = 0; var6 < var2; ++var6) { // L: 9731
+			Player var7 = Client.players[var3[var6]]; // L: 9732
+			if (var7 != null && var7 != ModelData0.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9733
+				PacketBufferNode var8;
+				if (var0 == 1) { // L: 9734
+					var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2965, Client.packetWriter.isaacCipher); // L: 9736
+					var8.packetBuffer.writeShort(var3[var6]); // L: 9737
+					var8.packetBuffer.method7687(0); // L: 9738
+					Client.packetWriter.addNode(var8); // L: 9739
+				} else if (var0 == 4) { // L: 9741
+					var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2962, Client.packetWriter.isaacCipher); // L: 9743
+					var8.packetBuffer.writeByte(0); // L: 9744
+					var8.packetBuffer.method7641(var3[var6]); // L: 9745
+					Client.packetWriter.addNode(var8); // L: 9746
+				} else if (var0 == 6) { // L: 9748
+					var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2969, Client.packetWriter.isaacCipher); // L: 9750
+					var8.packetBuffer.method7641(var3[var6]); // L: 9751
+					var8.packetBuffer.method7687(0); // L: 9752
+					Client.packetWriter.addNode(var8); // L: 9753
+				} else if (var0 == 7) { // L: 9755
+					var8 = WallDecoration.getPacketBufferNode(ClientPacket.field2980, Client.packetWriter.isaacCipher); // L: 9757
+					var8.packetBuffer.method7596(0); // L: 9758
+					var8.packetBuffer.method7641(var3[var6]); // L: 9759
+					Client.packetWriter.addNode(var8); // L: 9760
+				}
+
+				var4 = true; // L: 9762
+				break;
+			}
+		}
+
+		if (!var4) { // L: 9766
+			WorldMapEvent.addGameMessage(4, "", "Unable to find " + var1);
+		}
+
+	} // L: 9767
 }

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

@@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fs")
+@ObfuscatedName("fc")
 @Implements("EnumComposition")
 public class EnumComposition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Llp;"
 	)
 	@Export("EnumDefinition_archive")
-	static AbstractArchive EnumDefinition_archive;
+	public static AbstractArchive EnumDefinition_archive;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lir;"
 	)
 	@Export("EnumDefinition_cached")
 	static EvictingDualNodeHashTable EnumDefinition_cached;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("inputType")
 	public char inputType;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("outputType")
 	public char outputType;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1966559045
+		intValue = -1422398085
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1434238149
+		intValue = -1977259169
 	)
 	@Export("outputCount")
 	public int outputCount;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@Export("keys")
 	public int[] keys;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@Export("intVals")
 	public int[] intVals;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@Export("strVals")
 	public String[] strVals;
 
@@ -59,85 +59,108 @@ public class EnumComposition extends DualNode {
 		this.outputCount = 0; // L: 17
 	} // L: 22
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;B)V",
+		descriptor = "(Lpx;B)V",
-		garbageValue = "-91"
+		garbageValue = "2"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 40
+			int var2 = var1.readUnsignedByte(); // L: 36
-			if (var2 == 0) { // L: 41
+			if (var2 == 0) { // L: 37
-				return; // L: 44
+				return; // L: 40
 			}
 
-			this.decodeNext(var1, var2); // L: 42
+			this.decodeNext(var1, var2); // L: 38
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;II)V",
+		descriptor = "(Lpx;II)V",
-		garbageValue = "-2119565699"
+		garbageValue = "2123865922"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 47
+		if (var2 == 1) { // L: 43
 			this.inputType = (char)var1.readUnsignedByte();
-		} else if (var2 == 2) { // L: 48
+		} else if (var2 == 2) { // L: 44
 			this.outputType = (char)var1.readUnsignedByte();
-		} else if (var2 == 3) { // L: 49
+		} else if (var2 == 3) { // L: 45
 			this.defaultStr = var1.readStringCp1252NullTerminated();
-		} else if (var2 == 4) { // L: 50
+		} else if (var2 == 4) { // L: 46
 			this.defaultInt = var1.readInt();
 		} else {
 			int var3;
-			if (var2 == 5) { // L: 51
+			if (var2 == 5) { // L: 47
-				this.outputCount = var1.readUnsignedShort(); // L: 52
+				this.outputCount = var1.readUnsignedShort(); // L: 48
-				this.keys = new int[this.outputCount]; // L: 53
+				this.keys = new int[this.outputCount]; // L: 49
-				this.strVals = new String[this.outputCount]; // L: 54
+				this.strVals = new String[this.outputCount]; // L: 50
 
-				for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55
+				for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 51
-					this.keys[var3] = var1.readInt(); // L: 56
+					this.keys[var3] = var1.readInt(); // L: 52
-					this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57
+					this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 53
 				}
-			} else if (var2 == 6) { // L: 60
+			} else if (var2 == 6) { // L: 56
-				this.outputCount = var1.readUnsignedShort(); // L: 61
+				this.outputCount = var1.readUnsignedShort(); // L: 57
-				this.keys = new int[this.outputCount]; // L: 62
+				this.keys = new int[this.outputCount]; // L: 58
-				this.intVals = new int[this.outputCount]; // L: 63
+				this.intVals = new int[this.outputCount]; // L: 59
 
-				for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64
+				for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 60
-					this.keys[var3] = var1.readInt(); // L: 65
+					this.keys[var3] = var1.readInt(); // L: 61
-					this.intVals[var3] = var1.readInt(); // L: 66
+					this.intVals[var3] = var1.readInt(); // L: 62
 				}
 			}
 		}
 
-	} // L: 70
+	} // L: 66
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
+		descriptor = "(I)I",
-		garbageValue = "1"
+		garbageValue = "1493000853"
 	)
 	@Export("size")
 	public int size() {
-		return this.outputCount; // L: 73
+		return this.outputCount; // L: 69
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lky;IIII)V",
+		descriptor = "([BIII)Ljava/lang/String;",
-		garbageValue = "-585894477"
+		garbageValue = "2111850720"
 	)
-	@Export("Widget_setKeyRate")
+	@Export("decodeStringCp1252")
-	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+	public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
-		if (var0.field3417 == null) { // L: 1012
+		char[] var3 = new char[var2]; // L: 82
-			throw new RuntimeException(); // L: 1013
+		int var4 = 0; // L: 83
-		} else {
+
-			var0.field3417[var1] = var2; // L: 1015
+		for (int var5 = 0; var5 < var2; ++var5) { // L: 84
-			var0.field3418[var1] = var3; // L: 1016
+			int var6 = var0[var5 + var1] & 255; // L: 85
+			if (var6 != 0) { // L: 86
+				if (var6 >= 128 && var6 < 160) { // L: 87
+					char var7 = class341.cp1252AsciiExtension[var6 - 128]; // L: 88
+					if (var7 == 0) { // L: 89
+						var7 = '?';
 					}
-	} // L: 1017
+
+					var6 = var7; // L: 90
+				}
+
+				var3[var4++] = (char)var6; // L: 92
+			}
+		}
+
+		return new String(var3, 0, var4); // L: 94
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "2023636787"
+	)
+	public static void method3400() {
+		FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 96
+	} // L: 97
 }

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

@@ -3,30 +3,30 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ig")
+@ObfuscatedName("ir")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Loz;"
+		descriptor = "Loq;"
 	)
 	@Export("dualNode")
 	DualNode dualNode;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("remainingCapacity")
 	int remainingCapacity;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "Lpt;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lma;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
@@ -44,61 +44,61 @@ public final class EvictingDualNodeHashTable {
 		this.hashTable = new IterableNodeHashTable(var2); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(J)Loz;"
+		descriptor = "(J)Loq;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
-		DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 23
+		DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 24
-		if (var3 != null) { // L: 24
+		if (var3 != null) { // L: 25
-			this.deque.add(var3); // L: 25
+			this.deque.add(var3); // L: 26
 		}
 
-		return var3; // L: 28
+		return var3; // L: 29
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("remove")
 	public void remove(long var1) {
-		DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32
+		DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 33
-		if (var3 != null) { // L: 33
+		if (var3 != null) { // L: 34
-			var3.remove(); // L: 34
+			var3.remove(); // L: 35
-			var3.removeDual(); // L: 35
+			var3.removeDual(); // L: 36
-			++this.remainingCapacity; // L: 36
+			++this.remainingCapacity; // L: 37
 		}
 
-	} // L: 38
+	} // L: 39
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Loz;J)V"
+		descriptor = "(Loq;J)V"
 	)
 	@Export("put")
 	public void put(DualNode var1, long var2) {
-		if (this.remainingCapacity == 0) { // L: 41
+		if (this.remainingCapacity == 0) { // L: 42
-			DualNode var4 = this.deque.removeLast(); // L: 42
+			DualNode var4 = this.deque.removeLast(); // L: 43
-			var4.remove(); // L: 43
+			var4.remove(); // L: 44
-			var4.removeDual(); // L: 44
+			var4.removeDual(); // L: 45
-			if (var4 == this.dualNode) { // L: 45
+			if (var4 == this.dualNode) { // L: 46
-				var4 = this.deque.removeLast(); // L: 46
+				var4 = this.deque.removeLast(); // L: 47
-				var4.remove(); // L: 47
+				var4.remove(); // L: 48
-				var4.removeDual(); // L: 48
+				var4.removeDual(); // L: 49
 			}
 		} else {
-			--this.remainingCapacity; // L: 51
+			--this.remainingCapacity; // L: 52
 		}
 
-		this.hashTable.put(var1, var2); // L: 52
+		this.hashTable.put(var1, var2); // L: 53
-		this.deque.add(var1); // L: 53
+		this.deque.add(var1); // L: 54
-	} // L: 54
+	} // L: 55
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("clear")
 	public void clear() {
-		this.deque.clear(); // L: 57
+		this.deque.clear(); // L: 58
-		this.hashTable.clear(); // L: 58
+		this.hashTable.clear(); // L: 59
-		this.dualNode = new DualNode(); // L: 59
+		this.dualNode = new DualNode(); // L: 60
-		this.remainingCapacity = this.capacity; // L: 60
+		this.remainingCapacity = this.capacity; // L: 61
-	} // L: 61
+	} // L: 62
 }

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

@@ -2,34 +2,93 @@ 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("ia")
+@ObfuscatedName("gg")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("b")
+	@ObfuscatedName("jg")
 	@ObfuscatedGetter(
-		intValue = -360796493
+		intValue = 1186041129
 	)
-	static int field2664;
+	@Export("cameraZ")
-	@ObfuscatedName("v")
+	static int cameraZ;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1964753239
+		intValue = 1839266109
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 538442569
+		intValue = 475209611
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 708188277
+		intValue = 1225057041
 	)
 	@Export("z")
 	int z;
 
 	FaceNormal() {
 	} // L: 8
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(ILbb;ZI)I",
+		garbageValue = "-1800924378"
+	)
+	static int method4212(int var0, Script var1, boolean var2) {
+		Widget var7;
+		if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1269
+			int var4;
+			if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1286
+				var7 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1287
+				var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 1288
+				if (var4 >= 1 && var4 <= 10) { // L: 1289
+					class93 var8 = new class93(var4, var7.id, var7.childIndex, var7.itemId); // L: 1292
+					Interpreter.field821.add(var8); // L: 1293
+					return 1; // L: 1294
+				} else {
+					throw new RuntimeException(); // L: 1290
+				}
+			} else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1296
+				class12.Interpreter_intStackSize -= 3; // L: 1297
+				int var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 1298
+				var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 1299
+				int var5 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 1300
+				if (var5 >= 1 && var5 <= 10) { // L: 1301
+					class93 var6 = new class93(var5, var3, var4, class92.getWidget(var3).itemId); // L: 1304
+					Interpreter.field821.add(var6); // L: 1305
+					return 1; // L: 1306
+				} else {
+					throw new RuntimeException(); // L: 1302
+				}
+			} else {
+				return 2; // L: 1308
+			}
+		} else if (Interpreter.field823 >= 10) { // L: 1270
+			throw new RuntimeException(); // L: 1271
+		} else {
+			if (var0 >= 2000) { // L: 1274
+				var7 = class92.getWidget(Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]); // L: 1275
+			} else {
+				var7 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1277
+			}
+
+			if (var7.onResize == null) { // L: 1278
+				return 0;
+			} else {
+				ScriptEvent var9 = new ScriptEvent(); // L: 1279
+				var9.widget = var7; // L: 1280
+				var9.args = var7.onResize; // L: 1281
+				var9.field1054 = Interpreter.field823 + 1; // L: 1282
+				Client.scriptEvents.addFirst(var9); // L: 1283
+				return 1; // L: 1284
+			}
+		}
+	}
 }

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

@@ -1,26 +1,144 @@
+import java.io.File;
 import java.util.Hashtable;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fm")
+@ObfuscatedName("fg")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("FileSystem_hasPermissions")
 	static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
+	@Export("FileSystem_cacheDir")
+	static File FileSystem_cacheDir;
+	@ObfuscatedName("l")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
+	@ObfuscatedName("x")
+	@Export("ByteArrayPool_alternativeSizes")
+	static int[] ByteArrayPool_alternativeSizes;
 
 	static {
 		FileSystem_hasPermissions = false; // L: 7
 		FileSystem_cacheFiles = new Hashtable(16);
 	} // L: 9
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("o")
-	@Export("Entity_unpackID")
+	@ObfuscatedSignature(
-	public static int Entity_unpackID(long var0) {
+		descriptor = "(IB)Lgl;",
-		return (int)(var0 >>> 17 & 4294967295L); // L: 65
+		garbageValue = "75"
+	)
+	@Export("ItemDefinition_get")
+	public static ItemComposition ItemDefinition_get(int var0) {
+		ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 84
+		if (var1 != null) { // L: 85
+			return var1;
+		} else {
+			byte[] var2 = ItemComposition.ItemDefinition_archive.takeFile(10, var0); // L: 86
+			var1 = new ItemComposition(); // L: 87
+			var1.id = var0; // L: 88
+			if (var2 != null) { // L: 89
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.post(); // L: 90
+			if (var1.noteTemplate != -1) { // L: 91
+				var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note));
+			}
+
+			if (var1.notedId != -1) { // L: 92
+				var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId));
+			}
+
+			if (var1.placeholderTemplate != -1) { // L: 93
+				var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder));
+			}
+
+			if (!class82.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94
+				var1.name = "Members object"; // L: 95
+				var1.isTradable = false; // L: 96
+
+				int var3;
+				for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 97
+					var1.groundActions[var3] = null; // L: 98
+				}
+
+				for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 100
+					if (var3 != 4) { // L: 101
+						var1.inventoryActions[var3] = null; // L: 102
 					}
 				}
+
+				var1.shiftClickIndex = -2; // L: 105
+				var1.team = 0; // L: 106
+				if (var1.params != null) { // L: 107
+					boolean var6 = false; // L: 108
+
+					for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 109
+						ParamComposition var5 = class78.getParamDefinition((int)var4.key); // L: 110
+						if (var5.autoDisable) { // L: 111
+							var4.remove();
+						} else {
+							var6 = true; // L: 112
+						}
+					}
+
+					if (!var6) { // L: 114
+						var1.params = null;
+					}
+				}
+			}
+
+			ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117
+			return var1; // L: 118
+		}
+	}
+
+	@ObfuscatedName("jf")
+	@ObfuscatedSignature(
+		descriptor = "(Lki;IIIIIIB)V",
+		garbageValue = "-43"
+	)
+	static final void method3168(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (Client.field559) { // L: 10831
+			Client.alternativeScrollbarWidth = 32;
+		} else {
+			Client.alternativeScrollbarWidth = 0; // L: 10832
+		}
+
+		Client.field559 = false; // L: 10833
+		int var7;
+		if (MouseHandler.MouseHandler_currentButton == 1 || !Login.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10834
+			if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10835
+				var0.scrollY -= 4; // L: 10836
+				GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10837
+			} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10839
+				var0.scrollY += 4; // L: 10840
+				GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10841
+			} else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10843
+				var7 = var3 * (var3 - 32) / var4; // L: 10844
+				if (var7 < 8) { // L: 10845
+					var7 = 8;
+				}
+
+				int var8 = var6 - var2 - 16 - var7 / 2; // L: 10846
+				int var9 = var3 - 32 - var7; // L: 10847
+				var0.scrollY = var8 * (var4 - var3) / var9; // L: 10848
+				GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10849
+				Client.field559 = true; // L: 10850
+			}
+		}
+
+		if (Client.mouseWheelRotation != 0) { // L: 10853
+			var7 = var0.width; // L: 10854
+			if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10855
+				var0.scrollY += Client.mouseWheelRotation * 45; // L: 10856
+				GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var0); // L: 10857
+			}
+		}
+
+	} // L: 10860
+}

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

@@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("qe")
+@ObfuscatedName("qw")
 @Implements("FillMode")
 public enum FillMode implements MouseWheel {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lqe;"
+		descriptor = "Lqw;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lqe;"
+		descriptor = "Lqw;"
 	)
-	field4695(1, 1),
+	field4754(1, 1),
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lqe;"
+		descriptor = "Lqw;"
 	)
-	field4694(2, 2);
+	field4753(2, 2);
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1363476013
+		intValue = 1271749217
 	)
-	public final int field4699;
+	public final int field4756;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -2111018979
+		intValue = 1401042551
 	)
-	final int field4698;
+	final int field4757;
 
 	FillMode(int var3, int var4) {
-		this.field4699 = var3; // L: 19
+		this.field4756 = var3; // L: 19
-		this.field4698 = var4; // L: 20
+		this.field4757 = var4; // L: 20
 	} // L: 21
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "16"
+		garbageValue = "30"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.field4698; // L: 24
+		return this.field4757; // L: 25
 	}
 }

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

@@ -4,168 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hp")
+@ObfuscatedName("ga")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 330018341
+		intValue = -1072704917
 	)
 	@Export("z")
 	int z;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1177773149
+		intValue = 1879154845
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 541305317
+		intValue = -514738537
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lgx;"
 	)
 	@Export("renderable")
 	public Renderable renderable;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		longValue = 1757180845189134269L
+		longValue = 7063129096182387665L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1754694829
+		intValue = 43519557
 	)
 	@Export("flags")
 	int flags;
 
 	FloorDecoration() {
 	} // L: 11
-
-	@ObfuscatedName("i")
-	public static int method4592(long var0) {
-		return (int)(var0 >>> 14 & 3L); // L: 57
-	}
-
-	@ObfuscatedName("hx")
-	@ObfuscatedSignature(
-		descriptor = "(IIZI)V",
-		garbageValue = "718192951"
-	)
-	static final void method4591(int var0, int var1, boolean var2) {
-		if (!var2 || var0 != ScriptEvent.field1042 || KitDefinition.field1855 != var1) { // L: 5544
-			ScriptEvent.field1042 = var0; // L: 5547
-			KitDefinition.field1855 = var1; // L: 5548
-			Decimator.updateGameState(25); // L: 5549
-			MusicPatch.drawLoadingMessage("Loading - please wait.", true); // L: 5550
-			int var3 = GrandExchangeOfferOwnWorldComparator.baseX; // L: 5551
-			int var4 = VarcInt.baseY; // L: 5552
-			GrandExchangeOfferOwnWorldComparator.baseX = (var0 - 6) * 8; // L: 5553
-			VarcInt.baseY = (var1 - 6) * 8; // L: 5554
-			int var5 = GrandExchangeOfferOwnWorldComparator.baseX - var3; // L: 5555
-			int var6 = VarcInt.baseY - var4; // L: 5556
-			var3 = GrandExchangeOfferOwnWorldComparator.baseX; // L: 5557
-			var4 = VarcInt.baseY; // L: 5558
-
-			int var7;
-			int var9;
-			int[] var10000;
-			for (var7 = 0; var7 < 32768; ++var7) { // L: 5559
-				NPC var19 = Client.npcs[var7]; // L: 5560
-				if (var19 != null) { // L: 5561
-					for (var9 = 0; var9 < 10; ++var9) { // L: 5562
-						var10000 = var19.pathX; // L: 5563
-						var10000[var9] -= var5;
-						var10000 = var19.pathY; // L: 5564
-						var10000[var9] -= var6;
-					}
-
-					var19.x -= var5 * 128; // L: 5566
-					var19.y -= var6 * 128; // L: 5567
-				}
-			}
-
-			for (var7 = 0; var7 < 2048; ++var7) { // L: 5570
-				Player var22 = Client.players[var7]; // L: 5571
-				if (var22 != null) { // L: 5572
-					for (var9 = 0; var9 < 10; ++var9) { // L: 5573
-						var10000 = var22.pathX; // L: 5574
-						var10000[var9] -= var5;
-						var10000 = var22.pathY; // L: 5575
-						var10000[var9] -= var6;
-					}
-
-					var22.x -= var5 * 128; // L: 5577
-					var22.y -= var6 * 128; // L: 5578
-				}
-			}
-
-			byte var20 = 0; // L: 5581
-			byte var8 = 104; // L: 5582
-			byte var21 = 1; // L: 5583
-			if (var5 < 0) { // L: 5584
-				var20 = 103; // L: 5585
-				var8 = -1; // L: 5586
-				var21 = -1; // L: 5587
-			}
-
-			byte var10 = 0; // L: 5589
-			byte var11 = 104; // L: 5590
-			byte var12 = 1; // L: 5591
-			if (var6 < 0) { // L: 5592
-				var10 = 103; // L: 5593
-				var11 = -1; // L: 5594
-				var12 = -1; // L: 5595
-			}
-
-			int var14;
-			for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5597
-				for (var14 = var10; var11 != var14; var14 += var12) { // L: 5598
-					int var15 = var5 + var13; // L: 5599
-					int var16 = var14 + var6; // L: 5600
-
-					for (int var17 = 0; var17 < 4; ++var17) { // L: 5601
-						if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
-							Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5602
-						} else {
-							Client.groundItems[var17][var13][var14] = null; // L: 5603
-						}
-					}
-				}
-			}
-
-			for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5607 5608 5612
-				var18.x -= var5; // L: 5609
-				var18.y -= var6; // L: 5610
-				if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5611
-					var18.remove();
-				}
-			}
-
-			if (Client.destinationX != 0) { // L: 5614
-				Client.destinationX -= var5; // L: 5615
-				Client.destinationY -= var6; // L: 5616
-			}
-
-			Client.soundEffectCount = 0; // L: 5618
-			Client.isCameraLocked = false; // L: 5619
-			WorldMapLabelSize.cameraX -= var5 << 7; // L: 5620
-			class154.cameraZ -= var6 << 7; // L: 5621
-			class10.oculusOrbFocalPointX -= var5 << 7; // L: 5622
-			ClientPacket.oculusOrbFocalPointY -= var6 << 7; // L: 5623
-			Client.field714 = -1; // L: 5624
-			Client.graphicsObjects.clear(); // L: 5625
-			Client.projectiles.clear(); // L: 5626
-
-			for (var14 = 0; var14 < 4; ++var14) { // L: 5627
-				Client.collisionMaps[var14].clear();
-			}
-
-		}
-	} // L: 5545 5628
 }

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

@@ -1,84 +1,78 @@
-import java.io.File;
-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;
 
-@ObfuscatedName("gc")
+@ObfuscatedName("gi")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Llp;"
 	)
 	@Export("FloorOverlayDefinition_archive")
 	public static AbstractArchive FloorOverlayDefinition_archive;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lir;"
 	)
 	@Export("FloorOverlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
-	@Export("ByteArrayPool_alternativeSizes")
-	static int[] ByteArrayPool_alternativeSizes;
-	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 858309139
+		intValue = 789415847
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -297032293
+		intValue = -1583015683
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 183406227
+		intValue = 84531747
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -769091361
+		intValue = 416276119
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1068550667
+		intValue = 334853597
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 539781723
+		intValue = -1974079687
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1744203063
+		intValue = 247371203
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1545602265
+		intValue = -1197955665
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 658215089
+		intValue = 845891437
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -87,251 +81,186 @@ public class FloorOverlayDefinition extends DualNode {
 		FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11
 	}
 
-	FloorOverlayDefinition() {
+	public FloorOverlayDefinition() {
 		this.primaryRgb = 0; // L: 12
 		this.texture = -1; // L: 13
 		this.hideUnderlay = true; // L: 14
 		this.secondaryRgb = -1; // L: 15
-	} // L: 23
+	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1367888420"
+		garbageValue = "462057937"
 	)
 	@Export("postDecode")
-	void postDecode() {
+	public void postDecode() {
-		if (this.secondaryRgb != -1) { // L: 37
+		if (this.secondaryRgb != -1) { // L: 39
-			this.setHsl(this.secondaryRgb); // L: 38
+			this.setHsl(this.secondaryRgb); // L: 40
-			this.secondaryHue = this.hue; // L: 39
+			this.secondaryHue = this.hue; // L: 41
-			this.secondarySaturation = this.saturation;
+			this.secondarySaturation = this.saturation; // L: 42
-			this.secondaryLightness = this.lightness;
+			this.secondaryLightness = this.lightness; // L: 43
 		}
 
-		this.setHsl(this.primaryRgb);
+		this.setHsl(this.primaryRgb); // L: 45
-	} // L: 44
+	} // L: 46
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;II)V",
+		descriptor = "(Lpx;IB)V",
-		garbageValue = "1515870395"
+		garbageValue = "125"
 	)
 	@Export("decode")
-	void decode(Buffer var1, int var2) {
+	public void decode(Buffer var1, int var2) {
 		while (true) {
-			int var3 = var1.readUnsignedByte();
+			int var3 = var1.readUnsignedByte(); // L: 50
-			if (var3 == 0) { // L: 49
+			if (var3 == 0) { // L: 51
-				return; // L: 52
+				return; // L: 54
 			}
 
-			this.decodeNext(var1, var3, var2);
+			this.decodeNext(var1, var3, var2); // L: 52
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;III)V",
+		descriptor = "(Lpx;IIB)V",
-		garbageValue = "-343485551"
+		garbageValue = "104"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
-		if (var2 == 1) {
+		if (var2 == 1) { // L: 57
 			this.primaryRgb = var1.readMedium();
-		} else if (var2 == 2) {
+		} else if (var2 == 2) { // L: 58
 			this.texture = var1.readUnsignedByte();
-		} else if (var2 == 5) { // L: 57
+		} else if (var2 == 5) { // L: 59
 			this.hideUnderlay = false;
 		} else if (var2 == 7) {
-			this.secondaryRgb = var1.readMedium(); // L: 58
+			this.secondaryRgb = var1.readMedium(); // L: 60
-		} else if (var2 == 8) {
+		} else if (var2 == 8) { // L: 61
 		}
 
-	}
+	} // L: 63
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1828314979"
+		garbageValue = "-451287005"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
-		double var2 = (double)(var1 >> 16 & 255) / 256.0D;
+		double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 66
-		double var4 = (double)(var1 >> 8 & 255) / 256.0D;
+		double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 67
-		double var6 = (double)(var1 & 255) / 256.0D;
+		double var6 = (double)(var1 & 255) / 256.0D; // L: 68
-		double var8 = var2;
+		double var8 = var2; // L: 69
-		if (var4 < var2) {
+		if (var4 < var2) { // L: 70
 			var8 = var4;
 		}
 
-		if (var6 < var8) {
+		if (var6 < var8) { // L: 71
 			var8 = var6;
 		}
 
-		double var10 = var2;
+		double var10 = var2; // L: 72
-		if (var4 > var2) {
+		if (var4 > var2) { // L: 73
 			var10 = var4;
 		}
 
-		if (var6 > var10) { // L: 72
+		if (var6 > var10) { // L: 74
 			var10 = var6;
 		}
 
-		double var12 = 0.0D;
+		double var12 = 0.0D; // L: 75
-		double var14 = 0.0D;
+		double var14 = 0.0D; // L: 76
-		double var16 = (var8 + var10) / 2.0D;
+		double var16 = (var10 + var8) / 2.0D; // L: 77
-		if (var8 != var10) { // L: 76
+		if (var8 != var10) { // L: 78
-			if (var16 < 0.5D) {
+			if (var16 < 0.5D) { // L: 79
 				var14 = (var10 - var8) / (var8 + var10);
 			}
 
-			if (var16 >= 0.5D) { // L: 78
+			if (var16 >= 0.5D) { // L: 80
 				var14 = (var10 - var8) / (2.0D - var10 - var8);
 			}
 
-			if (var10 == var2) { // L: 79
+			if (var2 == var10) { // L: 81
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var10 == var4) { // L: 80
+			} else if (var10 == var4) { // L: 82
-				var12 = 2.0D + (var6 - var2) / (var10 - var8);
+				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
-			} else if (var10 == var6) {
+			} else if (var6 == var10) {
-				var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 81
+				var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 83
 			}
 		}
 
-		var12 /= 6.0D; // L: 83
+		var12 /= 6.0D; // L: 85
-		this.hue = (int)(var12 * 256.0D);
+		this.hue = (int)(var12 * 256.0D); // L: 86
-		this.saturation = (int)(256.0D * var14); // L: 85
+		this.saturation = (int)(256.0D * var14); // L: 87
-		this.lightness = (int)(256.0D * var16); // L: 86
+		this.lightness = (int)(256.0D * var16); // L: 88
-		if (this.saturation < 0) {
+		if (this.saturation < 0) { // L: 89
 			this.saturation = 0;
-		} else if (this.saturation > 255) {
+		} else if (this.saturation > 255) { // L: 90
 			this.saturation = 255;
 		}
 
-		if (this.lightness < 0) {
+		if (this.lightness < 0) { // L: 91
 			this.lightness = 0;
-		} else if (this.lightness > 255) { // L: 90
+		} else if (this.lightness > 255) { // L: 92
 			this.lightness = 255;
 		}
 
-	} // L: 91
+	} // L: 93
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIB)V",
+		descriptor = "(I)Ljm;",
-		garbageValue = "55"
+		garbageValue = "2018260435"
 	)
-	public static void method3788(String var0, String var1, int var2, int var3) throws IOException {
+	static PacketBufferNode method3700() {
-		JagexCache.idxCount = var3; // L: 40
+		return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23
-		WorldMapSection1.cacheGamebuild = var2; // L: 41
-
-		try {
-			class10.operatingSystemName = System.getProperty("os.name"); // L: 43
-		} catch (Exception var15) { // L: 45
-			class10.operatingSystemName = "Unknown"; // L: 46
 	}
 
-		class128.formattedOperatingSystemName = class10.operatingSystemName.toLowerCase(); // L: 48
+	@ObfuscatedName("jb")
-
+	@ObfuscatedSignature(
-		try {
+		descriptor = "(Lki;IIZB)V",
-			NetSocket.userHomeDirectory = System.getProperty("user.home"); // L: 50
+		garbageValue = "60"
-			if (NetSocket.userHomeDirectory != null) { // L: 51
+	)
-				NetSocket.userHomeDirectory = NetSocket.userHomeDirectory + "/";
+	@Export("alignWidgetSize")
-			}
+	static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
-		} catch (Exception var14) { // L: 53
+		int var4 = var0.width; // L: 10796
+		int var5 = var0.height; // L: 10797
+		if (var0.widthAlignment == 0) { // L: 10798
+			var0.width = var0.rawWidth;
+		} else if (var0.widthAlignment == 1) { // L: 10799
+			var0.width = var1 - var0.rawWidth;
+		} else if (var0.widthAlignment == 2) { // L: 10800
+			var0.width = var0.rawWidth * var1 >> 14;
 		}
 
-		try {
+		if (var0.heightAlignment == 0) { // L: 10801
-			if (class128.formattedOperatingSystemName.startsWith("win")) { // L: 55
+			var0.height = var0.rawHeight;
-				if (NetSocket.userHomeDirectory == null) { // L: 56
+		} else if (var0.heightAlignment == 1) { // L: 10802
-					NetSocket.userHomeDirectory = System.getenv("USERPROFILE");
+			var0.height = var2 - var0.rawHeight;
-				}
+		} else if (var0.heightAlignment == 2) {
-			} else if (NetSocket.userHomeDirectory == null) { // L: 59
+			var0.height = var2 * var0.rawHeight >> 14; // L: 10803
-				NetSocket.userHomeDirectory = System.getenv("HOME");
 		}
 
-			if (NetSocket.userHomeDirectory != null) { // L: 61
+		if (var0.widthAlignment == 4) { // L: 10804
-				NetSocket.userHomeDirectory = NetSocket.userHomeDirectory + "/";
+			var0.width = var0.height * var0.field3411 / var0.field3494;
-			}
-		} catch (Exception var13) { // L: 63
 		}
 
-		if (NetSocket.userHomeDirectory == null) { // L: 64
+		if (var0.heightAlignment == 4) { // L: 10805
-			NetSocket.userHomeDirectory = "~/";
+			var0.height = var0.field3494 * var0.width / var0.field3411;
 		}
 
-		ItemContainer.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", NetSocket.userHomeDirectory, "/tmp/", ""}; // L: 65
+		if (var0.contentType == 1337) { // L: 10806
-		class216.cacheSubPaths = new String[]{".jagex_cache_" + WorldMapSection1.cacheGamebuild, ".file_store_" + WorldMapSection1.cacheGamebuild}; // L: 66
+			Client.viewportWidget = var0;
-		int var9 = 0;
-
-		label128:
-		while (var9 < 4) {
-			JagexCache.cacheDir = WorldMapArea.method4036(var0, var1, var9); // L: 68
-			if (!JagexCache.cacheDir.exists()) { // L: 69
-				JagexCache.cacheDir.mkdirs();
 		}
 
-			File[] var5 = JagexCache.cacheDir.listFiles(); // L: 70
+		if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10807
-			if (var5 == null) { // L: 71
+			ScriptEvent var6 = new ScriptEvent(); // L: 10808
-				break;
+			var6.widget = var0; // L: 10809
+			var6.args = var0.onResize; // L: 10810
+			Client.scriptEvents.addFirst(var6); // L: 10811
 		}
 
-			File[] var6 = var5; // L: 73
+	} // L: 10813
-			int var7 = 0;
-
-			while (true) {
-				if (var7 >= var6.length) {
-					break label128;
-				}
-
-				File var8 = var6[var7]; // L: 75
-				if (!AbstractWorldMapIcon.method4405(var8, false)) { // L: 77
-					++var9; // L: 67
-					break;
-				}
-
-				++var7; // L: 74
-			}
-		}
-
-		class128.method2856(JagexCache.cacheDir); // L: 84
-
-		try {
-			File var4 = new File(NetSocket.userHomeDirectory, "random.dat"); // L: 87
-			int var11;
-			if (var4.exists()) { // L: 88
-				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 89
-			} else {
-				label110:
-				for (int var10 = 0; var10 < class216.cacheSubPaths.length; ++var10) { // L: 92
-					for (var11 = 0; var11 < ItemContainer.cacheParentPaths.length; ++var11) { // L: 93
-						File var12 = new File(ItemContainer.cacheParentPaths[var11] + class216.cacheSubPaths[var10] + File.separatorChar + "random.dat"); // L: 94
-						if (var12.exists()) { // L: 95
-							JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var12, "rw", 25L), 24, 0); // L: 96
-							break label110; // L: 97
-						}
-					}
-				}
-			}
-
-			if (JagexCache.JagexCache_randomDat == null) { // L: 102
-				RandomAccessFile var17 = new RandomAccessFile(var4, "rw"); // L: 103
-				var11 = var17.read(); // L: 104
-				var17.seek(0L); // L: 105
-				var17.write(var11); // L: 106
-				var17.seek(0L); // L: 107
-				var17.close(); // L: 108
-				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 109
-			}
-		} catch (IOException var16) { // L: 112
-		}
-
-		JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 114
-		JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 115
-		class115.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; // L: 116
-
-		for (var9 = 0; var9 < JagexCache.idxCount; ++var9) { // L: 117
-			class115.JagexCache_idxFiles[var9] = new BufferedFile(new AccessFile(Message.getFile("main_file_cache.idx" + var9), "rw", 1048576L), 6000, 0); // L: 118
-		}
-
-	} // L: 120
 }

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

@@ -4,48 +4,57 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fk")
+@ObfuscatedName("fa")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Llp;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
 	public static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lir;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
 	static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("i")
+	@ObfuscatedName("hn")
+	@Export("regionMapArchives")
+	static byte[][] regionMapArchives;
+	@ObfuscatedName("iz")
 	@ObfuscatedGetter(
-		intValue = 2001140681
+		intValue = -1688031679
+	)
+	@Export("selectedItemId")
+	static int selectedItemId;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = 1166691661
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1442875069
+		intValue = 1101049757
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1249056165
+		intValue = 2015074227
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1727815031
+		intValue = 1371638813
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 634259911
+		intValue = -1786707103
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -58,20 +67,20 @@ public class FloorUnderlayDefinition extends DualNode {
 		this.rgb = 0; // L: 12
 	} // L: 18
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
+		descriptor = "(B)V",
-		garbageValue = "1803560536"
+		garbageValue = "86"
 	)
 	@Export("postDecode")
 	void postDecode() {
 		this.setHsl(this.rgb); // L: 32
 	} // L: 33
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;II)V",
+		descriptor = "(Lpx;II)V",
-		garbageValue = "141274967"
+		garbageValue = "-1229195714"
 	)
 	@Export("decode")
 	void decode(Buffer var1, int var2) {
@@ -85,10 +94,10 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;III)V",
+		descriptor = "(Lpx;III)V",
-		garbageValue = "-606456868"
+		garbageValue = "1871549003"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -98,10 +107,10 @@ public class FloorUnderlayDefinition extends DualNode {
 
 	} // L: 46
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "15"
+		garbageValue = "118"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -128,10 +137,10 @@ public class FloorUnderlayDefinition extends DualNode {
 
 		double var12 = 0.0D; // L: 58
 		double var14 = 0.0D; // L: 59
-		double var16 = (var8 + var10) / 2.0D; // L: 60
+		double var16 = (var10 + var8) / 2.0D; // L: 60
 		if (var8 != var10) { // L: 61
 			if (var16 < 0.5D) { // L: 62
-				var14 = (var10 - var8) / (var10 + var8);
+				var14 = (var10 - var8) / (var8 + var10);
 			}
 
 			if (var16 >= 0.5D) { // L: 63
@@ -142,14 +151,14 @@ public class FloorUnderlayDefinition extends DualNode {
 				var12 = (var4 - var6) / (var10 - var8);
 			} else if (var10 == var4) { // L: 65
 				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
-			} else if (var10 == var6) {
+			} else if (var6 == var10) {
 				var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 66
 			}
 		}
 
 		var12 /= 6.0D; // L: 68
 		this.saturation = (int)(var14 * 256.0D); // L: 69
-		this.lightness = (int)(var16 * 256.0D); // L: 70
+		this.lightness = (int)(256.0D * var16); // L: 70
 		if (this.saturation < 0) { // L: 71
 			this.saturation = 0;
 		} else if (this.saturation > 255) { // L: 72
@@ -163,15 +172,131 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 
 		if (var16 > 0.5D) { // L: 75
-			this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D);
+			this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14);
 		} else {
-			this.hueMultiplier = (int)(var14 * var16 * 512.0D); // L: 76
+			this.hueMultiplier = (int)(512.0D * var16 * var14); // L: 76
 		}
 
 		if (this.hueMultiplier < 1) { // L: 77
 			this.hueMultiplier = 1;
 		}
 
-		this.hue = (int)((double)this.hueMultiplier * var12); // L: 78
+		this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 78
 	} // L: 79
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(Lpc;II)Z",
+		garbageValue = "1224143507"
+	)
+	@Export("updateExternalPlayer")
+	static boolean updateExternalPlayer(PacketBuffer var0, int var1) {
+		int var2 = var0.readBits(2); // L: 376
+		int var3;
+		int var4;
+		int var7;
+		int var8;
+		int var9;
+		int var10;
+		if (var2 == 0) { // L: 377
+			if (var0.readBits(1) != 0) { // L: 378
+				updateExternalPlayer(var0, var1);
+			}
+
+			var3 = var0.readBits(13); // L: 379
+			var4 = var0.readBits(13); // L: 380
+			boolean var12 = var0.readBits(1) == 1; // L: 381
+			if (var12) { // L: 382
+				Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
+			}
+
+			if (Client.players[var1] != null) { // L: 383
+				throw new RuntimeException(); // L: 384
+			} else {
+				Player var11 = Client.players[var1] = new Player(); // L: 386
+				var11.index = var1; // L: 387
+				if (Players.field1307[var1] != null) { // L: 388
+					var11.read(Players.field1307[var1]);
+				}
+
+				var11.orientation = Players.Players_orientations[var1]; // L: 389
+				var11.targetIndex = Players.Players_targetIndices[var1]; // L: 390
+				var7 = Players.Players_regions[var1]; // L: 391
+				var8 = var7 >> 28; // L: 392
+				var9 = var7 >> 14 & 255; // L: 393
+				var10 = var7 & 255; // L: 394
+				var11.pathTraversed[0] = Players.field1302[var1]; // L: 395
+				var11.plane = (byte)var8; // L: 396
+				var11.resetPath((var9 << 13) + var3 - SecureRandomCallable.baseX, (var10 << 13) + var4 - GrandExchangeOfferOwnWorldComparator.baseY); // L: 397
+				var11.field1095 = false; // L: 398
+				return true; // L: 399
+			}
+		} else if (var2 == 1) { // L: 401
+			var3 = var0.readBits(2); // L: 402
+			var4 = Players.Players_regions[var1]; // L: 403
+			Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 404
+			return false; // L: 405
+		} else {
+			int var5;
+			int var6;
+			if (var2 == 2) { // L: 407
+				var3 = var0.readBits(5); // L: 408
+				var4 = var3 >> 3; // L: 409
+				var5 = var3 & 7; // L: 410
+				var6 = Players.Players_regions[var1]; // L: 411
+				var7 = (var6 >> 28) + var4 & 3; // L: 412
+				var8 = var6 >> 14 & 255; // L: 413
+				var9 = var6 & 255; // L: 414
+				if (var5 == 0) { // L: 415
+					--var8; // L: 416
+					--var9; // L: 417
+				}
+
+				if (var5 == 1) { // L: 419
+					--var9;
+				}
+
+				if (var5 == 2) { // L: 420
+					++var8; // L: 421
+					--var9; // L: 422
+				}
+
+				if (var5 == 3) { // L: 424
+					--var8;
+				}
+
+				if (var5 == 4) { // L: 425
+					++var8;
+				}
+
+				if (var5 == 5) { // L: 426
+					--var8; // L: 427
+					++var9; // L: 428
+				}
+
+				if (var5 == 6) { // L: 430
+					++var9;
+				}
+
+				if (var5 == 7) { // L: 431
+					++var8; // L: 432
+					++var9; // L: 433
+				}
+
+				Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 435
+				return false; // L: 436
+			} else {
+				var3 = var0.readBits(18); // L: 438
+				var4 = var3 >> 16; // L: 439
+				var5 = var3 >> 8 & 255; // L: 440
+				var6 = var3 & 255; // L: 441
+				var7 = Players.Players_regions[var1]; // L: 442
+				var8 = (var7 >> 28) + var4 & 3; // L: 443
+				var9 = var5 + (var7 >> 14) & 255; // L: 444
+				var10 = var7 + var6 & 255; // L: 445
+				Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 446
+				return false; // L: 447
+			}
+		}
+	}
 }

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("md")
+@ObfuscatedName("mx")
 @Implements("Font")
 public final class Font extends AbstractFont {
 	public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
@@ -13,7 +13,7 @@ public final class Font extends AbstractFont {
 		super(var1); // L: 11
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("drawGlyph")
 	final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15
@@ -55,7 +55,7 @@ public final class Font extends AbstractFont {
 		}
 	} // L: 44
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("drawGlyphAlpha")
 	final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 47

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

@@ -1,54 +1,61 @@
 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("ow")
+@ObfuscatedName("pi")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Lpi;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Lpi;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Lpi;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Lpi;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Lpi;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Lpi;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lqu;"
+		descriptor = "Lek;"
 	)
-	@Export("rasterProvider")
+	static ClanSettings field4583;
-	public static AbstractRasterProvider rasterProvider;
+	@ObfuscatedName("mm")
-	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = 957028551
+	)
+	@Export("menuY")
+	static int menuY;
+	@ObfuscatedName("p")
 	@Export("name")
 	String name;
 
@@ -62,47 +69,267 @@ public class FontName {
 	}
 
 	FontName(String var1) {
-		this.name = var1; // L: 16
+		this.name = var1; // L: 20
-	} // L: 17
+	} // L: 21
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)I",
+		descriptor = "(II)V",
-		garbageValue = "-2021946113"
+		garbageValue = "2051101893"
 	)
-	static int method7415(int var0, int var1, int var2) {
+	static void method7230(int var0) {
-		if (var2 > 179) { // L: 84
+	} // L: 32
-			var1 /= 2;
-		}
 
-		if (var2 > 192) { // L: 85
+	@ObfuscatedName("o")
-			var1 /= 2;
-		}
-
-		if (var2 > 217) { // L: 86
-			var1 /= 2;
-		}
-
-		if (var2 > 243) { // L: 87
-			var1 /= 2;
-		}
-
-		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 88
-		return var3; // L: 89
-	}
-
-	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)[I",
+		descriptor = "(I)[Lpi;",
-		garbageValue = "-1556490427"
+		garbageValue = "-1328353728"
 	)
-	public static int[] method7414() {
+	public static FontName[] method7232() {
-		int[] var0 = new int[KeyHandler.field118]; // L: 251
+		return new FontName[]{FontName_plain11, FontName_verdana13, FontName_bold12, FontName_verdana15, FontName_verdana11, FontName_plain12}; // L: 16
-
-		for (int var1 = 0; var1 < KeyHandler.field118; ++var1) { // L: 252
-			var0[var1] = KeyHandler.field143[var1]; // L: 253
 	}
 
-		return var0; // L: 255
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(IB)I",
+		garbageValue = "25"
+	)
+	public static int method7228(int var0) {
+		--var0; // L: 75
+		var0 |= var0 >>> 1; // L: 76
+		var0 |= var0 >>> 2; // L: 77
+		var0 |= var0 >>> 4; // L: 78
+		var0 |= var0 >>> 8; // L: 79
+		var0 |= var0 >>> 16; // L: 80
+		return var0 + 1; // L: 81
+	}
+
+	@ObfuscatedName("as")
+	@ObfuscatedSignature(
+		descriptor = "(ILbb;ZI)I",
+		garbageValue = "2124893336"
+	)
+	static int method7231(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3525
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3526
+			return 1; // L: 3527
+		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3529
+			class12.Interpreter_intStackSize -= 3; // L: 3530
+			Client.publicChatMode = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3531
+			class21.privateChatMode = class116.method2686(Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]); // L: 3532
+			if (class21.privateChatMode == null) { // L: 3533
+				class21.privateChatMode = PrivateChatMode.field4794;
+			}
+
+			Client.tradeChatMode = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 3534
+			PacketBufferNode var13 = WallDecoration.getPacketBufferNode(ClientPacket.field3052, Client.packetWriter.isaacCipher); // L: 3536
+			var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3537
+			var13.packetBuffer.writeByte(class21.privateChatMode.field4796); // L: 3538
+			var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3539
+			Client.packetWriter.addNode(var13); // L: 3540
+			return 1; // L: 3541
+		} else {
+			PacketBufferNode var6;
+			int var7;
+			String var8;
+			int var9;
+			if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3543
+				var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3544
+				class12.Interpreter_intStackSize -= 2; // L: 3545
+				var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3546
+				var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3547
+				var6 = WallDecoration.getPacketBufferNode(ClientPacket.field3039, Client.packetWriter.isaacCipher); // L: 3549
+				var6.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3550
+				var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3551
+				var6.packetBuffer.writeByte(var7 - 1); // L: 3552
+				var6.packetBuffer.writeByte(var9); // L: 3553
+				Client.packetWriter.addNode(var6); // L: 3554
+				return 1; // L: 3555
+			} else {
+				int var3;
+				Message var5;
+				if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3557
+					class12.Interpreter_intStackSize -= 2; // L: 3558
+					var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3559
+					var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3560
+					var5 = class175.Messages_getByChannelAndID(var3, var7); // L: 3561
+					if (var5 != null) { // L: 3562
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.count; // L: 3563
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.cycle; // L: 3564
+						Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3565
+						Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3566
+						Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3567
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3568
+					} else {
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3571
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3572
+						Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3573
+						Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3574
+						Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3575
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3576
+					}
+
+					return 1; // L: 3578
+				} else {
+					Message var4;
+					if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3580
+						var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3581
+						var4 = class12.Messages_getMessage(var3); // L: 3582
+						if (var4 != null) { // L: 3583
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.type; // L: 3584
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.cycle; // L: 3585
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3586
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3587
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3588
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3589
+						} else {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3592
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3593
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3594
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3595
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3596
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3597
+						}
+
+						return 1; // L: 3599
+					} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3601
+						if (class21.privateChatMode == null) { // L: 3602
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1;
+						} else {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class21.privateChatMode.field4796; // L: 3603
+						}
+
+						return 1; // L: 3604
+					} else {
+						PacketBufferNode var12;
+						if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3606
+							var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3607
+							var7 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3608
+							var12 = GrandExchangeOfferNameComparator.method5784(var7, var8, class263.clientLanguage, -1); // L: 3609
+							Client.packetWriter.addNode(var12); // L: 3610
+							return 1; // L: 3611
+						} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3613
+							class9.Interpreter_stringStackSize -= 2; // L: 3614
+							var8 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize]; // L: 3615
+							String var11 = Interpreter.Interpreter_stringStack[class9.Interpreter_stringStackSize + 1]; // L: 3616
+							var12 = WallDecoration.getPacketBufferNode(ClientPacket.field2953, Client.packetWriter.isaacCipher); // L: 3618
+							var12.packetBuffer.writeShort(0); // L: 3619
+							int var10 = var12.packetBuffer.offset; // L: 3620
+							var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3621
+							User.method6525(var12.packetBuffer, var11); // L: 3622
+							var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3623
+							Client.packetWriter.addNode(var12); // L: 3624
+							return 1; // L: 3625
+						} else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3627
+							var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3628
+							class12.Interpreter_intStackSize -= 2; // L: 3629
+							var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3630
+							var9 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3631
+							var6 = GrandExchangeOfferNameComparator.method5784(var7, var8, class263.clientLanguage, var9); // L: 3632
+							Client.packetWriter.addNode(var6); // L: 3633
+							return 1; // L: 3634
+						} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3636
+							if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3643
+								Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3644
+								return 1; // L: 3645
+							} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3647
+								var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3648
+								Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class92.Messages_getHistorySize(var3); // L: 3649
+								return 1; // L: 3650
+							} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3652
+								var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3653
+								Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class4.Messages_getLastChatID(var3); // L: 3654
+								return 1; // L: 3655
+							} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3657
+								var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3658
+								Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = PendingSpawn.method2163(var3); // L: 3659
+								return 1; // L: 3660
+							} else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3662
+								var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3663
+								UrlRequester.doCheat(var8); // L: 3664
+								return 1; // L: 3665
+							} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3667
+								Client.field549 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3668
+								return 1; // L: 3669
+							} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3671
+								Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = Client.field549; // L: 3672
+								return 1; // L: 3673
+							} else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3675
+								var8 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3676
+								System.out.println(var8); // L: 3677
+								return 1; // L: 3678
+							} else if (var0 == 5024) { // L: 3680
+								--class12.Interpreter_intStackSize; // L: 3681
+								return 1; // L: 3682
+							} else if (var0 == 5025) { // L: 3684
+								++class12.Interpreter_intStackSize; // L: 3685
+								return 1; // L: 3686
+							} else if (var0 == 5030) { // L: 3688
+								class12.Interpreter_intStackSize -= 2; // L: 3689
+								var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3690
+								var7 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3691
+								var5 = class175.Messages_getByChannelAndID(var3, var7); // L: 3692
+								if (var5 != null) { // L: 3693
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.count; // L: 3694
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.cycle; // L: 3695
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3696
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3697
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3698
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3699
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3700
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3701
+								} else {
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3704
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3705
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3706
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3707
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3708
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3709
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3710
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3711
+								}
+
+								return 1; // L: 3713
+							} else if (var0 == 5031) { // L: 3715
+								var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3716
+								var4 = class12.Messages_getMessage(var3); // L: 3717
+								if (var4 != null) { // L: 3718
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.type; // L: 3719
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.cycle; // L: 3720
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3721
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3722
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3723
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3724
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3725
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3726
+								} else {
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1; // L: 3729
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3730
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3731
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3732
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3733
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3734
+									Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3735
+									Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = 0; // L: 3736
+								}
+
+								return 1; // L: 3738
+							} else {
+								return 2; // L: 3740
+							}
+						} else {
+							if (ModelData0.localPlayer != null && ModelData0.localPlayer.username != null) { // L: 3638
+								var8 = ModelData0.localPlayer.username.getName();
+							} else {
+								var8 = ""; // L: 3639
+							}
+
+							Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var8; // L: 3640
+							return 1; // L: 3641
+						}
+					}
+				}
+			}
+		}
 	}
 }

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

@@ -1,36 +1,36 @@
 import java.util.HashMap;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("of")
+@ObfuscatedName("po")
 @Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("d")
+	@ObfuscatedName("sc")
-	@ObfuscatedGetter(
-		intValue = 623297429
-	)
-	static int field4517;
-	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Lal;"
+	)
+	@Export("pcmPlayer1")
+	static PcmPlayer pcmPlayer1;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Llp;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Llp;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lln;Lln;)V"
+		descriptor = "(Llp;Llp;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1; // L: 14
@@ -38,10 +38,10 @@ public class Fonts {
 		this.map = new HashMap(); // L: 16
 	} // L: 17
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "([Low;I)Ljava/util/HashMap;",
+		descriptor = "([Lpi;I)Ljava/util/HashMap;",
-		garbageValue = "554923002"
+		garbageValue = "1588025566"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -53,7 +53,7 @@ public class Fonts {
 			if (this.map.containsKey(var5)) { // L: 26
 				var2.put(var5, this.map.get(var5)); // L: 27
 			} else {
-				Font var6 = class431.method7594(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30
+				Font var6 = GrandExchangeOfferWorldComparator.method5808(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30
 				if (var6 != null) { // L: 31
 					this.map.put(var5, var6); // L: 32
 					var2.put(var5, var6); // L: 33
@@ -61,52 +61,233 @@ public class Fonts {
 			}
 		}
 
-		return var2;
+		return var2; // L: 39
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lpz;B)V",
+		descriptor = "(IIIIIIILgm;Lgh;I)V",
-		garbageValue = "0"
+		garbageValue = "1253814318"
 	)
-	@Export("updatePlayer")
+	static final void method7226(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) {
-	static final void updatePlayer(PacketBuffer var0) {
+		ObjectComposition var9 = class82.getObjectDefinition(var4); // L: 999
-		var0.importIndex(); // L: 37
+		int var10;
-		int var1 = Client.localPlayerIndex; // L: 38
+		int var11;
-		Player var2 = GrandExchangeEvents.localPlayer = Client.players[var1] = new Player(); // L: 39
+		if (var5 != 1 && var5 != 3) { // L: 1002
-		var2.index = var1; // L: 40
+			var10 = var9.sizeX; // L: 1007
-		int var3 = var0.readBits(30); // L: 41
+			var11 = var9.sizeY; // L: 1008
-		byte var4 = (byte)(var3 >> 28); // L: 42
+		} else {
-		int var5 = var3 >> 14 & 16383; // L: 43
+			var10 = var9.sizeY; // L: 1003
-		int var6 = var3 & 16383; // L: 44
+			var11 = var9.sizeX; // L: 1004
-		var2.pathX[0] = var5 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 45
-		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46
-		var2.pathY[0] = var6 - VarcInt.baseY; // L: 47
-		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48
-		class18.Client_plane = var2.plane = var4; // L: 49
-		if (Players.field1276[var1] != null) { // L: 50
-			var2.read(Players.field1276[var1]);
 		}
 
-		Players.Players_count = 0; // L: 51
+		int var12;
-		Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52
+		int var13;
-		Players.field1283[var1] = 0; // L: 53
+		if (var10 + var2 <= 104) { // L: 1014
-		Players.Players_emptyIdxCount = 0; // L: 54
+			var12 = (var10 >> 1) + var2; // L: 1015
-
+			var13 = var2 + (var10 + 1 >> 1); // L: 1016
-		for (int var7 = 1; var7 < 2048; ++var7) { // L: 55
+		} else {
-			if (var1 != var7) { // L: 56
+			var12 = var2; // L: 1019
-				int var8 = var0.readBits(18); // L: 57
+			var13 = var2 + 1; // L: 1020
-				int var9 = var8 >> 16; // L: 58
-				int var10 = var8 >> 8 & 597; // L: 59
-				int var11 = var8 & 597; // L: 60
-				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61
-				Players.Players_orientations[var7] = 0; // L: 62
-				Players.Players_targetIndices[var7] = -1; // L: 63
-				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64
-				Players.field1283[var7] = 0; // L: 65
-			}
 		}
 
-		var0.exportIndex(); // L: 67
+		int var14;
-	} // L: 68
+		int var15;
+		if (var3 + var11 <= 104) { // L: 1022
+			var14 = var3 + (var11 >> 1); // L: 1023
+			var15 = var3 + (var11 + 1 >> 1); // L: 1024
+		} else {
+			var14 = var3; // L: 1027
+			var15 = var3 + 1; // L: 1028
+		}
+
+		int[][] var16 = Tiles.Tiles_heights[var1]; // L: 1030
+		int var17 = var16[var13][var15] + var16[var12][var15] + var16[var12][var14] + var16[var13][var14] >> 2; // L: 1031
+		int var18 = (var2 << 7) + (var10 << 6); // L: 1032
+		int var19 = (var3 << 7) + (var11 << 6); // L: 1033
+		long var20 = VarbitComposition.calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 1034
+		int var22 = (var5 << 6) + var6; // L: 1035
+		if (var9.int3 == 1) { // L: 1036
+			var22 += 256;
+		}
+
+		Object var30;
+		if (var6 == 22) { // L: 1037
+			if (var9.animationId == -1 && var9.transforms == null) { // L: 1039
+				var30 = var9.getModel(22, var5, var16, var18, var17, var19);
+			} else {
+				var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1040
+			}
+
+			var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); // L: 1041
+			if (var9.interactType == 1) { // L: 1042
+				var8.setBlockedByFloorDec(var2, var3);
+			}
+
+		} else if (var6 != 10 && var6 != 11) { // L: 1045
+			if (var6 >= 12) { // L: 1053
+				if (var9.animationId == -1 && var9.transforms == null) { // L: 1055
+					var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
+				} else {
+					var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1056
+				}
+
+				var7.method4176(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 1057
+				if (var9.interactType != 0) { // L: 1058
+					var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+				}
+
+			} else if (var6 == 0) { // L: 1061
+				if (var9.animationId == -1 && var9.transforms == null) { // L: 1063
+					var30 = var9.getModel(0, var5, var16, var18, var17, var19);
+				} else {
+					var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1064
+				}
+
+				var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field988[var5], 0, var20, var22); // L: 1065
+				if (var9.interactType != 0) { // L: 1066
+					var8.method3749(var2, var3, var6, var5, var9.boolean1);
+				}
+
+			} else if (var6 == 1) { // L: 1069
+				if (var9.animationId == -1 && var9.transforms == null) { // L: 1071
+					var30 = var9.getModel(1, var5, var16, var18, var17, var19);
+				} else {
+					var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1072
+				}
+
+				var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field989[var5], 0, var20, var22); // L: 1073
+				if (var9.interactType != 0) { // L: 1074
+					var8.method3749(var2, var3, var6, var5, var9.boolean1);
+				}
+
+			} else {
+				int var23;
+				if (var6 == 2) { // L: 1077
+					var23 = var5 + 1 & 3; // L: 1078
+					Object var25;
+					Object var31;
+					if (var9.animationId == -1 && var9.transforms == null) { // L: 1081
+						var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 1082
+						var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 1083
+					} else {
+						var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1086
+						var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1087
+					}
+
+					var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field988[var5], Tiles.field988[var23], var20, var22); // L: 1089
+					if (var9.interactType != 0) { // L: 1090
+						var8.method3749(var2, var3, var6, var5, var9.boolean1);
+					}
+
+				} else if (var6 == 3) { // L: 1093
+					if (var9.animationId == -1 && var9.transforms == null) { // L: 1095
+						var30 = var9.getModel(3, var5, var16, var18, var17, var19);
+					} else {
+						var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1096
+					}
+
+					var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field989[var5], 0, var20, var22); // L: 1097
+					if (var9.interactType != 0) { // L: 1098
+						var8.method3749(var2, var3, var6, var5, var9.boolean1);
+					}
+
+				} else if (var6 == 9) { // L: 1101
+					if (var9.animationId == -1 && var9.transforms == null) { // L: 1103
+						var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
+					} else {
+						var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1104
+					}
+
+					var7.method4176(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 1105
+					if (var9.interactType != 0) { // L: 1106
+						var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+					}
+
+				} else if (var6 == 4) { // L: 1109
+					if (var9.animationId == -1 && var9.transforms == null) { // L: 1111
+						var30 = var9.getModel(4, var5, var16, var18, var17, var19);
+					} else {
+						var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1112
+					}
+
+					var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field988[var5], 0, 0, 0, var20, var22); // L: 1113
+				} else {
+					long var24;
+					Object var26;
+					if (var6 == 5) { // L: 1116
+						var23 = 16; // L: 1117
+						var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1118
+						if (var24 != 0L) { // L: 1119
+							var23 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var24)).int2;
+						}
+
+						if (var9.animationId == -1 && var9.transforms == null) { // L: 1121
+							var26 = var9.getModel(4, var5, var16, var18, var17, var19);
+						} else {
+							var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1122
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field988[var5], 0, var23 * Tiles.field990[var5], var23 * Tiles.field991[var5], var20, var22); // L: 1123
+					} else if (var6 == 6) { // L: 1126
+						var23 = 8; // L: 1127
+						var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1128
+						if (0L != var24) { // L: 1129
+							var23 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var24)).int2 / 2;
+						}
+
+						if (var9.animationId == -1 && var9.transforms == null) { // L: 1131
+							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
+						} else {
+							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1132
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field995[var5], var23 * Tiles.field993[var5], var20, var22); // L: 1133
+					} else if (var6 == 7) { // L: 1136
+						int var29 = var5 + 2 & 3; // L: 1138
+						if (var9.animationId == -1 && var9.transforms == null) { // L: 1139
+							var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19);
+						} else {
+							var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1140
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); // L: 1141
+					} else if (var6 == 8) { // L: 1144
+						var23 = 8; // L: 1145
+						var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1146
+						if (0L != var24) { // L: 1147
+							var23 = class82.getObjectDefinition(NetSocket.Entity_unpackID(var24)).int2 / 2;
+						}
+
+						int var28 = var5 + 2 & 3; // L: 1150
+						Object var27;
+						if (var9.animationId == -1 && var9.transforms == null) { // L: 1151
+							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1152
+							var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1153
+						} else {
+							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1156
+							var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1157
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field995[var5], var23 * Tiles.field993[var5], var20, var22); // L: 1159
+					}
+				}
+			}
+		} else {
+			if (var9.animationId == -1 && var9.transforms == null) { // L: 1047
+				var30 = var9.getModel(10, var5, var16, var18, var17, var19);
+			} else {
+				var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.boolean3, (Renderable)null); // L: 1048
+			}
+
+			if (var30 != null) { // L: 1049
+				var7.method4176(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22);
+			}
+
+			if (var9.interactType != 0) {
+				var8.addGameObject(var2, var3, var10, var11, var9.boolean1); // L: 1050
+			}
+
+		}
+	} // L: 1043 1051 1059 1067 1075 1091 1099 1107 1114 1124 1134 1142 1160 1162
 }

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

@@ -1,72 +1,187 @@
+import java.awt.image.BufferedImage;
+import java.awt.image.PixelGrabber;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import javax.imageio.ImageIO;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("im")
+@ObfuscatedName("gt")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = -780977341
+	)
+	public static int field2492;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "[Lhf;"
+		descriptor = "[Lgu;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lln;Lln;IZ)V"
+		descriptor = "(Llp;Llp;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(); // L: 35
+		NodeDeque var5 = new NodeDeque(); // L: 11
-		int var6 = var1.getGroupFileCount(var3); // L: 36
+		int var6 = var1.getGroupFileCount(var3); // L: 12
-		this.frames = new Animation[var6]; // L: 37
+		this.frames = new Animation[var6]; // L: 13
-		int[] var7 = var1.getGroupFileIds(var3); // L: 38
+		int[] var7 = var1.getGroupFileIds(var3); // L: 14
 
-		for (int var8 = 0; var8 < var7.length; ++var8) { // L: 39
+		for (int var8 = 0; var8 < var7.length; ++var8) { // L: 15
-			byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 40
+			byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 16
-			Skeleton var10 = null; // L: 41
+			Skeleton var10 = null; // L: 17
-			int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 42
+			int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 18
 
-			for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 43 44 49
+			for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 19
-				if (var11 == var12.id) { // L: 45
+				if (var11 == var12.id) { // L: 21
-					var10 = var12; // L: 46
+					var10 = var12;
 					break;
 				}
 			}
 
-			if (var10 == null) { // L: 51
+			if (var10 == null) {
-				byte[] var13;
+				byte[] var13 = var2.getFile(var11, 0);
-				if (var4) { // L: 53
+				var10 = new Skeleton(var11, var13); // L: 31
-					var13 = var2.getFile(0, var11);
+				var5.addFirst(var10);
-				} else {
-					var13 = var2.getFile(var11, 0); // L: 54
 			}
 
-				var10 = new Skeleton(var11, var13); // L: 55
+			this.frames[var7[var8]] = new Animation(var9, var10);
-				var5.addFirst(var10); // L: 56
 		}
 
-			this.frames[var7[var8]] = new Animation(var9, var10); // L: 58
+	} // L: 36
-		}
 
-	} // L: 60
+	@ObfuscatedName("o")
-
-	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
+		descriptor = "(IB)Z",
-		garbageValue = "1974445635"
+		garbageValue = "-15"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
-		return this.frames[var1].hasAlphaTransform; // L: 63
+		return this.frames[var1].hasAlphaTransform; // L: 39
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IS)I",
+		descriptor = "([BB)Lqr;",
-		garbageValue = "500"
+		garbageValue = "7"
 	)
-	public static int method4934(int var0) {
+	public static final SpritePixels method4217(byte[] var0) {
-		return FileSystem.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 61
+		BufferedImage var1 = null; // L: 20
+
+		try {
+			Class var2 = ImageIO.class; // L: 22
+			synchronized(ImageIO.class) {
+				var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 23
+			} // L: 24
+
+			int var6 = var1.getWidth(); // L: 25
+			int var7 = var1.getHeight(); // L: 26
+			int[] var4 = new int[var7 * var6]; // L: 27
+			PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var6, var7, var4, 0, var6); // L: 28
+			var5.grabPixels(); // L: 29
+			return new SpritePixels(var4, var6, var7); // L: 30
+		} catch (IOException var9) { // L: 32
+		} catch (InterruptedException var10) { // L: 33
+		}
+
+		return new SpritePixels(0, 0); // L: 34
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Llp;Ljava/lang/String;Ljava/lang/String;B)[Lqr;",
+		garbageValue = "16"
+	)
+	public static SpritePixels[] method4218(AbstractArchive var0, String var1, String var2) {
+		int var3 = var0.getGroupId(var1); // L: 91
+		int var4 = var0.getFileId(var3, var2); // L: 92
+		SpritePixels[] var5;
+		if (!User.method6514(var0, var3, var4)) { // L: 95
+			var5 = null; // L: 96
+		} else {
+			SpritePixels[] var7 = new SpritePixels[class453.SpriteBuffer_spriteCount]; // L: 101
+
+			for (int var8 = 0; var8 < class453.SpriteBuffer_spriteCount; ++var8) { // L: 102
+				SpritePixels var9 = var7[var8] = new SpritePixels(); // L: 103
+				var9.width = class453.SpriteBuffer_spriteWidth; // L: 104
+				var9.height = class453.SpriteBuffer_spriteHeight; // L: 105
+				var9.xOffset = class453.SpriteBuffer_xOffsets[var8]; // L: 106
+				var9.yOffset = class453.SpriteBuffer_yOffsets[var8]; // L: 107
+				var9.subWidth = ScriptFrame.SpriteBuffer_spriteWidths[var8]; // L: 108
+				var9.subHeight = class453.SpriteBuffer_spriteHeights[var8]; // L: 109
+				int var10 = var9.subHeight * var9.subWidth; // L: 110
+				byte[] var11 = class127.SpriteBuffer_pixels[var8]; // L: 111
+				var9.pixels = new int[var10]; // L: 112
+
+				for (int var12 = 0; var12 < var10; ++var12) { // L: 113
+					var9.pixels[var12] = Decimator.SpriteBuffer_spritePalette[var11[var12] & 255];
 				}
 			}
+
+			VarcInt.method3325(); // L: 115
+			var5 = var7; // L: 118
+		}
+
+		return var5; // L: 120
+	}
+
+	@ObfuscatedName("he")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)V",
+		garbageValue = "13"
+	)
+	@Export("updateItemPile")
+	static final void updateItemPile(int var0, int var1) {
+		NodeDeque var2 = Client.groundItems[class128.Client_plane][var0][var1]; // L: 7964
+		if (var2 == null) { // L: 7965
+			class175.scene.removeGroundItemPile(class128.Client_plane, var0, var1); // L: 7966
+		} else {
+			long var3 = -99999999L; // L: 7969
+			TileItem var5 = null; // L: 7970
+
+			TileItem var6;
+			for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7971 7972 7980
+				ItemComposition var7 = FileSystem.ItemDefinition_get(var6.id); // L: 7973
+				long var11 = (long)var7.price; // L: 7974
+				if (var7.isStackable == 1) {
+					var11 *= (long)(var6.quantity + 1); // L: 7975
+				}
+
+				if (var11 > var3) { // L: 7976
+					var3 = var11; // L: 7977
+					var5 = var6; // L: 7978
+				}
+			}
+
+			if (var5 == null) { // L: 7982
+				class175.scene.removeGroundItemPile(class128.Client_plane, var0, var1); // L: 7983
+			} else {
+				var2.addLast(var5); // L: 7986
+				TileItem var13 = null; // L: 7987
+				TileItem var8 = null; // L: 7988
+
+				for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7989 7990 7995
+					if (var6.id != var5.id) { // L: 7991
+						if (var13 == null) { // L: 7992
+							var13 = var6;
+						}
+
+						if (var13.id != var6.id && var8 == null) { // L: 7993
+							var8 = var6;
+						}
+					}
+				}
+
+				long var9 = VarbitComposition.calculateTag(var0, var1, 3, false, 0); // L: 7997
+				class175.scene.newGroundItemPile(class128.Client_plane, var0, var1, class202.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class128.Client_plane), var5, var9, var13, var8); // L: 7998
+			}
+		}
+	} // L: 7967 7984 7999
+}

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

@@ -3,21 +3,21 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nh")
+@ObfuscatedName("nn")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
-	boolean field4237;
+	boolean field4311;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
-	boolean field4236;
+	boolean field4312;
 
 	Friend() {
 	} // L: 9
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnh;I)I",
+		descriptor = "(Lnn;I)I",
-		garbageValue = "-1631917139"
+		garbageValue = "1190428650"
 	)
 	@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) { // L: 15
 			return 1;
-		} else if (this.field4237 && !var1.field4237) { // L: 16
+		} else if (this.field4311 && !var1.field4311) { // L: 16
 			return -1;
-		} else if (!this.field4237 && var1.field4237) { // L: 17
+		} else if (!this.field4311 && var1.field4311) { // L: 17
 			return 1;
-		} else if (this.field4236 && !var1.field4236) { // L: 18
+		} else if (this.field4312 && !var1.field4312) { // L: 18
 			return -1;
-		} else if (!this.field4236 && var1.field4236) { // L: 19
+		} else if (!this.field4312 && var1.field4312) { // L: 19
 			return 1;
 		} else {
 			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lnn;I)I",
+		descriptor = "(Lnb;I)I",
-		garbageValue = "842367957"
+		garbageValue = "434999779"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {

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

@@ -4,91 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nk")
+@ObfuscatedName("nr")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("q")
+	@ObfuscatedName("o")
-	@Export("SpriteBuffer_pixels")
-	public static byte[][] SpriteBuffer_pixels;
-	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 900847361
+		intValue = 281202653
 	)
-	public int field4246;
+	public int field4314;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lqb;"
+		descriptor = "Lqv;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lqb;I)V"
+		descriptor = "(Lqv;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field4246 = (int)(class136.method2931() / 1000L); // L: 107
+		this.field4314 = (int)(class113.method2624() / 1000L); // L: 109
-		this.username = var1; // L: 108
+		this.username = var1; // L: 110
-		this.world = (short)var2; // L: 109
+		this.world = (short)var2; // L: 111
-	} // L: 110
+	} // L: 112
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-635847249"
-	)
-	public static void method6685() {
-		try {
-			JagexCache.JagexCache_dat2File.close(); // L: 276
-
-			for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { // L: 277
-				class115.JagexCache_idxFiles[var0].close();
-			}
-
-			JagexCache.JagexCache_idx255File.close(); // L: 278
-			JagexCache.JagexCache_randomDat.close(); // L: 279
-		} catch (Exception var2) { // L: 281
-		}
-
-	} // L: 282
-
-	@ObfuscatedName("kp")
-	@ObfuscatedSignature(
-		descriptor = "(Lky;I)Lky;",
-		garbageValue = "177537571"
-	)
-	static Widget method6686(Widget var0) {
-		Widget var2 = var0; // L: 11903
-		int var3 = Players.method2420(class326.getWidgetFlags(var0)); // L: 11905
-		Widget var1;
-		if (var3 == 0) { // L: 11906
-			var1 = null; // L: 11907
-		} else {
-			int var4 = 0;
-
-			while (true) {
-				if (var4 >= var3) {
-					var1 = var2; // L: 11917
-					break;
-				}
-
-				var2 = class127.getWidget(var2.parentId); // L: 11911
-				if (var2 == null) { // L: 11912
-					var1 = null; // L: 11913
-					break; // L: 11914
-				}
-
-				++var4; // L: 11910
-			}
-		}
-
-		Widget var5 = var1; // L: 11919
-		if (var1 == null) { // L: 11920
-			var5 = var0.parent;
-		}
-
-		return var5; // L: 11921
-	}
 }

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

@@ -1,559 +1,303 @@
+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("bw")
+@ObfuscatedName("bd")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("u")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lea;"
+		descriptor = "Lpj;"
-	)
-	static ClanChannel field808;
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Lpe;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lnr;"
+		descriptor = "Lna;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lnd;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -189724235
+		intValue = -2020260253
 	)
-	int field805;
+	int field803;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpe;)V"
+		descriptor = "(Lpj;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field805 = 0; // L: 23
+		this.field803 = 0; // L: 23
 		this.loginType = var1; // L: 26
 		this.friendsList = new FriendsList(var1); // L: 27
 		this.ignoreList = new IgnoreList(var1); // L: 28
+	} // L: 29
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "-76"
+	)
+	boolean method1666() {
+		return this.field803 == 2; // L: 32
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
+		descriptor = "(I)V",
-		garbageValue = "-846146726"
+		garbageValue = "-990336643"
 	)
-	boolean method1681() {
+	final void method1667() {
-		return this.field805 == 2; // L: 32
+		this.field803 = 1; // L: 36
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-22"
-	)
-	final void method1726() {
-		this.field805 = 1; // L: 36
 	} // L: 37
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;II)V",
+		descriptor = "(Lpx;II)V",
-		garbageValue = "-1095656877"
+		garbageValue = "1619915993"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2); // L: 40
-		this.field805 = 2; // L: 41
+		this.field803 = 2; // L: 41
-		class295.method5732(); // L: 42
-	} // L: 43
 
-	@ObfuscatedName("f")
+		for (int var3 = 0; var3 < Players.Players_count; ++var3) { // L: 43
+			Player var4 = Client.players[Players.Players_indices[var3]]; // L: 44
+			var4.clearIsFriend(); // L: 45
+		}
+
+		Iterator var5 = Messages.Messages_hashTable.iterator(); // L: 48
+
+		while (var5.hasNext()) {
+			Message var6 = (Message)var5.next(); // L: 49
+			var6.clearIsFromFriend(); // L: 51
+		}
+
+		if (PcmPlayer.friendsChat != null) { // L: 55
+			PcmPlayer.friendsChat.clearFriends(); // L: 56
+		}
+
+	} // L: 59
+
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
+		descriptor = "(B)V",
-		garbageValue = "-6357"
+		garbageValue = "-29"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
-		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 46
+		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 62
-			if ((long)var1.field4246 < class136.method2931() / 1000L - 5L) { // L: 47
+			if ((long)var1.field4314 < class113.method2624() / 1000L - 5L) { // L: 63
 				if (var1.world > 0) {
-					Actor.addGameMessage(5, "", var1.username + " has logged in."); // L: 48
+					WorldMapEvent.addGameMessage(5, "", var1.username + " has logged in."); // L: 64
 				}
 
-				if (var1.world == 0) { // L: 49
+				if (var1.world == 0) { // L: 65
-					Actor.addGameMessage(5, "", var1.username + " has logged out.");
+					WorldMapEvent.addGameMessage(5, "", var1.username + " has logged out.");
 				}
 
-				var1.remove(); // L: 50
+				var1.remove(); // L: 66
 			}
 		}
 
-	} // L: 53
+	} // L: 69
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
+		descriptor = "(S)V",
-		garbageValue = "1878826448"
+		garbageValue = "-1844"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field805 = 0; // L: 56
+		this.field803 = 0; // L: 72
-		this.friendsList.clear(); // L: 57
+		this.friendsList.clear(); // L: 73
-		this.ignoreList.clear(); // L: 58
+		this.ignoreList.clear(); // L: 74
-	} // L: 59
+	} // L: 75
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lqb;ZS)Z",
+		descriptor = "(Lqv;ZS)Z",
-		garbageValue = "301"
+		garbageValue = "753"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
-		if (var1 == null) { // L: 62
+		if (var1 == null) { // L: 78
 			return false;
-		} else if (var1.equals(GrandExchangeEvents.localPlayer.username)) { // L: 63
+		} else if (var1.equals(ModelData0.localPlayer.username)) { // L: 79
 			return true;
 		} else {
-			return this.friendsList.isFriended(var1, var2); // L: 64
+			return this.friendsList.isFriended(var1, var2); // L: 80
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Lqv;I)Z",
+		garbageValue = "1274631135"
+	)
+	@Export("isIgnored")
+	final boolean isIgnored(Username var1) {
+		if (var1 == null) { // L: 85
+			return false;
+		} else {
+			return this.ignoreList.contains(var1); // L: 86
 		}
 	}
 
 	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Lqb;B)Z",
-		garbageValue = "24"
-	)
-	@Export("isIgnored")
-	final boolean isIgnored(Username var1) {
-		if (var1 == null) { // L: 69
-			return false;
-		} else {
-			return this.ignoreList.contains(var1); // L: 70
-		}
-	}
-
-	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "95"
+		garbageValue = "-35"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
-		if (var1 != null) { // L: 75
+		if (var1 != null) { // L: 91
-			Username var2 = new Username(var1, this.loginType); // L: 76
+			Username var2 = new Username(var1, this.loginType); // L: 92
-			if (var2.hasCleanName()) { // L: 77
+			if (var2.hasCleanName()) { // L: 93
-				if (this.friendsListIsFull()) { // L: 78
+				if (this.friendsListIsFull()) { // L: 94
-					class149.method3138("Your friend list is full. Max of 200 for free users, and 400 for members"); // L: 80
+					Tiles.method2017(); // L: 95
-				} else if (GrandExchangeEvents.localPlayer.username.equals(var2)) { // L: 84
+				} else if (ModelData0.localPlayer.username.equals(var2)) { // L: 98
-					ClanSettings.method3031(); // L: 85
+					InterfaceParent.method2067("You can't add yourself to your own friend list"); // L: 100
-				} else if (this.isFriended(var2, false)) { // L: 88
+				} else if (this.isFriended(var2, false)) { // L: 104
-					class149.method3138(var1 + " is already on your friend list"); // L: 90
+					InterfaceParent.method2067(var1 + " is already on your friend list"); // L: 106
-				} else if (this.isIgnored(var2)) { // L: 94
+				} else if (this.isIgnored(var2)) { // L: 110
-					Canvas.method359(var1); // L: 95
+					InterfaceParent.method2067("Please remove " + var1 + " from your ignore list first"); // L: 112
 				} else {
-					Skeleton.method4728(var1); // L: 98
+					PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2998, Client.packetWriter.isaacCipher); // L: 118
+					var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 119
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 120
+					Client.packetWriter.addNode(var3); // L: 121
 				}
 			}
 		}
-	} // L: 82 86 92 96 99
+	} // L: 96 102 108 114 123
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1352470577"
+		garbageValue = "731924017"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field544 != 1; // L: 122
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field610 != 1; // L: 134
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1994485705"
+		garbageValue = "-1674532630"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
-		if (var1 != null) { // L: 129
+		if (var1 != null) { // L: 141
-			Username var2 = new Username(var1, this.loginType); // L: 130
+			Username var2 = new Username(var1, this.loginType); // L: 142
-			if (var2.hasCleanName()) { // L: 131
+			if (var2.hasCleanName()) { // L: 143
-				if (this.canAddIgnore()) { // L: 132
+				if (this.canAddIgnore()) { // L: 144
-					ModeWhere.method6092(); // L: 133
+					InterfaceParent.method2067("Your ignore list is full. Max of 100 for free users, and 400 for members"); // L: 146
-				} else if (GrandExchangeEvents.localPlayer.username.equals(var2)) { // L: 136
+				} else if (ModelData0.localPlayer.username.equals(var2)) { // L: 150
-					class149.method3138("You can't add yourself to your own ignore list"); // L: 138
+					UserComparator9.method2601(); // L: 151
-				} else if (this.isIgnored(var2)) { // L: 142
+				} else if (this.isIgnored(var2)) { // L: 154
-					class149.method3138(var1 + " is already on your ignore list"); // L: 144
+					class230.method4731(var1); // L: 155
-				} else if (this.isFriended(var2, false)) { // L: 148
+				} else if (this.isFriended(var2, false)) { // L: 158
-					KeyHandler.method348(var1); // L: 149
+					InterfaceParent.method2067("Please remove " + var1 + " from your friend list first"); // L: 160
 				} else {
-					GameEngine.method569(var1); // L: 152
+					PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2959, Client.packetWriter.isaacCipher); // L: 166
+					var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 167
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 168
+					Client.packetWriter.addNode(var3); // L: 169
 				}
 			}
 		}
-	} // L: 134 140 146 150 153
+	} // L: 148 152 156 162 171
 
 	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1971481625"
+		garbageValue = "-799291101"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field544 != 1; // L: 172
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field610 != 1; // L: 182
 	}
 
 	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
+		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-14"
+		garbageValue = "-1784311825"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
-		if (var1 != null) { // L: 179
+		if (var1 != null) { // L: 189
-			Username var2 = new Username(var1, this.loginType); // L: 180
+			Username var2 = new Username(var1, this.loginType); // L: 190
-			if (var2.hasCleanName()) { // L: 181
+			if (var2.hasCleanName()) { // L: 191
-				if (this.friendsList.removeByUsername(var2)) { // L: 182
+				if (this.friendsList.removeByUsername(var2)) { // L: 192
-					Client.field701 = Client.cycleCntr; // L: 184
+					Renderable.method4210(); // L: 193
-					PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2970, Client.packetWriter.isaacCipher); // L: 187
+					PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 195
-					var3.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var1)); // L: 188
+					var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 196
-					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 189
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 197
-					Client.packetWriter.addNode(var3); // L: 190
+					Client.packetWriter.addNode(var3); // L: 198
+				}
+
+				for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 201
+					Player var4 = Client.players[Players.Players_indices[var5]]; // L: 202
+					var4.clearIsFriend(); // L: 203
+				}
+
+				Iterator var6 = Messages.Messages_hashTable.iterator(); // L: 206
+
+				while (var6.hasNext()) {
+					Message var7 = (Message)var6.next(); // L: 207
+					var7.clearIsFromFriend(); // L: 209
+				}
+
+				if (PcmPlayer.friendsChat != null) { // L: 213
+					PcmPlayer.friendsChat.clearFriends(); // L: 214
 				}
 
-				class295.method5732(); // L: 192
 			}
 		}
-	} // L: 193
+	} // L: 217
 
 	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "20346063"
+		garbageValue = "516139495"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
-		if (var1 != null) { // L: 196
+		if (var1 != null) { // L: 220
-			Username var2 = new Username(var1, this.loginType); // L: 197
+			Username var2 = new Username(var1, this.loginType); // L: 221
-			if (var2.hasCleanName()) { // L: 198
+			if (var2.hasCleanName()) { // L: 222
-				if (this.ignoreList.removeByUsername(var2)) { // L: 199
+				if (this.ignoreList.removeByUsername(var2)) { // L: 223
-					Client.field701 = Client.cycleCntr; // L: 201
+					Renderable.method4210(); // L: 224
-					PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2991, Client.packetWriter.isaacCipher); // L: 204
+					PacketBufferNode var3 = WallDecoration.getPacketBufferNode(ClientPacket.field3034, Client.packetWriter.isaacCipher); // L: 226
-					var3.packetBuffer.writeByte(class425.stringCp1252NullTerminatedByteSize(var1)); // L: 205
+					var3.packetBuffer.writeByte(class392.stringCp1252NullTerminatedByteSize(var1)); // L: 227
-					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 206
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 228
-					Client.packetWriter.addNode(var3); // L: 207
+					Client.packetWriter.addNode(var3); // L: 229
 				}
 
-				KitDefinition.FriendSystem_invalidateIgnoreds(); // L: 209
+				class121.FriendSystem_invalidateIgnoreds(); // L: 231
 			}
 		}
-	} // L: 210
+	} // L: 232
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lqb;I)Z",
+		descriptor = "(Lqv;I)Z",
-		garbageValue = "-2101577013"
+		garbageValue = "723636782"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
-		Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 222
+		Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 244
-		return var2 != null && var2.hasWorld(); // L: 223
+		return var2 != null && var2.hasWorld(); // L: 245
-	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Lcn;",
-		garbageValue = "-1586565487"
-	)
-	static AttackOption[] method1743() {
-		return new AttackOption[]{AttackOption.field1263, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.field1257}; // L: 12680
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "106"
-	)
-	public static boolean method1698(int var0) {
-		return (var0 >> 28 & 1) != 0; // L: 29
-	}
-
-	@ObfuscatedName("hy")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1628645730"
-	)
-	static final void method1715() {
-		class389.method7094(false); // L: 5650
-		Client.field747 = 0; // L: 5651
-		boolean var0 = true; // L: 5652
-
-		int var1;
-		for (var1 = 0; var1 < Varcs.regionLandArchives.length; ++var1) { // L: 5653
-			if (VarpDefinition.regionMapArchiveIds[var1] != -1 && Varcs.regionLandArchives[var1] == null) { // L: 5654 5655
-				Varcs.regionLandArchives[var1] = Players.archive5.takeFile(VarpDefinition.regionMapArchiveIds[var1], 0); // L: 5656
-				if (Varcs.regionLandArchives[var1] == null) { // L: 5657
-					var0 = false; // L: 5658
-					++Client.field747; // L: 5659
 	}
 }
-
-			if (class133.regionLandArchiveIds[var1] != -1 && DynamicObject.regionMapArchives[var1] == null) { // L: 5663 5664
-				DynamicObject.regionMapArchives[var1] = Players.archive5.takeFileEncrypted(class133.regionLandArchiveIds[var1], 0, WorldMapSectionType.xteaKeys[var1]); // L: 5665
-				if (DynamicObject.regionMapArchives[var1] == null) { // L: 5666
-					var0 = false; // L: 5667
-					++Client.field747; // L: 5668
-				}
-			}
-		}
-
-		if (!var0) { // L: 5673
-			Client.field560 = 1; // L: 5674
-		} else {
-			Client.field558 = 0; // L: 5677
-			var0 = true; // L: 5678
-
-			int var3;
-			int var4;
-			for (var1 = 0; var1 < Varcs.regionLandArchives.length; ++var1) { // L: 5679
-				byte[] var15 = DynamicObject.regionMapArchives[var1]; // L: 5680
-				if (var15 != null) { // L: 5681
-					var3 = (class21.regions[var1] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5682
-					var4 = (class21.regions[var1] & 255) * 64 - VarcInt.baseY; // L: 5683
-					if (Client.isInInstance) { // L: 5684
-						var3 = 10; // L: 5685
-						var4 = 10; // L: 5686
-					}
-
-					var0 &= ItemComposition.method3771(var15, var3, var4); // L: 5688
-				}
-			}
-
-			if (!var0) { // L: 5691
-				Client.field560 = 2; // L: 5692
-			} else {
-				if (Client.field560 != 0) { // L: 5695
-					MusicPatch.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + 100 + "%" + ")", true);
-				}
-
-				class116.playPcmPlayers(); // L: 5696
-				ArchiveLoader.scene.clear(); // L: 5697
-
-				for (var1 = 0; var1 < 4; ++var1) { // L: 5698
-					Client.collisionMaps[var1].clear();
-				}
-
-				int var2;
-				for (var1 = 0; var1 < 4; ++var1) { // L: 5699
-					for (var2 = 0; var2 < 104; ++var2) { // L: 5700
-						for (var3 = 0; var3 < 104; ++var3) { // L: 5701
-							Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5702
-						}
-					}
-				}
-
-				class116.playPcmPlayers(); // L: 5706
-				class321.method5996(); // L: 5707
-				var1 = Varcs.regionLandArchives.length; // L: 5708
-				ClientPreferences.method2259(); // L: 5709
-				class389.method7094(true); // L: 5710
-				int var5;
-				if (!Client.isInInstance) { // L: 5711
-					byte[] var14;
-					for (var2 = 0; var2 < var1; ++var2) { // L: 5712
-						var3 = (class21.regions[var2] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5713
-						var4 = (class21.regions[var2] & 255) * 64 - VarcInt.baseY; // L: 5714
-						var14 = Varcs.regionLandArchives[var2]; // L: 5715
-						if (var14 != null) { // L: 5716
-							class116.playPcmPlayers(); // L: 5717
-							class1.method9(var14, var3, var4, ScriptEvent.field1042 * 8 - 48, KitDefinition.field1855 * 8 - 48, Client.collisionMaps); // L: 5718
-						}
-					}
-
-					for (var2 = 0; var2 < var1; ++var2) { // L: 5721
-						var3 = (class21.regions[var2] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5722
-						var4 = (class21.regions[var2] & 255) * 64 - VarcInt.baseY; // L: 5723
-						var14 = Varcs.regionLandArchives[var2]; // L: 5724
-						if (var14 == null && KitDefinition.field1855 < 800) { // L: 5725
-							class116.playPcmPlayers(); // L: 5726
-							class431.method7593(var3, var4, 64, 64); // L: 5727
-						}
-					}
-
-					class389.method7094(true); // L: 5730
-
-					for (var2 = 0; var2 < var1; ++var2) { // L: 5731
-						byte[] var13 = DynamicObject.regionMapArchives[var2]; // L: 5732
-						if (var13 != null) { // L: 5733
-							var4 = (class21.regions[var2] >> 8) * 64 - GrandExchangeOfferOwnWorldComparator.baseX; // L: 5734
-							var5 = (class21.regions[var2] & 255) * 64 - VarcInt.baseY; // L: 5735
-							class116.playPcmPlayers(); // L: 5736
-							Widget.method5681(var13, var4, var5, ArchiveLoader.scene, Client.collisionMaps); // L: 5737
-						}
-					}
-				}
-
-				int var6;
-				int var7;
-				int var8;
-				if (Client.isInInstance) { // L: 5741
-					int var9;
-					int var10;
-					int var11;
-					for (var2 = 0; var2 < 4; ++var2) { // L: 5742
-						class116.playPcmPlayers(); // L: 5743
-
-						for (var3 = 0; var3 < 13; ++var3) { // L: 5744
-							for (var4 = 0; var4 < 13; ++var4) { // L: 5745
-								boolean var16 = false; // L: 5746
-								var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5747
-								if (var6 != -1) { // L: 5748
-									var7 = var6 >> 24 & 3; // L: 5749
-									var8 = var6 >> 1 & 3; // L: 5750
-									var9 = var6 >> 14 & 1023; // L: 5751
-									var10 = var6 >> 3 & 2047; // L: 5752
-									var11 = (var9 / 8 << 8) + var10 / 8; // L: 5753
-
-									for (int var12 = 0; var12 < class21.regions.length; ++var12) { // L: 5754
-										if (class21.regions[var12] == var11 && Varcs.regionLandArchives[var12] != null) { // L: 5755
-											class305.method5781(Varcs.regionLandArchives[var12], var2, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5756
-											var16 = true; // L: 5757
-											break;
-										}
-									}
-								}
-
-								if (!var16) { // L: 5762
-									KeyHandler.method337(var2, var3 * 8, var4 * 8); // L: 5763
-								}
-							}
-						}
-					}
-
-					for (var2 = 0; var2 < 13; ++var2) { // L: 5768
-						for (var3 = 0; var3 < 13; ++var3) { // L: 5769
-							var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5770
-							if (var4 == -1) { // L: 5771
-								class431.method7593(var2 * 8, var3 * 8, 8, 8); // L: 5772
-							}
-						}
-					}
-
-					class389.method7094(true); // L: 5776
-
-					for (var2 = 0; var2 < 4; ++var2) { // L: 5777
-						class116.playPcmPlayers(); // L: 5778
-
-						for (var3 = 0; var3 < 13; ++var3) { // L: 5779
-							for (var4 = 0; var4 < 13; ++var4) { // L: 5780
-								var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5781
-								if (var5 != -1) { // L: 5782
-									var6 = var5 >> 24 & 3; // L: 5783
-									var7 = var5 >> 1 & 3; // L: 5784
-									var8 = var5 >> 14 & 1023; // L: 5785
-									var9 = var5 >> 3 & 2047; // L: 5786
-									var10 = (var8 / 8 << 8) + var9 / 8; // L: 5787
-
-									for (var11 = 0; var11 < class21.regions.length; ++var11) { // L: 5788
-										if (class21.regions[var11] == var10 && DynamicObject.regionMapArchives[var11] != null) { // L: 5789
-											Tiles.method2015(DynamicObject.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var7, ArchiveLoader.scene, Client.collisionMaps); // L: 5790
-											break; // L: 5791
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-
-				class389.method7094(true); // L: 5799
-				class116.playPcmPlayers(); // L: 5800
-				GraphicsDefaults.method6939(ArchiveLoader.scene, Client.collisionMaps); // L: 5801
-				class389.method7094(true); // L: 5802
-				var2 = Tiles.Tiles_minPlane; // L: 5803
-				if (var2 > class18.Client_plane) { // L: 5804
-					var2 = class18.Client_plane;
-				}
-
-				if (var2 < class18.Client_plane - 1) { // L: 5805
-					var2 = class18.Client_plane - 1;
-				}
-
-				if (Client.isLowDetail) { // L: 5806
-					ArchiveLoader.scene.init(Tiles.Tiles_minPlane);
-				} else {
-					ArchiveLoader.scene.init(0); // L: 5807
-				}
-
-				for (var3 = 0; var3 < 104; ++var3) { // L: 5808
-					for (var4 = 0; var4 < 104; ++var4) { // L: 5809
-						UserComparator3.updateItemPile(var3, var4); // L: 5810
-					}
-				}
-
-				class116.playPcmPlayers(); // L: 5813
-				class28.method390(); // L: 5814
-				ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5815
-				PacketBufferNode var17;
-				if (class127.client.hasFrame()) { // L: 5816
-					var17 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); // L: 5818
-					var17.packetBuffer.writeInt(1057001181); // L: 5819
-					Client.packetWriter.addNode(var17); // L: 5820
-				}
-
-				if (!Client.isInInstance) { // L: 5822
-					var3 = (ScriptEvent.field1042 - 6) / 8; // L: 5823
-					var4 = (ScriptEvent.field1042 + 6) / 8; // L: 5824
-					var5 = (KitDefinition.field1855 - 6) / 8; // L: 5825
-					var6 = (KitDefinition.field1855 + 6) / 8; // L: 5826
-
-					for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5827
-						for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5828
-							if (var7 < var3 || var7 > var4 || var8 < var5 || var8 > var6) { // L: 5829
-								Players.archive5.loadRegionFromName("m" + var7 + "_" + var8); // L: 5830
-								Players.archive5.loadRegionFromName("l" + var7 + "_" + var8); // L: 5831
-							}
-						}
-					}
-				}
-
-				Decimator.updateGameState(30); // L: 5835
-				class116.playPcmPlayers(); // L: 5836
-				NPC.method2360(); // L: 5837
-				var17 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2973, Client.packetWriter.isaacCipher); // L: 5838
-				Client.packetWriter.addNode(var17); // L: 5839
-				UserComparator9.method2619(); // L: 5840
-			}
-		}
-	} // L: 5675 5693 5841
-
-	@ObfuscatedName("iu")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-825343638"
-	)
-	@Export("Widget_runOnTargetLeave")
-	static void Widget_runOnTargetLeave() {
-		if (Client.isSpellSelected) { // L: 9666
-			Widget var0 = ItemComposition.getWidgetChild(Timer.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9667
-			if (var0 != null && var0.onTargetLeave != null) { // L: 9668
-				ScriptEvent var1 = new ScriptEvent(); // L: 9669
-				var1.widget = var0; // L: 9670
-				var1.args = var0.onTargetLeave; // L: 9671
-				ClanSettings.runScriptEvent(var1); // L: 9672
-			}
-
-			Client.selectedSpellItemId = -1; // L: 9674
-			Client.isSpellSelected = false; // L: 9675
-			class346.invalidateWidget(var0); // L: 9676
-		}
-	} // L: 9677
-}

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

@@ -4,282 +4,209 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ns")
+@ObfuscatedName("nx")
 @Implements("FriendsChat")
 public class FriendsChat extends UserList {
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lpe;"
+		descriptor = "Lpj;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lnp;"
+		descriptor = "Lnj;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1273194957
+		intValue = -546532963
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 923261223
+		intValue = -335963343
 	)
-	int field4244;
+	int field4309;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpe;Lnp;)V"
+		descriptor = "(Lpj;Lnj;)V"
 	)
 	public FriendsChat(LoginType var1, Usernamed var2) {
 		super(100); // L: 19
 		this.name = null; // L: 12
 		this.owner = null; // L: 13
-		this.field4244 = 1; // L: 16
+		this.field4309 = 1; // L: 16
 		this.loginType = var1; // L: 20
 		this.localUser = var2; // L: 21
 	} // L: 22
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lnn;",
+		descriptor = "(I)Lnb;",
-		garbageValue = "-2105397576"
+		garbageValue = "-1695844600"
 	)
 	@Export("newInstance")
 	User newInstance() {
-		return new ClanMate(); // L: 25
+		return new ClanMate(); // L: 26
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Lnn;",
+		descriptor = "(II)[Lnb;",
-		garbageValue = "1888809026"
+		garbageValue = "1788836658"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
-		return new ClanMate[var1]; // L: 29
+		return new ClanMate[var1]; // L: 31
 	}
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "106117795"
-	)
-	@Export("readName")
-	final void readName(String var1) {
-		long var5 = 0L; // L: 37
-		int var7 = var1.length(); // L: 38
-
-		for (int var8 = 0; var8 < var7; ++var8) { // L: 39
-			var5 *= 37L; // L: 40
-			char var9 = var1.charAt(var8); // L: 41
-			if (var9 >= 'A' && var9 <= 'Z') { // L: 42
-				var5 += (long)(var9 + 1 - 65);
-			} else if (var9 >= 'a' && var9 <= 'z') { // L: 43
-				var5 += (long)(var9 + 1 - 97);
-			} else if (var9 >= '0' && var9 <= '9') {
-				var5 += (long)(var9 + 27 - 48); // L: 44
-			}
-
-			if (var5 >= 177917621779460413L) { // L: 45
-				break;
-			}
-		}
-
-		while (var5 % 37L == 0L && var5 != 0L) { // L: 47
-			var5 /= 37L;
-		}
-
-		String var10 = class82.base37DecodeLong(var5); // L: 50
-		if (var10 == null) { // L: 51
-			var10 = "";
-		}
-
-		this.name = var10; // L: 54
-	} // L: 55
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1333219984"
-	)
-	@Export("setOwner")
-	final void setOwner(String var1) {
-		long var5 = 0L; // L: 62
-		int var7 = var1.length(); // L: 63
-
-		for (int var8 = 0; var8 < var7; ++var8) { // L: 64
-			var5 *= 37L; // L: 65
-			char var9 = var1.charAt(var8); // L: 66
-			if (var9 >= 'A' && var9 <= 'Z') { // L: 67
-				var5 += (long)(var9 + 1 - 65);
-			} else if (var9 >= 'a' && var9 <= 'z') { // L: 68
-				var5 += (long)(var9 + 1 - 97);
-			} else if (var9 >= '0' && var9 <= '9') {
-				var5 += (long)(var9 + 27 - 48); // L: 69
-			}
-
-			if (var5 >= 177917621779460413L) { // L: 70
-				break;
-			}
-		}
-
-		while (0L == var5 % 37L && 0L != var5) { // L: 72
-			var5 /= 37L;
-		}
-
-		String var10 = class82.base37DecodeLong(var5); // L: 75
-		if (var10 == null) { // L: 76
-			var10 = "";
-		}
-
-		this.owner = var10; // L: 79
-	} // L: 80
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Lpi;I)V",
-		garbageValue = "-896267822"
-	)
-	@Export("readUpdate")
-	public final void readUpdate(Buffer var1) {
-		this.setOwner(var1.readStringCp1252NullTerminated()); // L: 83
-		long var2 = var1.readLong(); // L: 84
-		long var5 = var2; // L: 86
-		String var4;
-		int var7;
-		if (var2 > 0L && var2 < 6582952005840035281L) { // L: 88
-			if (0L == var2 % 37L) { // L: 92
-				var4 = null; // L: 93
-			} else {
-				var7 = 0; // L: 96
-
-				for (long var8 = var2; var8 != 0L; var8 /= 37L) { // L: 97 98 100
-					++var7; // L: 99
-				}
-
-				StringBuilder var10 = new StringBuilder(var7); // L: 102
-
-				while (0L != var5) { // L: 103
-					long var11 = var5; // L: 104
-					var5 /= 37L; // L: 105
-					var10.append(class349.base37Table[(int)(var11 - var5 * 37L)]); // L: 106
-				}
-
-				var4 = var10.reverse().toString(); // L: 108
-			}
-		} else {
-			var4 = null; // L: 89
-		}
-
-		this.readName(var4); // L: 110
-		this.minKick = var1.readByte(); // L: 111
-		var7 = var1.readUnsignedByte(); // L: 112
-		if (var7 != 255) { // L: 113
-			this.clear(); // L: 114
-
-			for (int var13 = 0; var13 < var7; ++var13) { // L: 115
-				ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 116
-				int var14 = var1.readUnsignedShort(); // L: 117
-				var9.set(var14, ++this.field4244 - 1); // L: 118
-				var9.rank = var1.readByte(); // L: 119
-				var1.readStringCp1252NullTerminated(); // L: 120
-				this.isLocalPlayer(var9); // L: 121
-			}
-
-		}
-	} // L: 123
-
 	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;I)V",
+		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-432033095"
+		garbageValue = "1717144210"
 	)
-	public final void method6661(Buffer var1) {
+	@Export("readName")
-		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 126
+	final void readName(String var1) {
-		int var3 = var1.readUnsignedShort(); // L: 127
+		String var3 = class263.base37DecodeLong(class114.method2626(var1)); // L: 37
-		byte var4 = var1.readByte(); // L: 128
+		if (var3 == null) {
-		boolean var5 = false; // L: 129
+			var3 = ""; // L: 38
-		if (var4 == -128) { // L: 130
+		}
+
+		this.name = var3; // L: 41
+	} // L: 42
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-1165437728"
+	)
+	@Export("setOwner")
+	final void setOwner(String var1) {
+		String var3 = class263.base37DecodeLong(class114.method2626(var1)); // L: 47
+		if (var3 == null) {
+			var3 = ""; // L: 48
+		}
+
+		this.owner = var3; // L: 51
+	} // L: 52
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(Lpx;B)V",
+		garbageValue = "-38"
+	)
+	@Export("readUpdate")
+	public final void readUpdate(Buffer var1) {
+		this.setOwner(var1.readStringCp1252NullTerminated()); // L: 55
+		long var2 = var1.readLong(); // L: 56
+		this.readName(class293.method5431(var2)); // L: 57
+		this.minKick = var1.readByte(); // L: 58
+		int var4 = var1.readUnsignedByte(); // L: 59
+		if (var4 != 255) { // L: 60
+			this.clear(); // L: 61
+
+			for (int var5 = 0; var5 < var4; ++var5) { // L: 62
+				ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 63
+				int var7 = var1.readUnsignedShort(); // L: 64
+				var6.set(var7, ++this.field4309 - 1); // L: 65
+				var6.rank = var1.readByte(); // L: 66
+				var1.readStringCp1252NullTerminated(); // L: 67
+				this.isLocalPlayer(var6); // L: 68
+			}
+
+		}
+	} // L: 70
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Lpx;B)V",
+		garbageValue = "2"
+	)
+	public final void method6463(Buffer var1) {
+		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 73
+		int var3 = var1.readUnsignedShort(); // L: 74
+		byte var4 = var1.readByte(); // L: 75
+		boolean var5 = false; // L: 76
+		if (var4 == -128) { // L: 77
 			var5 = true;
 		}
 
 		ClanMate var6;
-		if (var5) { // L: 131
+		if (var5) { // L: 78
-			if (this.getSize() == 0) { // L: 132
+			if (this.getSize() == 0) { // L: 79
 				return;
 			}
 
-			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 133
+			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 80
-			if (var6 != null && var6.getWorld() == var3) { // L: 134
+			if (var6 != null && var6.getWorld() == var3) { // L: 81
-				this.remove(var6); // L: 135
+				this.remove(var6); // L: 82
 			}
 		} else {
-			var1.readStringCp1252NullTerminated(); // L: 139
+			var1.readStringCp1252NullTerminated(); // L: 86
-			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 140
+			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 87
-			if (var6 == null) { // L: 141
+			if (var6 == null) { // L: 88
-				if (this.getSize() > super.capacity) { // L: 142
+				if (this.getSize() > super.capacity) { // L: 89
 					return;
 				}
 
-				var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 143
+				var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 90
 			}
 
-			var6.set(var3, ++this.field4244 - 1); // L: 145
+			var6.set(var3, ++this.field4309 - 1); // L: 92
-			var6.rank = var4; // L: 146
+			var6.rank = var4; // L: 93
-			this.isLocalPlayer(var6); // L: 147
+			this.isLocalPlayer(var6); // L: 94
 		}
 
-	} // L: 149
+	} // L: 96
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-990148862"
+		garbageValue = "-570861245"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
-		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 152
+		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 99
-			((ClanMate)this.get(var1)).clearIsFriend(); // L: 153
+			((ClanMate)this.get(var1)).clearIsFriend(); // L: 100
 		}
 
-	} // L: 155
+	} // L: 102
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1742976679"
+		garbageValue = "-295246975"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
-		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 158
+		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 105
-			((ClanMate)this.get(var1)).clearIsIgnored(); // L: 159
+			((ClanMate)this.get(var1)).clearIsIgnored(); // L: 106
 		}
 
-	} // L: 161
+	} // L: 108
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Lne;I)V",
+		descriptor = "(Lnm;I)V",
-		garbageValue = "-103692595"
+		garbageValue = "402509546"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {
-		if (var1.getUsername().equals(this.localUser.username())) { // L: 164
+		if (var1.getUsername().equals(this.localUser.username())) { // L: 111
 			this.rank = var1.rank;
 		}
 
-	} // L: 165
+	} // L: 112
 }

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

@@ -3,159 +3,210 @@ 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("nr")
+@ObfuscatedName("na")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("i")
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -1971678933
+	)
+	@Export("musicTrackFileId")
+	public static int musicTrackFileId;
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lpe;"
+		descriptor = "Lpj;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -676332345
+		intValue = 1205835661
 	)
-	int field4235;
+	int field4299;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Llr;"
+		descriptor = "Llm;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpe;)V"
+		descriptor = "(Lpj;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400); // L: 18
-		this.field4235 = 1; // L: 14
+		this.field4299 = 1; // L: 14
 		this.friendLoginUpdates = new LinkDeque(); // L: 15
 		this.loginType = var1; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lnn;",
+		descriptor = "(I)Lnb;",
-		garbageValue = "-2105397576"
+		garbageValue = "-1695844600"
 	)
 	@Export("newInstance")
 	User newInstance() {
-		return new Friend(); // L: 23
+		return new Friend(); // L: 24
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Lnn;",
+		descriptor = "(II)[Lnb;",
-		garbageValue = "1888809026"
+		garbageValue = "1788836658"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
-		return new Friend[var1]; // L: 27
+		return new Friend[var1]; // L: 29
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lqb;ZB)Z",
+		descriptor = "(Lqv;ZB)Z",
-		garbageValue = "-86"
+		garbageValue = "-17"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
-		Friend var3 = (Friend)this.getByUsername(var1); // L: 31
+		Friend var3 = (Friend)this.getByUsername(var1); // L: 33
 		if (var3 == null) {
-			return false; // L: 32
+			return false; // L: 34
 		} else {
-			return !var2 || var3.world != 0; // L: 33
+			return !var2 || var3.world != 0; // L: 35
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;II)V",
+		descriptor = "(Lpx;IB)V",
-		garbageValue = "1085083645"
+		garbageValue = "78"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
 		while (true) {
-			if (var1.offset < var2) { // L: 38
+			if (var1.offset < var2) { // L: 40
-				boolean var3 = var1.readUnsignedByte() == 1; // L: 39
+				boolean var3 = var1.readUnsignedByte() == 1; // L: 41
-				Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 40
+				Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 42
-				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 41
+				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 43
-				int var6 = var1.readUnsignedShort(); // L: 42
+				int var6 = var1.readUnsignedShort(); // L: 44
-				int var7 = var1.readUnsignedByte(); // L: 43
+				int var7 = var1.readUnsignedByte(); // L: 45
-				int var8 = var1.readUnsignedByte(); // L: 44
+				int var8 = var1.readUnsignedByte(); // L: 46
-				boolean var9 = (var8 & 2) != 0; // L: 45
+				boolean var9 = (var8 & 2) != 0; // L: 47
-				boolean var10 = (var8 & 1) != 0; // L: 46
+				boolean var10 = (var8 & 1) != 0; // L: 48
-				if (var6 > 0) { // L: 47
+				if (var6 > 0) { // L: 49
-					var1.readStringCp1252NullTerminated(); // L: 48
+					var1.readStringCp1252NullTerminated(); // L: 50
-					var1.readUnsignedByte(); // L: 49
+					var1.readUnsignedByte(); // L: 51
-					var1.readInt(); // L: 50
+					var1.readInt(); // L: 52
 				}
 
-				var1.readStringCp1252NullTerminated(); // L: 52
+				var1.readStringCp1252NullTerminated(); // L: 54
-				if (var4 != null && var4.hasCleanName()) { // L: 53
+				if (var4 != null && var4.hasCleanName()) { // L: 55
-					Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 54
+					Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 56
-					if (var3) { // L: 55
+					if (var3) { // L: 57
-						Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 56
+						Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 58
-						if (var12 != null && var12 != var11) { // L: 57
+						if (var12 != null && var12 != var11) { // L: 59
-							if (var11 != null) { // L: 58
+							if (var11 != null) { // L: 60
-								this.remove(var12); // L: 59
+								this.remove(var12); // L: 61
 							} else {
-								var11 = var12; // L: 62
+								var11 = var12; // L: 64
 							}
 						}
 					}
 
-					if (var11 != null) { // L: 66
+					if (var11 != null) { // L: 68
-						this.changeName(var11, var4, var5); // L: 67
+						this.changeName(var11, var4, var5); // L: 69
-						if (var6 != var11.world) { // L: 68
+						if (var6 != var11.world) { // L: 70
-							boolean var14 = true; // L: 69
+							boolean var14 = true; // L: 71
 
-							for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 70
+							for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 72
-								if (var13.username.equals(var4)) { // L: 71
+								if (var13.username.equals(var4)) { // L: 73
-									if (var6 != 0 && var13.world == 0) { // L: 72
+									if (var6 != 0 && var13.world == 0) { // L: 74
-										var13.remove(); // L: 73
+										var13.remove(); // L: 75
-										var14 = false; // L: 74
+										var14 = false; // L: 76
-									} else if (var6 == 0 && var13.world != 0) { // L: 76
+									} else if (var6 == 0 && var13.world != 0) { // L: 78
-										var13.remove(); // L: 77
+										var13.remove(); // L: 79
-										var14 = false; // L: 78
+										var14 = false; // L: 80
 									}
 								}
 							}
 
-							if (var14) { // L: 82
+							if (var14) { // L: 84
 								this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6));
 							}
 						}
 					} else {
-						if (this.getSize() >= 400) { // L: 85
+						if (this.getSize() >= 400) { // L: 87
 							continue;
 						}
 
-						var11 = (Friend)this.addLast(var4, var5); // L: 86
+						var11 = (Friend)this.addLast(var4, var5); // L: 88
 					}
 
-					if (var6 != var11.world) { // L: 89
+					if (var6 != var11.world) { // L: 91
-						var11.int2 = ++this.field4235 - 1; // L: 90
+						var11.int2 = ++this.field4299 - 1; // L: 92
-						if (var11.world == -1 && var6 == 0) { // L: 91
+						if (var11.world == -1 && var6 == 0) { // L: 93
-							var11.int2 = -(var11.int2 * 859703757) * -1261040891;
+							var11.int2 = -(var11.int2 * -1393296031) * 960063137;
 						}
 
-						var11.world = var6; // L: 92
+						var11.world = var6; // L: 94
 					}
 
-					var11.rank = var7; // L: 94
+					var11.rank = var7; // L: 96
-					var11.field4237 = var9; // L: 95
+					var11.field4311 = var9; // L: 97
-					var11.field4236 = var10; // L: 96
+					var11.field4312 = var10; // L: 98
-					continue; // L: 97
+					continue; // L: 99
 				}
 
 				throw new IllegalStateException();
 			}
 
-			this.sort(); // L: 98
+			this.sort(); // L: 100
-			return; // L: 99
+			return; // L: 101
 		}
 	}
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(ILbb;ZB)I",
+		garbageValue = "8"
+	)
+	static int method6454(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget; // L: 1101
+		if (var0 == ScriptOpcodes.CC_GETX) { // L: 1102
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.x; // L: 1103
+			return 1; // L: 1104
+		} else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1106
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.y; // L: 1107
+			return 1; // L: 1108
+		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1110
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.width; // L: 1111
+			return 1; // L: 1112
+		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1114
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.height; // L: 1115
+			return 1; // L: 1116
+		} else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1118
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1119
+			return 1; // L: 1120
+		} else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1122
+			Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3.parentId; // L: 1123
+			return 1; // L: 1124
+		} else {
+			return 2; // L: 1126
+		}
+	}
+
+	@ObfuscatedName("br")
+	@ObfuscatedSignature(
+		descriptor = "(ILkd;ZB)V",
+		garbageValue = "20"
+	)
+	static void method6449(int var0, Coord var1, boolean var2) {
+		WorldMapArea var3 = MilliClock.getWorldMap().getMapArea(var0); // L: 4737
+		int var4 = ModelData0.localPlayer.plane; // L: 4738
+		int var5 = (ModelData0.localPlayer.x >> 7) + SecureRandomCallable.baseX; // L: 4739
+		int var6 = (ModelData0.localPlayer.y >> 7) + GrandExchangeOfferOwnWorldComparator.baseY; // L: 4740
+		Coord var7 = new Coord(var4, var5, var6); // L: 4741
+		MilliClock.getWorldMap().method7039(var3, var7, var1, var2); // L: 4742
+	} // L: 4743
 }

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("qg")
+@ObfuscatedName("qj")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("inflater")
 	Inflater inflater;
 
@@ -22,10 +22,10 @@ public class GZipDecompressor {
 		this(-1, 1000000, 1000000); // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;[BI)V",
+		descriptor = "(Lpx;[BI)V",
-		garbageValue = "21631557"
+		garbageValue = "-621970666"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {

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

@@ -4,42 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kl")
+@ObfuscatedName("kt")
 @Implements("GameBuild")
 public class GameBuild {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lkl;"
+		descriptor = "Lkt;"
 	)
 	@Export("LIVE")
 	static final GameBuild LIVE;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lkl;"
+		descriptor = "Lkt;"
 	)
 	@Export("BUILDLIVE")
 	static final GameBuild BUILDLIVE;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lkl;"
+		descriptor = "Lkt;"
 	)
 	@Export("RC")
 	static final GameBuild RC;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lkl;"
+		descriptor = "Lkt;"
 	)
 	@Export("WIP")
 	static final GameBuild WIP;
-	@ObfuscatedName("dk")
+	@ObfuscatedName("a")
-	@Export("mouseCam")
-	static boolean mouseCam;
-	@ObfuscatedName("b")
 	@Export("name")
 	public final String name;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -21967843
+		intValue = -1924800269
 	)
 	@Export("buildId")
 	final int buildId;
@@ -52,16 +49,17 @@ public class GameBuild {
 	}
 
 	GameBuild(String var1, int var2) {
-		this.name = var1; // L: 17
+		this.name = var1; // L: 13
-		this.buildId = var2; // L: 18
+		this.buildId = var2; // L: 14
-	} // L: 19
+	} // L: 15
 
-	@ObfuscatedName("id")
+	@ObfuscatedName("kp")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-733827758"
+		garbageValue = "206667436"
 	)
-	static final int method5773() {
+	static final int method5586() {
-		return Client.menuOptionsCount - 1; // L: 9844
+		float var0 = 200.0F * ((float)class12.clientPreferences.method2225() - 0.5F); // L: 12049
+		return 100 - Math.round(var0); // L: 12050
 	}
 }

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

@@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iy")
+@ObfuscatedName("hx")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1042326033
+		intValue = -942035955
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1852780791
+		intValue = -97756121
 	)
 	@Export("z")
 	int z;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1035014481
+		intValue = 174940337
 	)
 	@Export("centerX")
 	int centerX;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -491615683
+		intValue = 474371985
 	)
 	@Export("centerY")
 	int centerY;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lgx;"
 	)
 	@Export("renderable")
 	public Renderable renderable;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 949419433
+		intValue = -178209059
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 341581995
+		intValue = 1571383405
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1189496713
+		intValue = -1260565151
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 897314371
+		intValue = 1892090883
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1130692301
+		intValue = 1693444283
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -278227507
+		intValue = -986708627
 	)
-	int field2865;
+	int field2697;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 946452763
+		intValue = -24170279
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
 	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		longValue = 3413023011063757331L
+		longValue = 9002525375587932575L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -742925927
+		intValue = -304681645
 	)
 	@Export("flags")
 	int flags;
@@ -96,56 +96,79 @@ public final class GameObject {
 		this.flags = 0; // L: 17
 	} // L: 19
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)Lbd;",
+		descriptor = "(IIIB)Lbb;",
-		garbageValue = "1018035869"
+		garbageValue = "1"
 	)
 	@Export("getWorldMapScript")
 	static Script getWorldMapScript(int var0, int var1, int var2) {
-		int var3 = TileItem.method2393(var1, var0); // L: 38
+		int var3 = PcmPlayer.method744(var1, var0); // L: 38
-		Script var4 = UserComparator5.method2600(var3, var0); // L: 39
+		Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 41
-		if (var4 != null) { // L: 40
+		Script var4;
-			return var4; // L: 41
+		if (var5 != null) { // L: 42
+			var4 = var5; // L: 43
 		} else {
-			int var5 = (-3 - var2 << 8) + var0; // L: 45
+			String var6 = String.valueOf(var3); // L: 46
-			var4 = UserComparator5.method2600(var5, var0); // L: 48
+			int var7 = class115.archive12.getGroupId(var6); // L: 47
-			return var4 != null ? var4 : null; // L: 49 52
+			if (var7 == -1) { // L: 48
+				var4 = null; // L: 49
+			} else {
+				label59: {
+					byte[] var8 = class115.archive12.takeFileFlat(var7); // L: 52
+					if (var8 != null) { // L: 53
+						if (var8.length <= 1) { // L: 54
+							var4 = null; // L: 55
+							break label59; // L: 56
+						}
+
+						var5 = PcmPlayer.newScript(var8); // L: 58
+						if (var5 != null) { // L: 59
+							Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 60
+							var4 = var5; // L: 61
+							break label59; // L: 62
 						}
 					}
 
-	@ObfuscatedName("n")
+					var4 = null; // L: 65
-	@ObfuscatedSignature(
+				}
-		descriptor = "(IIIZIB)J",
+			}
-		garbageValue = "119"
-	)
-	@Export("calculateTag")
-	public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) {
-		long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 69
-		if (var3) { // L: 70
-			var5 |= 65536L;
 		}
 
-		return var5; // L: 71
+		if (var4 != null) { // L: 68
+			return var4; // L: 69
+		} else {
+			int var12 = (-3 - var2 << 8) + var0; // L: 73
+			Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); // L: 78
+			Script var13;
+			if (var14 != null) { // L: 79
+				var13 = var14; // L: 80
+			} else {
+				String var9 = String.valueOf(var12); // L: 83
+				int var10 = class115.archive12.getGroupId(var9); // L: 84
+				if (var10 == -1) { // L: 85
+					var13 = null; // L: 86
+				} else {
+					byte[] var11 = class115.archive12.takeFileFlat(var10); // L: 89
+					if (var11 != null) { // L: 90
+						if (var11.length <= 1) { // L: 91
+							var13 = null; // L: 92
+							return var13 != null ? var13 : null; // L: 105 108
 						}
 
-	@ObfuscatedName("am")
+						var14 = PcmPlayer.newScript(var11); // L: 95
-	@ObfuscatedSignature(
+						if (var14 != null) { // L: 96
-		descriptor = "(ILbd;ZI)I",
+							Script.Script_cached.put(var14, (long)(var12 << 16)); // L: 97
-		garbageValue = "329658125"
+							var13 = var14; // L: 98
-	)
+							return var13 != null ? var13 : null;
-	static int method5111(int var0, Script var1, boolean var2) {
-		if (var0 != 3700 && var0 != 3701) { // L: 2697
-			if (var0 == 3702) { // L: 2702
-				++Interpreter.Interpreter_intStackSize; // L: 2703
-				return 1; // L: 2704
-			} else {
-				return 2; // L: 2706
 						}
-		} else {
+					}
-			--Interpreter.Interpreter_intStackSize; // L: 2698
+
-			--class122.Interpreter_stringStackSize; // L: 2699
+					var13 = null; // L: 102
-			return 1; // L: 2700
+				}
+			}
+
+			return var13 != null ? var13 : null;
 		}
 	}
 }

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

@@ -4,42 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lc")
+@ObfuscatedName("ln")
 @Implements("GrandExchangeEvent")
 public class GrandExchangeEvent {
-	@ObfuscatedName("kd")
-	@ObfuscatedSignature(
-		descriptor = "Lky;"
-	)
-	@Export("hoveredItemContainer")
-	static Widget hoveredItemContainer;
 	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 2120306507
+		intValue = -1128323951
+	)
+	@Export("pcmSampleLength")
+	public static int pcmSampleLength;
+	@ObfuscatedName("ff")
+	@ObfuscatedGetter(
+		intValue = 1608944815
+	)
+	@Export("js5Port")
+	static int js5Port;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 1027306067
 	)
 	@Export("world")
 	public final int world;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		longValue = 4339962193294531453L
+		longValue = -6905147980507584697L
 	)
 	@Export("age")
 	public final long age;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Llh;"
+		descriptor = "Lly;"
 	)
 	@Export("grandExchangeOffer")
 	public final GrandExchangeOffer grandExchangeOffer;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("offerName")
 	String offerName;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@Export("previousOfferName")
 	String previousOfferName;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;BI)V"
+		descriptor = "(Lpx;BI)V"
 	)
 	GrandExchangeEvent(Buffer var1, byte var2, int var3) {
 		this.offerName = var1.readStringCp1252NullTerminated(); // L: 111
@@ -49,8 +55,8 @@ public class GrandExchangeEvent {
 		int var4 = var1.readInt(); // L: 115
 		int var5 = var1.readInt(); // L: 116
 		this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117
-		this.grandExchangeOffer.method6018(2); // L: 118
+		this.grandExchangeOffer.method5823(2); // L: 118
-		this.grandExchangeOffer.method6025(var2); // L: 119
+		this.grandExchangeOffer.method5826(var2); // L: 119
 		this.grandExchangeOffer.unitPrice = var4; // L: 120
 		this.grandExchangeOffer.totalQuantity = var5; // L: 121
 		this.grandExchangeOffer.currentQuantity = 0; // L: 122
@@ -58,20 +64,20 @@ public class GrandExchangeEvent {
 		this.grandExchangeOffer.id = var3; // L: 124
 	} // L: 125
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
+		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "1933113552"
+		garbageValue = "123"
 	)
 	@Export("getOfferName")
 	public String getOfferName() {
 		return this.offerName; // L: 128
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-2144874603"
+		garbageValue = "-744625642"
 	)
 	@Export("getPreviousOfferName")
 	public String getPreviousOfferName() {

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

@@ -7,28 +7,25 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lu")
+@ObfuscatedName("lb")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("lp")
+	@ObfuscatedName("n")
-	@ObfuscatedSignature(
+	@Export("ByteArrayPool_altSizeArrayCounts")
-		descriptor = "Lcz;"
+	static int[] ByteArrayPool_altSizeArrayCounts;
-	)
+	@ObfuscatedName("o")
-	@Export("localPlayer")
-	static Player localPlayer;
-	@ObfuscatedName("v")
 	@Export("events")
 	public final List events;
 
@@ -41,7 +38,7 @@ public class GrandExchangeEvents {
 	} // L: 67
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;Z)V",
+		descriptor = "(Lpx;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -63,10 +60,10 @@ public class GrandExchangeEvents {
 
 	} // L: 92
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/Comparator;ZI)V",
-		garbageValue = "-1621230645"
+		garbageValue = "1290370117"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {

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

@@ -4,42 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lh")
+@ObfuscatedName("ly")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("z")
+	@ObfuscatedName("o")
-	@Export("BZip2Decompressor_block")
-	static int[] BZip2Decompressor_block;
-	@ObfuscatedName("v")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 882617765
+		intValue = -1429288873
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 274655921
+		intValue = 708150215
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1718567641
+		intValue = -1969215889
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 781050121
+		intValue = 1702065649
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1429654689
+		intValue = 2023629729
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -48,7 +45,7 @@ public class GrandExchangeOffer {
 	} // L: 13
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;Z)V",
+		descriptor = "(Lpx;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -60,55 +57,46 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt(); // L: 21
 	} // L: 22
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(S)I",
+		descriptor = "(I)I",
-		garbageValue = "3324"
+		garbageValue = "284680094"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7; // L: 50
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "126"
+		garbageValue = "17"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0; // L: 54
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "659147953"
+		garbageValue = "585573305"
 	)
-	void method6018(int var1) {
+	void method5823(int var1) {
 		this.state &= -8; // L: 58
 		this.state = (byte)(this.state | var1 & 7); // L: 59
 	} // L: 60
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1485129862"
+		garbageValue = "-1891202738"
 	)
-	void method6025(int var1) {
+	void method5826(int var1) {
 		this.state &= -9; // L: 63
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8); // L: 64
 		}
 
 	} // L: 65
-
-	@ObfuscatedName("ah")
-	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "41"
-	)
-	static int method6032(int var0) {
-		return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3837
-	}
 }

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

@@ -1,22 +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("lq")
+@ObfuscatedName("lw")
 @Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("km")
+	@ObfuscatedName("q")
-	@ObfuscatedSignature(
+	@ObfuscatedGetter(
-		descriptor = "Lky;"
+		intValue = -569064403
 	)
-	static Widget field4011;
+	static int field4072;
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Llc;Llc;B)I",
+		descriptor = "(Lln;Lln;I)I",
-		garbageValue = "1"
+		garbageValue = "1626653530"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -24,10 +25,119 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
 	}
 
 	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 21
+		return super.equals(var1);
 	}
 
 	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "([FIFZFZ[FI)I",
+		garbageValue = "-1890109041"
+	)
+	public static int method5798(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) {
+		float var7 = 0.0F; // L: 15
+
+		for (int var8 = 0; var8 < var1 + 1; ++var8) { // L: 16
+			var7 += Math.abs(var0[var8]); // L: 17
+		}
+
+		float var24 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class114.field1435; // L: 19
+		if (var7 <= var24) { // L: 20
+			return -1; // L: 21
+		} else {
+			float[] var9 = new float[var1 + 1]; // L: 23
+
+			int var10;
+			for (var10 = 0; var10 < var1 + 1; ++var10) { // L: 24
+				var9[var10] = 1.0F / var7 * var0[var10]; // L: 25
+			}
+
+			while (Math.abs(var9[var1]) < var24) { // L: 27
+				--var1; // L: 28
+			}
+
+			var10 = 0; // L: 30
+			if (var1 == 0) { // L: 31
+				return var10; // L: 32
+			} else if (var1 == 1) { // L: 34
+				var6[0] = -var9[0] / var9[1]; // L: 35
+				boolean var22 = var3 ? var2 < var24 + var6[0] : var2 < var6[0] - var24; // L: 36
+				boolean var23 = var5 ? var4 > var6[0] - var24 : var4 > var6[0] + var24; // L: 37
+				var10 = var22 && var23 ? 1 : 0; // L: 38
+				if (var10 > 0) { // L: 39
+					if (var3 && var6[0] < var2) { // L: 40
+						var6[0] = var2; // L: 41
+					} else if (var5 && var6[0] > var4) { // L: 43
+						var6[0] = var4; // L: 44
+					}
+				}
+
+				return var10; // L: 47
+			} else {
+				class390 var11 = new class390(var9, var1); // L: 50
+				float[] var12 = new float[var1 + 1]; // L: 51
+
+				for (int var13 = 1; var13 <= var1; ++var13) { // L: 52
+					var12[var13 - 1] = (float)var13 * var9[var13]; // L: 53
+				}
+
+				float[] var21 = new float[var1 + 1]; // L: 55
+				int var14 = method5798(var12, var1 - 1, var2, false, var4, false, var21); // L: 56
+				if (var14 == -1) { // L: 57
+					return 0; // L: 58
+				} else {
+					boolean var15 = false; // L: 60
+					float var17 = 0.0F; // L: 62
+					float var18 = 0.0F; // L: 63
+					float var19 = 0.0F; // L: 64
+
+					for (int var20 = 0; var20 <= var14; ++var20) { // L: 65
+						if (var10 > var1) { // L: 66
+							return var10;
+						}
+
+						float var16;
+						if (var20 == 0) { // L: 67
+							var16 = var2; // L: 68
+							var18 = Ignored.method6616(var9, var1, var2); // L: 69
+							if (Math.abs(var18) <= var24 && var3) { // L: 70
+								var6[var10++] = var2;
+							}
+						} else {
+							var16 = var19; // L: 73
+							var18 = var17; // L: 74
+						}
+
+						if (var20 == var14) { // L: 76
+							var19 = var4; // L: 77
+							var15 = false; // L: 78
+						} else {
+							var19 = var21[var20]; // L: 81
+						}
+
+						var17 = Ignored.method6616(var9, var1, var19); // L: 83
+						if (var15) { // L: 84
+							var15 = false; // L: 85
+						} else if (Math.abs(var17) < var24) { // L: 88
+							if (var20 != var14 || var5) { // L: 89
+								var6[var10++] = var19; // L: 90
+								var15 = true; // L: 91
+							}
+						} else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) { // L: 94
+							var6[var10++] = ReflectionCheck.method601(var11, var16, var19, 0.0F); // L: 95
+							if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var24) { // L: 96
+								var6[var10 - 2] = (var6[var10 - 1] + var6[var10 - 2]) * 0.5F; // L: 97
+								--var10; // L: 98
+							}
+						}
+					}
+
+					return var10; // L: 104
+				}
+			}
+		}
 	}
 }

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

@@ -3,29 +3,460 @@ 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("li")
+@ObfuscatedName("la")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
-	@Export("Interpreter_intLocals")
-	static int[] Interpreter_intLocals;
-
-	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Llc;Llc;B)I",
+		descriptor = "(Lln;Lln;I)I",
-		garbageValue = "-86"
+		garbageValue = "-271291039"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-		return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56
+		return var1.getOfferName().compareTo(var2.getOfferName());
 	}
 
 	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
 	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 64
+		return super.equals(var1);
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/String;Llq;II)Ljm;",
+		garbageValue = "-1715525516"
+	)
+	public static PacketBufferNode method5784(int var0, String var1, Language var2, int var3) {
+		PacketBufferNode var4 = WallDecoration.getPacketBufferNode(ClientPacket.field2973, Client.packetWriter.isaacCipher); // L: 17
+		var4.packetBuffer.writeByte(0); // L: 18
+		int var5 = var4.packetBuffer.offset; // L: 19
+		var4.packetBuffer.writeByte(var0); // L: 20
+		String var6 = var1.toLowerCase(); // L: 21
+		byte var7 = 0; // L: 22
+		if (var6.startsWith("yellow:")) { // L: 23
+			var7 = 0; // L: 24
+			var1 = var1.substring("yellow:".length()); // L: 25
+		} else if (var6.startsWith("red:")) { // L: 27
+			var7 = 1; // L: 28
+			var1 = var1.substring("red:".length()); // L: 29
+		} else if (var6.startsWith("green:")) { // L: 31
+			var7 = 2; // L: 32
+			var1 = var1.substring("green:".length()); // L: 33
+		} else if (var6.startsWith("cyan:")) { // L: 35
+			var7 = 3; // L: 36
+			var1 = var1.substring("cyan:".length()); // L: 37
+		} else if (var6.startsWith("purple:")) { // L: 39
+			var7 = 4; // L: 40
+			var1 = var1.substring("purple:".length()); // L: 41
+		} else if (var6.startsWith("white:")) { // L: 43
+			var7 = 5; // L: 44
+			var1 = var1.substring("white:".length()); // L: 45
+		} else if (var6.startsWith("flash1:")) { // L: 47
+			var7 = 6; // L: 48
+			var1 = var1.substring("flash1:".length()); // L: 49
+		} else if (var6.startsWith("flash2:")) { // L: 51
+			var7 = 7; // L: 52
+			var1 = var1.substring("flash2:".length()); // L: 53
+		} else if (var6.startsWith("flash3:")) { // L: 55
+			var7 = 8; // L: 56
+			var1 = var1.substring("flash3:".length()); // L: 57
+		} else if (var6.startsWith("glow1:")) { // L: 59
+			var7 = 9; // L: 60
+			var1 = var1.substring("glow1:".length()); // L: 61
+		} else if (var6.startsWith("glow2:")) { // L: 63
+			var7 = 10; // L: 64
+			var1 = var1.substring("glow2:".length()); // L: 65
+		} else if (var6.startsWith("glow3:")) { // L: 67
+			var7 = 11; // L: 68
+			var1 = var1.substring("glow3:".length()); // L: 69
+		} else if (var2 != Language.Language_EN) { // L: 71
+			if (var6.startsWith("yellow:")) {
+				var7 = 0; // L: 73
+				var1 = var1.substring("yellow:".length()); // L: 74
+			} else if (var6.startsWith("red:")) { // L: 76
+				var7 = 1; // L: 77
+				var1 = var1.substring("red:".length()); // L: 78
+			} else if (var6.startsWith("green:")) { // L: 80
+				var7 = 2; // L: 81
+				var1 = var1.substring("green:".length()); // L: 82
+			} else if (var6.startsWith("cyan:")) { // L: 84
+				var7 = 3; // L: 85
+				var1 = var1.substring("cyan:".length()); // L: 86
+			} else if (var6.startsWith("purple:")) { // L: 88
+				var7 = 4; // L: 89
+				var1 = var1.substring("purple:".length()); // L: 90
+			} else if (var6.startsWith("white:")) { // L: 92
+				var7 = 5; // L: 93
+				var1 = var1.substring("white:".length()); // L: 94
+			} else if (var6.startsWith("flash1:")) { // L: 96
+				var7 = 6; // L: 97
+				var1 = var1.substring("flash1:".length()); // L: 98
+			} else if (var6.startsWith("flash2:")) { // L: 100
+				var7 = 7; // L: 101
+				var1 = var1.substring("flash2:".length()); // L: 102
+			} else if (var6.startsWith("flash3:")) { // L: 104
+				var7 = 8; // L: 105
+				var1 = var1.substring("flash3:".length()); // L: 106
+			} else if (var6.startsWith("glow1:")) { // L: 108
+				var7 = 9; // L: 109
+				var1 = var1.substring("glow1:".length()); // L: 110
+			} else if (var6.startsWith("glow2:")) { // L: 112
+				var7 = 10; // L: 113
+				var1 = var1.substring("glow2:".length()); // L: 114
+			} else if (var6.startsWith("glow3:")) { // L: 116
+				var7 = 11; // L: 117
+				var1 = var1.substring("glow3:".length()); // L: 118
+			}
+		}
+
+		var6 = var1.toLowerCase(); // L: 121
+		byte var8 = 0; // L: 122
+		if (var6.startsWith("wave:")) { // L: 123
+			var8 = 1; // L: 124
+			var1 = var1.substring("wave:".length()); // L: 125
+		} else if (var6.startsWith("wave2:")) { // L: 127
+			var8 = 2; // L: 128
+			var1 = var1.substring("wave2:".length()); // L: 129
+		} else if (var6.startsWith("shake:")) { // L: 131
+			var8 = 3; // L: 132
+			var1 = var1.substring("shake:".length()); // L: 133
+		} else if (var6.startsWith("scroll:")) { // L: 135
+			var8 = 4; // L: 136
+			var1 = var1.substring("scroll:".length()); // L: 137
+		} else if (var6.startsWith("slide:")) { // L: 139
+			var8 = 5; // L: 140
+			var1 = var1.substring("slide:".length()); // L: 141
+		} else if (var2 != Language.Language_EN) { // L: 143
+			if (var6.startsWith("wave:")) { // L: 144
+				var8 = 1; // L: 145
+				var1 = var1.substring("wave:".length()); // L: 146
+			} else if (var6.startsWith("wave2:")) { // L: 148
+				var8 = 2; // L: 149
+				var1 = var1.substring("wave2:".length()); // L: 150
+			} else if (var6.startsWith("shake:")) { // L: 152
+				var8 = 3; // L: 153
+				var1 = var1.substring("shake:".length()); // L: 154
+			} else if (var6.startsWith("scroll:")) { // L: 156
+				var8 = 4; // L: 157
+				var1 = var1.substring("scroll:".length()); // L: 158
+			} else if (var6.startsWith("slide:")) { // L: 160
+				var8 = 5; // L: 161
+				var1 = var1.substring("slide:".length()); // L: 162
+			}
+		}
+
+		var4.packetBuffer.writeByte(var7); // L: 165
+		var4.packetBuffer.writeByte(var8); // L: 166
+		User.method6525(var4.packetBuffer, var1); // L: 167
+		if (var0 == class296.field3552.rsOrdinal()) { // L: 168
+			var4.packetBuffer.writeByte(var3); // L: 169
+		}
+
+		var4.packetBuffer.method7740(var4.packetBuffer.offset - var5); // L: 171
+		return var4; // L: 172
+	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(ILbb;ZI)I",
+		garbageValue = "2032747937"
+	)
+	static int method5782(int var0, Script var1, boolean var2) {
+		int var3 = -1; // L: 561
+		Widget var4;
+		if (var0 >= 2000) {
+			var0 -= 1000;
+			var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize];
+			var4 = class92.getWidget(var3); // L: 566
+		} else {
+			var4 = var2 ? Interpreter.scriptDotWidget : KeyHandler.scriptActiveWidget;
+		}
+
+		if (var0 == ScriptOpcodes.CC_SETPOSITION) {
+			class12.Interpreter_intStackSize -= 4;
+			var4.rawX = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize];
+			var4.rawY = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1];
+			var4.xAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2];
+			var4.yAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3];
+			GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4);
+			class82.client.alignWidget(var4); // L: 576
+			if (var3 != -1 && var4.type == 0) {
+				UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var3 >> 16], var4, false);
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETSIZE) {
+			class12.Interpreter_intStackSize -= 4;
+			var4.rawWidth = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize];
+			var4.rawHeight = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 583
+			var4.widthAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 2]; // L: 584
+			var4.heightAlignment = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 3];
+			GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4);
+			class82.client.alignWidget(var4);
+			if (var3 != -1 && var4.type == 0) {
+				UserComparator8.revalidateWidgetScroll(NetSocket.Widget_interfaceComponents[var3 >> 16], var4, false);
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETHIDE) {
+			boolean var5 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1;
+			if (var5 != var4.isHidden) {
+				var4.isHidden = var5;
+				GrandExchangeOfferTotalQuantityComparator.invalidateWidget(var4); // L: 595
+			}
+
+			return 1; // L: 597
+		} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 599
+			var4.noClickThrough = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
+			var4.noScrollThrough = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize] == 1;
+			return 1;
+		} else {
+			return 2;
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Lpc;ILca;IB)V",
+		garbageValue = "98"
+	)
+	static final void method5786(PacketBuffer var0, int var1, Player var2, int var3) {
+		byte var4 = class193.field2250.field2252; // L: 451
+		int var5;
+		int var8;
+		int var9;
+		int var12;
+		if ((var3 & 1) != 0) { // L: 452
+			var5 = var0.method7576(); // L: 453
+			PlayerType var6 = (PlayerType)class291.findEnumerated(class118.PlayerType_values(), var0.readUnsignedByte()); // L: 454
+			boolean var7 = var0.method7593() == 1; // L: 455
+			var8 = var0.method7545(); // L: 456
+			var9 = var0.offset; // L: 457
+			if (var2.username != null && var2.appearance != null) { // L: 458
+				boolean var10 = false; // L: 459
+				if (var6.isUser && BufferedSource.friendSystem.isIgnored(var2.username)) { // L: 460 461
+					var10 = true;
+				}
+
+				if (!var10 && Client.field606 == 0 && !var2.isHidden) { // L: 463
+					Players.field1306.offset = 0; // L: 464
+					var0.method7569(Players.field1306.array, 0, var8); // L: 465
+					Players.field1306.offset = 0; // L: 466
+					String var11 = AbstractFont.escapeBrackets(WorldMapManager.method4679(LoginPacket.method5025(Players.field1306))); // L: 467
+					var2.overheadText = var11.trim(); // L: 468
+					var2.overheadTextColor = var5 >> 8; // L: 469
+					var2.overheadTextEffect = var5 & 255; // L: 470
+					var2.overheadTextCyclesRemaining = 150; // L: 471
+					var2.isAutoChatting = var7; // L: 472
+					var2.field1198 = var2 != ModelData0.localPlayer && var6.isUser && "" != Client.field549 && var11.toLowerCase().indexOf(Client.field549) == -1; // L: 473
+					if (var6.isPrivileged) { // L: 475
+						var12 = var7 ? 91 : 1;
+					} else {
+						var12 = var7 ? 90 : 2; // L: 476
+					}
+
+					if (var6.modIcon != -1) { // L: 477
+						WorldMapEvent.addGameMessage(var12, StudioGame.method5590(var6.modIcon) + var2.username.getName(), var11);
+					} else {
+						WorldMapEvent.addGameMessage(var12, var2.username.getName(), var11); // L: 478
+					}
+				}
+			}
+
+			var0.offset = var9 + var8; // L: 481
+		}
+
+		if ((var3 & 4) != 0) { // L: 483
+			var2.field1172 = var0.method7576(); // L: 484
+			if (var2.pathLength == 0) { // L: 485
+				var2.orientation = var2.field1172; // L: 486
+				var2.field1172 = -1; // L: 487
+			}
+		}
+
+		if ((var3 & 16) != 0) { // L: 490
+			var5 = var0.method7593(); // L: 491
+			byte[] var17 = new byte[var5]; // L: 492
+			Buffer var13 = new Buffer(var17); // L: 493
+			var0.method7569(var17, 0, var5); // L: 494
+			Players.field1307[var1] = var13; // L: 495
+			var2.read(var13); // L: 496
+		}
+
+		if ((var3 & 4096) != 0) { // L: 498
+			var2.spotAnimation = var0.method7576(); // L: 499
+			var5 = var0.method7567(); // L: 500
+			var2.spotAnimationHeight = var5 >> 16; // L: 501
+			var2.field1185 = (var5 & 65535) + Client.cycle; // L: 502
+			var2.spotAnimationFrame = 0; // L: 503
+			var2.spotAnimationFrameCycle = 0; // L: 504
+			if (var2.field1185 > Client.cycle) { // L: 505
+				var2.spotAnimationFrame = -1;
+			}
+
+			if (var2.spotAnimation == 65535) { // L: 506
+				var2.spotAnimation = -1;
+			}
+		}
+
+		if ((var3 & 2048) != 0) { // L: 508
+			class193[] var14 = Players.field1302; // L: 509
+			class193[] var21 = new class193[]{class193.field2248, class193.field2250, class193.field2249, class193.field2251}; // L: 513
+			var14[var1] = (class193)class291.findEnumerated(var21, var0.method7549()); // L: 515
+		}
+
+		if ((var3 & 16384) != 0) { // L: 517
+			var2.field1187 = var0.method7547(); // L: 518
+			var2.field1189 = var0.method7548(); // L: 519
+			var2.field1188 = var0.method7548(); // L: 520
+			var2.field1190 = var0.method7549(); // L: 521
+			var2.field1191 = var0.readUnsignedShort() + Client.cycle; // L: 522
+			var2.field1192 = var0.method7554() + Client.cycle; // L: 523
+			var2.field1139 = var0.readUnsignedShort(); // L: 524
+			if (var2.field1095) { // L: 525
+				var2.field1187 += var2.tileX; // L: 526
+				var2.field1189 += var2.tileY; // L: 527
+				var2.field1188 += var2.tileX; // L: 528
+				var2.field1190 += var2.tileY; // L: 529
+				var2.pathLength = 0; // L: 530
+			} else {
+				var2.field1187 += var2.pathX[0]; // L: 533
+				var2.field1189 += var2.pathY[0]; // L: 534
+				var2.field1188 += var2.pathX[0]; // L: 535
+				var2.field1190 += var2.pathY[0]; // L: 536
+				var2.pathLength = 1; // L: 537
+			}
+
+			var2.field1200 = 0; // L: 539
+		}
+
+		if ((var3 & 1024) != 0) { // L: 541
+			var2.field1196 = Client.cycle + var0.method7576(); // L: 542
+			var2.field1197 = Client.cycle + var0.readUnsignedShort(); // L: 543
+			var2.field1143 = var0.method7547(); // L: 544
+			var2.field1199 = var0.method7549(); // L: 545
+			var2.field1153 = var0.method7548(); // L: 546
+			var2.field1140 = (byte)var0.readUnsignedByte(); // L: 547
+		}
+
+		int var15;
+		if ((var3 & 32) != 0) { // L: 549
+			var5 = var0.method7554(); // L: 550
+			if (var5 == 65535) { // L: 551
+				var5 = -1;
+			}
+
+			var15 = var0.method7593(); // L: 552
+			JagexCache.performPlayerAnimation(var2, var5, var15); // L: 553
+		}
+
+		if ((var3 & 256) != 0) { // L: 555
+			var4 = var0.method7549(); // L: 556
+		}
+
+		if ((var3 & 128) != 0) { // L: 558
+			var2.targetIndex = var0.method7554(); // L: 559
+			if (var2.targetIndex == 65535) { // L: 560
+				var2.targetIndex = -1;
+			}
+		}
+
+		if ((var3 & 64) != 0) { // L: 562
+			var5 = var0.readUnsignedByte(); // L: 563
+			int var16;
+			int var19;
+			int var20;
+			if (var5 > 0) { // L: 564
+				for (var15 = 0; var15 < var5; ++var15) { // L: 565
+					var8 = -1; // L: 567
+					var9 = -1; // L: 568
+					var20 = -1; // L: 569
+					var19 = var0.readUShortSmart(); // L: 570
+					if (var19 == 32767) { // L: 571
+						var19 = var0.readUShortSmart(); // L: 572
+						var9 = var0.readUShortSmart(); // L: 573
+						var8 = var0.readUShortSmart(); // L: 574
+						var20 = var0.readUShortSmart(); // L: 575
+					} else if (var19 != 32766) { // L: 577
+						var9 = var0.readUShortSmart(); // L: 578
+					} else {
+						var19 = -1; // L: 580
+					}
+
+					var16 = var0.readUShortSmart(); // L: 581
+					var2.addHitSplat(var19, var9, var8, var20, Client.cycle, var16); // L: 582
+				}
+			}
+
+			var15 = var0.method7546(); // L: 585
+			if (var15 > 0) { // L: 586
+				for (var19 = 0; var19 < var15; ++var19) { // L: 587
+					var8 = var0.readUShortSmart(); // L: 588
+					var9 = var0.readUShortSmart(); // L: 589
+					if (var9 != 32767) { // L: 590
+						var20 = var0.readUShortSmart(); // L: 591
+						var16 = var0.readUnsignedByte(); // L: 592
+						var12 = var9 > 0 ? var0.method7593() : var16; // L: 593
+						var2.addHealthBar(var8, Client.cycle, var9, var20, var16, var12); // L: 594
+					} else {
+						var2.removeHealthBar(var8); // L: 596
+					}
+				}
+			}
+		}
+
+		if ((var3 & 8192) != 0) { // L: 600
+			for (var5 = 0; var5 < 3; ++var5) { // L: 601
+				var2.actions[var5] = var0.readStringCp1252NullTerminated();
+			}
+		}
+
+		if ((var3 & 8) != 0) { // L: 603
+			var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 604
+			if (var2.overheadText.charAt(0) == '~') { // L: 605
+				var2.overheadText = var2.overheadText.substring(1); // L: 606
+				WorldMapEvent.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 607
+			} else if (var2 == ModelData0.localPlayer) { // L: 609
+				WorldMapEvent.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 610
+			}
+
+			var2.isAutoChatting = false; // L: 612
+			var2.overheadTextColor = 0; // L: 613
+			var2.overheadTextEffect = 0; // L: 614
+			var2.overheadTextCyclesRemaining = 150; // L: 615
+		}
+
+		if (var2.field1095) { // L: 617
+			if (var4 == 127) { // L: 618
+				var2.resetPath(var2.tileX, var2.tileY);
+			} else {
+				class193 var22;
+				if (var4 != class193.field2250.field2252) { // L: 621
+					class193[] var18 = new class193[]{class193.field2248, class193.field2250, class193.field2249, class193.field2251}; // L: 624
+					var22 = (class193)class291.findEnumerated(var18, var4); // L: 626
+				} else {
+					var22 = Players.field1302[var1]; // L: 628
+				}
+
+				var2.method2117(var2.tileX, var2.tileY, var22); // L: 629
+			}
+		}
+
+	} // L: 633
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "1233324510"
+	)
+	public static int method5790(int var0) {
+		return class357.method6392(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 72
 	}
 }

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

@@ -4,132 +4,255 @@ 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("bf")
+@ObfuscatedName("bs")
 @Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("bg")
+	@ObfuscatedName("hz")
 	@ObfuscatedGetter(
-		intValue = -1956561099
+		intValue = -990800587
 	)
-	static int field483;
+	@Export("baseY")
-	@ObfuscatedName("hn")
+	static int baseY;
-	@ObfuscatedGetter(
+	@ObfuscatedName("o")
-		intValue = -525655717
-	)
-	@Export("baseX")
-	static int baseX;
-	@ObfuscatedName("nk")
-	@ObfuscatedSignature(
-		descriptor = "Lky;"
-	)
-	static Widget field486;
-	@ObfuscatedName("v")
 	@Export("filterWorlds")
 	boolean filterWorlds;
 
 	GrandExchangeOfferOwnWorldComparator() {
-	} // L: 12705
+	} // L: 12755
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Llc;Llc;B)I",
+		descriptor = "(Lln;Lln;I)I",
-		garbageValue = "1"
+		garbageValue = "1102099344"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-		if (var2.world == var1.world) { // L: 12708
+		if (var2.world == var1.world) { // L: 12758
 			return 0;
 		} else {
-			if (this.filterWorlds) { // L: 12709
+			if (this.filterWorlds) { // L: 12759
-				if (Client.worldId == var1.world) { // L: 12710
+				if (Client.worldId == var1.world) { // L: 12760
 					return -1;
 				}
 
-				if (var2.world == Client.worldId) { // L: 12711
+				if (var2.world == Client.worldId) { // L: 12761
 					return 1;
 				}
 			}
 
-			return var1.world < var2.world ? -1 : 1; // L: 12713
+			return var1.world < var2.world ? -1 : 1; // L: 12763
 		}
 	}
 
 	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12717
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12767
 	}
 
 	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 12721
+		return super.equals(var1); // L: 12771
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
+		descriptor = "(ILbb;ZB)I",
-		garbageValue = "-2123450792"
+		garbageValue = "106"
 	)
-	public static boolean method1130(int var0) {
+	static int method1120(int var0, Script var1, boolean var2) {
-		return var0 >= 0 && var0 < 112 ? KeyHandler.field140[var0] : false; // L: 236 237
+		int var3;
+		if (var0 == ScriptOpcodes.OC_NAME) { // L: 3428
+			var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3429
+			Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = FileSystem.ItemDefinition_get(var3).name; // L: 3430
+			return 1; // L: 3431
+		} else {
+			int var4;
+			ItemComposition var5;
+			if (var0 == ScriptOpcodes.OC_OP) { // L: 3433
+				class12.Interpreter_intStackSize -= 2; // L: 3434
+				var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3435
+				var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3436
+				var5 = FileSystem.ItemDefinition_get(var3); // L: 3437
+				if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
+					Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3438
+				} else {
+					Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3439
 				}
 
-	@ObfuscatedName("s")
+				return 1; // L: 3440
+			} else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3442
+				class12.Interpreter_intStackSize -= 2; // L: 3443
+				var3 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize]; // L: 3444
+				var4 = Interpreter.Interpreter_intStack[class12.Interpreter_intStackSize + 1]; // L: 3445
+				var5 = FileSystem.ItemDefinition_get(var3); // L: 3446
+				if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3447
+					Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
+				} else {
+					Interpreter.Interpreter_stringStack[++class9.Interpreter_stringStackSize - 1] = ""; // L: 3448
+				}
+
+				return 1; // L: 3449
+			} else if (var0 == ScriptOpcodes.OC_COST) { // L: 3451
+				var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3452
+				Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).price; // L: 3453
+				return 1; // L: 3454
+			} else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3456
+				var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3457
+				Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3458
+				return 1; // L: 3459
+			} else {
+				ItemComposition var7;
+				if (var0 == ScriptOpcodes.OC_CERT) { // L: 3461
+					var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3462
+					var7 = FileSystem.ItemDefinition_get(var3); // L: 3463
+					if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3464
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.note;
+					} else {
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3465
+					}
+
+					return 1; // L: 3466
+				} else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3468
+					var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3469
+					var7 = FileSystem.ItemDefinition_get(var3); // L: 3470
+					if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3471
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.note;
+					} else {
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3472
+					}
+
+					return 1; // L: 3473
+				} else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3475
+					var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3476
+					Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = FileSystem.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3477
+					return 1; // L: 3478
+				} else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3480
+					var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3481
+					var7 = FileSystem.ItemDefinition_get(var3); // L: 3482
+					if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3483
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.placeholder;
+					} else {
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3484
+					}
+
+					return 1; // L: 3485
+				} else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3487
+					var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3488
+					var7 = FileSystem.ItemDefinition_get(var3); // L: 3489
+					if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3490
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var7.placeholder;
+					} else {
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var3; // L: 3491
+					}
+
+					return 1; // L: 3492
+				} else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3494
+					String var6 = Interpreter.Interpreter_stringStack[--class9.Interpreter_stringStackSize]; // L: 3495
+					var4 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3496
+					class28.findItemDefinitions(var6, var4 == 1); // L: 3497
+					Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = UserComparator9.foundItemIdCount; // L: 3498
+					return 1; // L: 3499
+				} else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3501
+					if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3506
+						Coord.foundItemIndex = 0; // L: 3507
+						return 1; // L: 3508
+					} else if (var0 == 4213) { // L: 3510
+						var3 = Interpreter.Interpreter_intStack[--class12.Interpreter_intStackSize]; // L: 3511
+						var4 = FileSystem.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3512
+						if (var4 == -1) { // L: 3513
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4; // L: 3514
+						} else {
+							Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = var4 + 1; // L: 3517
+						}
+
+						return 1; // L: 3519
+					} else {
+						return 2; // L: 3521
+					}
+				} else {
+					if (class182.foundItemIds != null && Coord.foundItemIndex < UserComparator9.foundItemIdCount) { // L: 3502
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = class182.foundItemIds[++Coord.foundItemIndex - 1] & '\uffff'; // L: 3503
+					} else {
+						Interpreter.Interpreter_intStack[++class12.Interpreter_intStackSize - 1] = -1;
+					}
+
+					return 1; // L: 3504
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("gr")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
+		descriptor = "(IIIIZI)V",
-		garbageValue = "-121"
+		garbageValue = "1542062611"
 	)
-	public static boolean method1138(int var0) {
+	@Export("setViewportShape")
-		return var0 >= 0 && var0 < 112 ? KeyHandler.field131[var0] : false; // L: 246 247
+	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+		if (var2 < 1) { // L: 4896
+			var2 = 1;
 		}
 
-	@ObfuscatedName("gf")
+		if (var3 < 1) { // L: 4897
-	@ObfuscatedSignature(
+			var3 = 1;
-		descriptor = "(I)V",
-		garbageValue = "1843908381"
-	)
-	static final void method1128() {
-		int var0 = class286.field3274 * 128 + 64; // L: 3784
-		int var1 = class54.field447 * 128 + 64; // L: 3785
-		int var2 = WorldMapLabel.getTileHeight(var0, var1, class18.Client_plane) - BZip2State.field4662; // L: 3786
-		class13.method163(var0, var2, var1); // L: 3787
-		var0 = class154.field1691 * 128 + 64; // L: 3788
-		var1 = class67.field881 * 128 + 64; // L: 3789
-		var2 = WorldMapLabel.getTileHeight(var0, var1, class18.Client_plane) - DevicePcmPlayerProvider.field154; // L: 3790
-		int var3 = var0 - WorldMapLabelSize.cameraX; // L: 3791
-		int var4 = var2 - ItemContainer.cameraY; // L: 3792
-		int var5 = var1 - class154.cameraZ; // L: 3793
-		int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); // L: 3794
-		int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.9490051269531D) & 2047; // L: 3795
-		int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.9490051269531D) & 2047; // L: 3796
-		WorldMapSectionType.method4308(var7, var8); // L: 3797
-	} // L: 3798
-
-	@ObfuscatedName("ge")
-	@ObfuscatedSignature(
-		descriptor = "(Lcz;III)V",
-		garbageValue = "1679635193"
-	)
-	@Export("performPlayerAnimation")
-	static void performPlayerAnimation(Player var0, int var1, int var2) {
-		if (var0.sequence == var1 && var1 != -1) { // L: 4236
-			int var3 = class163.SequenceDefinition_get(var1).field2161; // L: 4237
-			if (var3 == 1) { // L: 4238
-				var0.sequenceFrame = 0; // L: 4239
-				var0.sequenceFrameCycle = 0; // L: 4240
-				var0.sequenceDelay = var2; // L: 4241
-				var0.field1152 = 0; // L: 4242
 		}
 
-			if (var3 == 2) { // L: 4244
+		int var5 = var3 - 334; // L: 4898
-				var0.field1152 = 0; // L: 4245
+		int var6;
-			}
+		if (var5 < 0) { // L: 4900
-		} else if (var1 == -1 || var0.sequence == -1 || class163.SequenceDefinition_get(var1).field2155 >= class163.SequenceDefinition_get(var0.sequence).field2155) { // L: 4248
+			var6 = Client.field748;
-			var0.sequence = var1; // L: 4249
+		} else if (var5 >= 100) { // L: 4901
-			var0.sequenceFrame = 0; // L: 4250
+			var6 = Client.field749;
-			var0.sequenceFrameCycle = 0; // L: 4251
+		} else {
-			var0.sequenceDelay = var2; // L: 4252
+			var6 = (Client.field749 - Client.field748) * var5 / 100 + Client.field748; // L: 4902
-			var0.field1152 = 0; // L: 4253
-			var0.field1170 = var0.pathLength; // L: 4254
 		}
 
-	} // L: 4256
+		int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4903
+		int var8;
+		int var9;
+		short var10;
+		if (var7 < Client.field656) { // L: 4904
+			var10 = Client.field656; // L: 4905
+			var6 = var10 * var2 * 334 / (var3 * 512); // L: 4906
+			if (var6 > Client.field753) { // L: 4907
+				var6 = Client.field753; // L: 4908
+				var8 = var3 * var6 * 512 / (var10 * 334); // L: 4909
+				var9 = (var2 - var8) / 2; // L: 4910
+				if (var4) { // L: 4911
+					Rasterizer2D.Rasterizer2D_resetClip(); // L: 4912
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4913
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4914
+				}
+
+				var0 += var9; // L: 4916
+				var2 -= var9 * 2; // L: 4917
+			}
+		} else if (var7 > Client.field755) { // L: 4920
+			var10 = Client.field755; // L: 4921
+			var6 = var10 * var2 * 334 / (var3 * 512); // L: 4922
+			if (var6 < Client.field752) { // L: 4923
+				var6 = Client.field752; // L: 4924
+				var8 = var10 * var2 * 334 / (var6 * 512); // L: 4925
+				var9 = (var3 - var8) / 2; // L: 4926
+				if (var4) { // L: 4927
+					Rasterizer2D.Rasterizer2D_resetClip(); // L: 4928
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4929
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4930
+				}
+
+				var1 += var9; // L: 4932
+				var3 -= var9 * 2; // L: 4933
+			}
+		}
+
+		Client.viewportZoom = var3 * var6 / 334; // L: 4936
+		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4937
+			WorldMapArea.method4514(var2, var3); // L: 4938
+		}
+
+		Client.viewportOffsetX = var0; // L: 4940
+		Client.viewportOffsetY = var1; // L: 4941
+		Client.viewportWidth = var2; // L: 4942
+		Client.viewportHeight = var3; // L: 4943
+	} // L: 4944
 }

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

@@ -1,78 +1,47 @@
 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("lw")
+@ObfuscatedName("ld")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = 1165862303
+	)
+	static int field4069;
+
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Llc;Llc;I)I",
+		descriptor = "(Lln;Lln;B)I",
-		garbageValue = "-1618602527"
+		garbageValue = "127"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); // L: 69
 	}
 
-	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-	}
-
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 77
 	}
 
-	@ObfuscatedName("f")
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73
+	}
+
+	@ObfuscatedName("kf")
 	@ObfuscatedSignature(
-		descriptor = "(I)[Ldk;",
+		descriptor = "(Lki;I)V",
-		garbageValue = "1223848574"
+		garbageValue = "-842316290"
 	)
-	static class119[] method5977() {
+	@Export("invalidateWidget")
-		return new class119[]{class119.field1449, class119.field1439, class119.field1440, class119.field1441, class119.field1442, class119.field1446, class119.field1444, class119.field1443, class119.field1455, class119.field1447, class119.field1448, class119.field1451, class119.field1450, class119.field1445, class119.field1457, class119.field1452, class119.field1454}; // L: 73
+	static void invalidateWidget(Widget var0) {
+		if (var0 != null && var0.cycle == Client.field694) { // L: 11919
+			Client.field652[var0.rootIndex] = true; // L: 11920
 		}
 
-	@ObfuscatedName("ie")
+	} // L: 11922
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1983287311"
-	)
-	@Export("incrementMenuEntries")
-	static final void incrementMenuEntries() {
-		boolean var0 = false; // L: 9793
-
-		while (!var0) { // L: 9794
-			var0 = true; // L: 9795
-
-			for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9796
-				if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9797
-					String var2 = Client.menuTargets[var1]; // L: 9798
-					Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9799
-					Client.menuTargets[var1 + 1] = var2; // L: 9800
-					String var3 = Client.menuActions[var1]; // L: 9801
-					Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9802
-					Client.menuActions[var1 + 1] = var3; // L: 9803
-					int var4 = Client.menuOpcodes[var1]; // L: 9804
-					Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9805
-					Client.menuOpcodes[var1 + 1] = var4; // L: 9806
-					var4 = Client.menuArguments1[var1]; // L: 9807
-					Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9808
-					Client.menuArguments1[var1 + 1] = var4; // L: 9809
-					var4 = Client.menuArguments2[var1]; // L: 9810
-					Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9811
-					Client.menuArguments2[var1 + 1] = var4; // L: 9812
-					var4 = Client.menuIdentifiers[var1]; // L: 9813
-					Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9814
-					Client.menuIdentifiers[var1 + 1] = var4; // L: 9815
-					boolean var5 = Client.menuShiftClick[var1]; // L: 9816
-					Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9817
-					Client.menuShiftClick[var1 + 1] = var5; // L: 9818
-					var0 = false; // L: 9819
-				}
-			}
-		}
-
-	} // L: 9823
 }

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

@@ -4,185 +4,41 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("le")
+@ObfuscatedName("lt")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Llc;Llc;B)I",
+		descriptor = "(Lln;Lln;B)I",
-		garbageValue = "2"
+		garbageValue = "88"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); // L: 43
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 51
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47
 	}
 
-	@ObfuscatedName("hc")
+	public boolean equals(Object var1) {
+		return super.equals(var1); // L: 51
+	}
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIII)V",
+		descriptor = "(III)I",
-		garbageValue = "-1285875699"
+		garbageValue = "-602449729"
 	)
-	@Export("drawObject")
+	static final int method5846(int var0, int var1) {
-	static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
+		int var2 = InterfaceParent.method2070(45365 + var0, 91923 + var1, 4) - 128 + (InterfaceParent.method2070(10294 + var0, var1 + 37821, 2) - 128 >> 1) + (InterfaceParent.method2070(var0, var1, 1) - 128 >> 2); // L: 918
-		long var5 = ArchiveLoader.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5844
+		var2 = (int)(0.3D * (double)var2) + 35; // L: 919
-		int var7;
+		if (var2 < 10) { // L: 920
-		int var8;
+			var2 = 10;
-		int var9;
+		} else if (var2 > 60) { // L: 921
-		int var10;
+			var2 = 60;
-		int var14;
-		int var26;
-		if (var5 != 0L) { // L: 5845
-			var7 = ArchiveLoader.scene.getObjectFlags(var0, var1, var2, var5); // L: 5846
-			var8 = var7 >> 6 & 3; // L: 5847
-			var9 = var7 & 31; // L: 5848
-			var10 = var3; // L: 5849
-			boolean var12 = var5 != 0L; // L: 5852
-			if (var12) { // L: 5853
-				boolean var13 = (int)(var5 >>> 16 & 1L) == 1; // L: 5856
-				var12 = !var13; // L: 5858
 		}
 
-			if (var12) { // L: 5862
+		return var2; // L: 922
-				var10 = var4;
-			}
-
-			int[] var19 = HealthBarUpdate.sceneMinimapSprite.pixels; // L: 5863
-			var26 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5864
-			var14 = FileSystem.Entity_unpackID(var5); // L: 5865
-			ObjectComposition var15 = class146.getObjectDefinition(var14); // L: 5866
-			if (var15.mapSceneId != -1) { // L: 5867
-				IndexedSprite var16 = GraphicsDefaults.mapSceneSprites[var15.mapSceneId]; // L: 5868
-				if (var16 != null) { // L: 5869
-					int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5870
-					int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5871
-					var16.drawAt(var1 * 4 + var17 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); // L: 5872
-				}
-			} else {
-				if (var9 == 0 || var9 == 2) { // L: 5876
-					if (var8 == 0) { // L: 5877
-						var19[var26] = var10; // L: 5878
-						var19[var26 + 512] = var10; // L: 5879
-						var19[var26 + 1024] = var10; // L: 5880
-						var19[var26 + 1536] = var10; // L: 5881
-					} else if (var8 == 1) { // L: 5883
-						var19[var26] = var10; // L: 5884
-						var19[var26 + 1] = var10; // L: 5885
-						var19[var26 + 2] = var10; // L: 5886
-						var19[var26 + 3] = var10; // L: 5887
-					} else if (var8 == 2) { // L: 5889
-						var19[var26 + 3] = var10; // L: 5890
-						var19[var26 + 512 + 3] = var10; // L: 5891
-						var19[var26 + 1024 + 3] = var10; // L: 5892
-						var19[var26 + 1536 + 3] = var10; // L: 5893
-					} else if (var8 == 3) { // L: 5895
-						var19[var26 + 1536] = var10; // L: 5896
-						var19[var26 + 1536 + 1] = var10; // L: 5897
-						var19[var26 + 1536 + 2] = var10; // L: 5898
-						var19[var26 + 1536 + 3] = var10; // L: 5899
 	}
 }
-
-				if (var9 == 3) { // L: 5902
-					if (var8 == 0) { // L: 5903
-						var19[var26] = var10;
-					} else if (var8 == 1) { // L: 5904
-						var19[var26 + 3] = var10;
-					} else if (var8 == 2) { // L: 5905
-						var19[var26 + 1536 + 3] = var10;
-					} else if (var8 == 3) { // L: 5906
-						var19[var26 + 1536] = var10;
-					}
-				}
-
-				if (var9 == 2) { // L: 5908
-					if (var8 == 3) { // L: 5909
-						var19[var26] = var10; // L: 5910
-						var19[var26 + 512] = var10; // L: 5911
-						var19[var26 + 1024] = var10; // L: 5912
-						var19[var26 + 1536] = var10; // L: 5913
-					} else if (var8 == 0) { // L: 5915
-						var19[var26] = var10; // L: 5916
-						var19[var26 + 1] = var10; // L: 5917
-						var19[var26 + 2] = var10; // L: 5918
-						var19[var26 + 3] = var10; // L: 5919
-					} else if (var8 == 1) { // L: 5921
-						var19[var26 + 3] = var10; // L: 5922
-						var19[var26 + 512 + 3] = var10; // L: 5923
-						var19[var26 + 1024 + 3] = var10; // L: 5924
-						var19[var26 + 1536 + 3] = var10; // L: 5925
-					} else if (var8 == 2) { // L: 5927
-						var19[var26 + 1536] = var10; // L: 5928
-						var19[var26 + 1536 + 1] = var10; // L: 5929
-						var19[var26 + 1536 + 2] = var10; // L: 5930
-						var19[var26 + 1536 + 3] = var10; // L: 5931
-					}
-				}
-			}
-		}
-
-		var5 = ArchiveLoader.scene.getGameObjectTag(var0, var1, var2); // L: 5936
-		if (0L != var5) { // L: 5937
-			var7 = ArchiveLoader.scene.getObjectFlags(var0, var1, var2, var5); // L: 5938
-			var8 = var7 >> 6 & 3; // L: 5939
-			var9 = var7 & 31; // L: 5940
-			var10 = FileSystem.Entity_unpackID(var5); // L: 5941
-			ObjectComposition var20 = class146.getObjectDefinition(var10); // L: 5942
-			if (var20.mapSceneId != -1) { // L: 5943
-				IndexedSprite var28 = GraphicsDefaults.mapSceneSprites[var20.mapSceneId]; // L: 5944
-				if (var28 != null) { // L: 5945
-					var26 = (var20.sizeX * 4 - var28.subWidth) / 2; // L: 5946
-					var14 = (var20.sizeY * 4 - var28.subHeight) / 2; // L: 5947
-					var28.drawAt(var1 * 4 + var26 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); // L: 5948
-				}
-			} else if (var9 == 9) { // L: 5951
-				int var25 = 15658734; // L: 5952
-				boolean var27 = 0L != var5; // L: 5955
-				if (var27) { // L: 5956
-					boolean var21 = (int)(var5 >>> 16 & 1L) == 1; // L: 5959
-					var27 = !var21; // L: 5961
-				}
-
-				if (var27) { // L: 5965
-					var25 = 15597568;
-				}
-
-				int[] var22 = HealthBarUpdate.sceneMinimapSprite.pixels; // L: 5966
-				int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5967
-				if (var8 != 0 && var8 != 2) { // L: 5968
-					var22[var29] = var25; // L: 5975
-					var22[var29 + 1 + 512] = var25; // L: 5976
-					var22[var29 + 1024 + 2] = var25; // L: 5977
-					var22[var29 + 1536 + 3] = var25; // L: 5978
-				} else {
-					var22[var29 + 1536] = var25; // L: 5969
-					var22[var29 + 1 + 1024] = var25; // L: 5970
-					var22[var29 + 512 + 2] = var25; // L: 5971
-					var22[var29 + 3] = var25; // L: 5972
-				}
-			}
-		}
-
-		var5 = ArchiveLoader.scene.getFloorDecorationTag(var0, var1, var2); // L: 5982
-		if (var5 != 0L) { // L: 5983
-			var7 = FileSystem.Entity_unpackID(var5); // L: 5984
-			ObjectComposition var23 = class146.getObjectDefinition(var7); // L: 5985
-			if (var23.mapSceneId != -1) { // L: 5986
-				IndexedSprite var24 = GraphicsDefaults.mapSceneSprites[var23.mapSceneId]; // L: 5987
-				if (var24 != null) { // L: 5988
-					var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5989
-					int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5990
-					var24.drawAt(var10 + var1 * 4 + 48, var11 + (104 - var2 - var23.sizeY) * 4 + 48); // L: 5991
-				}
-			}
-		}
-
-	} // L: 5995
-}

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

@@ -4,13 +4,20 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lp")
+@ObfuscatedName("lj")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Llc;Llc;I)I",
+		descriptor = "Llp;"
-		garbageValue = "-468460476"
+	)
+	@Export("WorldMapElement_archive")
+	static AbstractArchive WorldMapElement_archive;
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Lln;Lln;I)I",
+		garbageValue = "1939073970"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -25,176 +32,14 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
 		return super.equals(var1); // L: 36
 	}
 
-	@ObfuscatedName("go")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lcb;I)V",
+		descriptor = "(Llp;Llp;Ljava/lang/String;Ljava/lang/String;I)Lmx;",
-		garbageValue = "-1213322311"
+		garbageValue = "2088711199"
 	)
-	static final void method6006(Actor var0) {
+	public static Font method5808(AbstractArchive var0, AbstractArchive var1, String var2, String var3) {
-		var0.isWalking = false; // L: 4123
+		int var4 = var0.getGroupId(var2); // L: 124
-		SequenceDefinition var1;
+		int var5 = var0.getFileId(var4, var3); // L: 125
-		int var2;
+		return class387.method6781(var0, var1, var4, var5); // L: 126
-		if (var0.movementSequence != -1) { // L: 4124
-			var1 = class163.SequenceDefinition_get(var0.movementSequence); // L: 4125
-			if (var1 != null) { // L: 4126
-				if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 4127
-					++var0.movementFrameCycle; // L: 4128
-					if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4129
-						var0.movementFrameCycle = 1; // L: 4130
-						++var0.movementFrame; // L: 4131
-						Language.method6087(var1, var0.movementFrame, var0.x, var0.y); // L: 4132
-					}
-
-					if (var0.movementFrame >= var1.frameIds.length) { // L: 4134
-						var0.movementFrameCycle = 0; // L: 4135
-						var0.movementFrame = 0; // L: 4136
-						Language.method6087(var1, var0.movementFrame, var0.x, var0.y); // L: 4137
-					}
-				} else if (var1.isCachedModelIdSet()) { // L: 4140
-					++var0.movementFrame; // L: 4141
-					var2 = var1.method3844(); // L: 4142
-					if (var0.movementFrame < var2) { // L: 4143
-						KeyHandler.method336(var1, var0.movementFrame, var0.x, var0.y); // L: 4144
-					} else {
-						var0.movementFrameCycle = 0; // L: 4147
-						var0.movementFrame = 0; // L: 4148
-						KeyHandler.method336(var1, var0.movementFrame, var0.x, var0.y); // L: 4149
-					}
-				} else {
-					var0.movementSequence = -1; // L: 4152
-				}
-			} else {
-				var0.movementSequence = -1; // L: 4154
 	}
 }
-
-		if (var0.spotAnimation != -1 && Client.cycle >= var0.field1134) { // L: 4156
-			if (var0.spotAnimationFrame < 0) { // L: 4157
-				var0.spotAnimationFrame = 0;
-			}
-
-			int var4 = ClientPreferences.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4158
-			if (var4 != -1) { // L: 4159
-				SequenceDefinition var5 = class163.SequenceDefinition_get(var4); // L: 4160
-				if (var5 != null && var5.frameIds != null) { // L: 4161
-					++var0.spotAnimationFrameCycle; // L: 4162
-					if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { // L: 4163
-						var0.spotAnimationFrameCycle = 1; // L: 4164
-						++var0.spotAnimationFrame; // L: 4165
-						Language.method6087(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4166
-					}
-
-					if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { // L: 4168 4169
-						var0.spotAnimation = -1;
-					}
-				} else if (var5.isCachedModelIdSet()) { // L: 4172
-					++var0.spotAnimationFrame; // L: 4173
-					int var3 = var5.method3844(); // L: 4174
-					if (var0.spotAnimationFrame < var3) { // L: 4175
-						KeyHandler.method336(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4176
-					} else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { // L: 4179
-						var0.spotAnimation = -1;
-					}
-				} else {
-					var0.spotAnimation = -1; // L: 4182
-				}
-			} else {
-				var0.spotAnimation = -1; // L: 4184
-			}
-		}
-
-		if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4186
-			var1 = class163.SequenceDefinition_get(var0.sequence); // L: 4187
-			if (var1.field2159 == 1 && var0.field1170 > 0 && var0.field1143 <= Client.cycle && var0.field1163 < Client.cycle) { // L: 4188 4189
-				var0.sequenceDelay = 1; // L: 4190
-				return; // L: 4191
-			}
-		}
-
-		if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4195
-			var1 = class163.SequenceDefinition_get(var0.sequence); // L: 4196
-			if (var1 != null) { // L: 4197
-				if (!var1.isCachedModelIdSet() && var1.frameIds != null) { // L: 4198
-					++var0.sequenceFrameCycle; // L: 4199
-					if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4200
-						var0.sequenceFrameCycle = 1; // L: 4201
-						++var0.sequenceFrame; // L: 4202
-						Language.method6087(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4203
-					}
-
-					if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4205
-						var0.sequenceFrame -= var1.frameCount; // L: 4206
-						++var0.field1152; // L: 4207
-						if (var0.field1152 >= var1.field2138) { // L: 4208
-							var0.sequence = -1;
-						} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4209
-							Language.method6087(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4210
-						} else {
-							var0.sequence = -1;
-						}
-					}
-
-					var0.isWalking = var1.field2154; // L: 4212
-				} else if (var1.isCachedModelIdSet()) { // L: 4214
-					++var0.sequenceFrame; // L: 4215
-					var2 = var1.method3801().method2762(); // L: 4216
-					if (var0.sequenceFrame < var2) { // L: 4217
-						KeyHandler.method336(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4218
-					} else {
-						var0.sequenceFrame -= var1.frameCount; // L: 4221
-						++var0.field1152; // L: 4222
-						if (var0.field1152 >= var1.field2138) { // L: 4223
-							var0.sequence = -1;
-						} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { // L: 4224
-							KeyHandler.method336(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4225
-						} else {
-							var0.sequence = -1;
-						}
-					}
-				} else {
-					var0.sequence = -1; // L: 4228
-				}
-			} else {
-				var0.sequence = -1; // L: 4230
-			}
-		}
-
-		if (var0.sequenceDelay > 0) { // L: 4232
-			--var0.sequenceDelay;
-		}
-
-	} // L: 4233
-
-	@ObfuscatedName("hf")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIIII)V",
-		garbageValue = "1469705502"
-	)
-	@Export("updatePendingSpawn")
-	static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		PendingSpawn var9 = null; // L: 7693
-
-		for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7694 7695 7700
-			if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7696
-				var9 = var10; // L: 7697
-				break;
-			}
-		}
-
-		if (var9 == null) { // L: 7702
-			var9 = new PendingSpawn(); // L: 7703
-			var9.plane = var0; // L: 7704
-			var9.type = var3; // L: 7705
-			var9.x = var1; // L: 7706
-			var9.y = var2; // L: 7707
-			class163.method3315(var9); // L: 7708
-			Client.pendingSpawns.addFirst(var9); // L: 7709
-		}
-
-		var9.id = var4; // L: 7711
-		var9.field1107 = var5; // L: 7712
-		var9.orientation = var6; // L: 7713
-		var9.delay = var7; // L: 7714
-		var9.hitpoints = var8; // L: 7715
-	} // L: 7716
-}

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

@@ -4,96 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nc")
+@ObfuscatedName("nu")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("ip")
+	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "[Lqq;"
-	)
-	@Export("mapSceneSprites")
-	static IndexedSprite[] mapSceneSprites;
-	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1328751771
+		intValue = 1168914555
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 741115861
+		intValue = -153891603
 	)
-	public int field4314;
+	public int field4373;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -104742867
+		intValue = 889630627
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1903880711
+		intValue = -214563943
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1153445431
+		intValue = 2847389
 	)
-	public int field4322;
+	public int field4376;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 693600925
+		intValue = 1531771617
 	)
-	public int field4318;
+	public int field4377;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 822510473
+	)
+	public int field4378;
 	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 2085695885
+		intValue = -1018736855
 	)
-	public int field4319;
+	public int field4374;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = -1059199103
-	)
-	public int field4320;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = 218263637
-	)
-	public int field4321;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = 1626482123
-	)
-	public int field4315;
 	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 922588741
+		intValue = -1369265667
 	)
-	public int field4323;
+	public int field4375;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -2053526401
+	)
+	public int field4381;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 1936619473
+	)
+	public int field4372;
 
 	public GraphicsDefaults() {
 		this.compass = -1; // L: 7
-		this.field4314 = -1; // L: 8
+		this.field4373 = -1; // L: 8
 		this.mapScenes = -1; // L: 9
 		this.headIconsPk = -1; // L: 10
-		this.field4322 = -1; // L: 11
+		this.field4376 = -1; // L: 11
-		this.field4318 = -1; // L: 12
+		this.field4377 = -1; // L: 12
-		this.field4319 = -1; // L: 13
+		this.field4378 = -1; // L: 13
-		this.field4320 = -1; // L: 14
+		this.field4374 = -1; // L: 14
-		this.field4321 = -1; // L: 15
+		this.field4375 = -1; // L: 15
-		this.field4315 = -1; // L: 16
+		this.field4381 = -1; // L: 16
-		this.field4323 = -1; // L: 17
+		this.field4372 = -1; // L: 17
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lln;I)V",
+		descriptor = "(Llp;I)V",
-		garbageValue = "-689748439"
+		garbageValue = "-901187341"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4311.group); // L: 20
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4370.group); // L: 20
 		Buffer var3 = new Buffer(var2); // L: 21
 
 		while (true) {
@@ -104,483 +98,125 @@ public class GraphicsDefaults {
 
 			switch(var4) { // L: 25
 			case 1:
-				var3.readMedium(); // L: 43
+				var3.readMedium(); // L: 28
 				break;
 			case 2:
-				this.compass = var3.method7692(); // L: 28
+				this.compass = var3.method7532(); // L: 33
-				this.field4314 = var3.method7692(); // L: 29
+				this.field4373 = var3.method7532(); // L: 34
-				this.mapScenes = var3.method7692(); // L: 30
+				this.mapScenes = var3.method7532(); // L: 35
-				this.headIconsPk = var3.method7692(); // L: 31
+				this.headIconsPk = var3.method7532(); // L: 36
-				this.field4322 = var3.method7692(); // L: 32
+				this.field4376 = var3.method7532(); // L: 37
-				this.field4318 = var3.method7692(); // L: 33
+				this.field4377 = var3.method7532(); // L: 38
-				this.field4319 = var3.method7692(); // L: 34
+				this.field4378 = var3.method7532(); // L: 39
-				this.field4320 = var3.method7692(); // L: 35
+				this.field4374 = var3.method7532(); // L: 40
-				this.field4321 = var3.method7692(); // L: 36
+				this.field4375 = var3.method7532(); // L: 41
-				this.field4315 = var3.method7692(); // L: 37
+				this.field4381 = var3.method7532(); // L: 42
-				this.field4323 = var3.method7692(); // L: 38
+				this.field4372 = var3.method7532(); // L: 43
 			}
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lhv;[Lgv;I)V",
+		descriptor = "(IZIZB)V",
-		garbageValue = "200441934"
+		garbageValue = "-62"
 	)
-	static final void method6939(Scene var0, CollisionMap[] var1) {
+	@Export("sortWorldList")
-		int var2;
+	static void sortWorldList(int var0, boolean var1, int var2, boolean var3) {
+		if (World.World_worlds != null) { // L: 171
+			VarcInt.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); // L: 172
+		}
+
+	} // L: 174
+
+	@ObfuscatedName("hz")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "-128"
+	)
+	static final void method6732(int var0) {
+		int[] var1 = InterfaceParent.sceneMinimapSprite.pixels; // L: 5947
+		int var2 = var1.length; // L: 5948
+
 		int var3;
+		for (var3 = 0; var3 < var2; ++var3) { // L: 5949
+			var1[var3] = 0;
+		}
+
 		int var4;
 		int var5;
-		for (var2 = 0; var2 < 4; ++var2) { // L: 581
+		for (var3 = 1; var3 < 103; ++var3) { // L: 5950
-			for (var3 = 0; var3 < 104; ++var3) { // L: 582
+			var4 = (103 - var3) * 2048 + 24628; // L: 5951
-				for (var4 = 0; var4 < 104; ++var4) { // L: 583
+
-					if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 584
+			for (var5 = 1; var5 < 103; ++var5) { // L: 5952
-						var5 = var2; // L: 585
+				if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5953
-						if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 586
+					class175.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3);
-							var5 = var2 - 1;
 				}
 
-						if (var5 >= 0) { // L: 587
+				if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5954
-							var1[var5].setBlockedByFloor(var3, var4);
+					class175.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3);
 				}
+
+				var4 += 4; // L: 5955
+			}
+		}
+
+		var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5958
+		var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5959
+		InterfaceParent.sceneMinimapSprite.setRaster(); // L: 5960
+
+		int var6;
+		for (var5 = 1; var5 < 103; ++var5) { // L: 5961
+			for (var6 = 1; var6 < 103; ++var6) { // L: 5962
+				if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5963
+					WorldMapEvent.drawObject(var0, var6, var5, var3, var4);
+				}
+
+				if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5964
+					WorldMapEvent.drawObject(var0 + 1, var6, var5, var3, var4);
+				}
+			}
+		}
+
+		Client.mapIconCount = 0; // L: 5967
+
+		for (var5 = 0; var5 < 104; ++var5) { // L: 5968
+			for (var6 = 0; var6 < 104; ++var6) { // L: 5969
+				long var7 = class175.scene.getFloorDecorationTag(class128.Client_plane, var5, var6); // L: 5970
+				if (var7 != 0L) { // L: 5971
+					int var9 = NetSocket.Entity_unpackID(var7); // L: 5972
+					int var10 = class82.getObjectDefinition(var9).mapIconId; // L: 5973
+					if (var10 >= 0 && class120.WorldMapElement_get(var10).field1874) { // L: 5974 5975
+						Client.mapIcons[Client.mapIconCount] = class120.WorldMapElement_get(var10).getSpriteBool(false); // L: 5978
+						Client.mapIconXs[Client.mapIconCount] = var5; // L: 5979
+						Client.mapIconYs[Client.mapIconCount] = var6; // L: 5980
+						++Client.mapIconCount; // L: 5981
 					}
 				}
 			}
 		}
 
-		Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 592
+		DevicePcmPlayerProvider.rasterProvider.apply(); // L: 5986
-		if (Tiles.rndHue < -8) { // L: 593
+	} // L: 5987
-			Tiles.rndHue = -8;
-		}
 
-		if (Tiles.rndHue > 8) { // L: 594
+	@ObfuscatedName("kd")
-			Tiles.rndHue = 8;
+	@ObfuscatedSignature(
-		}
+		descriptor = "(II)V",
+		garbageValue = "-1911416331"
+	)
+	@Export("Widget_resetModelFrames")
+	static final void Widget_resetModelFrames(int var0) {
+		if (WorldMapDecoration.loadInterface(var0)) { // L: 11974
+			Widget[] var1 = NetSocket.Widget_interfaceComponents[var0]; // L: 11975
 
-		Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 595
+			for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11976
-		if (Tiles.rndLightness < -16) { // L: 596
+				Widget var3 = var1[var2]; // L: 11977
-			Tiles.rndLightness = -16;
+				if (var3 != null) { // L: 11978
-		}
+					var3.modelFrame = 0; // L: 11979
-
+					var3.modelFrameCycle = 0; // L: 11980
-		if (Tiles.rndLightness > 16) { // L: 597
-			Tiles.rndLightness = 16;
-		}
-
-		int var9;
-		int var10;
-		int var11;
-		int var12;
-		int var13;
-		int var14;
-		int var15;
-		int var16;
-		int[] var10000;
-		int var17;
-		int var18;
-		for (var2 = 0; var2 < 4; ++var2) { // L: 598
-			byte[][] var42 = class392.field4374[var2]; // L: 599
-			var9 = (int)Math.sqrt(5100.0D); // L: 605
-			var10 = var9 * 768 >> 8; // L: 606
-
-			int var19;
-			int var20;
-			for (var11 = 1; var11 < 103; ++var11) { // L: 607
-				for (var12 = 1; var12 < 103; ++var12) { // L: 608
-					var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 609
-					var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 610
-					var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 611
-					var16 = (var13 << 8) / var15; // L: 612
-					var17 = 65536 / var15; // L: 613
-					var18 = (var14 << 8) / var15; // L: 614
-					var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; // L: 615
-					var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); // L: 616
-					Tiles.field998[var12][var11] = var19 - var20; // L: 617
 				}
 			}
 
-			for (var11 = 0; var11 < 104; ++var11) { // L: 620
-				BufferedNetSocket.Tiles_hue[var11] = 0; // L: 621
-				class116.Tiles_saturation[var11] = 0; // L: 622
-				Tiles.Tiles_lightness[var11] = 0; // L: 623
-				class357.Tiles_hueMultiplier[var11] = 0; // L: 624
-				class361.field4213[var11] = 0; // L: 625
 		}
-
+	} // L: 11982
-			for (var11 = -5; var11 < 109; ++var11) { // L: 627
-				for (var12 = 0; var12 < 104; ++var12) { // L: 628
-					var13 = var11 + 5; // L: 629
-					int var10002;
-					if (var13 >= 0 && var13 < 104) { // L: 630
-						var14 = Tiles.Tiles_underlays[var2][var13][var12] & 255; // L: 631
-						if (var14 > 0) { // L: 632
-							FloorUnderlayDefinition var44 = class123.method2806(var14 - 1); // L: 633
-							var10000 = BufferedNetSocket.Tiles_hue; // L: 634
-							var10000[var12] += var44.hue;
-							var10000 = class116.Tiles_saturation; // L: 635
-							var10000[var12] += var44.saturation;
-							var10000 = Tiles.Tiles_lightness; // L: 636
-							var10000[var12] += var44.lightness;
-							var10000 = class357.Tiles_hueMultiplier; // L: 637
-							var10000[var12] += var44.hueMultiplier;
-							var10002 = class361.field4213[var12]++; // L: 638
-						}
-					}
-
-					var14 = var11 - 5; // L: 641
-					if (var14 >= 0 && var14 < 104) { // L: 642
-						var15 = Tiles.Tiles_underlays[var2][var14][var12] & 255; // L: 643
-						if (var15 > 0) { // L: 644
-							FloorUnderlayDefinition var45 = class123.method2806(var15 - 1); // L: 645
-							var10000 = BufferedNetSocket.Tiles_hue; // L: 646
-							var10000[var12] -= var45.hue;
-							var10000 = class116.Tiles_saturation; // L: 647
-							var10000[var12] -= var45.saturation;
-							var10000 = Tiles.Tiles_lightness; // L: 648
-							var10000[var12] -= var45.lightness;
-							var10000 = class357.Tiles_hueMultiplier; // L: 649
-							var10000[var12] -= var45.hueMultiplier;
-							var10002 = class361.field4213[var12]--; // L: 650
-						}
-					}
-				}
-
-				if (var11 >= 1 && var11 < 103) { // L: 654
-					var12 = 0; // L: 655
-					var13 = 0; // L: 656
-					var14 = 0; // L: 657
-					var15 = 0; // L: 658
-					var16 = 0; // L: 659
-
-					for (var17 = -5; var17 < 109; ++var17) { // L: 660
-						var18 = var17 + 5; // L: 661
-						if (var18 >= 0 && var18 < 104) { // L: 662
-							var12 += BufferedNetSocket.Tiles_hue[var18]; // L: 663
-							var13 += class116.Tiles_saturation[var18]; // L: 664
-							var14 += Tiles.Tiles_lightness[var18]; // L: 665
-							var15 += class357.Tiles_hueMultiplier[var18]; // L: 666
-							var16 += class361.field4213[var18]; // L: 667
-						}
-
-						var19 = var17 - 5; // L: 669
-						if (var19 >= 0 && var19 < 104) { // L: 670
-							var12 -= BufferedNetSocket.Tiles_hue[var19]; // L: 671
-							var13 -= class116.Tiles_saturation[var19]; // L: 672
-							var14 -= Tiles.Tiles_lightness[var19]; // L: 673
-							var15 -= class357.Tiles_hueMultiplier[var19]; // L: 674
-							var16 -= class361.field4213[var19]; // L: 675
-						}
-
-						if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 677 678 679 680
-							if (var2 < Tiles.Tiles_minPlane) { // L: 683
-								Tiles.Tiles_minPlane = var2;
-							}
-
-							var20 = Tiles.Tiles_underlays[var2][var11][var17] & 255; // L: 684
-							int var21 = class14.Tiles_overlays[var2][var11][var17] & 255; // L: 685
-							if (var20 > 0 || var21 > 0) { // L: 686
-								int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 687
-								int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 688
-								int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 689
-								int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 690
-								int var26 = Tiles.field998[var11][var17]; // L: 691
-								int var27 = Tiles.field998[var11 + 1][var17]; // L: 692
-								int var28 = Tiles.field998[var11 + 1][var17 + 1]; // L: 693
-								int var29 = Tiles.field998[var11][var17 + 1]; // L: 694
-								int var30 = -1; // L: 695
-								int var31 = -1; // L: 696
-								int var32;
-								int var33;
-								if (var20 > 0) { // L: 697
-									var32 = var12 * 256 / var15; // L: 698
-									var33 = var13 / var16; // L: 699
-									int var34 = var14 / var16; // L: 700
-									var30 = class162.hslToRgb(var32, var33, var34); // L: 701
-									var32 = var32 + Tiles.rndHue & 255; // L: 702
-									var34 += Tiles.rndLightness; // L: 703
-									if (var34 < 0) { // L: 704
-										var34 = 0;
-									} else if (var34 > 255) { // L: 705
-										var34 = 255;
-									}
-
-									var31 = class162.hslToRgb(var32, var33, var34); // L: 706
-								}
-
-								if (var2 > 0) { // L: 708
-									boolean var47 = true; // L: 709
-									if (var20 == 0 && class147.Tiles_shapes[var2][var11][var17] != 0) { // L: 710
-										var47 = false;
-									}
-
-									if (var21 > 0 && !Clock.method3349(var21 - 1).hideUnderlay) { // L: 711
-										var47 = false;
-									}
-
-									if (var47 && var22 == var23 && var24 == var22 && var25 == var22) { // L: 712 713
-										var10000 = class420.field4545[var2][var11];
-										var10000[var17] |= 2340;
-									}
-								}
-
-								var32 = 0; // L: 716
-								if (var31 != -1) { // L: 717
-									var32 = Rasterizer3D.Rasterizer3D_colorPalette[SoundCache.method772(var31, 96)];
-								}
-
-								if (var21 == 0) { // L: 718
-									var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, SoundCache.method772(var30, var26), SoundCache.method772(var30, var27), SoundCache.method772(var30, var28), SoundCache.method772(var30, var29), 0, 0, 0, 0, var32, 0); // L: 719
-								} else {
-									var33 = class147.Tiles_shapes[var2][var11][var17] + 1; // L: 722
-									byte var48 = Tiles.field983[var2][var11][var17]; // L: 723
-									FloorOverlayDefinition var35 = Clock.method3349(var21 - 1); // L: 724
-									int var36 = var35.texture; // L: 725
-									int var37;
-									int var38;
-									int var39;
-									int var40;
-									if (var36 >= 0) { // L: 728
-										var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 729
-										var37 = -1; // L: 730
-									} else if (var35.primaryRgb == 16711935) { // L: 733
-										var37 = -2; // L: 734
-										var36 = -1; // L: 735
-										var38 = -2; // L: 736
-									} else {
-										var37 = class162.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 739
-										var39 = var35.hue + Tiles.rndHue & 255; // L: 740
-										var40 = var35.lightness + Tiles.rndLightness; // L: 741
-										if (var40 < 0) { // L: 742
-											var40 = 0;
-										} else if (var40 > 255) { // L: 743
-											var40 = 255;
-										}
-
-										var38 = class162.hslToRgb(var39, var35.saturation, var40); // L: 744
-									}
-
-									var39 = 0; // L: 747
-									if (var38 != -2) { // L: 748
-										var39 = Rasterizer3D.Rasterizer3D_colorPalette[ClanSettings.method3028(var38, 96)];
-									}
-
-									if (var35.secondaryRgb != -1) { // L: 749
-										var40 = var35.secondaryHue + Tiles.rndHue & 255; // L: 750
-										int var41 = var35.secondaryLightness + Tiles.rndLightness; // L: 751
-										if (var41 < 0) { // L: 752
-											var41 = 0;
-										} else if (var41 > 255) { // L: 753
-											var41 = 255;
-										}
-
-										var38 = class162.hslToRgb(var40, var35.secondarySaturation, var41); // L: 754
-										var39 = Rasterizer3D.Rasterizer3D_colorPalette[ClanSettings.method3028(var38, 96)]; // L: 755
-									}
-
-									var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, SoundCache.method772(var30, var26), SoundCache.method772(var30, var27), SoundCache.method772(var30, var28), SoundCache.method772(var30, var29), ClanSettings.method3028(var37, var26), ClanSettings.method3028(var37, var27), ClanSettings.method3028(var37, var28), ClanSettings.method3028(var37, var29), var32, var39); // L: 757
-								}
-							}
-						}
-					}
-				}
-			}
-
-			for (var11 = 1; var11 < 103; ++var11) { // L: 764
-				for (var12 = 1; var12 < 103; ++var12) { // L: 765
-					if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 772
-						var17 = 0; // L: 773
-					} else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 776
-						var17 = var2 - 1; // L: 777
-					} else {
-						var17 = var2; // L: 780
-					}
-
-					var0.setTileMinPlane(var2, var12, var11, var17); // L: 782
-				}
-			}
-
-			Tiles.Tiles_underlays[var2] = null; // L: 785
-			class14.Tiles_overlays[var2] = null; // L: 786
-			class147.Tiles_shapes[var2] = null; // L: 787
-			Tiles.field983[var2] = null; // L: 788
-			class392.field4374[var2] = null; // L: 789
-		}
-
-		var0.method4762(-50, -10, -50); // L: 791
-
-		for (var2 = 0; var2 < 104; ++var2) { // L: 792
-			for (var3 = 0; var3 < 104; ++var3) { // L: 793
-				if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 794
-					var0.setLinkBelow(var2, var3);
-				}
-			}
-		}
-
-		var2 = 1; // L: 797
-		var3 = 2; // L: 798
-		var4 = 4; // L: 799
-
-		for (var5 = 0; var5 < 4; ++var5) { // L: 800
-			if (var5 > 0) { // L: 801
-				var2 <<= 3; // L: 802
-				var3 <<= 3; // L: 803
-				var4 <<= 3; // L: 804
-			}
-
-			for (int var6 = 0; var6 <= var5; ++var6) { // L: 806
-				for (int var7 = 0; var7 <= 104; ++var7) { // L: 807
-					for (int var8 = 0; var8 <= 104; ++var8) { // L: 808
-						short var46;
-						if ((class420.field4545[var6][var8][var7] & var2) != 0) { // L: 809
-							var9 = var7; // L: 810
-							var10 = var7; // L: 811
-							var11 = var6; // L: 812
-
-							for (var12 = var6; var9 > 0 && (class420.field4545[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 813 814
-							}
-
-							while (var10 < 104 && (class420.field4545[var6][var8][var10 + 1] & var2) != 0) { // L: 815
-								++var10;
-							}
-
-							label432:
-							while (var11 > 0) { // L: 816
-								for (var13 = var9; var13 <= var10; ++var13) { // L: 817
-									if ((class420.field4545[var11 - 1][var8][var13] & var2) == 0) {
-										break label432;
-									}
-								}
-
-								--var11; // L: 818
-							}
-
-							label421:
-							while (var12 < var5) { // L: 820
-								for (var13 = var9; var13 <= var10; ++var13) { // L: 821
-									if ((class420.field4545[var12 + 1][var8][var13] & var2) == 0) {
-										break label421;
-									}
-								}
-
-								++var12; // L: 822
-							}
-
-							var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 824
-							if (var13 >= 8) { // L: 825
-								var46 = 240; // L: 826
-								var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; // L: 827
-								var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 828
-								Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 829
-
-								for (var17 = var11; var17 <= var12; ++var17) { // L: 830
-									for (var18 = var9; var18 <= var10; ++var18) { // L: 831
-										var10000 = class420.field4545[var17][var8];
-										var10000[var18] &= ~var2;
-									}
-								}
-							}
-						}
-
-						if ((class420.field4545[var6][var8][var7] & var3) != 0) { // L: 835
-							var9 = var8; // L: 836
-							var10 = var8; // L: 837
-							var11 = var6; // L: 838
-
-							for (var12 = var6; var9 > 0 && (class420.field4545[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 839 840
-							}
-
-							while (var10 < 104 && (class420.field4545[var6][var10 + 1][var7] & var3) != 0) { // L: 841
-								++var10;
-							}
-
-							label485:
-							while (var11 > 0) { // L: 842
-								for (var13 = var9; var13 <= var10; ++var13) { // L: 843
-									if ((class420.field4545[var11 - 1][var13][var7] & var3) == 0) {
-										break label485;
-									}
-								}
-
-								--var11; // L: 844
-							}
-
-							label474:
-							while (var12 < var5) { // L: 846
-								for (var13 = var9; var13 <= var10; ++var13) { // L: 847
-									if ((class420.field4545[var12 + 1][var13][var7] & var3) == 0) {
-										break label474;
-									}
-								}
-
-								++var12; // L: 848
-							}
-
-							var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 850
-							if (var13 >= 8) { // L: 851
-								var46 = 240; // L: 852
-								var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; // L: 853
-								var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 854
-								Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 855
-
-								for (var17 = var11; var17 <= var12; ++var17) { // L: 856
-									for (var18 = var9; var18 <= var10; ++var18) { // L: 857
-										var10000 = class420.field4545[var17][var18];
-										var10000[var7] &= ~var3;
-									}
-								}
-							}
-						}
-
-						if ((class420.field4545[var6][var8][var7] & var4) != 0) { // L: 861
-							var9 = var8; // L: 862
-							var10 = var8; // L: 863
-							var11 = var7; // L: 864
-
-							for (var12 = var7; var11 > 0 && (class420.field4545[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 865 866
-							}
-
-							while (var12 < 104 && (class420.field4545[var6][var8][var12 + 1] & var4) != 0) { // L: 867
-								++var12;
-							}
-
-							label538:
-							while (var9 > 0) { // L: 868
-								for (var13 = var11; var13 <= var12; ++var13) { // L: 869
-									if ((class420.field4545[var6][var9 - 1][var13] & var4) == 0) {
-										break label538;
-									}
-								}
-
-								--var9; // L: 870
-							}
-
-							label527:
-							while (var10 < 104) { // L: 872
-								for (var13 = var11; var13 <= var12; ++var13) { // L: 873
-									if ((class420.field4545[var6][var10 + 1][var13] & var4) == 0) {
-										break label527;
-									}
-								}
-
-								++var10; // L: 874
-							}
-
-							if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 876
-								var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 877
-								Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 878
-
-								for (var14 = var9; var14 <= var10; ++var14) { // L: 879
-									for (var15 = var11; var15 <= var12; ++var15) { // L: 880
-										var10000 = class420.field4545[var6][var14];
-										var10000[var15] &= ~var4;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-	} // L: 888
 }

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

@@ -1,67 +1,75 @@
+import java.text.ParseException;
+import java.util.Date;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bn")
+@ObfuscatedName("bf")
 @Implements("GraphicsObject")
 public class GraphicsObject extends Renderable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 633552685
+		intValue = 772916355
+	)
+	@Export("canvasWidth")
+	public static int canvasWidth;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -1248002899
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1513105003
+		intValue = -1478722299
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -809996185
+		intValue = 118002909
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1383105845
+		intValue = 800105373
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -2057789727
+		intValue = -738623243
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1487431233
+		intValue = 1237979949
 	)
 	@Export("z")
 	int z;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lgw;"
+		descriptor = "Lgq;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1421112585
+		intValue = 657870691
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1965539669
+		intValue = 1465530257
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@Export("isFinished")
 	boolean isFinished;
 
@@ -75,20 +83,20 @@ public class GraphicsObject extends Renderable {
 		this.y = var4; // L: 24
 		this.z = var5; // L: 25
 		this.cycleStart = var7 + var6; // L: 26
-		int var8 = ClientPreferences.SpotAnimationDefinition_get(this.id).sequence; // L: 27
+		int var8 = class136.SpotAnimationDefinition_get(this.id).sequence; // L: 27
 		if (var8 != -1) { // L: 28
 			this.isFinished = false; // L: 29
-			this.sequenceDefinition = class163.SequenceDefinition_get(var8); // L: 30
+			this.sequenceDefinition = class114.SequenceDefinition_get(var8); // L: 30
 		} else {
 			this.isFinished = true; // L: 32
 		}
 
 	} // L: 33
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "79"
+		garbageValue = "115"
 	)
 	@Export("advance")
 	final void advance(int var1) {
@@ -105,7 +113,7 @@ public class GraphicsObject extends Renderable {
 				}
 			} else {
 				this.frame += var1; // L: 49
-				if (this.frame >= this.sequenceDefinition.method3844()) { // L: 50
+				if (this.frame >= this.sequenceDefinition.method3729()) { // L: 50
 					this.isFinished = true;
 				}
 			}
@@ -113,14 +121,14 @@ public class GraphicsObject extends Renderable {
 		}
 	} // L: 52
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(B)Liq;",
+		descriptor = "(I)Lhv;",
-		garbageValue = "103"
+		garbageValue = "-238822980"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = ClientPreferences.SpotAnimationDefinition_get(this.id); // L: 55
+		SpotAnimationDefinition var1 = class136.SpotAnimationDefinition_get(this.id); // L: 55
 		Model var2;
 		if (!this.isFinished) { // L: 57
 			var2 = var1.getModel(this.frame);
@@ -131,6 +139,65 @@ public class GraphicsObject extends Renderable {
 		return var2 == null ? null : var2; // L: 59
 	}
 
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Ljx;B)V",
+		garbageValue = "-3"
+	)
+	public static void method1870(Huffman var0) {
+		class282.huffman = var0; // L: 14
+	} // L: 15
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "-2116498850"
+	)
+	static boolean method1867() {
+		Date var0;
+		try {
+			var0 = class115.method2679(); // L: 955
+		} catch (ParseException var7) { // L: 957
+			class126.method2799(7); // L: 959
+			class345.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 960
+			return false; // L: 962
+		}
+
+		if (var0 == null) { // L: 964
+			return false; // L: 965
+		} else {
+			boolean var5 = class268.method5028(var0); // L: 967
+			java.util.Calendar var4 = java.util.Calendar.getInstance(); // L: 972
+			var4.set(2, 0); // L: 973
+			var4.set(5, 1); // L: 974
+			var4.set(1, 1900); // L: 975
+			Date var3 = var4.getTime(); // L: 976
+			boolean var2 = var0.after(var3); // L: 979
+			if (!var2) { // L: 982
+				class126.method2799(7); // L: 984
+				class345.setLoginResponseString("Date not valid.", "Please ensure date follows the format", "DD/MM/YYYY and is after 01/01/1900"); // L: 985
+				return false; // L: 987
+			} else {
+				if (!var5) { // L: 989
+					class7.field26 = 8388607; // L: 990
+				} else {
+					class7.field26 = (int)(var0.getTime() / 86400000L - 11745L); // L: 993
+				}
+
+				return true; // L: 995
+			}
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "19136992"
+	)
+	public static boolean method1868(int var0) {
+		return var0 == WorldMapDecorationType.field3578.id; // L: 51
+	}
+
 	public GraphicsObject() {
 	}
 }

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

@@ -3,37 +3,34 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ci")
+@ObfuscatedName("ct")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("bc")
+	@ObfuscatedName("l")
-	@Export("otp")
-	static String otp;
-	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Lfv;"
+		descriptor = "Lfr;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Llk;"
+		descriptor = "Llo;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lfv;)V"
+		descriptor = "(Lfr;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque(); // L: 12
 		this.definition = var1; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIB)V",
+		descriptor = "(IIIII)V",
-		garbageValue = "-72"
+		garbageValue = "-1281629783"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -44,11 +41,11 @@ public class HealthBar extends Node {
 			++var6; // L: 22
 			if (var7.cycle == var1) { // L: 23
 				var7.set(var1, var2, var3, var4); // L: 24
-				return; // L: 25
+				return;
 			}
 
-			if (var7.cycle <= var1) { // L: 27
+			if (var7.cycle <= var1) {
-				var5 = var7;
+				var5 = var7; // L: 27
 			}
 		}
 
@@ -66,10 +63,10 @@ public class HealthBar extends Node {
 		}
 	} // L: 31 35
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lcp;",
+		descriptor = "(IB)Lcn;",
-		garbageValue = "675782761"
+		garbageValue = "79"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -91,87 +88,60 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "-107"
+		garbageValue = "127"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method6164(); // L: 55
+		return this.updates.method5986(); // L: 55
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
+		descriptor = "(I)[Ldl;",
-		garbageValue = "-31"
+		garbageValue = "-95794784"
 	)
-	public static int method2344(int var0) {
+	static class118[] method2333() {
-		return class400.field4389[var0 & 16383]; // L: 28
+		return new class118[]{class118.field1498, class118.field1491, class118.field1492, class118.field1499, class118.field1490, class118.field1495}; // L: 25
 	}
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("fv")
 	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZI)I",
+		descriptor = "(Lle;Ljava/lang/String;I)V",
-		garbageValue = "1491549945"
+		garbageValue = "757631192"
 	)
-	static int method2343(int var0, Script var1, boolean var2) {
+	static void method2335(Archive var0, String var1) {
-		if (var0 == 6800) { // L: 4511
+		ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1475
-			Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4512
+		Client.archiveLoaders.add(var2); // L: 1476
-			return 1; // L: 4513
+		Client.field770 += var2.groupCount; // L: 1477
-		} else if (var0 != 6801 && var0 != 6802) { // L: 4515
+	} // L: 1478
-			if (var0 == 6850) { // L: 4519
-				Interpreter.Interpreter_stringStack[++class122.Interpreter_stringStackSize - 1] = ""; // L: 4520
-				return 1; // L: 4521
-			} else if (var0 != 6851 && var0 != 6852) { // L: 4523
-				if (var0 == 6853) { // L: 4527
-					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 4528
-					return 1; // L: 4529
-				} else {
-					return 2; // L: 4531
-				}
-			} else {
-				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4524
-				return 1; // L: 4525
-			}
-		} else {
-			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 4516
-			return 1; // L: 4517
-		}
-	}
 
-	@ObfuscatedName("il")
+	@ObfuscatedName("gp")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
+		descriptor = "(B)V",
-		garbageValue = "-1357746428"
+		garbageValue = "85"
 	)
-	static final void method2330(int var0, int var1, int var2, int var3) {
+	static final void method2334() {
-		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8655
+		if (Tiles.field997) { // L: 3842
-			if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 8656
+			for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3844
-				Client.field715[var4] = true;
+				Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3845
-			}
+				var1.method2114(); // L: 3846
 			}
 
-	} // L: 8658
+			Tiles.field997 = false; // L: 3849
+		}
 
-	@ObfuscatedName("lq")
+	} // L: 3851
+
+	@ObfuscatedName("ig")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
+		descriptor = "(I)V",
-		garbageValue = "-66"
+		garbageValue = "2108689548"
 	)
-	static final void method2328(int var0, int var1) {
+	static void method2336() {
-		ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : class21.guestClanChannel; // L: 12409
+		Client.menuOptionsCount = 0; // L: 8697
-		if (var2 != null && var1 >= 0 && var1 < var2.method3119()) { // L: 12410
+		Client.isMenuOpen = false; // L: 8698
-			ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 12411
+	} // L: 8699
-			if (var3.rank == -1) {
-				String var4 = var3.username.getName(); // L: 12413
-				PacketBufferNode var5 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2900, Client.packetWriter.isaacCipher); // L: 12414
-				var5.packetBuffer.writeByte(3 + class425.stringCp1252NullTerminatedByteSize(var4)); // L: 12415
-				var5.packetBuffer.writeByte(var0); // L: 12416
-				var5.packetBuffer.writeShort(var1); // L: 12417
-				var5.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 12418
-				Client.packetWriter.addNode(var5); // L: 12419
-			}
-		}
-	} // L: 12412 12420
 }

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

@@ -4,123 +4,111 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fv")
+@ObfuscatedName("fr")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Llp;"
 	)
-	@Export("HealthBarDefinition_archive")
+	public static AbstractArchive field1911;
-	static AbstractArchive HealthBarDefinition_archive;
+	@ObfuscatedName("l")
-	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Lir;"
-	)
-	static AbstractArchive field1863;
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lig;"
 	)
 	@Export("HealthBarDefinition_cached")
 	public static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lir;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
-	public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
+	static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("j")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -325466885
+		intValue = -1302897985
 	)
-	@Export("loginBoxCenter")
+	public int field1908;
-	static int loginBoxCenter;
+	@ObfuscatedName("s")
-	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 522457699
+		intValue = 202730899
-	)
-	public int field1862;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = 685524889
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1399118515
+		intValue = 2090616095
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1978967279
+		intValue = -952719889
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1746211851
+		intValue = -1042912721
 	)
-	public int field1866;
+	public int field1915;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -660483005
+		intValue = 1843319957
 	)
 	@Export("int5")
 	public int int5;
 	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1226121631
+		intValue = 1895414675
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1146936599
+		intValue = -608989391
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("d")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1563343657
+		intValue = 1407123339
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("m")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1571067937
+		intValue = 675668437
 	)
 	@Export("widthPadding")
 	public int widthPadding;
 
 	static {
-		HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14
+		HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
-		HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15
+		HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
 	}
 
-	HealthBarDefinition() {
+	public HealthBarDefinition() {
-		this.int1 = 255; // L: 19
+		this.int1 = 255;
-		this.int2 = 255; // L: 20
+		this.int2 = 255;
 		this.int3 = -1; // L: 21
-		this.field1866 = 1; // L: 22
+		this.field1915 = 1; // L: 22
-		this.int5 = 70; // L: 23
+		this.int5 = 70;
-		this.frontSpriteID = -1; // L: 24
+		this.frontSpriteID = -1;
-		this.backSpriteID = -1; // L: 25
+		this.backSpriteID = -1;
 		this.width = 30; // L: 26
-		this.widthPadding = 0; // L: 27
+		this.widthPadding = 0;
-	} // L: 29
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;I)V",
+		descriptor = "(Lpx;I)V",
-		garbageValue = "-1265984356"
+		garbageValue = "-819365300"
 	)
 	@Export("decode")
-	void decode(Buffer var1) {
+	public void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte();
+			int var2 = var1.readUnsignedByte(); // L: 31
 			if (var2 == 0) {
 				return;
 			}
@@ -129,115 +117,176 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;IB)V",
+		descriptor = "(Lpx;IB)V",
-		garbageValue = "7"
+		garbageValue = "22"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 55
+		if (var2 == 1) {
 			var1.readUnsignedShort();
-		} else if (var2 == 2) { // L: 58
+		} else if (var2 == 2) { // L: 41
 			this.int1 = var1.readUnsignedByte();
-		} else if (var2 == 3) { // L: 59
+		} else if (var2 == 3) { // L: 42
 			this.int2 = var1.readUnsignedByte();
-		} else if (var2 == 4) { // L: 60
+		} else if (var2 == 4) {
 			this.int3 = 0;
-		} else if (var2 == 5) { // L: 61
+		} else if (var2 == 5) {
 			this.int5 = var1.readUnsignedShort();
-		} else if (var2 == 6) { // L: 62
+		} else if (var2 == 6) {
-			var1.readUnsignedByte(); // L: 63
+			var1.readUnsignedByte();
-		} else if (var2 == 7) { // L: 65
+		} else if (var2 == 7) { // L: 48
-			this.frontSpriteID = var1.method7692();
+			this.frontSpriteID = var1.method7532();
-		} else if (var2 == 8) { // L: 66
+		} else if (var2 == 8) {
-			this.backSpriteID = var1.method7692();
+			this.backSpriteID = var1.method7532();
-		} else if (var2 == 11) { // L: 67
+		} else if (var2 == 11) {
 			this.int3 = var1.readUnsignedShort();
-		} else if (var2 == 14) { // L: 68
+		} else if (var2 == 14) {
 			this.width = var1.readUnsignedByte();
-		} else if (var2 == 15) { // L: 69
+		} else if (var2 == 15) {
 			this.widthPadding = var1.readUnsignedByte();
 		}
 
-	} // L: 71
+	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lqi;",
+		descriptor = "(I)Lqr;",
-		garbageValue = "1780689910"
+		garbageValue = "1767705109"
 	)
 	@Export("getFrontSprite")
 	public SpritePixels getFrontSprite() {
-		if (this.frontSpriteID < 0) { // L: 74
+		if (this.frontSpriteID < 0) { // L: 57
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 75
+			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
 			if (var1 != null) {
-				return var1; // L: 76
+				return var1;
 			} else {
-				var1 = class6.SpriteBuffer_getSprite(field1863, this.frontSpriteID, 0); // L: 77
+				var1 = StructComposition.SpriteBuffer_getSprite(field1911, this.frontSpriteID, 0);
 				if (var1 != null) {
-					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); // L: 78
+					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 				}
 
-				return var1; // L: 80
+				return var1;
 			}
 		}
 	}
 
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(I)Lqi;",
-		garbageValue = "-1861454537"
-	)
-	@Export("getBackSprite")
-	public SpritePixels getBackSprite() {
-		if (this.backSpriteID < 0) { // L: 84
-			return null;
-		} else {
-			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 85
-			if (var1 != null) {
-				return var1; // L: 86
-			} else {
-				var1 = class6.SpriteBuffer_getSprite(field1863, this.backSpriteID, 0); // L: 87
-				if (var1 != null) {
-					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 88
-				}
-
-				return var1; // L: 90
-			}
-		}
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1984956667"
-	)
-	public static void method3473() {
-		synchronized(MouseHandler.MouseHandler_instance) { // L: 45
-			MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 46
-			MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 47
-			MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 48
-			MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 49
-			MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 50
-			MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 51
-			MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 52
-			MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 53
-			MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 54
-		}
-	} // L: 56
-
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
+		descriptor = "(I)Lqr;",
-		garbageValue = "14"
+		garbageValue = "2134989657"
 	)
-	public static void method3466() {
+	@Export("getBackSprite")
-		ObjectComposition.ObjectDefinition_cached.clear(); // L: 437
+	public SpritePixels getBackSprite() {
-		ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 438
+		if (this.backSpriteID < 0) { // L: 67
-		ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 439
+			return null;
-		ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 440
+		} else {
-	} // L: 441
+			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 68
+			if (var1 != null) {
+				return var1; // L: 69
+			} else {
+				var1 = StructComposition.SpriteBuffer_getSprite(field1911, this.backSpriteID, 0); // L: 70
+				if (var1 != null) {
+					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 71
+				}
+
+				return var1; // L: 73
+			}
+		}
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llq;I)I",
+		garbageValue = "-857969129"
+	)
+	@Export("compareStrings")
+	public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) {
+		int var3 = var0.length(); // L: 11
+		int var4 = var1.length(); // L: 12
+		int var5 = 0; // L: 13
+		int var6 = 0; // L: 14
+		char var7 = 0; // L: 15
+		char var8 = 0; // L: 16
+
+		while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18
+			if (var5 - var7 >= var3) { // L: 19
+				return -1;
+			}
+
+			if (var6 - var8 >= var4) { // L: 20
+				return 1;
+			}
+
+			char var9;
+			if (var7 != 0) { // L: 23
+				var9 = var7; // L: 24
+				boolean var14 = false; // L: 25
+			} else {
+				var9 = var0.charAt(var5++); // L: 27
+			}
+
+			char var10;
+			if (var8 != 0) { // L: 28
+				var10 = var8; // L: 29
+				boolean var15 = false; // L: 30
+			} else {
+				var10 = var1.charAt(var6++); // L: 32
+			}
+
+			var7 = RouteStrategy.method3795(var9); // L: 33
+			var8 = RouteStrategy.method3795(var10); // L: 34
+			var9 = class343.standardizeChar(var9, var2); // L: 35
+			var10 = class343.standardizeChar(var10, var2); // L: 36
+			if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37
+				var9 = Character.toLowerCase(var9); // L: 38
+				var10 = Character.toLowerCase(var10); // L: 39
+				if (var10 != var9) { // L: 40
+					return class282.lowercaseChar(var9, var2) - class282.lowercaseChar(var10, var2);
+				}
+			}
+		}
+
+		int var16 = Math.min(var3, var4); // L: 43
+
+		char var12;
+		int var17;
+		for (var17 = 0; var17 < var16; ++var17) { // L: 44
+			if (var2 == Language.Language_FR) { // L: 45
+				var5 = var3 - 1 - var17; // L: 46
+				var6 = var4 - 1 - var17; // L: 47
+			} else {
+				var6 = var17; // L: 49
+				var5 = var17;
+			}
+
+			char var11 = var0.charAt(var5); // L: 50
+			var12 = var1.charAt(var6); // L: 51
+			if (var11 != var12 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52
+				var11 = Character.toLowerCase(var11); // L: 53
+				var12 = Character.toLowerCase(var12); // L: 54
+				if (var11 != var12) {
+					return class282.lowercaseChar(var11, var2) - class282.lowercaseChar(var12, var2); // L: 55
+				}
+			}
+		}
+
+		var17 = var3 - var4; // L: 58
+		if (var17 != 0) { // L: 59
+			return var17;
+		} else {
+			for (int var18 = 0; var18 < var16; ++var18) { // L: 60
+				var12 = var0.charAt(var18); // L: 61
+				char var13 = var1.charAt(var18); // L: 62
+				if (var12 != var13) { // L: 63
+					return class282.lowercaseChar(var12, var2) - class282.lowercaseChar(var13, var2);
+				}
+			}
+
+			return 0; // L: 65
+		}
+	}
 }

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

@@ -3,196 +3,80 @@ 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("cp")
+@ObfuscatedName("cn")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("rg")
+	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lqi;"
-	)
-	@Export("sceneMinimapSprite")
-	static SpritePixels sceneMinimapSprite;
-	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1067255387
+		intValue = 1515089
-	)
-	public static int field1189;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 1328246863
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 399035073
+		intValue = 58622393
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 573948343
+		intValue = 609346869
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 2144773551
+		intValue = -1802686675
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
 
 	HealthBarUpdate(int var1, int var2, int var3, int var4) {
-		this.cycle = var1;
+		this.cycle = var1; // L: 12
-		this.health = var2;
+		this.health = var2; // L: 13
-		this.health2 = var3;
+		this.health2 = var3; // L: 14
-		this.cycleOffset = var4;
+		this.cycleOffset = var4; // L: 15
-	}
+	} // L: 16
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "-1624379348"
+		garbageValue = "-115890137"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
-		this.cycle = var1;
+		this.cycle = var1; // L: 19
 		this.health = var2; // L: 20
-		this.health2 = var3;
+		this.health2 = var3; // L: 21
-		this.cycleOffset = var4;
+		this.cycleOffset = var4; // L: 22
-	}
+	} // L: 23
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lln;Lln;IZB)Lim;",
+		descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqy;"
-		garbageValue = "-50"
 	)
-	public static Frames method2185(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) {
+	@Export("newRunException")
-		boolean var4 = true; // L: 11
+	public static RunException newRunException(Throwable var0, String var1) {
-		int[] var5 = var0.getGroupFileIds(var2); // L: 12
+		RunException var2;
-
+		if (var0 instanceof RunException) { // L: 57
-		for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13
+			var2 = (RunException)var0; // L: 58
-			byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14
+			var2.message = var2.message + ' ' + var1; // L: 59
-			if (var7 == null) { // L: 15
-				var4 = false; // L: 16
 		} else {
-				int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19
+			var2 = new RunException(var0, var1); // L: 61
-				byte[] var9;
-				if (var3) { // L: 21
-					var9 = var1.getFile(0, var8);
-				} else {
-					var9 = var1.getFile(var8, 0); // L: 22
 		}
 
-				if (var9 == null) { // L: 23
+		return var2; // L: 62
-					var4 = false;
-				}
-			}
 	}
 
-		if (!var4) { // L: 25
+	@ObfuscatedName("p")
-			return null;
-		} else {
-			try {
-				return new Frames(var0, var1, var2, var3); // L: 27
-			} catch (Exception var11) { // L: 29
-				return null; // L: 30
-			}
-		}
-	}
-
-	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(ILbd;ZB)I",
+		descriptor = "(ZZB)I",
-		garbageValue = "-30"
+		garbageValue = "-11"
 	)
-	static int method2186(int var0, Script var1, boolean var2) {
+	public static int method2181(boolean var0, boolean var1) {
-		Widget var7;
+		byte var2 = 0; // L: 170
-		if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1269
+		int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 171
-			int var4;
+		return var3; // L: 172
-			if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1286
-				var7 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1287
-				var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1288
-				if (var4 >= 1 && var4 <= 10) { // L: 1289
-					class93 var8 = new class93(var4, var7.id, var7.childIndex, var7.itemId); // L: 1292
-					Interpreter.field843.add(var8); // L: 1293
-					return 1; // L: 1294
-				} else {
-					throw new RuntimeException(); // L: 1290
-				}
-			} else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1296
-				Interpreter.Interpreter_intStackSize -= 3; // L: 1297
-				int var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1298
-				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1299
-				int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1300
-				if (var5 >= 1 && var5 <= 10) { // L: 1301
-					class93 var6 = new class93(var5, var3, var4, class127.getWidget(var3).itemId); // L: 1304
-					Interpreter.field843.add(var6); // L: 1305
-					return 1; // L: 1306
-				} else {
-					throw new RuntimeException(); // L: 1302
-				}
-			} else {
-				return 2; // L: 1308
-			}
-		} else if (Interpreter.field844 >= 10) { // L: 1270
-			throw new RuntimeException(); // L: 1271
-		} else {
-			if (var0 >= 2000) { // L: 1274
-				var7 = class127.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1275
-			} else {
-				var7 = var2 ? WorldMapID.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1277
-			}
-
-			if (var7.onResize == null) { // L: 1278
-				return 0;
-			} else {
-				ScriptEvent var9 = new ScriptEvent(); // L: 1279
-				var9.widget = var7; // L: 1280
-				var9.args = var7.onResize; // L: 1281
-				var9.field1031 = Interpreter.field844 + 1; // L: 1282
-				Client.scriptEvents.addFirst(var9); // L: 1283
-				return 1; // L: 1284
 	}
 }
-	}
-
-	@ObfuscatedName("jy")
-	@ObfuscatedSignature(
-		descriptor = "(Lky;III)V",
-		garbageValue = "-1103204446"
-	)
-	@Export("alignWidgetPosition")
-	static void alignWidgetPosition(Widget var0, int var1, int var2) {
-		if (var0.xAlignment == 0) { // L: 10840
-			var0.x = var0.rawX;
-		} else if (var0.xAlignment == 1) { // L: 10841
-			var0.x = var0.rawX + (var1 - var0.width) / 2;
-		} else if (var0.xAlignment == 2) { // L: 10842
-			var0.x = var1 - var0.width - var0.rawX;
-		} else if (var0.xAlignment == 3) { // L: 10843
-			var0.x = var0.rawX * var1 >> 14;
-		} else if (var0.xAlignment == 4) { // L: 10844
-			var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14);
-		} else {
-			var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10845
-		}
-
-		if (var0.yAlignment == 0) { // L: 10846
-			var0.y = var0.rawY;
-		} else if (var0.yAlignment == 1) { // L: 10847
-			var0.y = (var2 - var0.height) / 2 + var0.rawY;
-		} else if (var0.yAlignment == 2) { // L: 10848
-			var0.y = var2 - var0.height - var0.rawY;
-		} else if (var0.yAlignment == 3) {
-			var0.y = var2 * var0.rawY >> 14; // L: 10849
-		} else if (var0.yAlignment == 4) { // L: 10850
-			var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2;
-		} else {
-			var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10851
-		}
-
-	} // L: 10852
-}

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

@@ -4,109 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gs")
+@ObfuscatedName("gk")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("tb")
+	@ObfuscatedGetter(
+		intValue = 2130203017
+	)
+	static int field2077;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lln;"
+		descriptor = "Llp;"
 	)
 	@Export("HitSplatDefinition_archive")
 	static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lir;"
 	)
 	@Export("HitSplatDefinition_cached")
-	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
+	static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lir;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
-	public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
+	static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lir;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
-	public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
+	static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -78193355
+		intValue = 1395317347
 	)
 	@Export("fontId")
 	int fontId;
 	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -867488021
+		intValue = 1417482049
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 566909491
+		intValue = 1131373797
 	)
-	public int field1998;
+	public int field2071;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = 2072278043
-	)
-	int field1999;
-	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = -367586383
-	)
-	int field2000;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 530891065
-	)
-	int field2001;
 	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1859926009
+		intValue = 1501343813
 	)
-	int field2002;
+	int field2062;
 	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 621557545
+		intValue = -63093085
 	)
-	public int field2003;
+	int field2067;
 	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1339697259
+		intValue = -580949191
 	)
-	public int field2004;
+	int field2064;
-	@ObfuscatedName("a")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 2090677099
+		intValue = 269659311
 	)
-	public int field2005;
+	int field2054;
-	@ObfuscatedName("y")
-	String field2010;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = 859094637
-	)
-	public int field2007;
 	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 494157579
+		intValue = 254386385
 	)
-	public int field2011;
+	public int field2055;
-	@ObfuscatedName("z")
-	@Export("transforms")
-	public int[] transforms;
 	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -608530201
+		intValue = -825953789
+	)
+	public int field2074;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -801066855
+	)
+	public int field2072;
+	@ObfuscatedName("d")
+	String field2069;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 1961631307
+	)
+	public int field2070;
+	@ObfuscatedName("z")
+	@ObfuscatedGetter(
+		intValue = -474593523
+	)
+	public int field2068;
+	@ObfuscatedName("i")
+	@Export("transforms")
+	public int[] transforms;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = -901285467
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = -1991065381
+		intValue = -895793349
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -120,25 +125,25 @@ public class HitSplatDefinition extends DualNode {
 	HitSplatDefinition() {
 		this.fontId = -1; // L: 26
 		this.textColor = 16777215; // L: 27
-		this.field1998 = 70; // L: 28
+		this.field2071 = 70; // L: 28
-		this.field1999 = -1; // L: 29
+		this.field2062 = -1; // L: 29
-		this.field2000 = -1; // L: 30
+		this.field2067 = -1; // L: 30
-		this.field2001 = -1; // L: 31
+		this.field2064 = -1; // L: 31
-		this.field2002 = -1; // L: 32
+		this.field2054 = -1; // L: 32
-		this.field2003 = 0; // L: 33
+		this.field2055 = 0; // L: 33
-		this.field2004 = 0; // L: 34
+		this.field2074 = 0; // L: 34
-		this.field2005 = -1; // L: 35
+		this.field2072 = -1; // L: 35
-		this.field2010 = ""; // L: 36
+		this.field2069 = ""; // L: 36
-		this.field2007 = -1; // L: 37
+		this.field2070 = -1; // L: 37
-		this.field2011 = 0; // L: 38
+		this.field2068 = 0; // L: 38
 		this.transformVarbit = -1; // L: 40
 		this.transformVarp = -1; // L: 41
 	} // L: 43
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;I)V",
+		descriptor = "(Lpx;I)V",
-		garbageValue = "1833933416"
+		garbageValue = "507933572"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -152,41 +157,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;II)V",
+		descriptor = "(Lpx;II)V",
-		garbageValue = "127877365"
+		garbageValue = "1744488048"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) { // L: 70
-			this.fontId = var1.method7692();
+			this.fontId = var1.method7532();
 		} else if (var2 == 2) { // L: 71
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) { // L: 72
-			this.field1999 = var1.method7692();
+			this.field2062 = var1.method7532();
 		} else if (var2 == 4) { // L: 73
-			this.field2001 = var1.method7692();
+			this.field2064 = var1.method7532();
 		} else if (var2 == 5) { // L: 74
-			this.field2000 = var1.method7692();
+			this.field2067 = var1.method7532();
 		} else if (var2 == 6) { // L: 75
-			this.field2002 = var1.method7692();
+			this.field2054 = var1.method7532();
 		} else if (var2 == 7) { // L: 76
-			this.field2003 = var1.readShort();
+			this.field2055 = var1.readShort();
 		} else if (var2 == 8) { // L: 77
-			this.field2010 = var1.readStringCp1252NullCircumfixed();
+			this.field2069 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) { // L: 78
-			this.field1998 = var1.readUnsignedShort();
+			this.field2071 = var1.readUnsignedShort();
 		} else if (var2 == 10) { // L: 79
-			this.field2004 = var1.readShort();
+			this.field2074 = var1.readShort();
 		} else if (var2 == 11) { // L: 80
-			this.field2005 = 0;
+			this.field2072 = 0;
 		} else if (var2 == 12) { // L: 81
-			this.field2007 = var1.readUnsignedByte();
+			this.field2070 = var1.readUnsignedByte();
 		} else if (var2 == 13) { // L: 82
-			this.field2011 = var1.readShort();
+			this.field2068 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field2005 = var1.readUnsignedShort(); // L: 83
+			this.field2072 = var1.readUnsignedShort(); // L: 83
 		} else if (var2 == 17 || var2 == 18) { // L: 84
 			this.transformVarbit = var1.readUnsignedShort(); // L: 85
 			if (this.transformVarbit == 65535) { // L: 86
@@ -221,16 +226,16 @@ public class HitSplatDefinition extends DualNode {
 
 	} // L: 103
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgs;",
+		descriptor = "(I)Lgk;",
-		garbageValue = "-505226354"
+		garbageValue = "1570100163"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1; // L: 106
 		if (this.transformVarbit != -1) { // L: 107
-			var1 = SecureRandomCallable.getVarbit(this.transformVarbit);
+			var1 = class18.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) { // L: 108
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -242,17 +247,17 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? UserComparator3.method2602(var2) : null; // L: 112 113
+		return var2 != -1 ? UserComparator4.method2567(var2) : null; // L: 112 113
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "864399323"
+		garbageValue = "1649280427"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field2010; // L: 117
+		String var2 = this.field2069; // L: 117
 
 		while (true) {
 			int var3 = var2.indexOf("%1"); // L: 119
@@ -260,26 +265,26 @@ public class HitSplatDefinition extends DualNode {
 				return var2; // L: 123
 			}
 
-			var2 = var2.substring(0, var3) + ItemLayer.intToString(var1, false) + var2.substring(var3 + 2); // L: 121
+			var2 = var2.substring(0, var3) + Message.intToString(var1, false) + var2.substring(var3 + 2); // L: 121
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lqi;",
+		descriptor = "(B)Lqr;",
-		garbageValue = "872036041"
+		garbageValue = "-97"
 	)
-	public SpritePixels method3625() {
+	public SpritePixels method3531() {
-		if (this.field1999 < 0) { // L: 127
+		if (this.field2062 < 0) { // L: 127
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1999); // L: 128
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2062); // L: 128
 			if (var1 != null) {
 				return var1; // L: 129
 			} else {
-				var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field1999, 0); // L: 130
+				var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2062, 0); // L: 130
-				if (var1 != null) {
+				if (var1 != null) { // L: 131
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1999); // L: 131
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field2062);
 				}
 
 				return var1; // L: 133
@@ -287,22 +292,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lqi;",
+		descriptor = "(I)Lqr;",
-		garbageValue = "-1662028806"
+		garbageValue = "-1422876623"
 	)
-	public SpritePixels method3640() {
+	public SpritePixels method3534() {
-		if (this.field2000 < 0) { // L: 137
+		if (this.field2067 < 0) { // L: 137
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2000); // L: 138
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2067); // L: 138
 			if (var1 != null) {
 				return var1; // L: 139
 			} else {
-				var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field2000, 0); // L: 140
+				var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2067, 0); // L: 140
 				if (var1 != null) { // L: 141
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field2000);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field2067);
 				}
 
 				return var1; // L: 143
@@ -310,22 +315,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lqi;",
+		descriptor = "(B)Lqr;",
-		garbageValue = "927571164"
+		garbageValue = "23"
 	)
-	public SpritePixels method3626() {
+	public SpritePixels method3533() {
-		if (this.field2001 < 0) { // L: 147
+		if (this.field2064 < 0) { // L: 147
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2001); // L: 148
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2064); // L: 148
 			if (var1 != null) {
 				return var1; // L: 149
 			} else {
-				var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field2001, 0); // L: 150
+				var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2064, 0); // L: 150
-				if (var1 != null) { // L: 151
+				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field2001);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field2064); // L: 151
 				}
 
 				return var1; // L: 153
@@ -333,22 +338,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lqi;",
+		descriptor = "(I)Lqr;",
-		garbageValue = "-1943622040"
+		garbageValue = "-554047425"
 	)
-	public SpritePixels method3627() {
+	public SpritePixels method3559() {
-		if (this.field2002 < 0) { // L: 157
+		if (this.field2054 < 0) { // L: 157
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2002); // L: 158
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field2054); // L: 158
-			if (var1 != null) { // L: 159
+			if (var1 != null) {
-				return var1;
+				return var1; // L: 159
 			} else {
-				var1 = class6.SpriteBuffer_getSprite(class282.field3261, this.field2002, 0); // L: 160
+				var1 = StructComposition.SpriteBuffer_getSprite(ModelData0.field2654, this.field2054, 0); // L: 160
-				if (var1 != null) { // L: 161
+				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field2002);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field2054); // L: 161
 				}
 
 				return var1; // L: 163
@@ -356,10 +361,10 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lmd;",
+		descriptor = "(I)Lmx;",
-		garbageValue = "-1180066279"
+		garbageValue = "287302031"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -370,7 +375,7 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) { // L: 169
 				return var1;
 			} else {
-				var1 = class163.method3322(class282.field3261, class349.HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170
+				var1 = class387.method6781(ModelData0.field2654, class1.HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170
 				if (var1 != null) {
 					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 171
 				}
@@ -379,15 +384,4 @@ public class HitSplatDefinition extends DualNode {
 			}
 		}
 	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "12"
-	)
-	@Export("Messages_getHistorySize")
-	static int Messages_getHistorySize(int var0) {
-		ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44
-		return var1 == null ? 0 : var1.size(); // L: 45 46
-	}
 }

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

@@ -3,44 +3,42 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 
-@ObfuscatedName("fw")
+@ObfuscatedName("fj")
 @Implements("HorizontalAlignment")
 public enum HorizontalAlignment implements MouseWheel {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lfw;"
+		descriptor = "Lfj;"
 	)
-	field1889(2, 0),
+	field1938(2, 0),
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lfw;"
+		descriptor = "Lfj;"
 	)
 	@Export("HorizontalAlignment_centered")
-	HorizontalAlignment_centered(1, 1),
+	HorizontalAlignment_centered(0, 1),
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lfw;"
+		descriptor = "Lfj;"
 	)
-	field1890(0, 2);
+	field1937(1, 2);
 
-	@ObfuscatedName("px")
+	@ObfuscatedName("jt")
-	@ObfuscatedSignature(
-		descriptor = "Loa;"
-	)
-	static class391 field1885;
-	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 544424349
+		intValue = -88443571
+	)
+	@Export("oculusOrbFocalPointX")
+	static int oculusOrbFocalPointX;
+	@ObfuscatedName("k")
+	@ObfuscatedGetter(
+		intValue = -150444483
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -801699883
+		intValue = -47587237
 	)
 	@Export("id")
 	final int id;
@@ -50,56 +48,111 @@ public enum HorizontalAlignment implements MouseWheel {
 		this.id = var4; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "16"
+		garbageValue = "30"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 19
+		return this.id; // L: 20
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("hh")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lqq;",
+		descriptor = "(ZLpc;B)V",
-		garbageValue = "2022945893"
+		garbageValue = "-31"
 	)
-	public static IndexedSprite method3492() {
+	@Export("updateNpcs")
-		IndexedSprite var0 = new IndexedSprite(); // L: 155
+	static final void updateNpcs(boolean var0, PacketBuffer var1) {
-		var0.width = class451.SpriteBuffer_spriteWidth; // L: 156
+		Client.field621 = 0; // L: 8002
-		var0.height = class451.SpriteBuffer_spriteHeight; // L: 157
+		Client.field565 = 0; // L: 8003
-		var0.xOffset = class451.SpriteBuffer_xOffsets[0]; // L: 158
+		PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 8005
-		var0.yOffset = class271.SpriteBuffer_yOffsets[0]; // L: 159
+		var2.importIndex(); // L: 8006
-		var0.subWidth = class451.SpriteBuffer_spriteWidths[0]; // L: 160
+		int var3 = var2.readBits(8); // L: 8007
-		var0.subHeight = class451.SpriteBuffer_spriteHeights[0]; // L: 161
+		int var4;
-		var0.palette = NetFileRequest.SpriteBuffer_spritePalette; // L: 162
+		if (var3 < Client.npcCount) { // L: 8008
-		var0.pixels = FriendLoginUpdate.SpriteBuffer_pixels[0]; // L: 163
+			for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 8009
-		ArchiveDiskActionHandler.method5813(); // L: 164
+				Client.field616[++Client.field621 - 1] = Client.npcIndices[var4];
-		return var0; // L: 165
+			}
 		}
 
-	@ObfuscatedName("t")
+		if (var3 > Client.npcCount) { // L: 8011
-	@ObfuscatedSignature(
+			throw new RuntimeException("");
-		descriptor = "(Lorg/json/JSONObject;Ljava/lang/String;B)[F",
+		} else {
-		garbageValue = "-127"
+			Client.npcCount = 0; // L: 8012
-	)
-	static float[] method3495(JSONObject var0, String var1) throws JSONException {
-		float[] var2 = new float[4]; // L: 307
 
-		try {
+			for (var4 = 0; var4 < var3; ++var4) { // L: 8013
-			JSONArray var3 = var0.getJSONArray(var1); // L: 309
+				int var5 = Client.npcIndices[var4]; // L: 8014
-			var2[0] = (float)var3.optDouble(0, 0.0D); // L: 310
+				NPC var6 = Client.npcs[var5]; // L: 8015
-			var2[1] = (float)var3.optDouble(1, 0.0D); // L: 311
+				int var7 = var2.readBits(1); // L: 8016
-			var2[2] = (float)var3.optDouble(2, 1.0D); // L: 312
+				if (var7 == 0) { // L: 8017
-			var2[3] = (float)var3.optDouble(3, 1.0D); // L: 313
+					Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8018
-		} catch (JSONException var4) { // L: 315
+					var6.npcCycle = Client.cycle; // L: 8019
-			var2[0] = 0.0F; // L: 316
+				} else {
-			var2[1] = 0.0F; // L: 317
+					int var8 = var2.readBits(2); // L: 8022
-			var2[2] = 1.0F; // L: 318
+					if (var8 == 0) { // L: 8023
-			var2[3] = 1.0F; // L: 319
+						Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8024
+						var6.npcCycle = Client.cycle; // L: 8025
+						Client.field601[++Client.field565 - 1] = var5; // L: 8026
+					} else {
+						int var9;
+						int var10;
+						if (var8 == 1) { // L: 8029
+							Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8030
+							var6.npcCycle = Client.cycle; // L: 8031
+							var9 = var2.readBits(3); // L: 8032
+							var6.method2340(var9, class193.field2251); // L: 8033
+							var10 = var2.readBits(1); // L: 8034
+							if (var10 == 1) { // L: 8035
+								Client.field601[++Client.field565 - 1] = var5;
+							}
+						} else if (var8 == 2) { // L: 8038
+							Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8039
+							var6.npcCycle = Client.cycle; // L: 8040
+							if (var2.readBits(1) == 1) { // L: 8041
+								var9 = var2.readBits(3); // L: 8042
+								var6.method2340(var9, class193.field2248); // L: 8043
+								var10 = var2.readBits(3); // L: 8044
+								var6.method2340(var10, class193.field2248); // L: 8045
+							} else {
+								var9 = var2.readBits(3); // L: 8048
+								var6.method2340(var9, class193.field2249); // L: 8049
 							}
 
-		return var2; // L: 321
+							var9 = var2.readBits(1); // L: 8051
+							if (var9 == 1) {
+								Client.field601[++Client.field565 - 1] = var5; // L: 8052
+							}
+						} else if (var8 == 3) { // L: 8055
+							Client.field616[++Client.field621 - 1] = var5; // L: 8056
 						}
 					}
+				}
+			}
+
+			class82.method2098(var0, var1); // L: 8061
+			JagexCache.method3158(var1); // L: 8062
+
+			int var11;
+			for (var11 = 0; var11 < Client.field621; ++var11) { // L: 8063
+				var3 = Client.field616[var11]; // L: 8064
+				if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 8065
+					Client.npcs[var3].definition = null; // L: 8066
+					Client.npcs[var3] = null; // L: 8067
+				}
+			}
+
+			if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 8070
+				throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
+			} else {
+				for (var11 = 0; var11 < Client.npcCount; ++var11) { // L: 8071
+					if (Client.npcs[Client.npcIndices[var11]] == null) { // L: 8072
+						throw new RuntimeException(var11 + "," + Client.npcCount); // L: 8073
+					}
+				}
+
+			}
+		}
+	} // L: 8076
+}

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

@@ -6,19 +6,13 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("jx")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lpi;"
-	)
-	@Export("NetCache_reference")
-	public static Buffer NetCache_reference;
-	@ObfuscatedName("v")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("keys")
 	int[] keys;
 
@@ -47,7 +41,7 @@ public class Huffman {
 
 					for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25
 						var11 = var3[var10]; // L: 26
-						if (var8 != var11) { // L: 27
+						if (var11 != var8) { // L: 27
 							break;
 						}
 
@@ -105,10 +99,10 @@ public class Huffman {
 
 	} // L: 60
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "([BII[BII)I",
-		garbageValue = "1922986790"
+		garbageValue = "-1517056524"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -156,10 +150,10 @@ public class Huffman {
 		return (var7 + 7 >> 3) - var5; // L: 97
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "([BI[BIII)I",
-		garbageValue = "-1823769978"
+		garbageValue = "-1136816719"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@@ -278,8 +272,8 @@ public class Huffman {
 					var6 = 0; // L: 155
 				}
 
-				if ((var8 & 1) != 0) { // L: 157
+				if ((var8 & 1) != 0) {
-					var6 = this.keys[var6];
+					var6 = this.keys[var6]; // L: 157
 				} else {
 					++var6; // L: 158
 				}

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

@@ -3,88 +3,114 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mw")
+@ObfuscatedName("nd")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lpe;"
+		descriptor = "Lpj;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpe;)V"
+		descriptor = "(Lpj;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400); // L: 13
 		this.loginType = var1; // L: 14
 	} // L: 15
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lnn;",
+		descriptor = "(I)Lnb;",
-		garbageValue = "-2105397576"
+		garbageValue = "-1695844600"
 	)
 	@Export("newInstance")
 	User newInstance() {
-		return new Ignored(); // L: 18
+		return new Ignored(); // L: 19
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Lnn;",
+		descriptor = "(II)[Lnb;",
-		garbageValue = "1888809026"
+		garbageValue = "1788836658"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
-		return new Ignored[var1]; // L: 22
+		return new Ignored[var1]; // L: 24
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;IS)V",
+		descriptor = "(Lpx;IB)V",
-		garbageValue = "-22904"
+		garbageValue = "0"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
 		while (true) {
-			if (var1.offset < var2) { // L: 26
+			if (var1.offset < var2) { // L: 28
-				int var3 = var1.readUnsignedByte(); // L: 27
+				int var3 = var1.readUnsignedByte(); // L: 29
-				boolean var4 = (var3 & 1) == 1; // L: 28
+				boolean var4 = (var3 & 1) == 1; // L: 30
-				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 29
+				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 31
-				Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 30
+				Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 32
-				var1.readStringCp1252NullTerminated(); // L: 31
+				var1.readStringCp1252NullTerminated(); // L: 33
-				if (var5 != null && var5.hasCleanName()) { // L: 32
+				if (var5 != null && var5.hasCleanName()) { // L: 34
-					Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 33
+					Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 35
-					if (var4) { // L: 34
+					if (var4) { // L: 36
-						Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 35
+						Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 37
-						if (var8 != null && var8 != var7) { // L: 36
+						if (var8 != null && var7 != var8) { // L: 38
-							if (var7 != null) { // L: 37
+							if (var7 != null) { // L: 39
-								this.remove(var8); // L: 38
+								this.remove(var8); // L: 40
 							} else {
-								var7 = var8; // L: 41
+								var7 = var8; // L: 43
 							}
 						}
 					}
 
-					if (var7 != null) { // L: 45
+					if (var7 != null) { // L: 47
-						this.changeName(var7, var5, var6); // L: 46
+						this.changeName(var7, var5, var6); // L: 48
 						continue;
 					}
 
-					if (this.getSize() < 400) { // L: 48
+					if (this.getSize() < 400) { // L: 50
-						int var9 = this.getSize(); // L: 49
+						int var9 = this.getSize(); // L: 51
-						var7 = (Ignored)this.addLast(var5, var6); // L: 50
+						var7 = (Ignored)this.addLast(var5, var6); // L: 52
-						var7.id = var9; // L: 51
+						var7.id = var9; // L: 53
 					}
 					continue;
 				}
 
-				throw new IllegalStateException(); // L: 54
+				throw new IllegalStateException(); // L: 56
 			}
 
-			return; // L: 55
+			return; // L: 57
+		}
+	}
+
+	@ObfuscatedName("il")
+	@ObfuscatedSignature(
+		descriptor = "(III)Ljava/lang/String;",
+		garbageValue = "1540266419"
+	)
+	static final String method6430(int var0, int var1) {
+		int var2 = var1 - var0; // L: 10187
+		if (var2 < -9) { // L: 10188
+			return class166.colorStartTag(16711680);
+		} else if (var2 < -6) { // L: 10189
+			return class166.colorStartTag(16723968);
+		} else if (var2 < -3) { // L: 10190
+			return class166.colorStartTag(16740352);
+		} else if (var2 < 0) { // L: 10191
+			return class166.colorStartTag(16756736);
+		} else if (var2 > 9) { // L: 10192
+			return class166.colorStartTag(65280);
+		} else if (var2 > 6) { // L: 10193
+			return class166.colorStartTag(4259584);
+		} else if (var2 > 3) { // L: 10194
+			return class166.colorStartTag(8453888);
+		} else {
+			return var2 > 0 ? class166.colorStartTag(12648192) : class166.colorStartTag(16776960); // L: 10195 10196
 		}
 	}
 }

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

@@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ng")
+@ObfuscatedName("nz")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -60193045
+		intValue = 157062685
 	)
 	@Export("id")
 	int id;
@@ -17,20 +17,20 @@ public class Ignored extends User {
 	Ignored() {
 	} // L: 6
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lng;B)I",
+		descriptor = "(Lnz;B)I",
-		garbageValue = "-48"
+		garbageValue = "0"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id; // L: 9
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Lnn;I)I",
+		descriptor = "(Lnb;I)I",
-		garbageValue = "842367957"
+		garbageValue = "434999779"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -41,14 +41,18 @@ public class Ignored extends User {
 		return this.compareTo_ignored((Ignored)var1); // L: 17
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
+		descriptor = "([FIFI)F",
-		garbageValue = "127"
+		garbageValue = "-1881391939"
 	)
-	static void method6828(int var0) {
+	static float method6616(float[] var0, int var1, float var2) {
-		if (var0 != Login.loginIndex) { // L: 1852
+		float var3 = var0[var1]; // L: 108
-			Login.loginIndex = var0; // L: 1853
+
+		for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 109
+			var3 = var2 * var3 + var0[var4]; // L: 110
+		}
+
+		return var3; // L: 112
 	}
-	} // L: 1854
 }

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

@@ -2,35 +2,38 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("qq")
+@ObfuscatedName("qd")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@Export("height")
 	public int height;
 
-	@ObfuscatedName("v")
+	IndexedSprite() {
+	} // L: 15
+
+	@ObfuscatedName("o")
 	@Export("normalize")
 	public void normalize() {
 		if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18
@@ -51,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	} // L: 31
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("shiftColors")
 	public void shiftColors(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34
@@ -84,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	} // L: 49
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset; // L: 52
@@ -130,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	} // L: 85
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
-	public void method8054(int var1, int var2, int var3, int var4) {
+	public void method7927(int var1, int var2, int var3, int var4) {
 		int var5 = this.subWidth; // L: 116
 		int var6 = this.subHeight; // L: 117
 		int var7 = 0; // L: 118
@@ -192,7 +195,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); // L: 157
 	} // L: 158
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@Export("IndexedSprite_two")
 	static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2); // L: 88
@@ -246,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	} // L: 113
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@Export("IndexedSprite_something")
 	static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
 		int var12 = var3; // L: 161

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

@@ -4,112 +4,112 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bj")
+@ObfuscatedName("bk")
 @Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("x")
+	@ObfuscatedName("h")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
 	@ObfuscatedName("j")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
-	@ObfuscatedName("h")
+	@ObfuscatedName("u")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lag;"
+		descriptor = "Laq;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lag;"
+		descriptor = "Laq;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lag;"
+		descriptor = "Laq;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lag;"
+		descriptor = "Laq;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("b")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lag;"
+		descriptor = "Laq;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("n")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lag;"
+		descriptor = "Laq;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lag;"
+		descriptor = "Laq;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lag;"
+		descriptor = "Laq;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("q")
+	@ObfuscatedName("r")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("p")
+	@ObfuscatedName("c")
 	@Export("delayTime")
 	int delayTime;
 	@ObfuscatedName("w")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Laa;"
+		descriptor = "Lba;"
 	)
 	@Export("filter")
 	AudioFilter filter;
-	@ObfuscatedName("d")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lag;"
+		descriptor = "Laq;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("m")
+	@ObfuscatedName("g")
 	@Export("duration")
 	int duration;
-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
 	@Export("offset")
 	int offset;
 
@@ -146,10 +146,10 @@ public class Instrument {
 		this.offset = 0; // L: 25
 	} // L: 50
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
-		class350.clearIntArray(Instrument_samples, 0, var1); // L: 53
+		class351.clearIntArray(Instrument_samples, 0, var1); // L: 53
 		if (var2 < 10) { // L: 54
 			return Instrument_samples;
 		} else {
@@ -289,6 +289,7 @@ public class Instrument {
 						++var14; // L: 139
 					}
 
+					boolean var21 = true; // L: 146
 					var15 = 128; // L: 147
 
 					while (true) {
@@ -353,7 +354,7 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) { // L: 179
@@ -367,9 +368,9 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;)V"
+		descriptor = "(Lpx;)V"
 	)
 	@Export("decode")
 	final void decode(Buffer var1) {

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

@@ -1,12 +1,13 @@
+import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("qc")
+@ObfuscatedName("qz")
 @Implements("IntHashTable")
 public class IntHashTable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@Export("array")
 	int[] array;
 
@@ -32,10 +33,10 @@ public class IntHashTable {
 
 	} // L: 17
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
+		descriptor = "(IS)I",
-		garbageValue = "83"
+		garbageValue = "-5470"
 	)
 	@Export("get")
 	public int get(int var1) {
@@ -55,4 +56,36 @@ public class IntHashTable {
 			var3 = var3 + 1 & var2; // L: 26
 		}
 	}
+
+	@ObfuscatedName("ly")
+	@ObfuscatedSignature(
+		descriptor = "(Lpx;B)V",
+		garbageValue = "20"
+	)
+	static void method8124(Buffer var0) {
+		if (Client.randomDatData != null) { // L: 12625
+			var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 12626
+		} else {
+			byte[] var2 = new byte[24]; // L: 12631
+
+			try {
+				JagexCache.JagexCache_randomDat.seek(0L); // L: 12633
+				JagexCache.JagexCache_randomDat.readFully(var2); // L: 12634
+
+				int var3;
+				for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { // L: 12635 12636 12637
+				}
+
+				if (var3 >= 24) { // L: 12639
+					throw new IOException();
+				}
+			} catch (Exception var6) {
+				for (int var4 = 0; var4 < 24; ++var4) { // L: 12642
+					var2[var4] = -1;
+				}
+			}
+
+			var0.writeBytes(var2, 0, var2.length); // L: 12647
+		}
+	} // L: 12627 12648
 }