diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index d1687494ba..5a21af8786 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -25,11 +25,11 @@
 
 object ProjectVersions {
     const val launcherVersion = "2.2.0"
-    const val rlVersion = "1.8.5"
+    const val rlVersion = "1.8.6"
 
-    const val openosrsVersion = "4.15.8"
+    const val openosrsVersion = "4.16.1"
 
-    const val rsversion = 201
+    const val rsversion = 202
     const val cacheversion = 165
 
     const val lombokVersion = "1.18.20"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fbce071a31..3cd8500c13 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 744e882ed5..1b6c787337 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
index 3b389f7b17..a637f90919 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
@@ -322,10 +322,10 @@ static class GrandExchange
 		static final int OFFER6 = 12;
 		static final int OFFER7 = 13;
 		static final int OFFER8 = 14;
-		static final int OFFER_CONTAINER = 24;
-		static final int OFFER_DESCRIPTION = 25;
-		static final int OFFER_PRICE = 26;
-		static final int OFFER_CONFIRM_BUTTON = 27;
+		static final int OFFER_CONTAINER = 25;
+		static final int OFFER_DESCRIPTION = 26;
+		static final int OFFER_PRICE = 27;
+		static final int OFFER_CONFIRM_BUTTON = 29;
 	}
 
 	static class GrandExchangeInventory
@@ -927,10 +927,10 @@ static class ExplorersRing
 
 	static class SettingsSide
 	{
-		static final int CAMERA_ZOOM_SLIDER_TRACK = 98;
-		static final int MUSIC_SLIDER = 27;
-		static final int SOUND_EFFECT_SLIDER = 41;
-		static final int AREA_SOUND_SLIDER = 55;
+		static final int CAMERA_ZOOM_SLIDER_TRACK = 100;
+		static final int MUSIC_SLIDER = 29;
+		static final int SOUND_EFFECT_SLIDER = 43;
+		static final int AREA_SOUND_SLIDER = 57;
 	}
 
 	static class Settings
diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
index 8ae622edc7..1bfd141dfd 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
@@ -156,7 +156,6 @@ public enum WidgetInfo
 	GRAND_EXCHANGE_WINDOW_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.WINDOW_CONTAINER),
 	GRAND_EXCHANGE_OFFER_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_CONTAINER),
 	GRAND_EXCHANGE_OFFER_TEXT(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_DESCRIPTION),
-	GRAND_EXCHANGE_OFFER_PRICE(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_PRICE),
 
 	GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER(WidgetID.GRAND_EXCHANGE_INVENTORY_GROUP_ID, WidgetID.GrandExchangeInventory.INVENTORY_ITEM_CONTAINER),
 
@@ -495,7 +494,7 @@ public enum WidgetInfo
 
 	WORLD_SWITCHER_LIST(WidgetID.WORLD_SWITCHER_GROUP_ID, WidgetID.WorldSwitcher.WORLD_LIST),
 
-	FOSSIL_ISLAND_OXYGENBAR(WidgetID.FOSSIL_ISLAND_OXYGENBAR_ID, 2),
+	FOSSIL_ISLAND_OXYGENBAR(WidgetID.FOSSIL_ISLAND_OXYGENBAR_ID, 1),
 
 	MINIGAME_TELEPORT_BUTTON(WidgetID.MINIGAME_TAB_ID, WidgetID.Minigames.TELEPORT_BUTTON),
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
deleted file mode 100644
index 15e20d6c8a..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2018, Woox <https://github.com/wooxsolo>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.runelite.client.plugins.chatboxperformance;
-
-import javax.inject.Inject;
-import net.runelite.api.Client;
-import net.runelite.api.GameState;
-import net.runelite.api.ScriptID;
-import net.runelite.api.events.ScriptCallbackEvent;
-import net.runelite.api.widgets.WidgetType;
-import net.runelite.api.widgets.Widget;
-import net.runelite.api.widgets.WidgetInfo;
-import net.runelite.api.widgets.WidgetPositionMode;
-import net.runelite.api.widgets.WidgetSizeMode;
-import net.runelite.client.callback.ClientThread;
-import net.runelite.client.eventbus.Subscribe;
-import net.runelite.client.plugins.Plugin;
-import net.runelite.client.plugins.PluginDescriptor;
-
-@PluginDescriptor(
-	name = "Chatbox performance",
-	hidden = true
-)
-public class ChatboxPerformancePlugin extends Plugin
-{
-	@Inject
-	private Client client;
-
-	@Inject
-	private ClientThread clientThread;
-
-	@Override
-	public void startUp()
-	{
-		if (client.getGameState() == GameState.LOGGED_IN)
-		{
-			clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0, 0));
-		}
-	}
-
-	@Override
-	public void shutDown()
-	{
-		if (client.getGameState() == GameState.LOGGED_IN)
-		{
-			clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0, 0));
-		}
-	}
-
-	@Subscribe
-	private void onScriptCallbackEvent(ScriptCallbackEvent ev)
-	{
-		if (!"chatboxBackgroundBuilt".equals(ev.getEventName()))
-		{
-			return;
-		}
-
-		fixDarkBackground();
-		fixWhiteLines(true);
-		fixWhiteLines(false);
-	}
-
-	private void fixDarkBackground()
-	{
-		int currOpacity = 256;
-		int prevY = 0;
-		Widget[] children = client.getWidget(WidgetInfo.CHATBOX_TRANSPARENT_BACKGROUND).getDynamicChildren();
-		Widget prev = null;
-		for (Widget w : children)
-		{
-			if (w.getType() != WidgetType.RECTANGLE)
-			{
-				continue;
-			}
-
-			if (prev != null)
-			{
-				int relY = w.getRelativeY();
-				prev.setHeightMode(WidgetSizeMode.ABSOLUTE);
-				prev.setYPositionMode(WidgetPositionMode.ABSOLUTE_TOP);
-				prev.setRelativeY(prevY);
-				prev.setOriginalY(prev.getRelativeY());
-				prev.setHeight(relY - prevY);
-				prev.setOriginalHeight(prev.getHeight());
-				prev.setOpacity(currOpacity);
-			}
-
-			prevY = w.getRelativeY();
-			currOpacity -= 3; // Rough number, can't get exactly the same as Jagex because of rounding
-			prev = w;
-		}
-		if (prev != null)
-		{
-			prev.setOpacity(currOpacity);
-		}
-	}
-
-	private void fixWhiteLines(boolean upperLine)
-	{
-		int currOpacity = 256;
-		int prevWidth = 0;
-		Widget[] children = client.getWidget(WidgetInfo.CHATBOX_TRANSPARENT_LINES).getDynamicChildren();
-		Widget prev = null;
-		for (Widget w : children)
-		{
-			if (w.getType() != WidgetType.RECTANGLE)
-			{
-				continue;
-			}
-
-			if ((w.getRelativeY() == 0 && !upperLine) ||
-				(w.getRelativeY() != 0 && upperLine))
-			{
-				continue;
-			}
-
-			if (prev != null)
-			{
-				int width = w.getWidth();
-				prev.setWidthMode(WidgetSizeMode.ABSOLUTE);
-				prev.setRelativeX(width);
-				prev.setOriginalX(width);
-				prev.setWidth(prevWidth - width);
-				prev.setOriginalWidth(prev.getWidth());
-				prev.setOpacity(currOpacity);
-			}
-
-			prevWidth = w.getWidth();
-
-			currOpacity -= upperLine ? 3 : 4; // Rough numbers, can't get exactly the same as Jagex because of rounding
-			prev = w;
-		}
-		if (prev != null)
-		{
-			prev.setOpacity(currOpacity);
-		}
-	}
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
index b2b78e9a52..c1f72e1b42 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
@@ -71,9 +71,11 @@
 public class SpecialCounterPlugin extends Plugin
 {
 	private static final Set<Integer> IGNORED_NPCS = ImmutableSet.of(
-		NpcID.DARK_ENERGY_CORE, NpcID.ZOMBIFIED_SPAWN, NpcID.ZOMBIFIED_SPAWN_8063,
-		NpcID.COMBAT_DUMMY, NpcID.UNDEAD_COMBAT_DUMMY,
-		NpcID.SKELETON_HELLHOUND_6613, NpcID.GREATER_SKELETON_HELLHOUND
+		NpcID.DARK_ENERGY_CORE, // corp 
+		NpcID.ZOMBIFIED_SPAWN, NpcID.ZOMBIFIED_SPAWN_8063, // vorkath
+		NpcID.COMBAT_DUMMY, NpcID.UNDEAD_COMBAT_DUMMY, // poh
+		NpcID.SKELETON_HELLHOUND_6613, NpcID.GREATER_SKELETON_HELLHOUND, // vetion
+		NpcID.SPAWN, NpcID.SCION // abyssal sire
 	);
 	
 	private static final Set<Integer> RESET_ON_LEAVE_INSTANCED_REGIONS = ImmutableSet.of(
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java
index f30b1c7667..26d39bd53d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java
@@ -29,106 +29,176 @@
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigGroup;
 import net.runelite.client.config.ConfigItem;
+import net.runelite.client.config.ConfigSection;
 
 @ConfigGroup("tileindicators")
 public interface TileIndicatorsConfig extends Config
 {
+	@ConfigSection(
+		name = "Destination Tile",
+		description = "Destination tile configuration",
+		position = 0
+	)
+	String destinationTile = "destinationTile";
+
+	@ConfigSection(
+		name = "Hovered Tile",
+		description = "Hovered tile configuration",
+		position = 1
+	)
+	String hoveredTile = "hoveredTile";
+
+	@ConfigSection(
+		name = "Current Tile",
+		description = "Current tile configuration",
+		position = 2
+	)
+	String currentTile = "currentTile";
+
+	@ConfigItem(
+		keyName = "highlightDestinationTile",
+		name = "Highlight destination tile",
+		description = "Highlights tile player is walking to",
+		position = 1,
+		section = destinationTile
+	)
+	default boolean highlightDestinationTile()
+	{
+		return true;
+	}
+
 	@Alpha
 	@ConfigItem(
 		keyName = "highlightDestinationColor",
-		name = "Destination tile",
+		name = "Highlight color",
 		description = "Configures the highlight color of current destination",
-		position = 1
+		position = 2,
+		section = destinationTile
 	)
 	default Color highlightDestinationColor()
 	{
 		return Color.GRAY;
 	}
 
+	@Alpha
 	@ConfigItem(
-		keyName = "highlightDestinationTile",
-		name = "Highlight destination tile",
-		description = "Highlights tile player is walking to",
-		position = 2
+		keyName = "destinationTileFillColor",
+		name = "Fill color",
+		description = "Configures the fill color of destination tile",
+		position = 3,
+		section = destinationTile
 	)
-	default boolean highlightDestinationTile()
+	default Color destinationTileFillColor()
 	{
-		return true;
+		return new Color(0, 0, 0, 50);
 	}
 
 	@ConfigItem(
 		keyName = "destinationTileBorderWidth",
-		name = "Destination border width",
+		name = "Border width",
 		description = "Width of the destination tile marker border",
-		position = 3
+		position = 4,
+		section = destinationTile
 	)
 	default double destinationTileBorderWidth()
 	{
 		return 2;
 	}
 
+	@ConfigItem(
+		keyName = "highlightHoveredTile",
+		name = "Highlight hovered tile",
+		description = "Highlights tile player is hovering with mouse",
+		position = 1,
+		section = hoveredTile
+	)
+	default boolean highlightHoveredTile()
+	{
+		return false;
+	}
+
 	@Alpha
 	@ConfigItem(
 		keyName = "highlightHoveredColor",
-		name = "Hovered tile",
+		name = "Highlight color",
 		description = "Configures the highlight color of hovered tile",
-		position = 4
+		position = 2,
+		section = hoveredTile
 	)
 	default Color highlightHoveredColor()
 	{
 		return new Color(0, 0, 0, 0);
 	}
 
+	@Alpha
 	@ConfigItem(
-		keyName = "highlightHoveredTile",
-		name = "Highlight hovered tile",
-		description = "Highlights tile player is hovering with mouse",
-		position = 5
+		keyName = "hoveredTileFillColor",
+		name = "Fill color",
+		description = "Configures the fill color of hovered tile",
+		position = 3,
+		section = hoveredTile
 	)
-	default boolean highlightHoveredTile()
+	default Color hoveredTileFillColor()
 	{
-		return false;
+		return new Color(0, 0, 0, 50);
 	}
 
 	@ConfigItem(
 		keyName = "hoveredTileBorderWidth",
-		name = "Hovered tile border width",
+		name = "Border width",
 		description = "Width of the hovered tile marker border",
-		position = 6
+		position = 4,
+		section = hoveredTile
 	)
 	default double hoveredTileBorderWidth()
 	{
 		return 2;
 	}
 
+	@ConfigItem(
+		keyName = "highlightCurrentTile",
+		name = "Highlight true tile",
+		description = "Highlights true tile player is on as seen by server",
+		position = 1,
+		section = currentTile
+	)
+	default boolean highlightCurrentTile()
+	{
+		return false;
+	}
+
 	@Alpha
 	@ConfigItem(
 		keyName = "highlightCurrentColor",
-		name = "True tile",
+		name = "Highlight color",
 		description = "Configures the highlight color of current true tile",
-		position = 7
+		position = 2,
+		section = currentTile
 	)
 	default Color highlightCurrentColor()
 	{
 		return Color.CYAN;
 	}
 
+	@Alpha
 	@ConfigItem(
-		keyName = "highlightCurrentTile",
-		name = "Highlight true tile",
-		description = "Highlights true tile player is on as seen by server",
-		position = 8
+		keyName = "currentTileFillColor",
+		name = "Fill color",
+		description = "Configures the fill color of current true tile",
+		position = 3,
+		section = currentTile
 	)
-	default boolean highlightCurrentTile()
+	default Color currentTileFillColor()
 	{
-		return false;
+		return new Color(0, 0, 0, 50);
 	}
 
 	@ConfigItem(
 		keyName = "currentTileBorderWidth",
-		name = "True tile border width",
+		name = "Border width",
 		description = "Width of the true tile marker border",
-		position = 9
+		position = 4,
+		section = currentTile
 	)
 	default double currentTileBorderWidth()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java
index 8abb968314..99f81a298b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java
@@ -63,13 +63,13 @@ public Dimension render(Graphics2D graphics)
 			// If we have tile "selected" render it
 			if (client.getSelectedSceneTile() != null)
 			{
-				renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), config.highlightHoveredColor(), config.hoveredTileBorderWidth());
+				renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), config.highlightHoveredColor(), config.hoveredTileBorderWidth(), config.hoveredTileFillColor());
 			}
 		}
 
 		if (config.highlightDestinationTile())
 		{
-			renderTile(graphics, client.getLocalDestinationLocation(), config.highlightDestinationColor(), config.destinationTileBorderWidth());
+			renderTile(graphics, client.getLocalDestinationLocation(), config.highlightDestinationColor(), config.destinationTileBorderWidth(), config.destinationTileFillColor());
 		}
 
 		if (config.highlightCurrentTile())
@@ -86,13 +86,13 @@ public Dimension render(Graphics2D graphics)
 				return null;
 			}
 
-			renderTile(graphics, playerPosLocal, config.highlightCurrentColor(), config.currentTileBorderWidth());
+			renderTile(graphics, playerPosLocal, config.highlightCurrentColor(), config.currentTileBorderWidth(), config.currentTileFillColor());
 		}
 
 		return null;
 	}
 
-	private void renderTile(final Graphics2D graphics, final LocalPoint dest, final Color color, final double borderWidth)
+	private void renderTile(final Graphics2D graphics, final LocalPoint dest, final Color color, final double borderWidth, final Color fillColor)
 	{
 		if (dest == null)
 		{
@@ -106,6 +106,6 @@ private void renderTile(final Graphics2D graphics, final LocalPoint dest, final
 			return;
 		}
 
-		OverlayUtil.renderPolygon(graphics, poly, color, new BasicStroke((float) borderWidth));
+		OverlayUtil.renderPolygon(graphics, poly, color, fillColor, new BasicStroke((float) borderWidth));
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
index 2adb8fa1b1..d5309be51b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
@@ -124,6 +124,7 @@ public class TimersPlugin extends Plugin
 	private static final String RESURRECT_THRALL_DISAPPEAR_MESSAGE_END = " thrall returns to the grave.</col>";
 	private static final String WARD_OF_ARCEUUS_MESSAGE = ">Your defence against Arceuus magic has been strengthened.</col>";
 	private static final String PICKPOCKET_FAILURE_MESSAGE = "You fail to pick the ";
+	private static final String DODGY_NECKLACE_PROTECTION_MESSAGE = "Your dodgy necklace protects you.";
 
 	private static final Pattern TELEBLOCK_PATTERN = Pattern.compile("A Tele Block spell has been cast on you(?: by .+)?\\. It will expire in (?<mins>\\d+) minutes?(?:, (?<secs>\\d+) seconds?)?\\.");
 	private static final Pattern DIVINE_POTION_PATTERN = Pattern.compile("You drink some of your divine (.+) potion\\.");
@@ -508,6 +509,11 @@ public void onChatMessage(ChatMessage event)
 			return;
 		}
 
+		if (message.contains(DODGY_NECKLACE_PROTECTION_MESSAGE))
+		{
+			removeGameTimer(PICKPOCKET_STUN);
+		}
+
 		if (message.contains(PICKPOCKET_FAILURE_MESSAGE) && config.showPickpocketStun() && message.contains("pocket"))
 		{
 			if (message.contains("hero") || message.contains("elf"))
diff --git a/runelite-client/src/main/scripts/ChatBuilder.hash b/runelite-client/src/main/scripts/ChatBuilder.hash
index 169c51e68a..d17ea1223a 100644
--- a/runelite-client/src/main/scripts/ChatBuilder.hash
+++ b/runelite-client/src/main/scripts/ChatBuilder.hash
@@ -1 +1 @@
-7D5A3CB415DC8A5BA0477F0587693A394E13C7144DCA3E2F9AEEE559A40210E2
\ No newline at end of file
+2AA6E95505D50D42398FC71705CEE6CD9A21BB9E4B0E74E123AE003BFCABCA21
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/ChatBuilder.rs2asm b/runelite-client/src/main/scripts/ChatBuilder.rs2asm
index 59c9b36675..e3739e6da4 100644
--- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm
@@ -293,7 +293,7 @@ LABEL251:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
@@ -385,12 +385,12 @@ LABEL365:
    iload                  10
    iconst                 -1
    if_icmpne              LABEL369
-   jump                   LABEL1725
+   jump                   LABEL1755
 LABEL369:
    iload                  9
    iconst                 -1
    if_icmpne              LABEL373
-   jump                   LABEL1725
+   jump                   LABEL1755
 LABEL373:
    iload                  10
    5031                  
@@ -409,7 +409,7 @@ LABEL373:
    invoke                 193
    iconst                 1
    if_icmpeq              CHAT_FILTER
-   jump                   LABEL1721
+   jump                   LABEL1751
 CHAT_FILTER:
    sload                  18                ; Load the message
    iconst                 1                 ; Gets changed to 0 if message is blocked
@@ -422,12 +422,13 @@ CHAT_FILTER:
    iconst                 1                 ; 2nd half of conditional
    sstore                 18                ; Override the message with our filtered message
    if_icmpeq              LABEL391          ; Check if we are building this message
-   jump                   LABEL1721          ; continue to next message, skipping this
+   jump                   LABEL1751          ; continue to next message, skipping this
 LABEL391:
    iload                  11
    sload                  16
    sload                  21
    sload                  18
+   sconst                 "null"
    invoke                 4742
    sload                  18
    iload                  12
@@ -436,9 +437,9 @@ LABEL391:
    iload                  15
    invoke                 90
    iconst                 1
-   if_icmpeq              LABEL405
-   jump                   LABEL1721
-LABEL405:
+   if_icmpeq              LABEL406
+   jump                   LABEL1751
+LABEL406:
    iload                  10 ; message uid
    sload                  17 ; message channel
    sload                  16 ; message name
@@ -453,34 +454,35 @@ LABEL405:
    sstore                 17 ; message channel
    iload                  11
    switch                
-      1: LABEL408
-      2: LABEL408
-      3: LABEL454
-      101: LABEL478
-      5: LABEL498
-      6: LABEL533
-      7: LABEL454
-      103: LABEL557
-      104: LABEL557
-      9: LABEL597
-      41: LABEL665
-      43: LABEL1040
-      107: LABEL1257
-      44: LABEL879
-      109: LABEL577
-      110: LABEL557
-      46: LABEL1175
-      14: LABEL1228
-      111: LABEL625
-      112: LABEL645
-      90: LABEL431
-      91: LABEL431
-   jump                   LABEL1295
-LABEL408:
+      1: LABEL409
+      2: LABEL409
+      3: LABEL457
+      101: LABEL482
+      5: LABEL503
+      6: LABEL539
+      7: LABEL457
+      103: LABEL564
+      104: LABEL564
+      9: LABEL606
+      41: LABEL677
+      43: LABEL1061
+      107: LABEL1285
+      44: LABEL896
+      109: LABEL585
+      110: LABEL564
+      46: LABEL1200
+      14: LABEL1255
+      111: LABEL635
+      112: LABEL656
+      90: LABEL433
+      91: LABEL433
+   jump                   LABEL1324
+LABEL409:
    sload                  21
    sload                  16
    sconst                 ":"
    join_string            2
+   sconst                 "null"
    invoke                 4742
    sload                  4
    sload                  18
@@ -499,12 +501,13 @@ LABEL408:
    iload                  4
    invoke                 203
    istore                 7
-   jump                   LABEL1311
-LABEL431:
+   jump                   LABEL1341
+LABEL433:
    sload                  21
    sload                  16
    sconst                 ":"
    join_string            2
+   sconst                 "null"
    invoke                 4742
    sload                  6
    sload                  18
@@ -523,8 +526,8 @@ LABEL431:
    iload                  4
    invoke                 203
    istore                 7
-   jump                   LABEL1311
-LABEL454:
+   jump                   LABEL1341
+LABEL457:
    sload                  21
    sconst                 "From "
    sload                  16
@@ -532,6 +535,7 @@ LABEL454:
    join_string            3
    sconst                 "privChatUsername"
    runelite_callback     
+   sconst                 "null"
    invoke                 4742
    sload                  5
    sload                  18
@@ -550,13 +554,14 @@ LABEL454:
    iload                  4
    invoke                 203
    istore                 7
-   jump                   LABEL1311
-LABEL478:
+   jump                   LABEL1341
+LABEL482:
    sload                  21
    sload                  9
    sload                  18
    sconst                 "</col>"
    join_string            3
+   sconst                 "null"
    invoke                 4742
    iload                  8
    iload                  9
@@ -571,13 +576,14 @@ LABEL478:
    iload                  4
    invoke                 199
    istore                 7
-   jump                   LABEL1311
-LABEL498:
+   jump                   LABEL1341
+LABEL503:
    sload                  21
    sload                  5
    sload                  18
    sconst                 "</col>"
    join_string            3
+   sconst                 "null"
    invoke                 4742
    iload                  8
    iload                  9
@@ -594,9 +600,9 @@ LABEL498:
    istore                 7
    get_varbit             1627
    iconst                 0
-   if_icmpeq              LABEL521
-   jump                   LABEL532
-LABEL521:
+   if_icmpeq              LABEL527
+   jump                   LABEL538
+LABEL527:
    iload                  12
    iconst                 500
    add                   
@@ -608,9 +614,9 @@ LABEL521:
    sconst                 "1"
    iconst                 10616832
    if_setontimer         
-LABEL532:
-   jump                   LABEL1311
-LABEL533:
+LABEL538:
+   jump                   LABEL1341
+LABEL539:
    sload                  21
    sconst                 "To "
    sload                  16
@@ -618,6 +624,7 @@ LABEL533:
    join_string            3
    sconst                 "privChatUsername"
    runelite_callback     
+   sconst                 "null"
    invoke                 4742
    sload                  5
    sload                  18
@@ -636,13 +643,14 @@ LABEL533:
    iload                  4
    invoke                 203
    istore                 7
-   jump                   LABEL1311
-LABEL557:
+   jump                   LABEL1341
+LABEL564:
    sload                  21
    sload                  10
    sload                  18
    sconst                 "</col>"
    join_string            3
+   sconst                 "null"
    invoke                 4742
    iload                  8
    iload                  9
@@ -657,13 +665,14 @@ LABEL557:
    iload                  4
    invoke                 199
    istore                 7
-   jump                   LABEL1311
-LABEL577:
+   jump                   LABEL1341
+LABEL585:
    sload                  21
    sconst                 "<col=1a31f2>"
    sload                  18
    sconst                 "</col>"
    join_string            3
+   sconst                 "null"
    invoke                 4742
    iload                  8
    iload                  9
@@ -678,8 +687,8 @@ LABEL577:
    iload                  4
    invoke                 199
    istore                 7
-   jump                   LABEL1311
-LABEL597:
+   jump                   LABEL1341
+LABEL606:
    sload                  21
    sconst                 "["
    sload                  3
@@ -689,6 +698,7 @@ LABEL597:
    sload                  16
    sconst                 ":"
    join_string            7
+   sconst                 "null"
    invoke                 4742
    sload                  7
    sload                  18
@@ -707,13 +717,14 @@ LABEL597:
    iload                  4
    invoke                 203
    istore                 7
-   jump                   LABEL1311
-LABEL625:
+   jump                   LABEL1341
+LABEL635:
    sload                  21
    sconst                 "<col=1a31f2>"
    sload                  18
    sconst                 "</col>"
    join_string            3
+   sconst                 "null"
    invoke                 4742
    iload                  8
    iload                  9
@@ -728,13 +739,14 @@ LABEL625:
    iload                  4
    invoke                 199
    istore                 7
-   jump                   LABEL1311
-LABEL645:
+   jump                   LABEL1341
+LABEL656:
    sload                  21
    sconst                 "<col=1a31f2>"
    sload                  18
    sconst                 "</col>"
    join_string            3
+   sconst                 "null"
    invoke                 4742
    iload                  8
    iload                  9
@@ -749,26 +761,26 @@ LABEL645:
    iload                  4
    invoke                 199
    istore                 7
-   jump                   LABEL1311
-LABEL665:
+   jump                   LABEL1341
+LABEL677:
    iconst                 1
    activeclansettings_find_affined
    iconst                 1
-   if_icmpeq              LABEL670
-   jump                   LABEL716
-LABEL670:
+   if_icmpeq              LABEL682
+   jump                   LABEL729
+LABEL682:
    iconst                 1
    activeclanchannel_find_affined
    iconst                 1
-   if_icmpeq              LABEL675
-   jump                   LABEL716
-LABEL675:
+   if_icmpeq              LABEL687
+   jump                   LABEL729
+LABEL687:
    sload                  18
    invoke                 5501
    iconst                 1
-   if_icmpeq              LABEL680
-   jump                   LABEL716
-LABEL680:
+   if_icmpeq              LABEL692
+   jump                   LABEL729
+LABEL692:
    sload                  18
    invoke                 632
    sstore                 18
@@ -780,6 +792,7 @@ LABEL680:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iconst                 -1
    iconst                 0
@@ -804,29 +817,29 @@ LABEL680:
    iload                  4
    invoke                 4483
    istore                 7
-   jump                   LABEL878
-LABEL716:
+   jump                   LABEL895
+LABEL729:
    iconst                 0
    activeclansettings_find_affined
    iconst                 1
-   if_icmpeq              LABEL721
-   jump                   LABEL847
-LABEL721:
+   if_icmpeq              LABEL734
+   jump                   LABEL863
+LABEL734:
    iconst                 0
    activeclanchannel_find_affined
    iconst                 1
-   if_icmpeq              LABEL726
-   jump                   LABEL847
-LABEL726:
+   if_icmpeq              LABEL739
+   jump                   LABEL863
+LABEL739:
    sload                  16
    removetags            
    activeclanchannel_getuserslot
    istore                 17
    iload                  17
    iconst                 -1
-   if_icmpne              LABEL734
-   jump                   LABEL811
-LABEL734:
+   if_icmpne              LABEL747
+   jump                   LABEL826
+LABEL747:
    iload                  17
    activeclanchannel_getuserrank
    invoke                 4302
@@ -834,9 +847,9 @@ LABEL734:
    sstore                 20
    iload                  16
    iconst                 -1
-   if_icmpne              LABEL743
-   jump                   LABEL775
-LABEL743:
+   if_icmpne              LABEL756
+   jump                   LABEL789
+LABEL756:
    sload                  21
    sconst                 "["
    sload                  2
@@ -844,6 +857,7 @@ LABEL743:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iload                  16
    iconst                 13
@@ -868,8 +882,8 @@ LABEL743:
    iload                  4
    invoke                 4483
    istore                 7
-   jump                   LABEL810
-LABEL775:
+   jump                   LABEL825
+LABEL789:
    sload                  21
    sconst                 "["
    sload                  2
@@ -877,6 +891,7 @@ LABEL775:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iconst                 -1
    iconst                 0
@@ -905,9 +920,9 @@ LABEL775:
    iload                  4
    invoke                 4483
    istore                 7
-LABEL810:
-   jump                   LABEL846
-LABEL811:
+LABEL825:
+   jump                   LABEL862
+LABEL826:
    iconst                 -1
    invoke                 4302
    istore                 16
@@ -919,6 +934,7 @@ LABEL811:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iload                  16
    iconst                 13
@@ -943,9 +959,9 @@ LABEL811:
    iload                  4
    invoke                 4483
    istore                 7
-LABEL846:
-   jump                   LABEL878
-LABEL847:
+LABEL862:
+   jump                   LABEL895
+LABEL863:
    sload                  21
    sconst                 "["
    sload                  2
@@ -953,6 +969,7 @@ LABEL847:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iconst                 -1
    iconst                 0
@@ -977,28 +994,28 @@ LABEL847:
    iload                  4
    invoke                 4483
    istore                 7
-LABEL878:
-   jump                   LABEL1311
-LABEL879:
+LABEL895:
+   jump                   LABEL1341
+LABEL896:
    activeclansettings_find_listened
    iconst                 1
-   if_icmpeq              LABEL883
-   jump                   LABEL1008
-LABEL883:
+   if_icmpeq              LABEL900
+   jump                   LABEL1028
+LABEL900:
    activeclanchannel_find_listened
    iconst                 1
-   if_icmpeq              LABEL887
-   jump                   LABEL1008
-LABEL887:
+   if_icmpeq              LABEL904
+   jump                   LABEL1028
+LABEL904:
    sload                  16
    removetags            
    activeclanchannel_getuserslot
    istore                 17
    iload                  17
    iconst                 -1
-   if_icmpne              LABEL895
-   jump                   LABEL972
-LABEL895:
+   if_icmpne              LABEL912
+   jump                   LABEL991
+LABEL912:
    iload                  17
    activeclanchannel_getuserrank
    invoke                 4302
@@ -1006,9 +1023,9 @@ LABEL895:
    sstore                 20
    iload                  16
    iconst                 -1
-   if_icmpne              LABEL904
-   jump                   LABEL936
-LABEL904:
+   if_icmpne              LABEL921
+   jump                   LABEL954
+LABEL921:
    sload                  21
    sconst                 "["
    sload                  2
@@ -1016,6 +1033,7 @@ LABEL904:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iload                  16
    iconst                 13
@@ -1040,8 +1058,8 @@ LABEL904:
    iload                  4
    invoke                 4483
    istore                 7
-   jump                   LABEL971
-LABEL936:
+   jump                   LABEL990
+LABEL954:
    sload                  21
    sconst                 "["
    sload                  2
@@ -1049,6 +1067,7 @@ LABEL936:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iconst                 -1
    iconst                 0
@@ -1077,9 +1096,9 @@ LABEL936:
    iload                  4
    invoke                 4483
    istore                 7
-LABEL971:
-   jump                   LABEL1007
-LABEL972:
+LABEL990:
+   jump                   LABEL1027
+LABEL991:
    iconst                 -1
    invoke                 4302
    istore                 16
@@ -1091,6 +1110,7 @@ LABEL972:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iload                  16
    iconst                 13
@@ -1115,9 +1135,9 @@ LABEL972:
    iload                  4
    invoke                 4483
    istore                 7
-LABEL1007:
-   jump                   LABEL1039
-LABEL1008:
+LABEL1027:
+   jump                   LABEL1060
+LABEL1028:
    sload                  21
    sconst                 "["
    sload                  2
@@ -1125,6 +1145,7 @@ LABEL1008:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iconst                 -1
    iconst                 0
@@ -1149,15 +1170,15 @@ LABEL1008:
    iload                  4
    invoke                 4483
    istore                 7
-LABEL1039:
-   jump                   LABEL1311
-LABEL1040:
+LABEL1060:
+   jump                   LABEL1341
+LABEL1061:
    sload                  18
    invoke                 5309
    iconst                 1
-   if_icmpeq              LABEL1045
-   jump                   LABEL1108
-LABEL1045:
+   if_icmpeq              LABEL1066
+   jump                   LABEL1131
+LABEL1066:
    sload                  18
    invoke                 632
    sstore                 18
@@ -1172,9 +1193,9 @@ LABEL1045:
    iconst                 1
    activeclansettings_find_affined
    iconst                 1
-   if_icmpeq              LABEL1061
-   jump                   LABEL1087
-LABEL1061:
+   if_icmpeq              LABEL1082
+   jump                   LABEL1109
+LABEL1082:
    sload                  21
    sconst                 "["
    sload                  2
@@ -1182,6 +1203,7 @@ LABEL1061:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    sload                  14
    sload                  18
@@ -1200,10 +1222,11 @@ LABEL1061:
    iload                  4
    invoke                 203
    istore                 7
-   jump                   LABEL1107
-LABEL1087:
+   jump                   LABEL1130
+LABEL1109:
    sload                  21
    sconst                 ""
+   sconst                 "null"
    invoke                 4742
    sload                  14
    sload                  18
@@ -1222,9 +1245,9 @@ LABEL1087:
    iload                  4
    invoke                 203
    istore                 7
-LABEL1107:
-   jump                   LABEL1174
-LABEL1108:
+LABEL1130:
+   jump                   LABEL1199
+LABEL1131:
    sload                  18
    sconst                 "</col>"
    sconst                 "</col>"
@@ -1235,9 +1258,9 @@ LABEL1108:
    iconst                 0
    activeclanchannel_find_affined
    iconst                 1
-   if_icmpeq              LABEL1120
-   jump                   LABEL1150
-LABEL1120:
+   if_icmpeq              LABEL1143
+   jump                   LABEL1174
+LABEL1143:
    sload                  21
    sconst                 "["
    sload                  2
@@ -1245,6 +1268,7 @@ LABEL1120:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iconst                 -1
    iconst                 0
@@ -1267,10 +1291,11 @@ LABEL1120:
    iload                  4
    invoke                 4483
    istore                 7
-   jump                   LABEL1174
-LABEL1150:
+   jump                   LABEL1199
+LABEL1174:
    sload                  21
    sconst                 ""
+   sconst                 "null"
    invoke                 4742
    iconst                 -1
    iconst                 0
@@ -1293,14 +1318,14 @@ LABEL1150:
    iload                  4
    invoke                 4483
    istore                 7
-LABEL1174:
-   jump                   LABEL1311
-LABEL1175:
+LABEL1199:
+   jump                   LABEL1341
+LABEL1200:
    activeclanchannel_find_listened
    iconst                 1
-   if_icmpeq              LABEL1179
-   jump                   LABEL1206
-LABEL1179:
+   if_icmpeq              LABEL1204
+   jump                   LABEL1232
+LABEL1204:
    sload                  21
    sconst                 "["
    sload                  2
@@ -1308,6 +1333,7 @@ LABEL1179:
    sconst                 "</col>"
    sconst                 "]"
    join_string            5
+   sconst                 "null"
    invoke                 4742
    iconst                 -1
    iconst                 0
@@ -1327,10 +1353,11 @@ LABEL1179:
    iload                  4
    invoke                 4483
    istore                 7
-   jump                   LABEL1227
-LABEL1206:
+   jump                   LABEL1254
+LABEL1232:
    sload                  21
    sconst                 ""
+   sconst                 "null"
    invoke                 4742
    iconst                 -1
    iconst                 0
@@ -1350,9 +1377,9 @@ LABEL1206:
    iload                  4
    invoke                 4483
    istore                 7
-LABEL1227:
-   jump                   LABEL1311
-LABEL1228:
+LABEL1254:
+   jump                   LABEL1341
+LABEL1255:
    sload                  18
    invoke                 2066
    istore                 13
@@ -1363,6 +1390,7 @@ LABEL1228:
    sconst                 "Broadcast:"
    sconst                 "</col>"
    join_string            3
+   sconst                 "null"
    invoke                 4742
    sload                  15
    sload                  18
@@ -1381,15 +1409,15 @@ LABEL1228:
    iload                  4
    invoke                 203
    istore                 7
-   jump                   LABEL1311
-LABEL1257:
+   jump                   LABEL1341
+LABEL1285:
    clientclock           
    iload                  12
    sub                   
    iconst                 500
-   if_icmpgt              LABEL1263
-   jump                   LABEL1278
-LABEL1263:
+   if_icmpgt              LABEL1291
+   jump                   LABEL1306
+LABEL1291:
    sconst                 "jk :P"
    iload                  8
    iload                  9
@@ -1404,10 +1432,11 @@ LABEL1263:
    iload                  4
    invoke                 199
    istore                 7
-   jump                   LABEL1294
-LABEL1278:
+   jump                   LABEL1323
+LABEL1306:
    sload                  21
    sload                  18
+   sconst                 "null"
    invoke                 4742
    iload                  8
    iload                  9
@@ -1422,11 +1451,12 @@ LABEL1278:
    iload                  4
    invoke                 199
    istore                 7
-LABEL1294:
-   jump                   LABEL1311
-LABEL1295:
+LABEL1323:
+   jump                   LABEL1341
+LABEL1324:
    sload                  21
    sload                  18
+   sconst                 "null"
    invoke                 4742
    iload                  8
    iload                  9
@@ -1441,32 +1471,32 @@ LABEL1295:
    iload                  4
    invoke                 199
    istore                 7
-LABEL1311:
+LABEL1341:
    iload                  9
    if_clearops           
    iload                  11
    switch                
-      1: LABEL1316
-      2: LABEL1316
-      3: LABEL1316
-      101: LABEL1420
-      6: LABEL1316
-      7: LABEL1316
-      103: LABEL1463
-      104: LABEL1463
-      9: LABEL1316
-      41: LABEL1316
-      106: LABEL1316
-      44: LABEL1316
-      109: LABEL1566
-      110: LABEL1463
-      14: LABEL1506
-      111: LABEL1609
-      112: LABEL1652
-      90: LABEL1316
-      91: LABEL1316
-   jump                   LABEL1695
-LABEL1316:
+      1: LABEL1346
+      2: LABEL1346
+      3: LABEL1346
+      101: LABEL1450
+      6: LABEL1346
+      7: LABEL1346
+      103: LABEL1493
+      104: LABEL1493
+      9: LABEL1346
+      41: LABEL1346
+      106: LABEL1346
+      44: LABEL1346
+      109: LABEL1596
+      110: LABEL1493
+      14: LABEL1536
+      111: LABEL1639
+      112: LABEL1682
+      90: LABEL1346
+      91: LABEL1346
+   jump                   LABEL1725
+LABEL1346:
    sconst                 "<col=ffffff>"
    sload                  16
    sconst                 "</col>"
@@ -1483,7 +1513,7 @@ LABEL1316:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
@@ -1493,20 +1523,20 @@ LABEL1316:
    removetags            
    compare               
    iconst                 0
-   if_icmpne              LABEL1344
-   jump                   LABEL1419
-LABEL1344:
+   if_icmpne              LABEL1374
+   jump                   LABEL1449
+LABEL1374:
    iload                  15
    iconst                 1
-   if_icmpeq              LABEL1348
-   jump                   LABEL1353
-LABEL1348:
+   if_icmpeq              LABEL1378
+   jump                   LABEL1383
+LABEL1378:
    iconst                 6
    sconst                 "Message"
    iload                  9
    if_setop              
-   jump                   LABEL1361
-LABEL1353:
+   jump                   LABEL1391
+LABEL1383:
    iconst                 6
    sconst                 "Add friend"
    iload                  9
@@ -1515,78 +1545,78 @@ LABEL1353:
    sconst                 "Add ignore"
    iload                  9
    if_setop              
-LABEL1361:
+LABEL1391:
    iconst                 8
    sconst                 "Report"
    iload                  9
    if_setop              
    iload                  11
    iconst                 9
-   if_icmpeq              LABEL1369
-   jump                   LABEL1382
-LABEL1369:
+   if_icmpeq              LABEL1399
+   jump                   LABEL1412
+LABEL1399:
    clan_getchatcount     
    iconst                 0
-   if_icmpgt              LABEL1373
-   jump                   LABEL1381
-LABEL1373:
+   if_icmpgt              LABEL1403
+   jump                   LABEL1411
+LABEL1403:
    clan_getchatrank      
    clan_getchatminkick   
-   if_icmpge              LABEL1377
-   jump                   LABEL1381
-LABEL1377:
+   if_icmpge              LABEL1407
+   jump                   LABEL1411
+LABEL1407:
    iconst                 9
    sconst                 "Kick"
    iload                  9
    if_setop              
-LABEL1381:
-   jump                   LABEL1419
-LABEL1382:
+LABEL1411:
+   jump                   LABEL1449
+LABEL1412:
    iload                  11
    iconst                 41
-   if_icmpeq              LABEL1386
-   jump                   LABEL1419
-LABEL1386:
+   if_icmpeq              LABEL1416
+   jump                   LABEL1449
+LABEL1416:
    iload                  18
    iload                  19
-   if_icmpge              LABEL1390
-   jump                   LABEL1419
-LABEL1390:
+   if_icmpge              LABEL1420
+   jump                   LABEL1449
+LABEL1420:
    iconst                 0
    activeclanchannel_find_affined
    iconst                 1
-   if_icmpeq              LABEL1395
-   jump                   LABEL1419
-LABEL1395:
+   if_icmpeq              LABEL1425
+   jump                   LABEL1449
+LABEL1425:
    sload                  16
    removetags            
    activeclanchannel_getuserslot
    istore                 17
    iload                  17
    iconst                 -1
-   if_icmpeq              LABEL1407
+   if_icmpeq              LABEL1437
    iload                  17
    activeclanchannel_getuserrank
    iconst                 -1
-   if_icmple              LABEL1407
-   jump                   LABEL1419
-LABEL1407:
+   if_icmple              LABEL1437
+   jump                   LABEL1449
+LABEL1437:
    iconst                 9
    sconst                 "Kick"
    iload                  9
    if_setop              
    iload                  18
    iload                  20
-   if_icmpge              LABEL1415
-   jump                   LABEL1419
-LABEL1415:
+   if_icmpge              LABEL1445
+   jump                   LABEL1449
+LABEL1445:
    iconst                 10
    sconst                 "Ban"
    iload                  9
    if_setop              
-LABEL1419:
-   jump                   LABEL1707
-LABEL1420:
+LABEL1449:
+   jump                   LABEL1737
+LABEL1450:
    sconst                 "<col=ffffff>"
    sload                  16
    sconst                 "</col>"
@@ -1603,7 +1633,7 @@ LABEL1420:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
@@ -1614,15 +1644,15 @@ LABEL1420:
    if_setop              
    iload                  15
    iconst                 1
-   if_icmpeq              LABEL1449
-   jump                   LABEL1454
-LABEL1449:
+   if_icmpeq              LABEL1479
+   jump                   LABEL1484
+LABEL1479:
    iconst                 6
    sconst                 "Message"
    iload                  9
    if_setop              
-   jump                   LABEL1462
-LABEL1454:
+   jump                   LABEL1492
+LABEL1484:
    iconst                 6
    sconst                 "Add friend"
    iload                  9
@@ -1631,9 +1661,9 @@ LABEL1454:
    sconst                 "Add ignore"
    iload                  9
    if_setop              
-LABEL1462:
-   jump                   LABEL1707
-LABEL1463:
+LABEL1492:
+   jump                   LABEL1737
+LABEL1493:
    sconst                 "<col=ffffff>"
    sload                  16
    sconst                 "</col>"
@@ -1650,7 +1680,7 @@ LABEL1463:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
@@ -1661,15 +1691,15 @@ LABEL1463:
    if_setop              
    iload                  15
    iconst                 1
-   if_icmpeq              LABEL1492
-   jump                   LABEL1497
-LABEL1492:
+   if_icmpeq              LABEL1522
+   jump                   LABEL1527
+LABEL1522:
    iconst                 6
    sconst                 "Message"
    iload                  9
    if_setop              
-   jump                   LABEL1505
-LABEL1497:
+   jump                   LABEL1535
+LABEL1527:
    iconst                 6
    sconst                 "Add friend"
    iload                  9
@@ -1678,20 +1708,20 @@ LABEL1497:
    sconst                 "Add ignore"
    iload                  9
    if_setop              
-LABEL1505:
-   jump                   LABEL1707
-LABEL1506:
+LABEL1535:
+   jump                   LABEL1737
+LABEL1536:
    sload                  19
    string_length         
    iconst                 0
-   if_icmpgt              LABEL1511
-   jump                   LABEL1540
-LABEL1511:
+   if_icmpgt              LABEL1541
+   jump                   LABEL1570
+LABEL1541:
    iload                  13
    iconst                 -1
-   if_icmpne              LABEL1515
-   jump                   LABEL1540
-LABEL1515:
+   if_icmpne              LABEL1545
+   jump                   LABEL1570
+LABEL1545:
    iconst                 6
    sconst                 "Open"
    iload                  9
@@ -1707,7 +1737,7 @@ LABEL1515:
    iconst                 3158271
    sconst                 "Iii"
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 2065
    iload                  9
    if_getlayer           
@@ -1716,17 +1746,17 @@ LABEL1515:
    sconst                 "Iii"
    iload                  9
    if_setonmouseleave    
-   jump                   LABEL1548
-LABEL1540:
+   jump                   LABEL1578
+LABEL1570:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
    if_setonmouseleave    
-LABEL1548:
+LABEL1578:
    iconst                 9
    sconst                 "Clear history"
    iload                  9
@@ -1744,8 +1774,8 @@ LABEL1548:
    sconst                 "isi"
    iload                  9
    if_setonop            
-   jump                   LABEL1707
-LABEL1566:
+   jump                   LABEL1737
+LABEL1596:
    sconst                 "<col=0xffffff>"
    sload                  16
    sconst                 "</col>"
@@ -1766,22 +1796,22 @@ LABEL1566:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
    if_setonmouseleave    
    iload                  15
    iconst                 1
-   if_icmpeq              LABEL1595
-   jump                   LABEL1600
-LABEL1595:
+   if_icmpeq              LABEL1625
+   jump                   LABEL1630
+LABEL1625:
    iconst                 6
    sconst                 "Message"
    iload                  9
    if_setop              
-   jump                   LABEL1608
-LABEL1600:
+   jump                   LABEL1638
+LABEL1630:
    iconst                 6
    sconst                 "Add friend"
    iload                  9
@@ -1790,9 +1820,9 @@ LABEL1600:
    sconst                 "Add ignore"
    iload                  9
    if_setop              
-LABEL1608:
-   jump                   LABEL1707
-LABEL1609:
+LABEL1638:
+   jump                   LABEL1737
+LABEL1639:
    sconst                 "<col=0xffffff>"
    sload                  16
    sconst                 "</col>"
@@ -1813,22 +1843,22 @@ LABEL1609:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
    if_setonmouseleave    
    iload                  15
    iconst                 1
-   if_icmpeq              LABEL1638
-   jump                   LABEL1643
-LABEL1638:
+   if_icmpeq              LABEL1668
+   jump                   LABEL1673
+LABEL1668:
    iconst                 6
    sconst                 "Message"
    iload                  9
    if_setop              
-   jump                   LABEL1651
-LABEL1643:
+   jump                   LABEL1681
+LABEL1673:
    iconst                 6
    sconst                 "Add friend"
    iload                  9
@@ -1837,9 +1867,9 @@ LABEL1643:
    sconst                 "Add ignore"
    iload                  9
    if_setop              
-LABEL1651:
-   jump                   LABEL1707
-LABEL1652:
+LABEL1681:
+   jump                   LABEL1737
+LABEL1682:
    sconst                 "<col=0xffffff>"
    sload                  16
    sconst                 "</col>"
@@ -1860,22 +1890,22 @@ LABEL1652:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
    if_setonmouseleave    
    iload                  15
    iconst                 1
-   if_icmpeq              LABEL1681
-   jump                   LABEL1686
-LABEL1681:
+   if_icmpeq              LABEL1711
+   jump                   LABEL1716
+LABEL1711:
    iconst                 6
    sconst                 "Message"
    iload                  9
    if_setop              
-   jump                   LABEL1694
-LABEL1686:
+   jump                   LABEL1724
+LABEL1716:
    iconst                 6
    sconst                 "Add friend"
    iload                  9
@@ -1884,9 +1914,9 @@ LABEL1686:
    sconst                 "Add ignore"
    iload                  9
    if_setop              
-LABEL1694:
-   jump                   LABEL1707
-LABEL1695:
+LABEL1724:
+   jump                   LABEL1737
+LABEL1725:
    iconst                 -1
    sconst                 ""
    iload                  9
@@ -1894,12 +1924,12 @@ LABEL1695:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
    if_setonmouseleave    
-LABEL1707:
+LABEL1737:
    iload                  6
    iload                  7
    sub                   
@@ -1914,20 +1944,20 @@ LABEL1707:
    iload                  8
    enum                  
    istore                 9
-LABEL1721:
+LABEL1751:
    iload                  10
    chat_getprevuid       
    istore                 10
    jump                   LABEL365
-LABEL1725:
+LABEL1755:
    iload                  8
    istore                 22
-LABEL1727:
+LABEL1757:
    iload                  9
    iconst                 -1
-   if_icmpne              LABEL1731
-   jump                   LABEL1814
-LABEL1731:
+   if_icmpne              LABEL1761
+   jump                   LABEL1844
+LABEL1761:
    iload                  9
    if_clearops           
    iconst                 -1
@@ -1937,7 +1967,7 @@ LABEL1731:
    iconst                 -1
    sconst                 ""
    iload                  9
-   if_setonmouserepeat   
+   if_setonmouseover     
    iconst                 -1
    sconst                 ""
    iload                  9
@@ -1954,14 +1984,14 @@ LABEL1731:
    multiply              
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL1759
-   jump                   LABEL1763
-LABEL1759:
+   if_icmpeq              LABEL1789
+   jump                   LABEL1793
+LABEL1789:
    sconst                 ""
    cc_settext            
    iconst                 1
    cc_sethide            
-LABEL1763:
+LABEL1793:
    iconst                 10616888
    iload                  8
    iconst                 4
@@ -1970,14 +2000,14 @@ LABEL1763:
    add                   
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL1773
-   jump                   LABEL1777
-LABEL1773:
+   if_icmpeq              LABEL1803
+   jump                   LABEL1807
+LABEL1803:
    sconst                 ""
    cc_settext            
    iconst                 1
    cc_sethide            
-LABEL1777:
+LABEL1807:
    iconst                 10616888
    iload                  8
    iconst                 4
@@ -1986,14 +2016,14 @@ LABEL1777:
    add                   
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL1787
-   jump                   LABEL1791
-LABEL1787:
+   if_icmpeq              LABEL1817
+   jump                   LABEL1821
+LABEL1817:
    sconst                 ""
    cc_settext            
    iconst                 1
    cc_sethide            
-LABEL1791:
+LABEL1821:
    iconst                 10616888
    iload                  8
    iconst                 4
@@ -2002,12 +2032,12 @@ LABEL1791:
    add                   
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL1801
-   jump                   LABEL1803
-LABEL1801:
+   if_icmpeq              LABEL1831
+   jump                   LABEL1833
+LABEL1831:
    iconst                 1
    cc_sethide            
-LABEL1803:
+LABEL1833:
    iload                  8
    iconst                 1
    add                   
@@ -2018,8 +2048,8 @@ LABEL1803:
    iload                  8
    enum                  
    istore                 9
-   jump                   LABEL1727
-LABEL1814:
+   jump                   LABEL1757
+LABEL1844:
    iload                  6
    iconst                 2
    sub                   
@@ -2033,20 +2063,20 @@ LABEL1814:
    istore                 23
    iload                  6
    iload                  23
-   if_icmpgt              LABEL1829
-   jump                   LABEL1831
-LABEL1829:
+   if_icmpgt              LABEL1859
+   jump                   LABEL1861
+LABEL1859:
    iload                  6
    istore                 23
-LABEL1831:
+LABEL1861:
    iload                  22
    istore                 8
-LABEL1833:
+LABEL1863:
    iload                  8
    iconst                 0
-   if_icmpgt              LABEL1837
-   jump                   LABEL1920
-LABEL1837:
+   if_icmpgt              LABEL1867
+   jump                   LABEL1950
+LABEL1867:
    iload                  8
    iconst                 1
    sub                   
@@ -2077,15 +2107,15 @@ LABEL1837:
    multiply              
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL1869
-   jump                   LABEL1874
-LABEL1869:
+   if_icmpeq              LABEL1899
+   jump                   LABEL1904
+LABEL1899:
    cc_getx               
    iload                  6
    iconst                 0
    iconst                 0
    cc_setposition        
-LABEL1874:
+LABEL1904:
    iconst                 10616888
    iload                  8
    iconst                 4
@@ -2094,15 +2124,15 @@ LABEL1874:
    add                   
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL1884
-   jump                   LABEL1889
-LABEL1884:
+   if_icmpeq              LABEL1914
+   jump                   LABEL1919
+LABEL1914:
    cc_getx               
    iload                  6
    iconst                 0
    iconst                 0
    cc_setposition        
-LABEL1889:
+LABEL1919:
    iconst                 10616888
    iload                  8
    iconst                 4
@@ -2111,15 +2141,15 @@ LABEL1889:
    add                   
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL1899
-   jump                   LABEL1904
-LABEL1899:
+   if_icmpeq              LABEL1929
+   jump                   LABEL1934
+LABEL1929:
    cc_getx               
    iload                  6
    iconst                 0
    iconst                 0
    cc_setposition        
-LABEL1904:
+LABEL1934:
    iconst                 10616888
    iload                  8
    iconst                 4
@@ -2128,17 +2158,17 @@ LABEL1904:
    add                   
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL1914
-   jump                   LABEL1919
-LABEL1914:
+   if_icmpeq              LABEL1944
+   jump                   LABEL1949
+LABEL1944:
    cc_getx               
    iload                  6
    iconst                 0
    iconst                 0
    cc_setposition        
-LABEL1919:
-   jump                   LABEL1833
-LABEL1920:
+LABEL1949:
+   jump                   LABEL1863
+LABEL1950:
    iconst                 0
    iload                  23
    iconst                 10616888
diff --git a/runelite-client/src/main/scripts/ChatSend.hash b/runelite-client/src/main/scripts/ChatSend.hash
index 9c54adf40e..03fd850497 100644
--- a/runelite-client/src/main/scripts/ChatSend.hash
+++ b/runelite-client/src/main/scripts/ChatSend.hash
@@ -1 +1 @@
-6FB26238E2041A40DE52A7E797AD54BF8633BE93FD3B0C244F1313B53CC0A922
\ No newline at end of file
+77B41EBBD7A825A8AC984B282115ED636C9F32A4FA777B1B58169E9C6FF103E0
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.hash b/runelite-client/src/main/scripts/ChatSplitBuilder.hash
index f44294153a..39f5efa12c 100644
--- a/runelite-client/src/main/scripts/ChatSplitBuilder.hash
+++ b/runelite-client/src/main/scripts/ChatSplitBuilder.hash
@@ -1 +1 @@
-7D996BC73BC98D9BDE8FCDC0A866021F1F217F370B35C30C5B4B0FFECD9135C0
\ No newline at end of file
+21BB416CB6B1BC4EF5150411D12A118494BCF943E7A419682377C33639F488C1
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
index 80cdf54e09..eb8907443e 100644
--- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
@@ -203,20 +203,20 @@ LABEL156:
    get_varc_int           55
    get_varc_int           202
    if_icmpge              LABEL189
-   jump                   LABEL319
+   jump                   LABEL320
 LABEL189:
    get_varc_int           55
    clientclock           
    iconst                 3000
    sub                   
    if_icmpgt              LABEL195
-   jump                   LABEL319
+   jump                   LABEL320
 LABEL195:
    iconst                 14
    chat_gethistorylength 
    iconst                 0
    if_icmpgt              LABEL200
-   jump                   LABEL319
+   jump                   LABEL320
 LABEL200:
    iconst                 14
    iconst                 0
@@ -232,7 +232,7 @@ LABEL200:
    iload                  12
    iconst                 -1
    if_icmpne              LABEL215
-   jump                   LABEL319
+   jump                   LABEL320
 LABEL215:
    sload                  0
    invoke                 2066
@@ -245,7 +245,7 @@ LABEL215:
    reboottimer           
    iconst                 0
    if_icmple              LABEL227
-   jump                   LABEL319
+   jump                   LABEL320
 LABEL227:
    iload                  7
    sload                  2
@@ -253,6 +253,7 @@ LABEL227:
    sload                  0
    sconst                 "</col>"
    join_string            3
+   sconst                 "null"
    invoke                 4742
    iload                  9
    iload                  10
@@ -273,14 +274,14 @@ LABEL227:
    sload                  4
    string_length         
    iconst                 0
-   if_icmpgt              LABEL255
-   jump                   LABEL284
-LABEL255:
+   if_icmpgt              LABEL256
+   jump                   LABEL285
+LABEL256:
    iload                  16
    iconst                 -1
-   if_icmpne              LABEL259
-   jump                   LABEL284
-LABEL259:
+   if_icmpne              LABEL260
+   jump                   LABEL285
+LABEL260:
    iconst                 6
    sconst                 "Open"
    iload                  10
@@ -305,8 +306,8 @@ LABEL259:
    sconst                 "Iii"
    iload                  10
    if_setonmouseleave    
-   jump                   LABEL292
-LABEL284:
+   jump                   LABEL293
+LABEL285:
    iconst                 -1
    sconst                 ""
    iload                  10
@@ -315,7 +316,7 @@ LABEL284:
    sconst                 ""
    iload                  10
    if_setonmouseleave    
-LABEL292:
+LABEL293:
    iconst                 9
    sconst                 "Clear history"
    iload                  10
@@ -343,7 +344,7 @@ LABEL292:
    iload                  9
    enum                  
    istore                 10
-LABEL319:
+LABEL320:
    iload                  0
    istore                 12
    iconst                 0
@@ -352,34 +353,34 @@ LABEL319:
    istore                 19
    get_varp               287
    iconst                 1
-   if_icmpeq              LABEL329
-   jump                   LABEL566
-LABEL329:
+   if_icmpeq              LABEL330
+   jump                   LABEL559
+LABEL330:
    get_varc_int           41
    iconst                 1337
-   if_icmpne              LABEL336
+   if_icmpne              LABEL337
    get_varbit             4089
    iconst                 0
-   if_icmpeq              LABEL336
-   jump                   LABEL566
-LABEL336:
+   if_icmpeq              LABEL337
+   jump                   LABEL559
+LABEL337:
    iload                  12
    iconst                 -1
-   if_icmpne              LABEL340
-   jump                   LABEL566
-LABEL340:
+   if_icmpne              LABEL341
+   jump                   LABEL559
+LABEL341:
    iload                  10
    iconst                 -1
-   if_icmpne              LABEL344
-   jump                   LABEL566
-LABEL344:
+   if_icmpne              LABEL345
+   jump                   LABEL559
+LABEL345:
    iload                  7
    iload                  4
    sub                   
    iconst                 57
-   if_icmplt              LABEL350
-   jump                   LABEL566
-LABEL350:
+   if_icmplt              LABEL351
+   jump                   LABEL559
+LABEL351:
    iload                  12
    5031                  
    istore                 15
@@ -397,7 +398,7 @@ LABEL350:
    invoke                 91
    iconst                 1
    if_icmpeq              CHAT_FILTER       ; Jump to our new label instead
-   jump                   LABEL562
+   jump                   LABEL555
 CHAT_FILTER:
    sload                  0                 ; Load the message
    iconst                 1                 ; Gets changed to 0 if message is blocked
@@ -409,14 +410,14 @@ CHAT_FILTER:
    pop_int               ; Pop the messageType
    iconst                 1                 ; 2nd half of conditional
    sstore                 0                 ; Override the message with our filtered message
-   if_icmpeq              LABEL368          ; Check if we are building this message
-   jump                   LABEL562
-LABEL368:
+   if_icmpeq              LABEL369          ; Check if we are building this message
+   jump                   LABEL555
+LABEL369:
    iload                  12 ; message uid
    sconst                 "" ; message channel
-   sload                   1 ; message name
-   sload                   0 ; message
-   sload                   2 ; message timestamp
+   sload                  1 ; message name
+   sload                  0 ; message
+   sload                  2 ; message timestamp
    sconst                 "chatMessageBuilding"
    runelite_callback     
    pop_int                  ; uid
@@ -426,18 +427,14 @@ LABEL368:
    pop_string               ; message channel
    iload                  18
    switch                
-      3: LABEL371
-      5: LABEL435
-      6: LABEL403
-      7: LABEL371
-   jump                   LABEL476
-LABEL371:
+      3: LABEL372
+      5: LABEL430
+      6: LABEL401
+      7: LABEL372
+   jump                   LABEL468
+LABEL372:
    iload                  7
-   sload                  5
    sload                  2
-   append                
-   sconst                 "</col>"
-   append                
    sload                  5
    sconst                 "splitPrivChatUsernameColor"
    runelite_callback     
@@ -446,6 +443,7 @@ LABEL371:
    sconst                 ":"
    sconst                 "</col>"
    join_string            5
+   sload                  5
    invoke                 4742
    sload                  5
    sload                  0
@@ -465,14 +463,10 @@ LABEL371:
    invoke                 203
    add                   
    istore                 7
-   jump                   LABEL494
-LABEL403:
+   jump                   LABEL487
+LABEL401:
    iload                  7
-   sload                  5
    sload                  2
-   append                
-   sconst                 "</col>"
-   append                
    sload                  5
    sconst                 "splitPrivChatUsernameColor"
    runelite_callback     
@@ -481,6 +475,7 @@ LABEL403:
    sconst                 ":"
    sconst                 "</col>"
    join_string            5
+   sload                  5
    invoke                 4742
    sload                  5
    sload                  0
@@ -500,18 +495,15 @@ LABEL403:
    invoke                 203
    add                   
    istore                 7
-   jump                   LABEL494
-LABEL435:
+   jump                   LABEL487
+LABEL430:
    iload                  7
-   sload                  5
    sload                  2
-   append                
-   sconst                 "</col>"
-   append                
    sload                  5
    sload                  0
    sconst                 "</col>"
    join_string            3
+   sload                  5
    invoke                 4742
    iload                  9
    iload                  10
@@ -529,9 +521,9 @@ LABEL435:
    istore                 7
    iload                  19
    iconst                 0
-   if_icmpeq              LABEL464
-   jump                   LABEL475
-LABEL464:
+   if_icmpeq              LABEL456
+   jump                   LABEL467
+LABEL456:
    iload                  13
    iconst                 500
    add                   
@@ -543,12 +535,13 @@ LABEL464:
    sconst                 "1"
    iconst                 10616832
    if_setontimer         
-LABEL475:
-   jump                   LABEL494
-LABEL476:
+LABEL467:
+   jump                   LABEL487
+LABEL468:
    iload                  7
    sload                  2
    sload                  0
+   sconst                 "null"
    invoke                 4742
    iload                  9
    iload                  10
@@ -564,31 +557,31 @@ LABEL476:
    invoke                 199
    add                   
    istore                 7
-LABEL494:
+LABEL487:
    iload                  10
    if_clearops           
    iload                  18
    iconst                 3
-   if_icmpeq              LABEL506
+   if_icmpeq              LABEL499
    iload                  18
    iconst                 6
-   if_icmpeq              LABEL506
+   if_icmpeq              LABEL499
    iload                  18
    iconst                 7
-   if_icmpeq              LABEL506
-   jump                   LABEL540
-LABEL506:
+   if_icmpeq              LABEL499
+   jump                   LABEL533
+LABEL499:
    iload                  14
    iconst                 1
-   if_icmpeq              LABEL510
-   jump                   LABEL515
-LABEL510:
+   if_icmpeq              LABEL503
+   jump                   LABEL508
+LABEL503:
    iconst                 8
    sconst                 "Message"
    iload                  10
    if_setop              
-   jump                   LABEL523
-LABEL515:
+   jump                   LABEL516
+LABEL508:
    iconst                 8
    sconst                 "Add friend"
    iload                  10
@@ -597,7 +590,7 @@ LABEL515:
    sconst                 "Add ignore"
    iload                  10
    if_setop              
-LABEL523:
+LABEL516:
    iconst                 10
    sconst                 "Report"
    iload                  10
@@ -614,13 +607,13 @@ LABEL523:
    sconst                 "is"
    iload                  10
    if_setonop            
-   jump                   LABEL544
-LABEL540:
+   jump                   LABEL537
+LABEL533:
    iconst                 -1
    sconst                 ""
    iload                  10
    if_setonop            
-LABEL544:
+LABEL537:
    iconst                 -1
    sconst                 ""
    iload                  10
@@ -639,17 +632,17 @@ LABEL544:
    iload                  9
    enum                  
    istore                 10
-LABEL562:
+LABEL555:
    iload                  12
    chat_getprevuid       
    istore                 12
-   jump                   LABEL336
-LABEL566:
+   jump                   LABEL337
+LABEL559:
    iload                  10
    iconst                 -1
-   if_icmpne              LABEL570
-   jump                   LABEL653
-LABEL570:
+   if_icmpne              LABEL563
+   jump                   LABEL646
+LABEL563:
    iload                  10
    if_clearops           
    iconst                 -1
@@ -676,14 +669,14 @@ LABEL570:
    multiply              
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL598
-   jump                   LABEL602
-LABEL598:
+   if_icmpeq              LABEL591
+   jump                   LABEL595
+LABEL591:
    sconst                 ""
    cc_settext            
    iconst                 1
    cc_sethide            
-LABEL602:
+LABEL595:
    iconst                 10682368
    iload                  9
    iconst                 4
@@ -692,14 +685,14 @@ LABEL602:
    add                   
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL612
-   jump                   LABEL616
-LABEL612:
+   if_icmpeq              LABEL605
+   jump                   LABEL609
+LABEL605:
    sconst                 ""
    cc_settext            
    iconst                 1
    cc_sethide            
-LABEL616:
+LABEL609:
    iconst                 10682368
    iload                  9
    iconst                 4
@@ -708,14 +701,14 @@ LABEL616:
    add                   
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL626
-   jump                   LABEL630
-LABEL626:
+   if_icmpeq              LABEL619
+   jump                   LABEL623
+LABEL619:
    sconst                 ""
    cc_settext            
    iconst                 1
    cc_sethide            
-LABEL630:
+LABEL623:
    iconst                 10682368
    iload                  9
    iconst                 4
@@ -724,12 +717,12 @@ LABEL630:
    add                   
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL640
-   jump                   LABEL642
-LABEL640:
+   if_icmpeq              LABEL633
+   jump                   LABEL635
+LABEL633:
    iconst                 1
    cc_sethide            
-LABEL642:
+LABEL635:
    iload                  9
    iconst                 1
    add                   
@@ -740,6 +733,6 @@ LABEL642:
    iload                  9
    enum                  
    istore                 10
-   jump                   LABEL566
-LABEL653:
+   jump                   LABEL559
+LABEL646:
    return                
diff --git a/runelite-client/src/main/scripts/CommandScript.hash b/runelite-client/src/main/scripts/CommandScript.hash
index 3e4753a0fe..837a1a06f9 100644
--- a/runelite-client/src/main/scripts/CommandScript.hash
+++ b/runelite-client/src/main/scripts/CommandScript.hash
@@ -1 +1 @@
-690BCC4CE42FE670B31A14E214FECD3B27CEB013D6413713DB4A587D1CC38974
\ No newline at end of file
+BC3DDC3675375E1FD9AD64DEBF4FDA5B4102FE542088C310881120DC47270566
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm
index 15da445c03..8f7fb0cece 100644
--- a/runelite-client/src/main/scripts/CommandScript.rs2asm
+++ b/runelite-client/src/main/scripts/CommandScript.rs2asm
@@ -789,7 +789,7 @@ LABEL659:
    mes                   
    jump                   LABEL664
 LABEL662:
-   sconst                 "You are not chatting in the channel of your own clan at the moment."
+   sconst                 "You are not chatting in the channel of your own Iron Group at the moment."
    mes                   
 LABEL664:
    jump                   LABEL810
diff --git a/runelite-client/src/main/scripts/GELayout.hash b/runelite-client/src/main/scripts/GELayout.hash
index dba0bed2f5..0417d1658c 100644
--- a/runelite-client/src/main/scripts/GELayout.hash
+++ b/runelite-client/src/main/scripts/GELayout.hash
@@ -1 +1 @@
-03E202EADA91DB0D5EE9B98E360685149F29B10A1C565B9BE65C2A50BD262BC3
\ No newline at end of file
+F24070EC29F94E90F83578CF29B242EB9F31D6255578C69F51814E9C199B6E8E
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/GELayout.rs2asm b/runelite-client/src/main/scripts/GELayout.rs2asm
index b60bb6537b..9e8c00b4c7 100644
--- a/runelite-client/src/main/scripts/GELayout.rs2asm
+++ b/runelite-client/src/main/scripts/GELayout.rs2asm
@@ -1,7 +1,7 @@
 .id                 806
 .int_stack_count    7
 .string_stack_count 0
-.int_var_count      9
+.int_var_count      11
 .string_var_count   0
    iload                  6
    invoke                 41
@@ -52,12 +52,25 @@ LABEL37:
    iconst                 0
    iload                  2
    if_settrans           
+   iconst                 -1
+   istore                 9
+   iconst                 0
+   istore                 10
+   iload                  7
+   invoke                 5733
+   istore                 10
+   istore                 9
    iload                  7
    stockmarket_isofferempty
    iconst                 1
-   if_icmpeq              LABEL48
-   jump                   LABEL66
-LABEL48:
+   if_icmpeq              LABEL56
+   jump                   LABEL78
+LABEL56:
+   iload                  9
+   iconst                 -1
+   if_icmpeq              LABEL60
+   jump                   LABEL78
+LABEL60:
    iconst                 1
    iload                  3
    if_sethide            
@@ -71,14 +84,14 @@ LABEL48:
    iload                  1
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL63
-   jump                   LABEL65
-LABEL63:
+   if_icmpeq              LABEL75
+   jump                   LABEL77
+LABEL75:
    sconst                 "Grand Exchange: Set up offer"
    cc_settext            
-LABEL65:
+LABEL77:
    return                
-LABEL66:
+LABEL78:
    iconst                 1
    iload                  3
    if_sethide            
@@ -92,10 +105,10 @@ LABEL66:
    iload                  1
    cc_find               
    iconst                 1
-   if_icmpeq              LABEL81
-   jump                   LABEL83
-LABEL81:
+   if_icmpeq              LABEL93
+   jump                   LABEL95
+LABEL93:
    sconst                 "Grand Exchange: Offer status"
    cc_settext            
-LABEL83:
+LABEL95:
    return                
diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash
index 66a18c2a05..8ea504548f 100644
--- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash
+++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash
@@ -1 +1 @@
-9C827673E7E0FADA71DB2017F4AEE7CC2A6A9C617756DBAF7821B93D62D412C8
\ No newline at end of file
+1A989C17A54BD28EE9DEE314EFB9198FCD16B0D90D2B296CE4C4165C7464B8BC
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
index 89363385e9..ce745610ea 100644
--- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
+++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
@@ -23,9 +23,9 @@
    runelite_callback     
    sub                   
    istore                 1
-   iconst                 7602274
+   iconst                 7602276
    if_getwidth           
-   iconst                 7602275
+   iconst                 7602277
    if_getwidth           
    sub                   
    istore                 2
@@ -78,6 +78,6 @@ LABEL44:
    iconst                 0
    iconst                 0
    iconst                 0
-   iconst                 7602275
+   iconst                 7602277
    if_setposition        
    return                
diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash b/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash
deleted file mode 100644
index e928cac148..0000000000
--- a/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash
+++ /dev/null
@@ -1 +0,0 @@
-CAF61FF2A3131623A421CCCC68914587A69044768DEB79432DA8A85937283F7B
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm
deleted file mode 100644
index 9d9a3c7001..0000000000
--- a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm
+++ /dev/null
@@ -1,516 +0,0 @@
-.id                 923
-.int_stack_count    0
-.string_stack_count 0
-.int_var_count      5
-.string_var_count   0
-; callback "chatboxBackgroundBuilt"
-; 	used by the ChatboxPerformancePlugin to know when it needs to rebuild.
-;   Unmark the plugin as hidden and toggle it. The chatbox should change opacity
-;   slightly
-   iconst                 10616834
-   cc_deleteall          
-   iconst                 0
-   istore                 0
-   get_varc_int           41
-   iconst                 1337
-   if_icmpeq              LABEL15
-   get_varbit             542
-   iconst                 1
-   if_icmpeq              LABEL11
-   jump                   LABEL31
-LABEL11:
-   getwindowmode         
-   iconst                 1
-   if_icmpne              LABEL15
-   jump                   LABEL31
-LABEL15:
-   invoke                 922
-   iconst                 1
-   if_icmpeq              LABEL19
-   jump                   LABEL22
-LABEL19:
-   iconst                 1
-   istore                 0
-   jump                   LABEL31
-LABEL22:
-   getwindowmode         
-   iconst                 1
-   if_icmpeq              LABEL26
-   jump                   LABEL31
-LABEL26:
-   iconst                 0
-   set_varc_int           41
-   iconst                 0
-   iconst                 0
-   invoke                 183
-LABEL31:
-   iload                  0
-   iconst                 10616866
-   if_sethide            
-   get_varbit             6374
-   iconst                 1
-   if_icmpeq              LABEL38
-   jump                   LABEL55
-LABEL38:
-   getwindowmode         
-   iconst                 1
-   if_icmpne              LABEL42
-   jump                   LABEL55
-LABEL42:
-   iconst                 1
-   iconst                 0
-   iconst                 2
-   iconst                 0
-   iconst                 10616888
-   if_setposition        
-   iconst                 -1
-   iconst                 0
-   iconst                 0
-   iconst                 0
-   iconst                 10617389
-   if_setposition        
-   jump                   LABEL67
-LABEL55:
-   iconst                 0
-   iconst                 0
-   iconst                 0
-   iconst                 0
-   iconst                 10616888
-   if_setposition        
-   iconst                 0
-   iconst                 0
-   iconst                 2
-   iconst                 0
-   iconst                 10617389
-   if_setposition        
-LABEL67:
-   iconst                 10616867
-   cc_deleteall          
-   iconst                 10616886
-   cc_deleteall          
-   iconst                 0
-   istore                 1
-   clientclock           
-   get_varc_int           223
-   if_icmplt              LABEL77
-   jump                   LABEL89
-LABEL77:
-   invoke                 900
-   iconst                 1129
-   if_icmpne              LABEL81
-   jump                   LABEL89
-LABEL81:
-   iconst                 1
-   istore                 1
-   iconst                 2155
-   get_varc_int           223
-   sconst                 "i"
-   iconst                 10616867
-   if_setontimer         
-   jump                   LABEL93
-LABEL89:
-   iconst                 -1
-   sconst                 ""
-   iconst                 10616867
-   if_setontimer         
-LABEL93:
-   invoke                 921
-   iconst                 0
-   if_icmpeq              LABEL97
-   jump                   LABEL163
-LABEL97:
-   iconst                 1
-   iconst                 10616867
-   if_setnoclickthrough  
-   iload                  1
-   iconst                 0
-   if_icmpeq              LABEL104
-   jump                   LABEL142
-LABEL104:
-   iconst                 10616867
-   iconst                 5
-   iconst                 0
-   cc_create             
-   iconst                 0
-   iconst                 0
-   iconst                 1
-   iconst                 1
-   cc_setsize            
-   iconst                 0
-   iconst                 0
-   iconst                 1
-   iconst                 1
-   cc_setposition        
-   iconst                 1017
-   cc_setgraphic         
-   iconst                 0
-   cc_settiling          
-   iconst                 0
-   cc_settrans           
-   iconst                 10616886
-   iconst                 3
-   iconst                 0
-   cc_create             
-   iconst                 0
-   iconst                 1
-   iconst                 1
-   iconst                 0
-   cc_setsize            
-   iconst                 0
-   iconst                 15
-   iconst                 1
-   iconst                 2
-   cc_setposition        
-   iconst                 8418912
-   cc_setcolour          
-   iconst                 1
-   cc_setfill            
-LABEL142:
-   iconst                 10617389
-   iconst                 792
-   iconst                 789
-   iconst                 790
-   iconst                 791
-   iconst                 773
-   iconst                 788
-   iconst                 0
-   invoke                 838
-   invoke                 2373
-   iconst                 1
-   if_icmpeq              LABEL155
-   jump                   LABEL159
-LABEL155:
-   iconst                 255
-   iconst                 10616835
-   if_settrans           
-   jump                   LABEL162
-LABEL159:
-   iconst                 0
-   iconst                 10616835
-   if_settrans           
-LABEL162:
-   return                
-LABEL163:
-   iconst                 16384
-   iconst                 25
-   div                   
-   istore                 2
-   iconst                 16384
-   istore                 3
-   get_varbit             2570
-   iconst                 1
-   if_icmpeq              LABEL173
-   jump                   LABEL177
-LABEL173:
-   iconst                 1
-   iconst                 10616867
-   if_setnoclickthrough  
-   jump                   LABEL183
-LABEL177:
-   iconst                 0
-   iconst                 10616867
-   if_setnoclickthrough  
-   iconst                 1
-   iconst                 10616867
-   if_setnoscrollthrough 
-LABEL183:
-   iconst                 0
-   istore                 4
-   iload                  1
-   iconst                 0
-   if_icmpeq              LABEL189
-   jump                   LABEL417
-LABEL189:
-   invoke                 1445
-   iconst                 1
-   if_icmpeq              LABEL193
-   jump                   LABEL267
-LABEL193:
-   iload                  4
-   iconst                 20
-   if_icmplt              LABEL197
-   jump                   LABEL226
-LABEL197:
-   iconst                 10616867
-   iconst                 3
-   iload                  4
-   cc_create             
-   iconst                 0
-   iload                  3
-   iconst                 1
-   iconst                 2
-   cc_setsize            
-   iconst                 0
-   iconst                 0
-   iconst                 1
-   iconst                 2
-   cc_setposition        
-   iconst                 0
-   cc_setcolour          
-   iconst                 1
-   cc_setfill            
-   iconst                 252
-   cc_settrans           
-   iload                  4
-   iconst                 1
-   add                   
-   iload                  3
-   iload                  2
-   sub                   
-   istore                 3
-   istore                 4
-   jump                   LABEL193
-LABEL226:
-   iconst                 10616886
-   iconst                 3
-   iconst                 0
-   cc_create             
-   iconst                 10616886
-   iconst                 3
-   iconst                 1
-   cc_create              1
-   iconst                 16384
-   iconst                 1
-   iconst                 2
-   iconst                 0
-   cc_setsize            
-   iconst                 16384
-   iconst                 1
-   iconst                 2
-   iconst                 0
-   cc_setsize             1
-   iconst                 0
-   iconst                 0
-   iconst                 0
-   iconst                 0
-   cc_setposition        
-   iconst                 0
-   iconst                 15
-   iconst                 0
-   iconst                 2
-   cc_setposition         1
-   iconst                 16777215
-   cc_setcolour          
-   iconst                 16777215
-   cc_setcolour           1
-   iconst                 1
-   cc_setfill            
-   iconst                 1
-   cc_setfill             1
-   iconst                 100
-   cc_settrans           
-   iconst                 120
-   cc_settrans            1
-   jump                   LABEL417
-LABEL267:
-   invoke                 1972
-   iconst                 0
-   if_icmpeq              LABEL271
-   jump                   LABEL351
-LABEL271:
-   iload                  4
-   iconst                 20
-   if_icmplt              LABEL275
-   jump                   LABEL350
-LABEL275:
-   iconst                 10616867
-   iconst                 3
-   iload                  4
-   cc_create             
-   iconst                 0
-   iload                  3
-   iconst                 1
-   iconst                 2
-   cc_setsize            
-   iconst                 0
-   iconst                 0
-   iconst                 1
-   iconst                 2
-   cc_setposition        
-   iconst                 0
-   cc_setcolour          
-   iconst                 1
-   cc_setfill            
-   iconst                 254
-   cc_settrans           
-   iconst                 10616886
-   iconst                 3
-   iload                  4
-   iconst                 2
-   multiply              
-   cc_create             
-   iconst                 10616886
-   iconst                 3
-   iload                  4
-   iconst                 2
-   multiply              
-   iconst                 1
-   add                   
-   cc_create              1
-   iload                  3
-   iconst                 1
-   iconst                 2
-   iconst                 0
-   cc_setsize            
-   iload                  3
-   iconst                 1
-   iconst                 2
-   iconst                 0
-   cc_setsize             1
-   iconst                 0
-   iconst                 0
-   iconst                 0
-   iconst                 0
-   cc_setposition        
-   iconst                 0
-   iconst                 15
-   iconst                 0
-   iconst                 2
-   cc_setposition         1
-   iconst                 16777215
-   cc_setcolour          
-   iconst                 16777215
-   cc_setcolour           1
-   iconst                 1
-   cc_setfill            
-   iconst                 1
-   cc_setfill             1
-   iconst                 250
-   cc_settrans           
-   iconst                 250
-   cc_settrans            1
-   iload                  4
-   iconst                 1
-   add                   
-   iload                  3
-   iload                  2
-   sub                   
-   istore                 3
-   istore                 4
-   jump                   LABEL271
-LABEL350:
-   sconst                 "chatboxBackgroundBuilt"
-   runelite_callback     
-   jump                   LABEL417
-LABEL351:
-   iconst                 10616867
-   iconst                 3
-   iload                  4
-   cc_create             
-   iconst                 0
-   iload                  3
-   iconst                 1
-   iconst                 2
-   cc_setsize            
-   iconst                 0
-   iconst                 0
-   iconst                 1
-   iconst                 2
-   cc_setposition        
-   iconst                 0
-   cc_setcolour          
-   iconst                 1
-   cc_setfill            
-   iconst                 225
-   cc_settrans           
-   iconst                 10616886
-   iconst                 3
-   iload                  4
-   iconst                 2
-   multiply              
-   cc_create             
-   iconst                 10616886
-   iconst                 3
-   iload                  4
-   iconst                 2
-   multiply              
-   iconst                 1
-   add                   
-   cc_create              1
-   iload                  3
-   iconst                 1
-   iconst                 2
-   iconst                 0
-   cc_setsize            
-   iload                  3
-   iconst                 1
-   iconst                 2
-   iconst                 0
-   cc_setsize             1
-   iconst                 0
-   iconst                 0
-   iconst                 0
-   iconst                 0
-   cc_setposition        
-   iconst                 0
-   iconst                 15
-   iconst                 0
-   iconst                 2
-   cc_setposition         1
-   iconst                 16777215
-   cc_setcolour          
-   iconst                 16777215
-   cc_setcolour           1
-   iconst                 1
-   cc_setfill            
-   iconst                 1
-   cc_setfill             1
-   iconst                 200
-   cc_settrans           
-   iconst                 130
-   cc_settrans            1
-LABEL417:
-   iconst                 10617389
-   iconst                 1190
-   iconst                 1187
-   iconst                 1188
-   iconst                 1189
-   iconst                 1185
-   iconst                 1186
-   iconst                 1
-   invoke                 838
-   iload                  0
-   iconst                 1
-   if_icmpeq              LABEL430
-   jump                   LABEL434
-LABEL430:
-   iconst                 255
-   iconst                 10616835
-   if_settrans           
-   jump                   LABEL465
-LABEL434:
-   invoke                 1972
-   iconst                 0
-   if_icmpeq              LABEL438
-   jump                   LABEL442
-LABEL438:
-   iconst                 155
-   iconst                 10616835
-   if_settrans           
-   jump                   LABEL465
-LABEL442:
-   iconst                 255
-   iconst                 10616835
-   if_settrans           
-   iconst                 10616834
-   iconst                 3
-   iconst                 0
-   cc_create             
-   iconst                 0
-   iconst                 0
-   iconst                 1
-   iconst                 1
-   cc_setsize            
-   iconst                 0
-   iconst                 0
-   iconst                 1
-   iconst                 1
-   cc_setposition        
-   iconst                 0
-   cc_setcolour          
-   iconst                 1
-   cc_setfill            
-   iconst                 225
-   cc_settrans           
-LABEL465:
-   return                
diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java
index 0002a60a69..deffc52d5d 100644
--- a/runescape-client/src/main/java/AbstractArchive.java
+++ b/runescape-client/src/main/java/AbstractArchive.java
@@ -4,87 +4,87 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ko")
+@ObfuscatedName("ku")
 @Implements("AbstractArchive")
 public abstract class AbstractArchive {
-	@ObfuscatedName("qf")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Llz;"
-	)
-	@Export("friendsChat")
-	static FriendsChat friendsChat;
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lpd;"
+		descriptor = "Lpt;"
 	)
 	@Export("gzipDecompressor")
 	static GZipDecompressor gzipDecompressor;
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 967246027
+		intValue = 1947791089
 	)
-	static int field3702;
-	@ObfuscatedName("t")
+	static int field3843;
+	@ObfuscatedName("by")
+	@ObfuscatedSignature(
+		descriptor = "[Lpa;"
+	)
+	@Export("worldSelectFlagSprites")
+	static IndexedSprite[] worldSelectFlagSprites;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -272070621
+		intValue = -1495351037
 	)
 	@Export("groupCount")
 	int groupCount;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("groupIds")
 	int[] groupIds;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("groupNameHashes")
 	int[] groupNameHashes;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lpp;"
+		descriptor = "Lpu;"
 	)
 	@Export("groupNameHashTable")
 	IntHashTable groupNameHashTable;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("groupCrcs")
 	int[] groupCrcs;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("groupVersions")
 	int[] groupVersions;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("fileCounts")
 	int[] fileCounts;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("fileIds")
 	int[][] fileIds;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("fileNameHashes")
 	int[][] fileNameHashes;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "[Lpp;"
+		descriptor = "[Lpu;"
 	)
 	@Export("fileNameHashTables")
 	IntHashTable[] fileNameHashTables;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@Export("groups")
 	Object[] groups;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@Export("files")
 	Object[][] files;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = -557696457
+		intValue = 880297365
 	)
 	@Export("hash")
 	public int hash;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@Export("releaseGroups")
 	boolean releaseGroups;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@Export("shallowFiles")
 	boolean shallowFiles;
 
 	static {
 		gzipDecompressor = new GZipDecompressor(); // L: 23
-		field3702 = 0; // L: 27
+		field3843 = 0; // L: 27
 	}
 
 	AbstractArchive(boolean var1, boolean var2) {
@@ -92,639 +92,714 @@ public abstract class AbstractArchive {
 		this.shallowFiles = var2; // L: 33
 	} // L: 34
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "297974277"
+		garbageValue = "-2090166080"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
-	} // L: 118
+	} // L: 123
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "23"
+		descriptor = "(II)V",
+		garbageValue = "2024016984"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
-	} // L: 204
+	} // L: 209
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(IB)I",
-		garbageValue = "14"
+		garbageValue = "35"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
-		return this.groups[var1] != null ? 100 : 0; // L: 174 175
+		return this.groups[var1] != null ? 100 : 0; // L: 179 180
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
 		descriptor = "([BI)V",
-		garbageValue = "482099677"
+		garbageValue = "-1691736536"
 	)
 	@Export("decodeIndex")
 	void decodeIndex(byte[] var1) {
-		this.hash = NPC.method2256(var1, var1.length); // L: 37
-		Buffer var2 = new Buffer(ByteArrayPool.decompressBytes(var1)); // L: 38
-		int var3 = var2.readUnsignedByte(); // L: 39
-		if (var3 >= 5 && var3 <= 7) { // L: 40
-			if (var3 >= 6) { // L: 41
-				var2.readInt(); // L: 42
+		int var3 = var1.length; // L: 38
+		int var2 = Friend.method6298(var1, 0, var3); // L: 40
+		this.hash = var2; // L: 42
+		Buffer var4 = new Buffer(ViewportMouse.decompressBytes(var1)); // L: 43
+		int var5 = var4.readUnsignedByte(); // L: 44
+		if (var5 >= 5 && var5 <= 7) { // L: 45
+			if (var5 >= 6) { // L: 46
+				var4.readInt(); // L: 47
 			}
 
-			int var4 = var2.readUnsignedByte(); // L: 45
-			if (var3 >= 7) { // L: 46
-				this.groupCount = var2.method6982();
+			int var6 = var4.readUnsignedByte(); // L: 50
+			if (var5 >= 7) { // L: 51
+				this.groupCount = var4.method7561();
 			} else {
-				this.groupCount = var2.readUnsignedShort(); // L: 47
+				this.groupCount = var4.readUnsignedShort(); // L: 52
 			}
 
-			int var5 = 0; // L: 48
-			int var6 = -1; // L: 49
-			this.groupIds = new int[this.groupCount]; // L: 50
-			int var7;
-			if (var3 >= 7) { // L: 51
-				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 52
-					this.groupIds[var7] = var5 += var2.method6982(); // L: 53
-					if (this.groupIds[var7] > var6) { // L: 54
-						var6 = this.groupIds[var7];
+			int var7 = 0; // L: 53
+			int var8 = -1; // L: 54
+			this.groupIds = new int[this.groupCount]; // L: 55
+			int var9;
+			if (var5 >= 7) { // L: 56
+				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57
+					this.groupIds[var9] = var7 += var4.method7561(); // L: 58
+					if (this.groupIds[var9] > var8) { // L: 59
+						var8 = this.groupIds[var9];
 					}
 				}
 			} else {
-				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 58
-					this.groupIds[var7] = var5 += var2.readUnsignedShort(); // L: 59
-					if (this.groupIds[var7] > var6) { // L: 60
-						var6 = this.groupIds[var7];
+				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 63
+					this.groupIds[var9] = var7 += var4.readUnsignedShort(); // L: 64
+					if (this.groupIds[var9] > var8) { // L: 65
+						var8 = this.groupIds[var9];
 					}
 				}
 			}
 
-			this.groupCrcs = new int[var6 + 1]; // L: 63
-			this.groupVersions = new int[var6 + 1]; // L: 64
-			this.fileCounts = new int[var6 + 1]; // L: 65
-			this.fileIds = new int[var6 + 1][]; // L: 66
-			this.groups = new Object[var6 + 1]; // L: 67
-			this.files = new Object[var6 + 1][]; // L: 68
-			if (var4 != 0) { // L: 69
-				this.groupNameHashes = new int[var6 + 1]; // L: 70
-
-				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 71
-					this.groupNameHashes[this.groupIds[var7]] = var2.readInt();
+			this.groupCrcs = new int[var8 + 1]; // L: 68
+			this.groupVersions = new int[var8 + 1]; // L: 69
+			this.fileCounts = new int[var8 + 1]; // L: 70
+			this.fileIds = new int[var8 + 1][]; // L: 71
+			this.groups = new Object[var8 + 1]; // L: 72
+			this.files = new Object[var8 + 1][]; // L: 73
+			if (var6 != 0) { // L: 74
+				this.groupNameHashes = new int[var8 + 1]; // L: 75
+
+				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 76
+					this.groupNameHashes[this.groupIds[var9]] = var4.readInt();
 				}
 
-				this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 72
+				this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 77
 			}
 
-			for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 74
-				this.groupCrcs[this.groupIds[var7]] = var2.readInt();
+			for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 79
+				this.groupCrcs[this.groupIds[var9]] = var4.readInt();
 			}
 
-			for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 75
-				this.groupVersions[this.groupIds[var7]] = var2.readInt();
+			for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 80
+				this.groupVersions[this.groupIds[var9]] = var4.readInt();
 			}
 
-			for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 76
-				this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort();
+			for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 81
+				this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort();
 			}
 
-			int var8;
-			int var9;
 			int var10;
 			int var11;
 			int var12;
-			if (var3 >= 7) { // L: 77
-				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 78
-					var8 = this.groupIds[var7]; // L: 79
-					var9 = this.fileCounts[var8]; // L: 80
-					var5 = 0; // L: 81
-					var10 = -1; // L: 82
-					this.fileIds[var8] = new int[var9]; // L: 83
-
-					for (var11 = 0; var11 < var9; ++var11) { // L: 84
-						var12 = this.fileIds[var8][var11] = var5 += var2.method6982(); // L: 85
-						if (var12 > var10) { // L: 86
-							var10 = var12;
+			int var13;
+			int var14;
+			if (var5 >= 7) { // L: 82
+				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 83
+					var10 = this.groupIds[var9]; // L: 84
+					var11 = this.fileCounts[var10]; // L: 85
+					var7 = 0; // L: 86
+					var12 = -1; // L: 87
+					this.fileIds[var10] = new int[var11]; // L: 88
+
+					for (var13 = 0; var13 < var11; ++var13) { // L: 89
+						var14 = this.fileIds[var10][var13] = var7 += var4.method7561(); // L: 90
+						if (var14 > var12) { // L: 91
+							var12 = var14;
 						}
 					}
 
-					this.files[var8] = new Object[var10 + 1]; // L: 88
+					this.files[var10] = new Object[var12 + 1]; // L: 93
 				}
 			} else {
-				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 92
-					var8 = this.groupIds[var7]; // L: 93
-					var9 = this.fileCounts[var8]; // L: 94
-					var5 = 0; // L: 95
-					var10 = -1; // L: 96
-					this.fileIds[var8] = new int[var9]; // L: 97
-
-					for (var11 = 0; var11 < var9; ++var11) { // L: 98
-						var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); // L: 99
-						if (var12 > var10) { // L: 100
-							var10 = var12;
+				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 97
+					var10 = this.groupIds[var9]; // L: 98
+					var11 = this.fileCounts[var10]; // L: 99
+					var7 = 0; // L: 100
+					var12 = -1; // L: 101
+					this.fileIds[var10] = new int[var11]; // L: 102
+
+					for (var13 = 0; var13 < var11; ++var13) { // L: 103
+						var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); // L: 104
+						if (var14 > var12) { // L: 105
+							var12 = var14;
 						}
 					}
 
-					this.files[var8] = new Object[var10 + 1]; // L: 102
+					this.files[var10] = new Object[var12 + 1]; // L: 107
 				}
 			}
 
-			if (var4 != 0) { // L: 105
-				this.fileNameHashes = new int[var6 + 1][]; // L: 106
-				this.fileNameHashTables = new IntHashTable[var6 + 1]; // L: 107
+			if (var6 != 0) { // L: 110
+				this.fileNameHashes = new int[var8 + 1][]; // L: 111
+				this.fileNameHashTables = new IntHashTable[var8 + 1]; // L: 112
 
-				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 108
-					var8 = this.groupIds[var7]; // L: 109
-					var9 = this.fileCounts[var8]; // L: 110
-					this.fileNameHashes[var8] = new int[this.files[var8].length]; // L: 111
+				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 113
+					var10 = this.groupIds[var9]; // L: 114
+					var11 = this.fileCounts[var10]; // L: 115
+					this.fileNameHashes[var10] = new int[this.files[var10].length]; // L: 116
 
-					for (var10 = 0; var10 < var9; ++var10) { // L: 112
-						this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt();
+					for (var12 = 0; var12 < var11; ++var12) { // L: 117
+						this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt();
 					}
 
-					this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); // L: 113
+					this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); // L: 118
 				}
 			}
 
 		} else {
 			throw new RuntimeException("");
 		}
-	} // L: 116
+	} // L: 121
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(III)[B",
-		garbageValue = "-1781760739"
+		descriptor = "(IIB)[B",
+		garbageValue = "-53"
 	)
 	@Export("takeFile")
 	public byte[] takeFile(int var1, int var2) {
-		return this.takeFileEncrypted(var1, var2, (int[])null); // L: 121
+		return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
 		descriptor = "(II[II)[B",
-		garbageValue = "1620324813"
+		garbageValue = "2102188024"
 	)
 	@Export("takeFileEncrypted")
 	public byte[] takeFileEncrypted(int var1, int var2, int[] var3) {
-		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 125
-			if (this.files[var1][var2] == null) { // L: 126
-				boolean var4 = this.buildFiles(var1, var3); // L: 127
-				if (!var4) { // L: 128
-					this.loadGroup(var1); // L: 129
-					var4 = this.buildFiles(var1, var3); // L: 130
-					if (!var4) { // L: 131
+		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 130
+			if (this.files[var1][var2] == null) { // L: 131
+				boolean var4 = this.buildFiles(var1, var3); // L: 132
+				if (!var4) { // L: 133
+					this.loadGroup(var1); // L: 134
+					var4 = this.buildFiles(var1, var3); // L: 135
+					if (!var4) { // L: 136
 						return null;
 					}
 				}
 			}
 
-			byte[] var5 = ChatChannel.method2013(this.files[var1][var2], false); // L: 134
+			byte[] var5 = GrandExchangeOfferOwnWorldComparator.method1147(this.files[var1][var2], false); // L: 139
 			if (this.shallowFiles) {
-				this.files[var1][var2] = null; // L: 135
+				this.files[var1][var2] = null; // L: 140
 			}
 
-			return var5; // L: 136
+			return var5; // L: 141
 		} else {
 			return null;
 		}
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "69"
+		descriptor = "(IIS)Z",
+		garbageValue = "-22135"
 	)
 	@Export("tryLoadFile")
 	public boolean tryLoadFile(int var1, int var2) {
-		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 140
-			if (this.files[var1][var2] != null) {
-				return true; // L: 141
-			} else if (this.groups[var1] != null) { // L: 142
+		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 145
+			if (this.files[var1][var2] != null) { // L: 146
+				return true;
+			} else if (this.groups[var1] != null) { // L: 147
 				return true;
 			} else {
-				this.loadGroup(var1); // L: 143
-				return this.groups[var1] != null; // L: 144
+				this.loadGroup(var1); // L: 148
+				return this.groups[var1] != null; // L: 149
 			}
 		} else {
-			return false; // L: 145
+			return false; // L: 150
 		}
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "698545747"
+		descriptor = "(IB)Z",
+		garbageValue = "-43"
 	)
-	public boolean method5359(int var1) {
-		if (this.files.length == 1) { // L: 149
+	public boolean method5595(int var1) {
+		if (this.files.length == 1) { // L: 154
 			return this.tryLoadFile(0, var1);
 		} else if (this.files[var1].length == 1) {
-			return this.tryLoadFile(var1, 0); // L: 150
+			return this.tryLoadFile(var1, 0); // L: 155
 		} else {
-			throw new RuntimeException(); // L: 151
+			throw new RuntimeException(); // L: 156
 		}
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-1744461106"
+		garbageValue = "-2108715945"
 	)
 	@Export("tryLoadGroup")
 	public boolean tryLoadGroup(int var1) {
-		if (this.groups[var1] != null) { // L: 155
+		if (this.groups[var1] != null) { // L: 160
 			return true;
 		} else {
-			this.loadGroup(var1); // L: 156
-			return this.groups[var1] != null; // L: 157
+			this.loadGroup(var1); // L: 161
+			return this.groups[var1] != null; // L: 162
 		}
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("bp")
 	@ObfuscatedSignature(
-		descriptor = "(S)Z",
-		garbageValue = "-5079"
+		descriptor = "(B)Z",
+		garbageValue = "89"
 	)
 	@Export("isFullyLoaded")
 	public boolean isFullyLoaded() {
-		boolean var1 = true; // L: 162
+		boolean var1 = true; // L: 167
 
-		for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 163
-			int var3 = this.groupIds[var2]; // L: 164
-			if (this.groups[var3] == null) { // L: 165
-				this.loadGroup(var3); // L: 166
-				if (this.groups[var3] == null) { // L: 167
+		for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 168
+			int var3 = this.groupIds[var2]; // L: 169
+			if (this.groups[var3] == null) { // L: 170
+				this.loadGroup(var3); // L: 171
+				if (this.groups[var3] == null) { // L: 172
 					var1 = false;
 				}
 			}
 		}
 
-		return var1; // L: 170
+		return var1; // L: 175
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("bd")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[B",
-		garbageValue = "0"
+		descriptor = "(II)[B",
+		garbageValue = "1730057328"
 	)
 	@Export("takeFileFlat")
 	public byte[] takeFileFlat(int var1) {
-		if (this.files.length == 1) { // L: 179
+		if (this.files.length == 1) { // L: 184
 			return this.takeFile(0, var1);
 		} else if (this.files[var1].length == 1) {
-			return this.takeFile(var1, 0); // L: 180
+			return this.takeFile(var1, 0); // L: 185
 		} else {
-			throw new RuntimeException(); // L: 181
+			throw new RuntimeException(); // L: 186
 		}
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		descriptor = "(III)[B",
-		garbageValue = "2111917178"
+		descriptor = "(IIB)[B",
+		garbageValue = "51"
 	)
 	@Export("getFile")
 	public byte[] getFile(int var1, int var2) {
-		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 185
-			if (this.files[var1][var2] == null) { // L: 186
-				boolean var3 = this.buildFiles(var1, (int[])null); // L: 187
-				if (!var3) { // L: 188
-					this.loadGroup(var1); // L: 189
-					var3 = this.buildFiles(var1, (int[])null); // L: 190
-					if (!var3) { // L: 191
+		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 190
+			if (this.files[var1][var2] == null) { // L: 191
+				boolean var3 = this.buildFiles(var1, (int[])null); // L: 192
+				if (!var3) { // L: 193
+					this.loadGroup(var1); // L: 194
+					var3 = this.buildFiles(var1, (int[])null); // L: 195
+					if (!var3) { // L: 196
 						return null;
 					}
 				}
 			}
 
-			byte[] var4 = ChatChannel.method2013(this.files[var1][var2], false); // L: 194
-			return var4; // L: 195
+			byte[] var4 = GrandExchangeOfferOwnWorldComparator.method1147(this.files[var1][var2], false); // L: 199
+			return var4; // L: 200
 		} else {
 			return null;
 		}
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
 		descriptor = "(II)[B",
-		garbageValue = "407164309"
+		garbageValue = "1978488509"
 	)
 	@Export("getFileFlat")
 	public byte[] getFileFlat(int var1) {
-		if (this.files.length == 1) { // L: 199
+		if (this.files.length == 1) { // L: 204
 			return this.getFile(0, var1);
 		} else if (this.files[var1].length == 1) {
-			return this.getFile(var1, 0); // L: 200
+			return this.getFile(var1, 0); // L: 205
 		} else {
-			throw new RuntimeException(); // L: 201
+			throw new RuntimeException(); // L: 206
 		}
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("bg")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[I",
-		garbageValue = "-18"
+		descriptor = "(II)[I",
+		garbageValue = "1166188734"
 	)
 	@Export("getGroupFileIds")
 	public int[] getGroupFileIds(int var1) {
-		return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210
+		return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215
 	}
 
-	@ObfuscatedName("bg")
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
 		descriptor = "(IB)I",
-		garbageValue = "33"
+		garbageValue = "-1"
 	)
 	@Export("getGroupFileCount")
 	public int getGroupFileCount(int var1) {
-		return this.files[var1].length; // L: 214
+		return this.files[var1].length; // L: 219
 	}
 
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1225769356"
+		garbageValue = "-949601640"
 	)
 	@Export("getGroupCount")
 	public int getGroupCount() {
-		return this.files.length; // L: 218
+		return this.files.length; // L: 223
 	}
 
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bm")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "30287775"
+		garbageValue = "-1889298595"
 	)
 	@Export("clearGroups")
 	public void clearGroups() {
-		for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222
+		for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 227
 			this.groups[var1] = null;
 		}
 
-	} // L: 223
+	} // L: 228
 
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bs")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "39"
+		descriptor = "(II)V",
+		garbageValue = "1137038905"
 	)
 	@Export("clearFilesGroup")
 	public void clearFilesGroup(int var1) {
-		for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226
+		for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 231
 			this.files[var1][var2] = null;
 		}
 
-	} // L: 227
+	} // L: 232
 
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1612581115"
+		descriptor = "(B)V",
+		garbageValue = "-6"
 	)
 	@Export("clearFiles")
 	public void clearFiles() {
-		for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 230
-			if (this.files[var1] != null) { // L: 231
-				for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 232
+		for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 235
+			if (this.files[var1] != null) { // L: 236
+				for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 237
 					this.files[var1][var2] = null;
 				}
 			}
 		}
 
-	} // L: 235
+	} // L: 240
 
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
-		descriptor = "(I[IB)Z",
-		garbageValue = "63"
+		descriptor = "(I[II)Z",
+		garbageValue = "16711680"
 	)
 	@Export("buildFiles")
 	boolean buildFiles(int var1, int[] var2) {
-		if (this.groups[var1] == null) { // L: 238
+		if (this.groups[var1] == null) { // L: 243
 			return false;
 		} else {
-			int var3 = this.fileCounts[var1]; // L: 239
-			int[] var4 = this.fileIds[var1]; // L: 240
-			Object[] var5 = this.files[var1]; // L: 241
-			boolean var6 = true; // L: 242
-
-			for (int var7 = 0; var7 < var3; ++var7) { // L: 243
-				if (var5[var4[var7]] == null) { // L: 244
-					var6 = false; // L: 245
+			int var3 = this.fileCounts[var1]; // L: 244
+			int[] var4 = this.fileIds[var1]; // L: 245
+			Object[] var5 = this.files[var1]; // L: 246
+			boolean var6 = true; // L: 247
+
+			for (int var7 = 0; var7 < var3; ++var7) { // L: 248
+				if (var5[var4[var7]] == null) { // L: 249
+					var6 = false; // L: 250
 					break;
 				}
 			}
 
-			if (var6) { // L: 249
+			if (var6) { // L: 254
 				return true;
 			} else {
 				byte[] var21;
-				if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 251
-					var21 = ChatChannel.method2013(this.groups[var1], false); // L: 256
+				if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256
+					var21 = GrandExchangeOfferOwnWorldComparator.method1147(this.groups[var1], false); // L: 261
 				} else {
-					var21 = ChatChannel.method2013(this.groups[var1], true); // L: 252
-					Buffer var8 = new Buffer(var21); // L: 253
-					var8.xteaDecrypt(var2, 5, var8.array.length); // L: 254
+					var21 = GrandExchangeOfferOwnWorldComparator.method1147(this.groups[var1], true); // L: 257
+					Buffer var8 = new Buffer(var21); // L: 258
+					var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259
 				}
 
-				byte[] var25 = ByteArrayPool.decompressBytes(var21); // L: 259
-				if (this.releaseGroups) { // L: 264
+				byte[] var25 = ViewportMouse.decompressBytes(var21); // L: 264
+				if (this.releaseGroups) { // L: 282
 					this.groups[var1] = null;
 				}
 
 				int var10;
-				if (var3 > 1) { // L: 265
-					int var22 = var25.length; // L: 266
-					--var22; // L: 267
+				if (var3 > 1) { // L: 283
+					int var22 = var25.length; // L: 284
+					--var22; // L: 285
 					var10 = var25[var22] & 255;
-					var22 -= var10 * var3 * 4; // L: 268
-					Buffer var11 = new Buffer(var25); // L: 269
-					int[] var12 = new int[var3]; // L: 270
-					var11.offset = var22; // L: 271
+					var22 -= var10 * var3 * 4; // L: 286
+					Buffer var11 = new Buffer(var25); // L: 287
+					int[] var12 = new int[var3]; // L: 288
+					var11.offset = var22; // L: 289
 
 					int var14;
 					int var15;
-					for (int var13 = 0; var13 < var10; ++var13) { // L: 272
-						var14 = 0; // L: 273
+					for (int var13 = 0; var13 < var10; ++var13) { // L: 290
+						var14 = 0; // L: 291
 
-						for (var15 = 0; var15 < var3; ++var15) { // L: 274
-							var14 += var11.readInt(); // L: 275
-							var12[var15] += var14; // L: 276
+						for (var15 = 0; var15 < var3; ++var15) { // L: 292
+							var14 += var11.readInt(); // L: 293
+							var12[var15] += var14; // L: 294
 						}
 					}
 
-					byte[][] var23 = new byte[var3][]; // L: 279
+					byte[][] var23 = new byte[var3][]; // L: 297
 
-					for (var14 = 0; var14 < var3; ++var14) { // L: 280
-						var23[var14] = new byte[var12[var14]]; // L: 281
-						var12[var14] = 0; // L: 282
+					for (var14 = 0; var14 < var3; ++var14) { // L: 298
+						var23[var14] = new byte[var12[var14]]; // L: 299
+						var12[var14] = 0; // L: 300
 					}
 
-					var11.offset = var22; // L: 284
-					var14 = 0; // L: 285
+					var11.offset = var22; // L: 302
+					var14 = 0; // L: 303
 
 					int var17;
-					for (var15 = 0; var15 < var10; ++var15) { // L: 286
-						int var24 = 0; // L: 287
-
-						for (var17 = 0; var17 < var3; ++var17) { // L: 288
-							var24 += var11.readInt(); // L: 289
-							System.arraycopy(var25, var14, var23[var17], var12[var17], var24); // L: 290
-							var12[var17] += var24; // L: 291
-							var14 += var24; // L: 292
+					for (var15 = 0; var15 < var10; ++var15) { // L: 304
+						int var24 = 0; // L: 305
+
+						for (var17 = 0; var17 < var3; ++var17) { // L: 306
+							var24 += var11.readInt(); // L: 307
+							System.arraycopy(var25, var14, var23[var17], var12[var17], var24); // L: 308
+							var12[var17] += var24; // L: 309
+							var14 += var24; // L: 310
 						}
 					}
 
-					for (var15 = 0; var15 < var3; ++var15) { // L: 295
-						if (!this.shallowFiles) { // L: 296
-							var17 = var4[var15]; // L: 298
-							byte[] var19 = var23[var15]; // L: 300
+					for (var15 = 0; var15 < var3; ++var15) { // L: 313
+						if (!this.shallowFiles) { // L: 314
+							var17 = var4[var15]; // L: 316
+							byte[] var19 = var23[var15]; // L: 318
 							Object var18;
-							if (var19 == null) { // L: 302
-								var18 = null; // L: 303
-							} else if (var19.length > 136) { // L: 306
-								DirectByteArrayCopier var20 = new DirectByteArrayCopier(); // L: 308
-								var20.set(var19); // L: 309
-								var18 = var20; // L: 310
+							if (var19 == null) { // L: 320
+								var18 = null; // L: 321
+							} else if (var19.length > 136) { // L: 324
+								DirectByteArrayCopier var20 = new DirectByteArrayCopier(); // L: 326
+								var20.set(var19); // L: 327
+								var18 = var20; // L: 328
 							} else {
-								var18 = var19; // L: 315
+								var18 = var19; // L: 333
 							}
 
-							var5[var17] = var18; // L: 317
+							var5[var17] = var18; // L: 335
 						} else {
-							var5[var4[var15]] = var23[var15]; // L: 319
+							var5[var4[var15]] = var23[var15]; // L: 337
 						}
 					}
-				} else if (!this.shallowFiles) { // L: 323
-					var10 = var4[0]; // L: 325
+				} else if (!this.shallowFiles) { // L: 341
+					var10 = var4[0]; // L: 343
 					Object var26;
-					if (var25 == null) { // L: 328
-						var26 = null; // L: 329
-					} else if (var25.length > 136) { // L: 332
-						DirectByteArrayCopier var27 = new DirectByteArrayCopier(); // L: 334
-						var27.set(var25); // L: 335
-						var26 = var27; // L: 336
+					if (var25 == null) { // L: 346
+						var26 = null; // L: 347
+					} else if (var25.length > 136) { // L: 350
+						DirectByteArrayCopier var27 = new DirectByteArrayCopier(); // L: 352
+						var27.set(var25); // L: 353
+						var26 = var27; // L: 354
 					} else {
-						var26 = var25; // L: 341
+						var26 = var25; // L: 359
 					}
 
-					var5[var10] = var26; // L: 343
+					var5[var10] = var26; // L: 361
 				} else {
-					var5[var4[0]] = var25; // L: 345
+					var5[var4[0]] = var25; // L: 363
 				}
 
-				return true; // L: 347
+				return true; // L: 365
 			}
 		}
 	}
 
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-337873165"
+		garbageValue = "1240338847"
 	)
 	@Export("getGroupId")
 	public int getGroupId(String var1) {
-		var1 = var1.toLowerCase(); // L: 351
-		return this.groupNameHashTable.get(class157.hashString(var1)); // L: 352
+		var1 = var1.toLowerCase(); // L: 369
+		return this.groupNameHashTable.get(Skills.hashString(var1)); // L: 370
 	}
 
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;B)I",
-		garbageValue = "-28"
+		descriptor = "(ILjava/lang/String;I)I",
+		garbageValue = "1416207334"
 	)
 	@Export("getFileId")
 	public int getFileId(int var1, String var2) {
-		var2 = var2.toLowerCase(); // L: 356
-		return this.fileNameHashTables[var1].get(class157.hashString(var2)); // L: 357
+		var2 = var2.toLowerCase(); // L: 374
+		return this.fileNameHashTables[var1].get(Skills.hashString(var2)); // L: 375
 	}
 
-	@ObfuscatedName("br")
+	@ObfuscatedName("bt")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-		garbageValue = "1454790429"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z",
+		garbageValue = "-124"
 	)
 	@Export("isValidFileName")
 	public boolean isValidFileName(String var1, String var2) {
-		var1 = var1.toLowerCase(); // L: 361
-		var2 = var2.toLowerCase(); // L: 362
-		int var3 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 363
-		if (var3 < 0) { // L: 364
+		var1 = var1.toLowerCase(); // L: 379
+		var2 = var2.toLowerCase(); // L: 380
+		int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 381
+		if (var3 < 0) { // L: 382
 			return false;
 		} else {
-			int var4 = this.fileNameHashTables[var3].get(class157.hashString(var2)); // L: 365
-			return var4 >= 0; // L: 366
+			int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 383
+			return var4 >= 0; // L: 384
 		}
 	}
 
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bh")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;Ljava/lang/String;B)[B",
-		garbageValue = "-103"
+		garbageValue = "34"
 	)
 	@Export("takeFileByNames")
 	public byte[] takeFileByNames(String var1, String var2) {
-		var1 = var1.toLowerCase(); // L: 371
-		var2 = var2.toLowerCase(); // L: 372
-		int var3 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 373
-		int var4 = this.fileNameHashTables[var3].get(class157.hashString(var2)); // L: 374
-		return this.takeFile(var3, var4); // L: 375
+		var1 = var1.toLowerCase(); // L: 389
+		var2 = var2.toLowerCase(); // L: 390
+		int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 391
+		int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 392
+		return this.takeFile(var3, var4); // L: 393
 	}
 
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bn")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-		garbageValue = "-1438586602"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z",
+		garbageValue = "27"
 	)
 	@Export("tryLoadFileByNames")
 	public boolean tryLoadFileByNames(String var1, String var2) {
-		var1 = var1.toLowerCase(); // L: 379
-		var2 = var2.toLowerCase(); // L: 380
-		int var3 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 381
-		int var4 = this.fileNameHashTables[var3].get(class157.hashString(var2)); // L: 382
-		return this.tryLoadFile(var3, var4); // L: 383
+		var1 = var1.toLowerCase(); // L: 397
+		var2 = var2.toLowerCase(); // L: 398
+		int var3 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 399
+		int var4 = this.fileNameHashTables[var3].get(Skills.hashString(var2)); // L: 400
+		return this.tryLoadFile(var3, var4); // L: 401
 	}
 
-	@ObfuscatedName("bv")
+	@ObfuscatedName("bj")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)Z",
-		garbageValue = "95468042"
+		garbageValue = "-397687589"
 	)
 	@Export("tryLoadGroupByName")
 	public boolean tryLoadGroupByName(String var1) {
-		var1 = var1.toLowerCase(); // L: 387
-		int var2 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 388
-		return this.tryLoadGroup(var2); // L: 389
+		var1 = var1.toLowerCase(); // L: 405
+		int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 406
+		return this.tryLoadGroup(var2); // L: 407
 	}
 
-	@ObfuscatedName("bu")
+	@ObfuscatedName("by")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "2011859328"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "-41"
 	)
 	@Export("loadRegionFromName")
 	public void loadRegionFromName(String var1) {
-		var1 = var1.toLowerCase(); // L: 393
-		int var2 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 394
-		if (var2 >= 0) { // L: 395
-			this.loadRegionFromGroup(var2); // L: 396
+		var1 = var1.toLowerCase(); // L: 411
+		int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 412
+		if (var2 >= 0) { // L: 413
+			this.loadRegionFromGroup(var2); // L: 414
 		}
-	} // L: 397
+	} // L: 415
 
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bk")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "1472948344"
+		garbageValue = "1233825396"
 	)
 	@Export("groupLoadPercentByName")
 	public int groupLoadPercentByName(String var1) {
-		var1 = var1.toLowerCase(); // L: 400
-		int var2 = this.groupNameHashTable.get(class157.hashString(var1)); // L: 401
-		return this.groupLoadPercent(var2); // L: 402
+		var1 = var1.toLowerCase(); // L: 418
+		int var2 = this.groupNameHashTable.get(Skills.hashString(var1)); // L: 419
+		return this.groupLoadPercent(var2); // L: 420
 	}
+
+	@ObfuscatedName("hs")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-2059538703"
+	)
+	static final void method5693() {
+		for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7978 7979 8022
+			if (var0.hitpoints > 0) { // L: 7980
+				--var0.hitpoints;
+			}
+
+			boolean var1;
+			int var2;
+			int var3;
+			ObjectComposition var4;
+			if (var0.hitpoints == 0) { // L: 7981
+				if (var0.objectId >= 0) { // L: 7983
+					var2 = var0.objectId; // L: 7985
+					var3 = var0.field1080; // L: 7986
+					var4 = class148.getObjectDefinition(var2); // L: 7988
+					if (var3 == 11) { // L: 7989
+						var3 = 10;
+					}
+
+					if (var3 >= 5 && var3 <= 8) { // L: 7990
+						var3 = 4;
+					}
+
+					var1 = var4.method3491(var3); // L: 7991
+					if (!var1) { // L: 7993
+						continue;
+					}
+				}
+
+				DevicePcmPlayerProvider.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1087, var0.field1080); // L: 7995
+				var0.remove(); // L: 7996
+			} else {
+				if (var0.delay > 0) { // L: 8000
+					--var0.delay;
+				}
+
+				if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 8001
+					if (var0.id >= 0) { // L: 8003
+						var2 = var0.id; // L: 8005
+						var3 = var0.field1075; // L: 8006
+						var4 = class148.getObjectDefinition(var2); // L: 8008
+						if (var3 == 11) { // L: 8009
+							var3 = 10;
+						}
+
+						if (var3 >= 5 && var3 <= 8) { // L: 8010
+							var3 = 4;
+						}
+
+						var1 = var4.method3491(var3); // L: 8011
+						if (!var1) { // L: 8013
+							continue;
+						}
+					}
+
+					DevicePcmPlayerProvider.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1075); // L: 8015
+					var0.delay = -1; // L: 8016
+					if (var0.id == var0.objectId && var0.objectId == -1) { // L: 8017
+						var0.remove();
+					} else if (var0.objectId == var0.id && var0.field1087 == var0.orientation && var0.field1080 == var0.field1075) { // L: 8018
+						var0.remove();
+					}
+				}
+			}
+		}
+
+	} // L: 8024
 }
diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java
index 7f5618e9c1..fd6abfc045 100644
--- a/runescape-client/src/main/java/AbstractByteArrayCopier.java
+++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java
@@ -1,122 +1,41 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jt")
+@ObfuscatedName("jx")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Lpa;"
+	)
+	@Export("titleboxSprite")
+	static IndexedSprite titleboxSprite;
+	@ObfuscatedName("is")
+	@ObfuscatedGetter(
+		intValue = -37753137
+	)
+	@Export("cameraY")
+	static int cameraY;
+
 	AbstractByteArrayCopier() {
 	} // L: 4
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)[B",
-		garbageValue = "99"
+		descriptor = "(I)[B",
+		garbageValue = "1918796592"
 	)
 	@Export("get")
 	abstract byte[] get();
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "([BB)V",
-		garbageValue = "-48"
+		descriptor = "([BI)V",
+		garbageValue = "-1795617978"
 	)
 	@Export("set")
 	public abstract void set(byte[] var1);
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lkd;IIIBZS)V",
-		garbageValue = "-20064"
-	)
-	@Export("requestNetFile")
-	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
-		long var6 = (long)((var1 << 16) + var2); // L: 108
-		NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 109
-		if (var8 == null) { // L: 110
-			var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 111
-			if (var8 == null) { // L: 112
-				var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 113
-				if (var8 != null) { // L: 114
-					if (var5) { // L: 115
-						var8.removeDual(); // L: 116
-						NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 117
-						--NetCache.NetCache_pendingWritesCount; // L: 118
-						++NetCache.NetCache_pendingPriorityWritesCount; // L: 119
-					}
-
-				} else {
-					if (!var5) { // L: 123
-						var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 124
-						if (var8 != null) { // L: 125
-							return;
-						}
-					}
-
-					var8 = new NetFileRequest(); // L: 127
-					var8.archive = var0; // L: 128
-					var8.crc = var3; // L: 129
-					var8.padding = var4; // L: 130
-					if (var5) { // L: 131
-						NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 132
-						++NetCache.NetCache_pendingPriorityWritesCount; // L: 133
-					} else {
-						NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 136
-						NetCache.NetCache_pendingWrites.put(var8, var6); // L: 137
-						++NetCache.NetCache_pendingWritesCount; // L: 138
-					}
-
-				}
-			}
-		}
-	} // L: 121 140
-
-	@ObfuscatedName("in")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;B)V",
-		garbageValue = "1"
-	)
-	static void method5169(int var0, String var1) {
-		int var2 = Players.Players_count; // L: 9075
-		int[] var3 = Players.Players_indices; // L: 9076
-		boolean var4 = false; // L: 9077
-		Username var5 = new Username(var1, GrandExchangeOfferUnitPriceComparator.loginType); // L: 9078
-
-		for (int var6 = 0; var6 < var2; ++var6) { // L: 9079
-			Player var7 = Client.players[var3[var6]]; // L: 9080
-			if (var7 != null && var7 != HealthBarDefinition.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9081
-				PacketBufferNode var8;
-				if (var0 == 1) { // L: 9082
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2733, Client.packetWriter.isaacCipher); // L: 9084
-					var8.packetBuffer.writeShort(var3[var6]); // L: 9085
-					var8.packetBuffer.writeByte(0); // L: 9086
-					Client.packetWriter.addNode(var8); // L: 9087
-				} else if (var0 == 4) { // L: 9089
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2769, Client.packetWriter.isaacCipher); // L: 9091
-					var8.packetBuffer.method6962(var3[var6]); // L: 9092
-					var8.packetBuffer.method7171(0); // L: 9093
-					Client.packetWriter.addNode(var8); // L: 9094
-				} else if (var0 == 6) { // L: 9096
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2714, Client.packetWriter.isaacCipher); // L: 9098
-					var8.packetBuffer.method7001(var3[var6]); // L: 9099
-					var8.packetBuffer.method6993(0); // L: 9100
-					Client.packetWriter.addNode(var8); // L: 9101
-				} else if (var0 == 7) { // L: 9103
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 9105
-					var8.packetBuffer.writeShort(var3[var6]); // L: 9106
-					var8.packetBuffer.method7171(0); // L: 9107
-					Client.packetWriter.addNode(var8); // L: 9108
-				}
-
-				var4 = true; // L: 9110
-				break;
-			}
-		}
-
-		if (!var4) { // L: 9114
-			class397.addGameMessage(4, "", "Unable to find " + var1);
-		}
-
-	} // L: 9115
 }
diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java
index c071362851..8b356937d2 100644
--- a/runescape-client/src/main/java/AbstractFont.java
+++ b/runescape-client/src/main/java/AbstractFont.java
@@ -4,76 +4,76 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ls")
+@ObfuscatedName("lm")
 @Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "[Loe;"
+		descriptor = "[Lpa;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("widths")
 	int[] widths;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("kerning")
 	byte[] kerning;
 
@@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.maxDescent = var9 - this.ascent; // L: 50
 	} // L: 51
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("w")
 	@Export("readMetrics")
 	void readMetrics(byte[] var1) {
 		this.advances = new int[256]; // L: 58
@@ -193,7 +193,7 @@ void readMetrics(byte[] var1) {
 				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)method5800(var11, var12, var4, this.advances, var10, var13, var8); // L: 93
+							this.kerning[var8 + (var13 << 8)] = (byte)method6038(var11, var12, var4, this.advances, var10, var13, var8); // L: 93
 						}
 					}
 				}
@@ -204,17 +204,17 @@ void readMetrics(byte[] var1) {
 
 	} // L: 98
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("r")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) { // L: 123
 			var1 = ' ';
 		}
 
-		return this.advances[AbstractSocket.charToByteCp1252(var1) & 255]; // L: 124
+		return this.advances[class372.charToByteCp1252(var1) & 255]; // L: 124
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("o")
 	@Export("stringWidth")
 	public int stringWidth(String var1) {
 		if (var1 == null) { // L: 128
@@ -238,7 +238,7 @@ public int stringWidth(String var1) {
 							if (!var7.equals("gt")) { // L: 142
 								if (var7.startsWith("img=")) { // L: 143
 									try {
-										int var8 = TaskHandler.method2881(var7.substring(4)); // L: 145
+										int var8 = ClanChannelMember.method2778(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 int stringWidth(String var1) {
 					}
 
 					if (var2 == -1) { // L: 155
-						var4 += this.advances[(char)(AbstractSocket.charToByteCp1252(var6) & 255)]; // L: 156
+						var4 += this.advances[(char)(class372.charToByteCp1252(var6) & 255)]; // L: 156
 						if (this.kerning != null && var3 != -1) { // L: 157
 							var4 += this.kerning[var6 + (var3 << 8)];
 						}
@@ -270,7 +270,7 @@ public int stringWidth(String var1) {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("v")
 	@Export("breakLines")
 	public int breakLines(String var1, int[] var2, String[] var3) {
 		if (var1 == null) { // L: 165
@@ -321,7 +321,7 @@ public int breakLines(String var1, int[] var2, String[] var3) {
 							var11 = '>'; // L: 204
 						} else if (var16.startsWith("img=")) { // L: 206
 							try {
-								int var17 = TaskHandler.method2881(var16.substring(4)); // L: 208
+								int var17 = ClanChannelMember.method2778(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 int breakLines(String var1, int[] var2, String[] var3) {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@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 int lineWidth(String var1, int var2) {
 		return var4; // L: 255
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("h")
 	@Export("lineCount")
 	public int lineCount(String var1, int var2) {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 259
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IILjava/lang/String;II)Lmo;"
+		descriptor = "(IILjava/lang/String;II)Lme;"
 	)
-	public Bounds method5745(int var1, int var2, String var3, int var4, int var5) {
+	public Bounds method6091(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
@@ -414,7 +414,7 @@ public Bounds method5745(int var1, int var2, String var3, int var4, int var5) {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("a")
 	@Export("draw")
 	public void draw(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) { // L: 292
@@ -423,7 +423,7 @@ public void draw(String var1, int var2, int var3, int var4, int var5) {
 		}
 	} // L: 295
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("u")
 	@Export("drawAlpha")
 	public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) { // L: 298
@@ -433,7 +433,7 @@ public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int v
 		}
 	} // L: 302
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("k")
 	@Export("drawRightAligned")
 	public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) { // L: 305
@@ -442,7 +442,7 @@ public void drawRightAligned(String var1, int var2, int var3, int var4, int var5
 		}
 	} // L: 308
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("f")
 	@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 void drawCentered(String var1, int var2, int var3, int var4, int var5) {
 		}
 	} // L: 314
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("l")
 	@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 int drawLines(String var1, int var2, int var3, int var4, int var5, int va
 		}
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("q")
 	@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 void drawCenteredWave(String var1, int var2, int var3, int var4, int var5
 		}
 	} // L: 357
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("x")
 	@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 void drawCenteredWave2(String var1, int var2, int var3, int var4, int var
 		}
 	} // L: 369
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("z")
 	@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 void drawCenteredShake(String var1, int var2, int var3, int var4, int var
 		}
 	} // L: 379
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("i")
 	@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 void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4,
 		}
 	} // L: 393
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("y")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1; // L: 396
@@ -599,95 +599,105 @@ void reset(int var1, int var2) {
 		AbstractFont_justificationCurrent = 0; // L: 402
 	} // L: 403
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ah")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
+			int var2;
+			String var3;
 			if (var1.startsWith("col=")) { // L: 407
-				AbstractFont_color = ItemComposition.method3407(var1.substring(4), 16);
-			} else if (var1.equals("/col")) { // L: 408
+				var3 = var1.substring(4); // L: 409
+				var2 = MusicPatchNode.method5293(var3, 16, true); // L: 411
+				AbstractFont_color = var2; // L: 413
+			} else if (var1.equals("/col")) { // L: 415
 				AbstractFont_color = AbstractFont_previousColor;
-			} else if (var1.startsWith("str=")) { // L: 409
-				AbstractFont_strike = ItemComposition.method3407(var1.substring(4), 16);
-			} else if (var1.equals("str")) { // L: 410
+			} else if (var1.startsWith("str=")) { // L: 416
+				var3 = var1.substring(4); // L: 418
+				var2 = MusicPatchNode.method5293(var3, 16, true); // L: 420
+				AbstractFont_strike = var2; // L: 422
+			} else if (var1.equals("str")) { // L: 424
 				AbstractFont_strike = 8388608;
-			} else if (var1.equals("/str")) { // L: 411
+			} else if (var1.equals("/str")) { // L: 425
 				AbstractFont_strike = -1;
-			} else if (var1.startsWith("u=")) { // L: 412
-				AbstractFont_underline = ItemComposition.method3407(var1.substring(2), 16);
-			} else if (var1.equals("u")) { // L: 413
+			} else if (var1.startsWith("u=")) { // L: 426
+				var3 = var1.substring(2); // L: 428
+				var2 = MusicPatchNode.method5293(var3, 16, true); // L: 430
+				AbstractFont_underline = var2; // L: 432
+			} else if (var1.equals("u")) { // L: 434
 				AbstractFont_underline = 0;
-			} else if (var1.equals("/u")) { // L: 414
+			} else if (var1.equals("/u")) { // L: 435
 				AbstractFont_underline = -1;
-			} else if (var1.startsWith("shad=")) { // L: 415
-				AbstractFont_shadow = ItemComposition.method3407(var1.substring(5), 16);
-			} else if (var1.equals("shad")) { // L: 416
+			} else if (var1.startsWith("shad=")) { // L: 436
+				var3 = var1.substring(5); // L: 438
+				var2 = MusicPatchNode.method5293(var3, 16, true); // L: 440
+				AbstractFont_shadow = var2; // L: 442
+			} else if (var1.equals("shad")) { // L: 444
 				AbstractFont_shadow = 0;
-			} else if (var1.equals("/shad")) { // L: 417
+			} else if (var1.equals("/shad")) { // L: 445
 				AbstractFont_shadow = AbstractFont_previousShadow;
-			} else if (var1.equals("br")) { // L: 418
-				this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
+			} else if (var1.equals("br")) {
+				this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); // L: 446
 			}
-		} catch (Exception var3) { // L: 420
+		} catch (Exception var5) { // L: 448
 		}
 
-	} // L: 421
+	} // L: 449
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
-		int var3 = 0; // L: 424
-		boolean var4 = false; // L: 425
+		int var3 = 0; // L: 452
+		boolean var4 = false; // L: 453
 
-		for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 426
-			char var6 = var1.charAt(var5); // L: 427
-			if (var6 == '<') { // L: 428
+		for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 454
+			char var6 = var1.charAt(var5); // L: 455
+			if (var6 == '<') { // L: 456
 				var4 = true;
-			} else if (var6 == '>') { // L: 429
+			} else if (var6 == '>') { // L: 457
 				var4 = false;
-			} else if (!var4 && var6 == ' ') { // L: 430
+			} else if (!var4 && var6 == ' ') { // L: 458
 				++var3;
 			}
 		}
 
-		if (var3 > 0) { // L: 432
+		if (var3 > 0) { // L: 460
 			AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3;
 		}
 
-	} // L: 433
+	} // L: 461
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ab")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
-		var3 -= this.ascent; // L: 436
-		int var4 = -1; // L: 437
-		int var5 = -1; // L: 438
-
-		for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 439
-			if (var1.charAt(var6) != 0) { // L: 440
-				char var7 = (char)(AbstractSocket.charToByteCp1252(var1.charAt(var6)) & 255); // L: 441
-				if (var7 == '<') { // L: 442
-					var4 = var6; // L: 443
+		var3 -= this.ascent; // L: 464
+		int var4 = -1; // L: 465
+		int var5 = -1; // L: 466
+
+		for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 467
+			if (var1.charAt(var6) != 0) { // L: 468
+				char var7 = (char)(class372.charToByteCp1252(var1.charAt(var6)) & 255); // L: 469
+				if (var7 == '<') { // L: 470
+					var4 = var6; // L: 471
 				} else {
 					int var9;
-					if (var7 == '>' && var4 != -1) { // L: 446
-						String var8 = var1.substring(var4 + 1, var6); // L: 447
-						var4 = -1; // L: 448
-						if (var8.equals("lt")) { // L: 449
+					if (var7 == '>' && var4 != -1) { // L: 474
+						String var8 = var1.substring(var4 + 1, var6); // L: 475
+						var4 = -1; // L: 476
+						if (var8.equals("lt")) { // L: 477
 							var7 = '<';
 						} else {
-							if (!var8.equals("gt")) { // L: 450
-								if (var8.startsWith("img=")) { // L: 451
+							if (!var8.equals("gt")) { // L: 478
+								if (var8.startsWith("img=")) { // L: 479
 									try {
-										var9 = TaskHandler.method2881(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
-										var5 = -1; // L: 457
-									} catch (Exception var14) { // L: 459
+										var9 = ClanChannelMember.method2778(var8.substring(4)); // L: 481
+										IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 482
+										var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 483
+										var2 += var10.width; // L: 484
+										var5 = -1; // L: 485
+									} catch (Exception var14) { // L: 487
 									}
 								} else {
-									this.decodeTag(var8); // L: 463
+									this.decodeTag(var8); // L: 491
 								}
 								continue;
 							}
@@ -696,103 +706,103 @@ void draw0(String var1, int var2, int var3) {
 						}
 					}
 
-					if (var7 == 160) { // L: 467
+					if (var7 == 160) { // L: 495
 						var7 = ' ';
 					}
 
-					if (var4 == -1) { // L: 468
-						if (this.kerning != null && var5 != -1) { // L: 469
+					if (var4 == -1) { // L: 496
+						if (this.kerning != null && var5 != -1) { // L: 497
 							var2 += this.kerning[var7 + (var5 << 8)];
 						}
 
-						int var12 = this.widths[var7]; // L: 470
-						var9 = this.heights[var7]; // L: 471
-						if (var7 != ' ') { // L: 472
-							if (AbstractFont_alpha == 256) { // L: 473
-								if (AbstractFont_shadow != -1) { // L: 474
+						int var12 = this.widths[var7]; // L: 498
+						var9 = this.heights[var7]; // L: 499
+						if (var7 != ' ') { // L: 500
+							if (AbstractFont_alpha == 256) { // L: 501
+								if (AbstractFont_shadow != -1) { // L: 502
 									AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow);
 								}
 
-								this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 475
+								this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 503
 							} else {
-								if (AbstractFont_shadow != -1) { // L: 478
+								if (AbstractFont_shadow != -1) { // L: 506
 									AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha);
 								}
 
-								this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 479
+								this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 507
 							}
-						} else if (AbstractFont_justificationTotal > 0) { // L: 483
-							AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 484
-							var2 += AbstractFont_justificationCurrent >> 8; // L: 485
-							AbstractFont_justificationCurrent &= 255; // L: 486
+						} else if (AbstractFont_justificationTotal > 0) { // L: 511
+							AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 512
+							var2 += AbstractFont_justificationCurrent >> 8; // L: 513
+							AbstractFont_justificationCurrent &= 255; // L: 514
 						}
 
-						int var13 = this.advances[var7]; // L: 489
-						if (AbstractFont_strike != -1) { // L: 490
+						int var13 = this.advances[var7]; // L: 517
+						if (AbstractFont_strike != -1) { // L: 518
 							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
 						}
 
-						if (AbstractFont_underline != -1) { // L: 491
+						if (AbstractFont_underline != -1) { // L: 519
 							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
 						}
 
-						var2 += var13; // L: 492
-						var5 = var7; // L: 493
+						var2 += var13; // L: 520
+						var5 = var7; // L: 521
 					}
 				}
 			}
 		}
 
-	} // L: 496
+	} // L: 524
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("an")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
-		var3 -= this.ascent; // L: 499
-		int var6 = -1; // L: 500
-		int var7 = -1; // L: 501
-		int var8 = 0; // L: 502
-
-		for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 503
-			if (var1.charAt(var9) != 0) { // L: 504
-				char var10 = (char)(AbstractSocket.charToByteCp1252(var1.charAt(var9)) & 255); // L: 505
-				if (var10 == '<') { // L: 506
-					var6 = var9; // L: 507
+		var3 -= this.ascent; // L: 527
+		int var6 = -1; // L: 528
+		int var7 = -1; // L: 529
+		int var8 = 0; // L: 530
+
+		for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 531
+			if (var1.charAt(var9) != 0) { // L: 532
+				char var10 = (char)(class372.charToByteCp1252(var1.charAt(var9)) & 255); // L: 533
+				if (var10 == '<') { // L: 534
+					var6 = var9; // L: 535
 				} else {
 					int var12;
 					int var13;
 					int var14;
-					if (var10 == '>' && var6 != -1) { // L: 510
-						String var11 = var1.substring(var6 + 1, var9); // L: 511
-						var6 = -1; // L: 512
-						if (var11.equals("lt")) { // L: 513
+					if (var10 == '>' && var6 != -1) { // L: 538
+						String var11 = var1.substring(var6 + 1, var9); // L: 539
+						var6 = -1; // L: 540
+						if (var11.equals("lt")) { // L: 541
 							var10 = '<';
 						} else {
-							if (!var11.equals("gt")) { // L: 514
-								if (var11.startsWith("img=")) { // L: 515
+							if (!var11.equals("gt")) { // L: 542
+								if (var11.startsWith("img=")) { // L: 543
 									try {
-										if (var4 != null) { // L: 518
+										if (var4 != null) { // L: 546
 											var12 = var4[var8];
 										} else {
-											var12 = 0; // L: 519
+											var12 = 0; // L: 547
 										}
 
-										if (var5 != null) { // L: 521
+										if (var5 != null) { // L: 549
 											var13 = var5[var8];
 										} else {
-											var13 = 0; // L: 522
+											var13 = 0; // L: 550
 										}
 
-										++var8; // L: 523
-										var14 = TaskHandler.method2881(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
-										var7 = -1; // L: 528
-									} catch (Exception var19) { // L: 530
+										++var8; // L: 551
+										var14 = ClanChannelMember.method2778(var11.substring(4)); // L: 552
+										IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 553
+										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 554
+										var2 += var15.width; // L: 555
+										var7 = -1; // L: 556
+									} catch (Exception var19) { // L: 558
 									}
 								} else {
-									this.decodeTag(var11); // L: 534
+									this.decodeTag(var11); // L: 562
 								}
 								continue;
 							}
@@ -801,70 +811,70 @@ void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
 						}
 					}
 
-					if (var10 == 160) { // L: 538
+					if (var10 == 160) { // L: 566
 						var10 = ' ';
 					}
 
-					if (var6 == -1) { // L: 539
-						if (this.kerning != null && var7 != -1) { // L: 540
+					if (var6 == -1) { // L: 567
+						if (this.kerning != null && var7 != -1) { // L: 568
 							var2 += this.kerning[var10 + (var7 << 8)];
 						}
 
-						int var17 = this.widths[var10]; // L: 541
-						var12 = this.heights[var10]; // L: 542
-						if (var4 != null) { // L: 544
+						int var17 = this.widths[var10]; // L: 569
+						var12 = this.heights[var10]; // L: 570
+						if (var4 != null) { // L: 572
 							var13 = var4[var8];
 						} else {
-							var13 = 0; // L: 545
+							var13 = 0; // L: 573
 						}
 
-						if (var5 != null) { // L: 547
+						if (var5 != null) { // L: 575
 							var14 = var5[var8];
 						} else {
-							var14 = 0; // L: 548
+							var14 = 0; // L: 576
 						}
 
-						++var8; // L: 549
-						if (var10 != ' ') { // L: 550
-							if (AbstractFont_alpha == 256) { // L: 551
-								if (AbstractFont_shadow != -1) { // L: 552
+						++var8; // L: 577
+						if (var10 != ' ') { // L: 578
+							if (AbstractFont_alpha == 256) { // L: 579
+								if (AbstractFont_shadow != -1) { // L: 580
 									AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow);
 								}
 
-								this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 553
+								this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 581
 							} else {
-								if (AbstractFont_shadow != -1) { // L: 556
+								if (AbstractFont_shadow != -1) { // L: 584
 									AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha);
 								}
 
-								this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 557
+								this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 585
 							}
-						} else if (AbstractFont_justificationTotal > 0) { // L: 561
-							AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 562
-							var2 += AbstractFont_justificationCurrent >> 8; // L: 563
-							AbstractFont_justificationCurrent &= 255; // L: 564
+						} else if (AbstractFont_justificationTotal > 0) { // L: 589
+							AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 590
+							var2 += AbstractFont_justificationCurrent >> 8; // L: 591
+							AbstractFont_justificationCurrent &= 255; // L: 592
 						}
 
-						int var18 = this.advances[var10]; // L: 567
-						if (AbstractFont_strike != -1) { // L: 568
+						int var18 = this.advances[var10]; // L: 595
+						if (AbstractFont_strike != -1) { // L: 596
 							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
 						}
 
-						if (AbstractFont_underline != -1) { // L: 569
+						if (AbstractFont_underline != -1) { // L: 597
 							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline);
 						}
 
-						var2 += var18; // L: 570
-						var7 = var10; // L: 571
+						var2 += var18; // L: 598
+						var7 = var10; // L: 599
 					}
 				}
 			}
 		}
 
-	} // L: 574
+	} // L: 602
 
-	@ObfuscatedName("y")
-	static int method5800(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	@ObfuscatedName("n")
+	static int method6038(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 +909,7 @@ static int method5800(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[
 		return -var13; // L: 119
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("g")
 	@Export("escapeBrackets")
 	public static String escapeBrackets(String var0) {
 		int var1 = var0.length(); // L: 263
@@ -928,157 +938,157 @@ public static String escapeBrackets(String var0) {
 		return var6.toString(); // L: 276
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("ax")
 	@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
-		int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 581
-		int var8 = 0; // L: 582
-		int var9 = 0; // L: 583
+		int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 608
+		int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 609
+		int var8 = 0; // L: 610
+		int var9 = 0; // L: 611
 		int var10;
-		if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 584
-			var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 585
-			var4 -= var10; // L: 586
-			var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 587
-			var9 += var3 * var10; // L: 588
-			var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 589
+		if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 612
+			var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 613
+			var4 -= var10; // L: 614
+			var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 615
+			var9 += var3 * var10; // L: 616
+			var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 617
 		}
 
-		if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 591
+		if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 619
 			var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
 		}
 
-		if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 592
-			var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 593
-			var3 -= var10; // L: 594
-			var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 595
-			var9 += var10; // L: 596
-			var6 += var10; // L: 597
-			var8 += var10; // L: 598
-			var7 += var10; // L: 599
+		if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 620
+			var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 621
+			var3 -= var10; // L: 622
+			var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 623
+			var9 += var10; // L: 624
+			var6 += var10; // L: 625
+			var8 += var10; // L: 626
+			var7 += var10; // L: 627
 		}
 
-		if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 601
-			var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 602
-			var3 -= var10; // L: 603
-			var8 += var10; // L: 604
-			var7 += var10; // L: 605
+		if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 629
+			var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 630
+			var3 -= var10; // L: 631
+			var8 += var10; // L: 632
+			var7 += var10; // L: 633
 		}
 
-		if (var3 > 0 && var4 > 0) { // L: 607
-			AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 608
+		if (var3 > 0 && var4 > 0) { // L: 635
+			AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 636
 		}
-	} // L: 609
+	} // L: 637
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("am")
 	@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
-		var5 = -(var5 & 3); // L: 613
+		int var9 = -(var5 >> 2); // L: 640
+		var5 = -(var5 & 3); // L: 641
 
-		for (int var10 = -var6; var10 < 0; ++var10) { // L: 614
+		for (int var10 = -var6; var10 < 0; ++var10) { // L: 642
 			int var11;
-			for (var11 = var9; var11 < 0; ++var11) { // L: 615
-				if (var1[var3++] != 0) { // L: 616
+			for (var11 = var9; var11 < 0; ++var11) { // L: 643
+				if (var1[var3++] != 0) { // L: 644
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 617
+					++var4; // L: 645
 				}
 
-				if (var1[var3++] != 0) { // L: 618
+				if (var1[var3++] != 0) { // L: 646
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 619
+					++var4; // L: 647
 				}
 
-				if (var1[var3++] != 0) { // L: 620
+				if (var1[var3++] != 0) { // L: 648
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 621
+					++var4; // L: 649
 				}
 
-				if (var1[var3++] != 0) { // L: 622
+				if (var1[var3++] != 0) { // L: 650
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 623
+					++var4; // L: 651
 				}
 			}
 
-			for (var11 = var5; var11 < 0; ++var11) { // L: 625
-				if (var1[var3++] != 0) { // L: 626
+			for (var11 = var5; var11 < 0; ++var11) { // L: 653
+				if (var1[var3++] != 0) { // L: 654
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 627
+					++var4; // L: 655
 				}
 			}
 
-			var4 += var7; // L: 629
-			var3 += var8; // L: 630
+			var4 += var7; // L: 657
+			var3 += var8; // L: 658
 		}
 
-	} // L: 632
+	} // L: 660
 
 	@ObfuscatedName("az")
 	@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
-		int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 636
-		int var9 = 0; // L: 637
-		int var10 = 0; // L: 638
+		int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 663
+		int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 664
+		int var9 = 0; // L: 665
+		int var10 = 0; // L: 666
 		int var11;
-		if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 639
-			var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 640
-			var4 -= var11; // L: 641
-			var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 642
-			var10 += var3 * var11; // L: 643
-			var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 644
+		if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 667
+			var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 668
+			var4 -= var11; // L: 669
+			var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 670
+			var10 += var3 * var11; // L: 671
+			var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 672
 		}
 
-		if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 646
+		if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 674
 			var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
 		}
 
-		if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 647
-			var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 648
-			var3 -= var11; // L: 649
-			var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 650
-			var10 += var11; // L: 651
-			var7 += var11; // L: 652
-			var9 += var11; // L: 653
-			var8 += var11; // L: 654
+		if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 675
+			var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 676
+			var3 -= var11; // L: 677
+			var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 678
+			var10 += var11; // L: 679
+			var7 += var11; // L: 680
+			var9 += var11; // L: 681
+			var8 += var11; // L: 682
 		}
 
-		if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 656
-			var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 657
-			var3 -= var11; // L: 658
-			var9 += var11; // L: 659
-			var8 += var11; // L: 660
+		if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 684
+			var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 685
+			var3 -= var11; // L: 686
+			var9 += var11; // L: 687
+			var8 += var11; // L: 688
 		}
 
-		if (var3 > 0 && var4 > 0) { // L: 662
-			AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 663
+		if (var3 > 0 && var4 > 0) { // L: 690
+			AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 691
 		}
-	} // L: 664
+	} // L: 692
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("au")
 	@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
-		var9 = 256 - var9; // L: 668
-
-		for (int var10 = -var6; var10 < 0; ++var10) { // L: 669
-			for (int var11 = -var5; var11 < 0; ++var11) { // L: 670
-				if (var1[var3++] != 0) { // L: 671
-					int var12 = var0[var4]; // L: 672
-					var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 673
+		var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 695
+		var9 = 256 - var9; // L: 696
+
+		for (int var10 = -var6; var10 < 0; ++var10) { // L: 697
+			for (int var11 = -var5; var11 < 0; ++var11) { // L: 698
+				if (var1[var3++] != 0) { // L: 699
+					int var12 = var0[var4]; // L: 700
+					var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 701
 				} else {
-					++var4; // L: 675
+					++var4; // L: 703
 				}
 			}
 
-			var4 += var7; // L: 677
-			var3 += var8; // L: 678
+			var4 += var7; // L: 705
+			var3 += var8; // L: 706
 		}
 
-	} // L: 680
+	} // L: 708
 }
diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java
index 5325607a83..ab8c4abf2d 100644
--- a/runescape-client/src/main/java/AbstractRasterProvider.java
+++ b/runescape-client/src/main/java/AbstractRasterProvider.java
@@ -4,24 +4,21 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("od")
+@ObfuscatedName("pn")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("z")
-	@Export("cacheSubPaths")
-	static String[] cacheSubPaths;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1231434651
+		intValue = 1468450979
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1399536545
+		intValue = 191788269
 	)
 	@Export("height")
 	public int height;
@@ -29,29 +26,48 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	} // L: 8
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "1712436925"
+		descriptor = "(IIB)V",
+		garbageValue = "0"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "-419314546"
+		garbageValue = "1782361529"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "571325302"
+		garbageValue = "-1651135554"
 	)
 	@Export("apply")
 	public final void apply() {
 		Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); // L: 11
 	} // L: 12
+
+	@ObfuscatedName("fe")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-685860336"
+	)
+	static int method7714() {
+		if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 2159
+			int var0 = 0; // L: 2160
+
+			for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 2161
+				var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 2162
+			}
+
+			return var0 * 10000 / Client.field753; // L: 2164
+		} else {
+			return 10000;
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java
index 025fb287c1..8f03c5617c 100644
--- a/runescape-client/src/main/java/AbstractSocket.java
+++ b/runescape-client/src/main/java/AbstractSocket.java
@@ -4,128 +4,64 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mp")
+@ObfuscatedName("md")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
+	@ObfuscatedName("pq")
+	@ObfuscatedSignature(
+		descriptor = "Loo;"
+	)
+	@Export("HitSplatDefinition_cachedSprites")
+	static class404 HitSplatDefinition_cachedSprites;
+
 	protected AbstractSocket() {
 	} // L: 7
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "1"
+		descriptor = "(I)V",
+		garbageValue = "-2099219864"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1953698452"
+		descriptor = "(B)I",
+		garbageValue = "-44"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1632705310"
+		garbageValue = "-1579083707"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-1771919747"
+		garbageValue = "1654551476"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "([BIII)I",
-		garbageValue = "-1246528305"
+		descriptor = "([BIIS)I",
+		garbageValue = "909"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "-748791607"
+		garbageValue = "-1320460000"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(CI)B",
-		garbageValue = "1205000986"
-	)
-	@Export("charToByteCp1252")
-	public static byte charToByteCp1252(char var0) {
-		byte var1;
-		if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12
-			var1 = (byte)var0;
-		} else if (var0 == 8364) { // L: 13
-			var1 = -128;
-		} else if (var0 == 8218) { // L: 14
-			var1 = -126;
-		} else if (var0 == 402) { // L: 15
-			var1 = -125;
-		} else if (var0 == 8222) { // L: 16
-			var1 = -124;
-		} else if (var0 == 8230) { // L: 17
-			var1 = -123;
-		} else if (var0 == 8224) { // L: 18
-			var1 = -122;
-		} else if (var0 == 8225) { // L: 19
-			var1 = -121;
-		} else if (var0 == 710) { // L: 20
-			var1 = -120;
-		} else if (var0 == 8240) { // L: 21
-			var1 = -119;
-		} else if (var0 == 352) { // L: 22
-			var1 = -118;
-		} else if (var0 == 8249) { // L: 23
-			var1 = -117;
-		} else if (var0 == 338) { // L: 24
-			var1 = -116;
-		} else if (var0 == 381) { // L: 25
-			var1 = -114;
-		} else if (var0 == 8216) { // L: 26
-			var1 = -111;
-		} else if (var0 == 8217) { // L: 27
-			var1 = -110;
-		} else if (var0 == 8220) { // L: 28
-			var1 = -109;
-		} else if (var0 == 8221) { // L: 29
-			var1 = -108;
-		} else if (var0 == 8226) { // L: 30
-			var1 = -107;
-		} else if (var0 == 8211) { // L: 31
-			var1 = -106;
-		} else if (var0 == 8212) { // L: 32
-			var1 = -105;
-		} else if (var0 == 732) { // L: 33
-			var1 = -104;
-		} else if (var0 == 8482) { // L: 34
-			var1 = -103;
-		} else if (var0 == 353) { // L: 35
-			var1 = -102;
-		} else if (var0 == 8250) { // L: 36
-			var1 = -101;
-		} else if (var0 == 339) { // L: 37
-			var1 = -100;
-		} else if (var0 == 382) { // L: 38
-			var1 = -98;
-		} else if (var0 == 376) { // L: 39
-			var1 = -97;
-		} else {
-			var1 = 63; // L: 40
-		}
-
-		return var1; // L: 41
-	}
 }
diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java
index eb3804fcb4..3a4de129d1 100644
--- a/runescape-client/src/main/java/AbstractSound.java
+++ b/runescape-client/src/main/java/AbstractSound.java
@@ -2,10 +2,10 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("bl")
+@ObfuscatedName("bq")
 @Implements("AbstractSound")
 public abstract class AbstractSound extends Node {
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("position")
 	int position;
 
diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java
index e96480c5b5..60641eff0d 100644
--- a/runescape-client/src/main/java/AbstractUserComparator.java
+++ b/runescape-client/src/main/java/AbstractUserComparator.java
@@ -4,20 +4,23 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ma")
+@ObfuscatedName("mn")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
+	@Export("Interpreter_stringLocals")
+	static String[] Interpreter_stringLocals;
+	@ObfuscatedName("b")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	} // L: 8
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/util/Comparator;B)V",
-		garbageValue = "-58"
+		descriptor = "(Ljava/util/Comparator;I)V",
+		garbageValue = "-1995915904"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -29,10 +32,10 @@ final void addComparator(Comparator var1) {
 
 	} // L: 17
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;Lla;I)I",
-		garbageValue = "100896848"
+		descriptor = "(Lmv;Lmv;B)I",
+		garbageValue = "-7"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java
index 31c97e705a..928528c0af 100644
--- a/runescape-client/src/main/java/AbstractWorldMapData.java
+++ b/runescape-client/src/main/java/AbstractWorldMapData.java
@@ -5,177 +5,189 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gl")
+@ObfuscatedName("hz")
 @Implements("AbstractWorldMapData")
 public abstract class AbstractWorldMapData {
-	@ObfuscatedName("o")
+	@ObfuscatedName("hq")
+	@ObfuscatedSignature(
+		descriptor = "[Lpa;"
+	)
+	@Export("mapSceneSprites")
+	static IndexedSprite[] mapSceneSprites;
+	@ObfuscatedName("iv")
+	@ObfuscatedSignature(
+		descriptor = "[Lpa;"
+	)
+	@Export("scrollBarSprites")
+	static IndexedSprite[] scrollBarSprites;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 793807045
+		intValue = 1782223213
 	)
 	@Export("regionXLow")
 	int regionXLow;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1976495533
+		intValue = -1380556263
 	)
 	@Export("regionYLow")
 	int regionYLow;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1224582621
+		intValue = -1179298939
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1447419567
+		intValue = -1710961949
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -156049595
+		intValue = 1957720323
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 237039767
+		intValue = -1718804111
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 2062701093
+		intValue = 2087149335
 	)
 	@Export("groupId")
 	int groupId;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1770671525
+		intValue = -1532441347
 	)
 	@Export("fileId")
 	int fileId;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("floorUnderlayIds")
 	short[][][] floorUnderlayIds;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("floorOverlayIds")
 	short[][][] floorOverlayIds;
-	@ObfuscatedName("l")
-	byte[][][] field2154;
-	@ObfuscatedName("u")
-	byte[][][] field2145;
-	@ObfuscatedName("n")
+	@ObfuscatedName("g")
+	byte[][][] field2699;
+	@ObfuscatedName("e")
+	byte[][][] field2706;
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "[[[[Lgp;"
+		descriptor = "[[[[Lhb;"
 	)
 	@Export("decorations")
 	WorldMapDecoration[][][][] decorations;
-	@ObfuscatedName("z")
-	boolean field2158;
-	@ObfuscatedName("q")
-	boolean field2149;
+	@ObfuscatedName("u")
+	boolean field2696;
+	@ObfuscatedName("k")
+	boolean field2709;
 
 	AbstractWorldMapData() {
 		this.groupId = -1; // L: 14
 		this.fileId = -1; // L: 15
 		new LinkedList();
-		this.field2158 = false; // L: 26
-		this.field2149 = false;
-	}
+		this.field2696 = false; // L: 26
+		this.field2709 = false; // L: 27
+	} // L: 29
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "530647470"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "28"
 	)
 	@Export("readGeography")
 	abstract void readGeography(Buffer var1);
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "109"
+		descriptor = "(I)Z",
+		garbageValue = "2143795454"
 	)
 	@Export("isFullyLoaded")
 	boolean isFullyLoaded() {
-		return this.field2158 && this.field2149;
+		return this.field2696 && this.field2709; // L: 32
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;I)V",
-		garbageValue = "1857158984"
+		descriptor = "(Lku;S)V",
+		garbageValue = "9434"
 	)
 	@Export("loadGeography")
 	void loadGeography(AbstractArchive var1) {
-		if (!this.isFullyLoaded()) {
-			byte[] var2 = var1.takeFile(this.groupId, this.fileId);
-			if (var2 != null) {
+		if (!this.isFullyLoaded()) { // L: 36
+			byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37
+			if (var2 != null) { // L: 38
 				this.readGeography(new Buffer(var2)); // L: 39
-				this.field2158 = true; // L: 40
-				this.field2149 = true; // L: 41
+				this.field2696 = true; // L: 40
+				this.field2709 = true; // L: 41
 			}
 
 		}
 	} // L: 43
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-2035301414"
+		descriptor = "(B)V",
+		garbageValue = "-46"
 	)
 	@Export("reset")
 	void reset() {
 		this.floorUnderlayIds = null; // L: 46
 		this.floorOverlayIds = null; // L: 47
-		this.field2154 = null; // L: 48
-		this.field2145 = null; // L: 49
+		this.field2699 = null; // L: 48
+		this.field2706 = null; // L: 49
 		this.decorations = null; // L: 50
-		this.field2158 = false; // L: 51
-		this.field2149 = false; // L: 52
+		this.field2696 = false; // L: 51
+		this.field2709 = false; // L: 52
 	} // L: 53
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(IILop;I)V",
-		garbageValue = "-167681766"
+		descriptor = "(IILpi;I)V",
+		garbageValue = "1462902800"
 	)
 	@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.method3929(var1, var2, var3, var4); // L: 61
+				this.method4762(var1, var2, var3, var4); // L: 61
 			} else {
-				this.method3930(var1, var2, var3, var4); // L: 64
+				this.method4763(var1, var2, var3, var4); // L: 64
 			}
 
 		}
 	} // L: 58 66
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "(IILop;II)V",
-		garbageValue = "-358725932"
+		descriptor = "(IILpi;II)V",
+		garbageValue = "-1058192672"
 	)
-	void method3929(int var1, int var2, Buffer var3, int var4) {
-		boolean var5 = (var4 & 2) != 0;
-		if (var5) {
-			this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
+	void method4762(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
 		}
 
-		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
-	}
+		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73
+	} // L: 74
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "(IILop;II)V",
-		garbageValue = "314745138"
+		descriptor = "(IILpi;IB)V",
+		garbageValue = "-82"
 	)
-	void method3930(int var1, int var2, Buffer var3, int var4) {
-		int var5 = ((var4 & 24) >> 3) + 1;
+	void method4763(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
 		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 80
@@ -190,8 +202,8 @@ void method3930(int var1, int var2, Buffer var3, int var4) {
 				if (var14 != 0) { // L: 85
 					this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86
 					var11 = var3.readUnsignedByte(); // L: 87
-					this.field2154[var9][var1][var2] = (byte)(var11 >> 2); // L: 88
-					this.field2145[var9][var1][var2] = (byte)(var11 & 3); // L: 89
+					this.field2699[var9][var1][var2] = (byte)(var11 >> 2); // L: 88
+					this.field2706[var9][var1][var2] = (byte)(var11 & 3); // L: 89
 				}
 			}
 		}
@@ -203,7 +215,7 @@ void method3930(int var1, int var2, Buffer var3, int var4) {
 					WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99
 
 					for (var11 = 0; var11 < var9; ++var11) { // L: 100
-						int var12 = var3.method6946(); // L: 101
+						int var12 = var3.method7400(); // L: 101
 						int var13 = var3.readUnsignedByte(); // L: 102
 						var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103
 					}
@@ -213,96 +225,102 @@ void method3930(int var1, int var2, Buffer var3, int var4) {
 
 	} // L: 107
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1248831647"
+		garbageValue = "-139627402"
 	)
 	@Export("getRegionX")
 	int getRegionX() {
 		return this.regionX; // L: 112
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1001102625"
+		garbageValue = "1464511988"
 	)
 	@Export("getRegionY")
 	int getRegionY() {
 		return this.regionY; // L: 116
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(Lik;Lpw;B)Lib;",
-		garbageValue = "-34"
+		descriptor = "(CB)Z",
+		garbageValue = "69"
 	)
-	@Export("getPacketBufferNode")
-	public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) {
-		PacketBufferNode var2 = class92.method2296(); // L: 27
-		var2.clientPacket = var0; // L: 28
-		var2.clientPacketLength = var0.length; // L: 29
-		if (var2.clientPacketLength == -1) { // L: 30
-			var2.packetBuffer = new PacketBuffer(260);
-		} else if (var2.clientPacketLength == -2) {
-			var2.packetBuffer = new PacketBuffer(10000); // L: 31
-		} else if (var2.clientPacketLength <= 18) { // L: 32
-			var2.packetBuffer = new PacketBuffer(20);
-		} else if (var2.clientPacketLength <= 98) { // L: 33
-			var2.packetBuffer = new PacketBuffer(100);
+	@Export("isCharPrintable")
+	public static boolean isCharPrintable(char var0) {
+		if (var0 >= ' ' && var0 <= '~') { // L: 186
+			return true;
+		} else if (var0 >= 160 && var0 <= 255) { // L: 187
+			return true;
 		} else {
-			var2.packetBuffer = new PacketBuffer(260); // L: 34
+			return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 188
 		}
-
-		var2.packetBuffer.setIsaacCipher(var1); // L: 35
-		var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36
-		var2.index = 0; // L: 37
-		return var2; // L: 38
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("ku")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)Ljava/lang/String;",
-		garbageValue = "-2039941836"
+		descriptor = "(Ljm;I)V",
+		garbageValue = "-2046983611"
 	)
-	static String method3956(Buffer var0, int var1) {
-		try {
-			int var2 = var0.readUShortSmart(); // L: 69
-			if (var2 > var1) { // L: 70
-				var2 = var1;
+	static final void method4787(Widget var0) {
+		int var1 = var0.contentType; // L: 12214
+		if (var1 == 324) { // L: 12215
+			if (Client.field744 == -1) { // L: 12216
+				Client.field744 = var0.spriteId2; // L: 12217
+				Client.field571 = var0.spriteId; // L: 12218
+			}
+
+			if (Client.playerAppearance.isFemale) { // L: 12220
+				var0.spriteId2 = Client.field744;
+			} else {
+				var0.spriteId2 = Client.field571; // L: 12221
+			}
+
+		} else if (var1 == 325) { // L: 12224
+			if (Client.field744 == -1) { // L: 12225
+				Client.field744 = var0.spriteId2; // L: 12226
+				Client.field571 = var0.spriteId; // L: 12227
+			}
+
+			if (Client.playerAppearance.isFemale) { // L: 12229
+				var0.spriteId2 = Client.field571;
+			} else {
+				var0.spriteId2 = Client.field744; // L: 12230
 			}
 
-			byte[] var3 = new byte[var2]; // L: 71
-			var0.offset += class264.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 72
-			String var4 = class264.decodeStringCp1252(var3, 0, var2); // L: 73
-			return var4; // L: 74
-		} catch (Exception var6) { // L: 76
-			return "Cabbage"; // L: 77
+		} else if (var1 == 327) { // L: 12233
+			var0.modelAngleX = 150; // L: 12234
+			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12235
+			var0.modelType = 5; // L: 12236
+			var0.modelId = 0; // L: 12237
+		} else if (var1 == 328) { // L: 12240
+			var0.modelAngleX = 150; // L: 12241
+			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 12242
+			var0.modelType = 5; // L: 12243
+			var0.modelId = 1; // L: 12244
 		}
-	}
+	} // L: 12222 12231 12238 12245 12247
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("lj")
 	@ObfuscatedSignature(
-		descriptor = "(B)[Loe;",
-		garbageValue = "70"
+		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "-1607165722"
 	)
-	static IndexedSprite[] method3958() {
-		IndexedSprite[] var0 = new IndexedSprite[class414.SpriteBuffer_spriteCount]; // L: 142
+	static String method4791(String var0) {
+		PlayerType[] var1 = SpotAnimationDefinition.PlayerType_values(); // L: 12695
 
-		for (int var1 = 0; var1 < class414.SpriteBuffer_spriteCount; ++var1) { // L: 143
-			IndexedSprite var2 = var0[var1] = new IndexedSprite(); // L: 144
-			var2.width = class414.SpriteBuffer_spriteWidth; // L: 145
-			var2.height = class414.SpriteBuffer_spriteHeight; // L: 146
-			var2.xOffset = class414.SpriteBuffer_xOffsets[var1]; // L: 147
-			var2.yOffset = class414.SpriteBuffer_yOffsets[var1]; // L: 148
-			var2.subWidth = UrlRequester.SpriteBuffer_spriteWidths[var1]; // L: 149
-			var2.subHeight = class414.SpriteBuffer_spriteHeights[var1]; // L: 150
-			var2.palette = HitSplatDefinition.SpriteBuffer_spritePalette; // L: 151
-			var2.pixels = class295.SpriteBuffer_pixels[var1]; // L: 152
+		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12696
+			PlayerType var3 = var1[var2]; // L: 12697
+			if (var3.modIcon != -1 && var0.startsWith(class221.method4705(var3.modIcon))) { // L: 12699 12700
+				var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12701
+				break;
+			}
 		}
 
-		PacketBuffer.method6913(); // L: 154
-		return var0; // L: 155
+		return var0; // L: 12708
 	}
 }
diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java
index d7fcd54b56..779d58a26e 100644
--- a/runescape-client/src/main/java/AbstractWorldMapIcon.java
+++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java
@@ -4,84 +4,80 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gm")
+@ObfuscatedName("ij")
 @Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("et")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive11")
-	static Archive archive11;
-	@ObfuscatedName("e")
+	@ObfuscatedName("bl")
+	static String field2761;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lie;"
+		descriptor = "Lju;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lie;"
+		descriptor = "Lju;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1380271839
+		intValue = 1375469525
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 380689567
+		intValue = 973974995
 	)
 	@Export("screenY")
 	int screenY;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lie;Lie;)V"
+		descriptor = "(Lju;Lju;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1; // L: 13
 		this.coord2 = var2; // L: 14
 	} // L: 15
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1660589105"
+		garbageValue = "-1255702565"
 	)
 	@Export("getElement")
 	public abstract int getElement();
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lga;",
-		garbageValue = "0"
+		descriptor = "(I)Lhm;",
+		garbageValue = "-577826789"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "374350712"
+		descriptor = "(S)I",
+		garbageValue = "-21504"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1569056170"
+		garbageValue = "1225820190"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "1706303277"
+		garbageValue = "-740062777"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
@@ -92,60 +88,60 @@ boolean fitsScreen(int var1, int var2) {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-2053967223"
+		garbageValue = "-1808683977"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
 		return this.getElement() >= 0; // L: 33
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "1990490630"
+		garbageValue = "1509429224"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) { // L: 37
 			return false;
 		} else {
-			WorldMapElement var3 = ItemComposition.WorldMapElement_get(this.getElement()); // L: 38
+			WorldMapElement var3 = class78.WorldMapElement_get(this.getElement()); // L: 38
 			int var4 = this.getSubWidth(); // L: 39
 			int var5 = this.getSubHeight(); // L: 40
 			switch(var3.horizontalAlignment.value) { // L: 41
 			case 0:
-				if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 49
+				if (var1 > this.screenX - var4 && var1 <= 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) { // L: 44
 					return false;
 				}
 				break;
 			case 2:
-				if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 54
+				if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 49
 					return false;
 				}
 			}
 
 			switch(var3.verticalAlignment.value) { // L: 58
 			case 0:
-				if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 61
+				if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 61
 					return false;
 				}
 				break;
 			case 1:
-				if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 71
+				if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 66
 					return false;
 				}
 				break;
 			case 2:
-				if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 66
+				if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 71
 					return false;
 				}
 			}
@@ -154,10 +150,10 @@ boolean elementFitsScreen(int var1, int var2) {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "84"
+		descriptor = "(III)Z",
+		garbageValue = "-1210187925"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
@@ -165,110 +161,151 @@ boolean labelFitsScreen(int var1, int var2) {
 		if (var3 == null) { // L: 80
 			return false; // L: 81
 		} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83
-			return var2 >= this.screenY && var2 <= var3.height + this.screenY; // L: 84
+			return var2 >= this.screenY && var2 <= this.screenY + var3.height; // L: 84
 		} else {
 			return false; // L: 85
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Z",
+		garbageValue = "91"
+	)
+	public static boolean method4863(int var0) {
+		return var0 >= WorldMapDecorationType.field3391.id && var0 <= WorldMapDecorationType.field3385.id || var0 == WorldMapDecorationType.field3406.id; // L: 43
+	}
+
+	@ObfuscatedName("hg")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-1528171345"
+		descriptor = "(I)I",
+		garbageValue = "-356740041"
 	)
-	static int method4026(int var0, Script var1, boolean var2) {
-		if (var0 < 1000) { // L: 433
-			return WorldMapLabelSize.method3540(var0, var1, var2);
-		} else if (var0 < 1100) { // L: 434
-			return BZip2State.method7179(var0, var1, var2);
-		} else if (var0 < 1200) { // L: 435
-			return class132.method2766(var0, var1, var2);
-		} else if (var0 < 1300) { // L: 436
-			return class19.method290(var0, var1, var2);
-		} else if (var0 < 1400) { // L: 437
-			return WorldMapEvent.method4105(var0, var1, var2);
-		} else if (var0 < 1500) { // L: 438
-			return MusicPatch.method4950(var0, var1, var2);
-		} else if (var0 < 1600) { // L: 439
-			return ViewportMouse.method4622(var0, var1, var2);
-		} else if (var0 < 1700) { // L: 440
-			return WorldMapSection1.method3999(var0, var1, var2);
-		} else if (var0 < 1800) { // L: 441
-			return class54.method1101(var0, var1, var2);
-		} else if (var0 < 1900) { // L: 442
-			return GraphicsObject.method1896(var0, var1, var2);
-		} else if (var0 < 2000) { // L: 443
-			return InterfaceParent.method2079(var0, var1, var2);
-		} else if (var0 < 2100) { // L: 444
-			return BZip2State.method7179(var0, var1, var2);
-		} else if (var0 < 2200) { // L: 445
-			return class132.method2766(var0, var1, var2);
-		} else if (var0 < 2300) { // L: 446
-			return class19.method290(var0, var1, var2);
-		} else if (var0 < 2400) { // L: 447
-			return WorldMapEvent.method4105(var0, var1, var2);
-		} else if (var0 < 2500) {
-			return MusicPatch.method4950(var0, var1, var2); // L: 448
-		} else if (var0 < 2600) { // L: 449
-			return GrandExchangeOfferWorldComparator.method5439(var0, var1, var2);
-		} else if (var0 < 2700) { // L: 450
-			return class196.method3972(var0, var1, var2);
-		} else if (var0 < 2800) { // L: 451
-			return MouseRecorder.method2089(var0, var1, var2);
-		} else if (var0 < 2900) { // L: 452
-			return class13.method173(var0, var1, var2);
-		} else if (var0 < 3000) { // L: 453
-			return InterfaceParent.method2079(var0, var1, var2);
-		} else if (var0 < 3200) { // L: 454
-			return ScriptFrame.method1118(var0, var1, var2);
-		} else if (var0 < 3300) { // L: 455
-			return class123.method2618(var0, var1, var2);
-		} else if (var0 < 3400) { // L: 456
-			return UrlRequester.method2427(var0, var1, var2);
-		} else if (var0 < 3500) { // L: 457
-			return World.method1668(var0, var1, var2);
-		} else if (var0 < 3600) { // L: 458
-			return GameEngine.method555(var0, var1, var2);
-		} else if (var0 < 3700) { // L: 459
-			return class139.method2837(var0, var1, var2);
-		} else if (var0 < 3800) { // L: 460
-			return class129.method2738(var0, var1, var2);
-		} else if (var0 < 3900) { // L: 461
-			return SoundCache.method799(var0, var1, var2);
-		} else if (var0 < 4000) { // L: 462
-			return Fonts.method6687(var0, var1, var2);
-		} else if (var0 < 4100) { // L: 463
-			return class14.method190(var0, var1, var2);
-		} else if (var0 < 4200) {
-			return class28.method401(var0, var1, var2); // L: 464
-		} else if (var0 < 4300) { // L: 465
-			return TileItem.method2309(var0, var1, var2);
-		} else if (var0 < 5100) { // L: 466
-			return class114.method2542(var0, var1, var2);
-		} else if (var0 < 5400) { // L: 467
-			return class91.method2271(var0, var1, var2);
-		} else if (var0 < 5600) { // L: 468
-			return InvDefinition.method2982(var0, var1, var2);
-		} else if (var0 < 5700) { // L: 469
-			return class184.method3871(var0, var1, var2);
-		} else if (var0 < 6300) { // L: 470
-			return GrandExchangeOfferOwnWorldComparator.method1158(var0, var1, var2);
-		} else if (var0 < 6600) { // L: 471
-			return class12.method171(var0, var1, var2);
-		} else if (var0 < 6700) { // L: 472
-			return ArchiveDiskActionHandler.method5257(var0, var1, var2);
-		} else if (var0 < 6800) { // L: 473
-			return class123.method2608(var0, var1, var2);
-		} else if (var0 < 6900) { // L: 474
-			return class244.method4727(var0, var1, var2);
-		} else if (var0 < 7000) { // L: 475
-			return ChatChannel.method2012(var0, var1, var2);
-		} else if (var0 < 7100) { // L: 476
-			return class139.method2845(var0, var1, var2);
-		} else if (var0 < 7200) { // L: 477
-			return class67.method1914(var0, var1, var2);
+	static final int method4862() {
+		if (SecureRandomFuture.clientPreferences.roofsHidden) { // L: 5508
+			return class20.Client_plane;
 		} else {
-			return var0 < 7300 ? class28.method402(var0, var1, var2) : 2; // L: 478 479
+			int var0 = 3; // L: 5509
+			if (UserComparator7.cameraPitch < 310) { // L: 5510
+				label169: {
+					int var1;
+					int var2;
+					if (Client.oculusOrbState == 1) { // L: 5513
+						var1 = class7.oculusOrbFocalPointX >> 7; // L: 5514
+						var2 = Actor.oculusOrbFocalPointY >> 7; // L: 5515
+					} else {
+						var1 = class340.localPlayer.x >> 7; // L: 5518
+						var2 = class340.localPlayer.y >> 7; // L: 5519
+					}
+
+					int var3 = UserComparator7.cameraX >> 7; // L: 5521
+					int var4 = UserComparator10.cameraZ >> 7; // L: 5522
+					if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 5523
+						if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { // L: 5524
+							if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5525
+								var0 = class20.Client_plane;
+							}
+
+							int var5;
+							if (var1 > var3) { // L: 5527
+								var5 = var1 - var3;
+							} else {
+								var5 = var3 - var1; // L: 5528
+							}
+
+							int var6;
+							if (var2 > var4) { // L: 5530
+								var6 = var2 - var4;
+							} else {
+								var6 = var4 - var2; // L: 5531
+							}
+
+							int var7;
+							int var8;
+							if (var5 > var6) { // L: 5532
+								var7 = var6 * 65536 / var5; // L: 5533
+								var8 = 32768; // L: 5534
+
+								while (true) {
+									if (var3 == var1) { // L: 5535
+										break label169;
+									}
+
+									if (var3 < var1) {
+										++var3; // L: 5536
+									} else if (var3 > var1) { // L: 5537
+										--var3;
+									}
+
+									if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5538
+										var0 = class20.Client_plane;
+									}
+
+									var8 += var7; // L: 5539
+									if (var8 >= 65536) { // L: 5540
+										var8 -= 65536; // L: 5541
+										if (var4 < var2) { // L: 5542
+											++var4;
+										} else if (var4 > var2) { // L: 5543
+											--var4;
+										}
+
+										if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5544
+											var0 = class20.Client_plane;
+										}
+									}
+								}
+							} else {
+								if (var6 > 0) { // L: 5548
+									var7 = var5 * 65536 / var6; // L: 5549
+									var8 = 32768; // L: 5550
+
+									while (var4 != var2) { // L: 5551
+										if (var4 < var2) { // L: 5552
+											++var4;
+										} else if (var4 > var2) { // L: 5553
+											--var4;
+										}
+
+										if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5554
+											var0 = class20.Client_plane;
+										}
+
+										var8 += var7; // L: 5555
+										if (var8 >= 65536) { // L: 5556
+											var8 -= 65536; // L: 5557
+											if (var3 < var1) { // L: 5558
+												++var3;
+											} else if (var3 > var1) { // L: 5559
+												--var3;
+											}
+
+											if ((Tiles.Tiles_renderFlags[class20.Client_plane][var3][var4] & 4) != 0) { // L: 5560
+												var0 = class20.Client_plane;
+											}
+										}
+									}
+								}
+								break label169;
+							}
+						}
+
+						return class20.Client_plane;
+					}
+
+					return class20.Client_plane;
+				}
+			}
+
+			if (class340.localPlayer.x >= 0 && class340.localPlayer.y >= 0 && class340.localPlayer.x < 13312 && class340.localPlayer.y < 13312) { // L: 5565
+				if ((Tiles.Tiles_renderFlags[class20.Client_plane][class340.localPlayer.x >> 7][class340.localPlayer.y >> 7] & 4) != 0) { // L: 5566
+					var0 = class20.Client_plane;
+				}
+
+				return var0; // L: 5567
+			} else {
+				return class20.Client_plane;
+			}
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java
index b8cac8c585..9c00084cf4 100644
--- a/runescape-client/src/main/java/AccessFile.java
+++ b/runescape-client/src/main/java/AccessFile.java
@@ -1,29 +1,31 @@
+import java.io.DataInputStream;
 import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.io.SyncFailedException;
+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("nv")
+@ObfuscatedName("oa")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		longValue = -1037204394665170999L
+		longValue = 6458662844052359411L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		longValue = -743568297070171741L
+		longValue = -4202787537300384147L
 	)
 	@Export("offset")
 	long offset;
@@ -49,52 +51,52 @@ public AccessFile(File var1, String var2, long var3) throws IOException {
 		this.file.seek(0L); // L: 23
 	} // L: 24
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1); // L: 27
 		this.offset = var1; // L: 28
 	} // L: 29
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "([BIIS)V",
-		garbageValue = "-31371"
+		garbageValue = "-13111"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
-		if ((long)var3 + this.offset > this.maxSize) { // L: 32
-			this.file.seek(this.maxSize); // L: 33
-			this.file.write(1); // L: 34
-			throw new EOFException(); // L: 35
+		if (this.offset + (long)var3 > this.maxSize) { // L: 32
+			this.file.seek(this.maxSize);
+			this.file.write(1);
+			throw new EOFException();
 		} else {
-			this.file.write(var1, var2, var3); // L: 37
-			this.offset += (long)var3; // L: 38
+			this.file.write(var1, var2, var3);
+			this.offset += (long)var3;
 		}
-	} // L: 39
+	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "91"
+		descriptor = "(I)V",
+		garbageValue = "1700348985"
 	)
 	@Export("close")
 	public final void close() throws IOException {
-		this.closeSync(false); // L: 42
-	} // L: 43
+		this.closeSync(false);
+	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
-		garbageValue = "-14"
+		descriptor = "(ZI)V",
+		garbageValue = "-824076886"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
-		if (this.file != null) { // L: 46
-			if (var1) { // L: 47
+		if (this.file != null) {
+			if (var1) {
 				try {
 					this.file.getFD().sync(); // L: 49
-				} catch (SyncFailedException var3) { // L: 51
+				} catch (SyncFailedException var3) {
 				}
 			}
 
@@ -104,20 +106,20 @@ public final void closeSync(boolean var1) throws IOException {
 
 	} // L: 56
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)J",
-		garbageValue = "-633440828"
+		descriptor = "(B)J",
+		garbageValue = "-117"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length(); // L: 59
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "([BIII)I",
-		garbageValue = "1378280482"
+		descriptor = "([BIIB)I",
+		garbageValue = "66"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {
@@ -136,4 +138,70 @@ protected void finalize() throws Throwable {
 		}
 
 	} // L: 73
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V",
+		garbageValue = "-2057333088"
+	)
+	@Export("RunException_sendStackTrace")
+	public static void RunException_sendStackTrace(String var0, Throwable var1) {
+		if (var1 != null) {
+			var1.printStackTrace();
+		} else {
+			try {
+				String var2 = ""; // L: 33
+				if (var1 != null) { // L: 34
+					var2 = IgnoreList.method6267(var1);
+				}
+
+				if (var0 != null) { // L: 35
+					if (var1 != null) { // L: 36
+						var2 = var2 + " | ";
+					}
+
+					var2 = var2 + var0;
+				}
+
+				System.out.println("Error: " + var2);
+				var2 = var2.replace(':', '.');
+				var2 = var2.replace('@', '_');
+				var2 = var2.replace('&', '_');
+				var2 = var2.replace('#', '_');
+				if (RunException.RunException_applet == null) {
+					return;
+				}
+
+				URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + NPC.javaVersion + "&ct=" + class398.clientType + "&e=" + var2); // L: 45
+				DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46
+				var4.read(); // L: 47
+				var4.close(); // L: 48
+			} catch (Exception var5) { // L: 50
+			}
+
+		}
+	} // L: 51
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lfo;",
+		garbageValue = "2133446029"
+	)
+	@Export("SpotAnimationDefinition_get")
+	public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) {
+		SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 37
+		if (var1 != null) { // L: 38
+			return var1;
+		} else {
+			byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 39
+			var1 = new SpotAnimationDefinition(); // L: 40
+			var1.id = var0; // L: 41
+			if (var2 != null) { // L: 42
+				var1.decode(new Buffer(var2));
+			}
+
+			SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43
+			return var1; // L: 44
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java
index cb39ce12b9..23a4f0b29a 100644
--- a/runescape-client/src/main/java/Actor.java
+++ b/runescape-client/src/main/java/Actor.java
@@ -4,542 +4,653 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ct")
+@ObfuscatedName("cy")
 @Implements("Actor")
 public abstract class Actor extends Renderable {
-	@ObfuscatedName("ht")
+	@ObfuscatedName("jw")
 	@ObfuscatedGetter(
-		intValue = 1224542185
+		intValue = -920273095
 	)
-	static int field1146;
+	@Export("oculusOrbFocalPointY")
+	static int oculusOrbFocalPointY;
+	@ObfuscatedName("an")
+	@Export("isWalking")
+	boolean isWalking;
 	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = 1060488561
+		intValue = -797221037
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = 1758566435
+		intValue = -378004067
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -780864819
+		intValue = 1848624375
 	)
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("as")
-	@Export("isWalking")
-	boolean isWalking;
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 1850945247
+		intValue = 1728936343
 	)
-	int field1087;
-	@ObfuscatedName("az")
+	int field1120;
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 1010787109
+		intValue = 467296973
 	)
 	@Export("playerCycle")
 	int playerCycle;
 	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 1162942381
+		intValue = -913877769
 	)
 	@Export("idleSequence")
 	int idleSequence;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = -976729951
+		intValue = 383490447
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = 1205631887
+		intValue = -15560867
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
 	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = 1698656563
+		intValue = 1191511995
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = -1827265149
+		intValue = -1495792429
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("an")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = -862066401
+		intValue = 731481149
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -680764833
+		intValue = -1761005899
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
-	@ObfuscatedName("av")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 528537939
+		intValue = 80446087
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("at")
 	@Export("overheadText")
 	String overheadText;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ai")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("aj")
-	boolean field1099;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aq")
+	boolean field1114;
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = -1349162329
+		intValue = 1997962917
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = -485598179
+		intValue = -662438945
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 1527060029
+		intValue = 106086783
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ad")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bp")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bd")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("ba")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bq")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bg")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
-		descriptor = "Lkf;"
+		descriptor = "Llr;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = -1726125141
+		intValue = -962879023
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bm")
 	@Export("false0")
 	boolean false0;
 	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = -1484671141
+		intValue = -1964951137
 	)
-	int field1112;
-	@ObfuscatedName("bm")
-	boolean field1127;
-	@ObfuscatedName("br")
+	int field1122;
+	@ObfuscatedName("bl")
+	boolean field1118;
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = 1478500765
+		intValue = 1411460693
 	)
 	@Export("movementSequence")
 	int movementSequence;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = 1354844887
+		intValue = -1470905675
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = 909600967
+		intValue = 892078037
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
 	@ObfuscatedName("bv")
 	@ObfuscatedGetter(
-		intValue = -153672255
+		intValue = -1419164143
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bb")
 	@ObfuscatedGetter(
-		intValue = 688727445
+		intValue = 126354783
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = -701592673
+		intValue = -1624543435
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bx")
 	@ObfuscatedGetter(
-		intValue = 1424121639
+		intValue = -538098431
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = -1810491641
+		intValue = -524732497
 	)
-	int field1116;
-	@ObfuscatedName("bk")
+	int field1126;
+	@ObfuscatedName("bh")
 	@ObfuscatedGetter(
-		intValue = -1442456691
+		intValue = -1337511095
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = 1112868275
+		intValue = -2016638493
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = 914687343
+		intValue = -921802207
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
-	@ObfuscatedName("be")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = -577715243
+		intValue = 1121204749
 	)
-	int field1125;
-	@ObfuscatedName("bb")
+	int field1130;
+	@ObfuscatedName("bk")
 	@ObfuscatedGetter(
-		intValue = 539982077
+		intValue = -2034554825
 	)
-	int field1126;
-	@ObfuscatedName("by")
+	int field1131;
+	@ObfuscatedName("bo")
 	@ObfuscatedGetter(
-		intValue = -222009755
+		intValue = -873586319
 	)
-	int field1083;
-	@ObfuscatedName("ba")
+	int field1132;
+	@ObfuscatedName("bf")
 	@ObfuscatedGetter(
-		intValue = 964367307
+		intValue = 1359620153
 	)
-	int field1128;
-	@ObfuscatedName("bq")
+	int field1133;
+	@ObfuscatedName("be")
 	@ObfuscatedGetter(
-		intValue = 646319749
+		intValue = 415157759
 	)
-	int field1100;
-	@ObfuscatedName("ca")
+	int field1134;
+	@ObfuscatedName("ce")
 	@ObfuscatedGetter(
-		intValue = 154596387
+		intValue = 288830733
 	)
-	int field1130;
-	@ObfuscatedName("cq")
+	int field1135;
+	@ObfuscatedName("cl")
 	@ObfuscatedGetter(
-		intValue = -1879657163
+		intValue = -2010992435
 	)
-	int field1131;
-	@ObfuscatedName("ck")
+	int field1136;
+	@ObfuscatedName("cp")
 	@ObfuscatedGetter(
-		intValue = -438636187
+		intValue = -1055433063
 	)
-	int field1132;
-	@ObfuscatedName("ci")
+	int field1157;
+	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		intValue = 1091823721
+		intValue = -473786329
 	)
-	int field1133;
-	@ObfuscatedName("cx")
+	int field1138;
+	@ObfuscatedName("ck")
 	@ObfuscatedGetter(
-		intValue = -685467991
+		intValue = 987624827
 	)
 	@Export("npcCycle")
 	int npcCycle;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cg")
 	@ObfuscatedGetter(
-		intValue = -1735337961
+		intValue = 384336211
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cy")
+	@ObfuscatedGetter(
+		intValue = -529478277
+	)
+	int field1141;
+	@ObfuscatedName("cn")
+	@ObfuscatedGetter(
+		intValue = 1020348289
+	)
+	int field1140;
+	@ObfuscatedName("cv")
+	byte field1143;
+	@ObfuscatedName("co")
+	byte field1144;
+	@ObfuscatedName("cc")
+	byte field1095;
+	@ObfuscatedName("cs")
+	byte field1146;
+	@ObfuscatedName("cr")
 	@ObfuscatedGetter(
-		intValue = 1488414823
+		intValue = 592803175
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("cd")
+	@ObfuscatedName("cb")
 	@ObfuscatedGetter(
-		intValue = -2044798983
+		intValue = -399857819
 	)
-	int field1137;
+	int field1148;
 	@ObfuscatedName("cj")
 	@ObfuscatedGetter(
-		intValue = 369982221
+		intValue = -771997279
 	)
-	int field1138;
-	@ObfuscatedName("cl")
+	int field1149;
+	@ObfuscatedName("ca")
 	@ObfuscatedGetter(
-		intValue = 274803431
+		intValue = 832053673
 	)
 	@Export("pathLength")
 	int pathLength;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cz")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("ce")
+	@ObfuscatedName("cw")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("cp")
-	@Export("pathTraversed")
-	byte[] pathTraversed;
-	@ObfuscatedName("cg")
+	@ObfuscatedName("ct")
+	@ObfuscatedSignature(
+		descriptor = "[Lgj;"
+	)
+	class185[] field1153;
+	@ObfuscatedName("ci")
 	@ObfuscatedGetter(
-		intValue = -405619359
+		intValue = -154765815
 	)
-	int field1085;
-	@ObfuscatedName("cw")
+	int field1117;
+	@ObfuscatedName("ch")
 	@ObfuscatedGetter(
-		intValue = 910802769
+		intValue = 1854868211
 	)
-	int field1144;
-	@ObfuscatedName("cr")
+	int field1098;
+	@ObfuscatedName("cq")
 	@ObfuscatedGetter(
-		intValue = -947188393
+		intValue = 658677507
 	)
-	int field1145;
+	int field1119;
 
 	Actor() {
-		this.isWalking = false; // L: 12
-		this.field1087 = 1; // L: 13
-		this.idleSequence = -1; // L: 15
-		this.turnLeftSequence = -1; // L: 16
-		this.turnRightSequence = -1; // L: 17
-		this.walkSequence = -1; // L: 18
-		this.walkBackSequence = -1; // L: 19
-		this.walkLeftSequence = -1; // L: 20
-		this.walkRightSequence = -1; // L: 21
-		this.runSequence = -1; // L: 22
-		this.overheadText = null; // L: 23
-		this.field1099 = false; // L: 25
-		this.overheadTextCyclesRemaining = 100; // L: 26
-		this.overheadTextColor = 0; // L: 27
-		this.overheadTextEffect = 0; // L: 28
-		this.hitSplatCount = 0; // L: 30
-		this.hitSplatTypes = new int[4]; // L: 31
-		this.hitSplatValues = new int[4]; // L: 32
-		this.hitSplatCycles = new int[4]; // L: 33
-		this.hitSplatTypes2 = new int[4]; // L: 34
-		this.hitSplatValues2 = new int[4]; // L: 35
-		this.healthBars = new IterableNodeDeque(); // L: 36
-		this.targetIndex = -1; // L: 37
-		this.false0 = false; // L: 38
-		this.field1112 = -1; // L: 39
-		this.movementSequence = -1; // L: 41
-		this.movementFrame = 0; // L: 42
-		this.movementFrameCycle = 0; // L: 43
-		this.sequence = -1; // L: 44
-		this.sequenceFrame = 0; // L: 45
-		this.sequenceFrameCycle = 0; // L: 46
-		this.sequenceDelay = 0; // L: 47
-		this.field1116 = 0; // L: 48
-		this.spotAnimation = -1; // L: 49
-		this.spotAnimationFrame = 0; // L: 50
-		this.spotAnimationFrameCycle = 0; // L: 51
-		this.npcCycle = 0; // L: 61
-		this.defaultHeight = 200; // L: 62
-		this.field1137 = 0; // L: 64
-		this.field1138 = 32; // L: 65
-		this.pathLength = 0; // L: 66
-		this.pathX = new int[10]; // L: 67
-		this.pathY = new int[10]; // L: 68
-		this.pathTraversed = new byte[10]; // L: 69
-		this.field1085 = 0; // L: 70
-		this.field1144 = 0; // L: 71
-		this.field1145 = -1; // L: 72
-	} // L: 74
+		this.isWalking = false; // L: 13
+		this.field1120 = 1; // L: 14
+		this.idleSequence = -1;
+		this.turnLeftSequence = -1;
+		this.turnRightSequence = -1; // L: 18
+		this.walkSequence = -1;
+		this.walkBackSequence = -1;
+		this.walkLeftSequence = -1; // L: 21
+		this.walkRightSequence = -1;
+		this.runSequence = -1; // L: 23
+		this.overheadText = null;
+		this.field1114 = false; // L: 26
+		this.overheadTextCyclesRemaining = 100;
+		this.overheadTextColor = 0;
+		this.overheadTextEffect = 0; // L: 29
+		this.hitSplatCount = 0;
+		this.hitSplatTypes = new int[4];
+		this.hitSplatValues = new int[4];
+		this.hitSplatCycles = new int[4]; // L: 34
+		this.hitSplatTypes2 = new int[4];
+		this.hitSplatValues2 = new int[4];
+		this.healthBars = new IterableNodeDeque(); // L: 37
+		this.targetIndex = -1;
+		this.false0 = false;
+		this.field1122 = -1; // L: 40
+		this.movementSequence = -1;
+		this.movementFrame = 0;
+		this.movementFrameCycle = 0;
+		this.sequence = -1;
+		this.sequenceFrame = 0; // L: 46
+		this.sequenceFrameCycle = 0; // L: 47
+		this.sequenceDelay = 0;
+		this.field1126 = 0; // L: 49
+		this.spotAnimation = -1;
+		this.spotAnimationFrame = 0;
+		this.spotAnimationFrameCycle = 0; // L: 52
+		this.npcCycle = 0;
+		this.defaultHeight = 200;
+		this.field1141 = -1;
+		this.field1140 = -1; // L: 65
+		this.field1148 = 0; // L: 71
+		this.field1149 = 32; // L: 72
+		this.pathLength = 0;
+		this.pathX = new int[10];
+		this.pathY = new int[10];
+		this.field1153 = new class185[10];
+		this.field1117 = 0; // L: 77
+		this.field1098 = 0; // L: 78
+		this.field1119 = -1;
+	} // L: 81
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-532391824"
+		descriptor = "(B)Z",
+		garbageValue = "1"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
-		return false; // L: 82
+		return false; // L: 89
 	}
 
 	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "64"
+		descriptor = "(I)V",
+		garbageValue = "1722592983"
 	)
-	final void method2165() {
-		this.pathLength = 0; // L: 77
-		this.field1144 = 0; // L: 78
-	} // L: 79
+	final void method2228() {
+		this.pathLength = 0; // L: 84
+		this.field1098 = 0; // L: 85
+	} // L: 86
 
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIB)V",
-		garbageValue = "32"
+		descriptor = "(IIIIIII)V",
+		garbageValue = "1118050478"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
-		boolean var7 = true; // L: 86
-		boolean var8 = true; // L: 87
+		boolean var7 = true; // L: 93
+		boolean var8 = true; // L: 94
 
 		int var9;
-		for (var9 = 0; var9 < 4; ++var9) { // L: 88
-			if (this.hitSplatCycles[var9] > var5) { // L: 89
+		for (var9 = 0; var9 < 4; ++var9) { // L: 95
+			if (this.hitSplatCycles[var9] > var5) { // L: 96
 				var7 = false;
 			} else {
-				var8 = false; // L: 90
+				var8 = false; // L: 97
 			}
 		}
 
-		var9 = -1; // L: 92
-		int var10 = -1; // L: 93
-		int var11 = 0; // L: 94
-		if (var1 >= 0) { // L: 95
-			HitSplatDefinition var12 = Canvas.method372(var1); // L: 96
-			var10 = var12.field1816; // L: 97
-			var11 = var12.field1805; // L: 98
+		var9 = -1; // L: 99
+		int var10 = -1; // L: 100
+		int var11 = 0; // L: 101
+		if (var1 >= 0) { // L: 102
+			HitSplatDefinition var12 = UserComparator6.method2554(var1); // L: 103
+			var10 = var12.field1946; // L: 104
+			var11 = var12.field1934; // L: 105
 		}
 
 		int var14;
-		if (var8) { // L: 100
-			if (var10 == -1) { // L: 101
+		if (var8) { // L: 107
+			if (var10 == -1) { // L: 108
 				return;
 			}
 
-			var9 = 0; // L: 102
-			var14 = 0; // L: 103
-			if (var10 == 0) { // L: 104
+			var9 = 0; // L: 109
+			var14 = 0; // L: 110
+			if (var10 == 0) { // L: 111
 				var14 = this.hitSplatCycles[0];
-			} else if (var10 == 1) { // L: 105
+			} else if (var10 == 1) { // L: 112
 				var14 = this.hitSplatValues[0];
 			}
 
-			for (int var13 = 1; var13 < 4; ++var13) { // L: 106
-				if (var10 == 0) { // L: 107
-					if (this.hitSplatCycles[var13] < var14) { // L: 108
-						var9 = var13; // L: 109
-						var14 = this.hitSplatCycles[var13]; // L: 110
+			for (int var13 = 1; var13 < 4; ++var13) { // L: 113
+				if (var10 == 0) { // L: 114
+					if (this.hitSplatCycles[var13] < var14) { // L: 115
+						var9 = var13; // L: 116
+						var14 = this.hitSplatCycles[var13]; // L: 117
 					}
-				} else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 113 114
-					var9 = var13; // L: 115
-					var14 = this.hitSplatValues[var13]; // L: 116
+				} else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 120 121
+					var9 = var13; // L: 122
+					var14 = this.hitSplatValues[var13]; // L: 123
 				}
 			}
 
-			if (var10 == 1 && var14 >= var2) { // L: 120
+			if (var10 == 1 && var14 >= var2) { // L: 127
 				return;
 			}
 		} else {
-			if (var7) { // L: 123
+			if (var7) { // L: 130
 				this.hitSplatCount = 0;
 			}
 
-			for (var14 = 0; var14 < 4; ++var14) { // L: 124
-				byte var15 = this.hitSplatCount; // L: 125
-				this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 126
-				if (this.hitSplatCycles[var15] <= var5) { // L: 127
-					var9 = var15; // L: 128
-					break; // L: 129
+			for (var14 = 0; var14 < 4; ++var14) { // L: 131
+				byte var15 = this.hitSplatCount; // L: 132
+				this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 133
+				if (this.hitSplatCycles[var15] <= var5) { // L: 134
+					var9 = var15; // L: 135
+					break; // L: 136
 				}
 			}
 		}
 
-		if (var9 >= 0) { // L: 133
-			this.hitSplatTypes[var9] = var1; // L: 134
-			this.hitSplatValues[var9] = var2; // L: 135
-			this.hitSplatTypes2[var9] = var3; // L: 136
-			this.hitSplatValues2[var9] = var4; // L: 137
-			this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 138
+		if (var9 >= 0) { // L: 140
+			this.hitSplatTypes[var9] = var1; // L: 141
+			this.hitSplatValues[var9] = var2; // L: 142
+			this.hitSplatTypes2[var9] = var3; // L: 143
+			this.hitSplatValues2[var9] = var4; // L: 144
+			this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 145
 		}
-	} // L: 139
+	} // L: 146
 
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIII)V",
-		garbageValue = "-2125214461"
+		garbageValue = "-1630331843"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
-		HealthBarDefinition var7 = ObjectSound.method1772(var1); // L: 142
-		HealthBar var8 = null; // L: 143
-		HealthBar var9 = null; // L: 144
-		int var10 = var7.int2; // L: 145
-		int var11 = 0; // L: 146
+		HealthBarDefinition var7 = class118.method2683(var1); // L: 149
+		HealthBar var8 = null; // L: 150
+		HealthBar var9 = null; // L: 151
+		int var10 = var7.int2; // L: 152
+		int var11 = 0; // L: 153
 
 		HealthBar var12;
-		for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 147
-			++var11; // L: 148
-			if (var12.definition.field1668 == var7.field1668) { // L: 149
-				var12.put(var2 + var4, var5, var6, var3); // L: 150
-				return; // L: 151
+		for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 154
+			++var11; // L: 155
+			if (var12.definition.field1796 == var7.field1796) { // L: 156
+				var12.put(var2 + var4, var5, var6, var3); // L: 157
+				return; // L: 158
 			}
 
-			if (var12.definition.int1 <= var7.int1) { // L: 153
+			if (var12.definition.int1 <= var7.int1) { // L: 160
 				var8 = var12;
 			}
 
-			if (var12.definition.int2 > var10) { // L: 154
-				var9 = var12; // L: 155
-				var10 = var12.definition.int2; // L: 156
+			if (var12.definition.int2 > var10) { // L: 161
+				var9 = var12; // L: 162
+				var10 = var12.definition.int2; // L: 163
 			}
 		}
 
-		if (var9 != null || var11 < 4) { // L: 159
-			var12 = new HealthBar(var7); // L: 160
-			if (var8 == null) { // L: 161
+		if (var9 != null || var11 < 4) { // L: 166
+			var12 = new HealthBar(var7); // L: 167
+			if (var8 == null) { // L: 168
 				this.healthBars.addLast(var12);
 			} else {
-				IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 162
+				IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 169
 			}
 
-			var12.put(var2 + var4, var5, var6, var3); // L: 163
-			if (var11 >= 4) { // L: 164
+			var12.put(var2 + var4, var5, var6, var3); // L: 170
+			if (var11 >= 4) { // L: 171
 				var9.remove();
 			}
 
 		}
-	} // L: 165
+	} // L: 172
 
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1759022108"
+		descriptor = "(IB)V",
+		garbageValue = "-93"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
-		HealthBarDefinition var2 = ObjectSound.method1772(var1); // L: 168
+		HealthBarDefinition var2 = class118.method2683(var1); // L: 175
 
-		for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 169
-			if (var2 == var3.definition) { // L: 170
-				var3.remove(); // L: 171
-				return; // L: 172
+		for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 176
+			if (var2 == var3.definition) { // L: 177
+				var3.remove(); // L: 178
+				return; // L: 179
 			}
 		}
 
-	} // L: 175
+	} // L: 182
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "1718558788"
+	)
+	static int method2235(int var0, int var1) {
+		FloorOverlayDefinition var2 = class18.method302(var0); // L: 15
+		if (var2 == null) { // L: 16
+			return var1; // L: 17
+		} else if (var2.secondaryRgb >= 0) { // L: 19
+			return var2.secondaryRgb | -16777216; // L: 20
+		} else {
+			int var3;
+			int var4;
+			byte var5;
+			int var7;
+			if (var2.texture >= 0) { // L: 22
+				var4 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); // L: 24
+				var5 = 96; // L: 25
+				if (var4 == -2) { // L: 27
+					var3 = 12345678; // L: 28
+				} else if (var4 == -1) { // L: 31
+					if (var5 < 0) { // L: 32
+						var5 = 0; // L: 33
+					} else if (var5 > 127) { // L: 35
+						var5 = 127; // L: 36
+					}
+
+					var7 = 127 - var5; // L: 38
+					var3 = var7; // L: 39
+				} else {
+					var7 = var5 * (var4 & 127) / 128; // L: 42
+					if (var7 < 2) { // L: 43
+						var7 = 2;
+					} else if (var7 > 126) { // L: 44
+						var7 = 126;
+					}
+
+					var3 = var7 + (var4 & 65408); // L: 45
+				}
+
+				return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; // L: 48
+			} else if (var2.primaryRgb == 16711935) { // L: 50
+				return var1; // L: 51
+			} else {
+				var3 = WorldMapRectangle.method4794(var2.hue, var2.saturation, var2.lightness); // L: 54
+				var5 = 96; // L: 56
+				if (var3 == -2) { // L: 58
+					var4 = 12345678; // L: 59
+				} else if (var3 == -1) { // L: 62
+					if (var5 < 0) { // L: 63
+						var5 = 0; // L: 64
+					} else if (var5 > 127) {
+						var5 = 127;
+					}
+
+					var7 = 127 - var5;
+					var4 = var7; // L: 70
+				} else {
+					var7 = var5 * (var3 & 127) / 128; // L: 73
+					if (var7 < 2) { // L: 74
+						var7 = 2;
+					} else if (var7 > 126) { // L: 75
+						var7 = 126;
+					}
+
+					var4 = var7 + (var3 & 65408); // L: 76
+				}
+
+				return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; // L: 79
+			}
+		}
+	}
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(IB)I",
+		garbageValue = "28"
+	)
+	static int method2233(int var0) {
+		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66
+		if (var1 == null) { // L: 67
+			return -1;
+		} else {
+			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java
index ca39640524..01920949a9 100644
--- a/runescape-client/src/main/java/Animation.java
+++ b/runescape-client/src/main/java/Animation.java
@@ -3,51 +3,51 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("he")
+@ObfuscatedName("gu")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("i")
-	static int[] field2317;
-	@ObfuscatedName("w")
-	static int[] field2309;
-	@ObfuscatedName("s")
-	static int[] field2314;
-	@ObfuscatedName("a")
-	static int[] field2312;
-	@ObfuscatedName("o")
+	@ObfuscatedName("c")
+	static int[] field2223;
+	@ObfuscatedName("b")
+	static int[] field2220;
+	@ObfuscatedName("p")
+	static int[] field2224;
+	@ObfuscatedName("m")
+	static int[] field2219;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lha;"
+		descriptor = "Lgi;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field2317 = new int[500]; // L: 8
-		field2309 = new int[500]; // L: 9
-		field2314 = new int[500]; // L: 10
-		field2312 = new int[500]; // L: 11
+		field2223 = new int[500]; // L: 8
+		field2220 = new int[500]; // L: 9
+		field2224 = new int[500]; // L: 10
+		field2219 = new int[500]; // L: 11
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "([BLha;)V"
+		descriptor = "([BLgi;)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
-							field2317[var7] = var10; // L: 35
-							field2309[var7] = 0; // L: 36
-							field2314[var7] = 0; // L: 37
-							field2312[var7] = 0; // L: 38
+							field2223[var7] = var10; // L: 35
+							field2220[var7] = 0; // L: 36
+							field2224[var7] = 0; // L: 37
+							field2219[var7] = 0; // L: 38
 							++var7; // L: 39
 							break;
 						}
 					}
 				}
 
-				field2317[var7] = var8; // L: 44
+				field2223[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
-					field2309[var7] = var4.readShortSmart();
+					field2220[var7] = var4.readShortSmart();
 				} else {
-					field2309[var7] = var11; // L: 48
+					field2220[var7] = var11; // L: 48
 				}
 
 				if ((var9 & 2) != 0) { // L: 49
-					field2314[var7] = var4.readShortSmart();
+					field2224[var7] = var4.readShortSmart();
 				} else {
-					field2314[var7] = var11; // L: 50
+					field2224[var7] = var11; // L: 50
 				}
 
 				if ((var9 & 4) != 0) { // L: 51
-					field2312[var7] = var4.readShortSmart();
+					field2219[var7] = var4.readShortSmart();
 				} else {
-					field2312[var7] = var11; // L: 52
+					field2219[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] = field2317[var8]; // L: 67
-				this.transformXs[var8] = field2309[var8]; // L: 68
-				this.transformYs[var8] = field2314[var8]; // L: 69
-				this.transformZs[var8] = field2312[var8]; // L: 70
+				this.transformSkeletonLabels[var8] = field2223[var8]; // L: 67
+				this.transformXs[var8] = field2220[var8]; // L: 68
+				this.transformYs[var8] = field2224[var8]; // L: 69
+				this.transformZs[var8] = field2219[var8]; // L: 70
 			}
 
 		}
diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java
index b809953458..fdda2f2366 100644
--- a/runescape-client/src/main/java/ApproximateRouteStrategy.java
+++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java
@@ -3,42 +3,233 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bs")
+@ObfuscatedName("bi")
 @Implements("ApproximateRouteStrategy")
 public class ApproximateRouteStrategy extends RouteStrategy {
-	@ObfuscatedName("qr")
-	@ObfuscatedSignature(
-		descriptor = "Lpz;"
-	)
-	@Export("privateChatMode")
-	static PrivateChatMode privateChatMode;
-	@ObfuscatedName("de")
-	@Export("mouseCam")
-	static boolean mouseCam;
-	@ObfuscatedName("ed")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive1")
-	static Archive archive1;
-	@ObfuscatedName("fi")
+	@ObfuscatedName("sg")
 	@ObfuscatedGetter(
-		intValue = 1994087319
+		intValue = -62264007
 	)
-	@Export("worldPort")
-	static int worldPort;
+	static int field460;
+	@ObfuscatedName("u")
+	@Export("ByteArrayPool_altSizeArrayCounts")
+	public static int[] ByteArrayPool_altSizeArrayCounts;
 
 	ApproximateRouteStrategy() {
-	} // L: 12118
+	} // L: 12795
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIILfq;I)Z",
-		garbageValue = "-526381699"
+		descriptor = "(IIILgf;I)Z",
+		garbageValue = "-563456214"
 	)
 	@Export("hasArrived")
 	public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) {
-		return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12121
+		return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 12799
+	}
+
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "-10"
+	)
+	static int method1139(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3707
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = PlayerComposition.loadWorlds() ? 1 : 0; // L: 3708
+			return 1; // L: 3709
+		} else {
+			World var9;
+			if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3711
+				var9 = class282.worldListStart(); // L: 3712
+				if (var9 != null) { // L: 3713
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.id; // L: 3714
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.properties; // L: 3715
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; // L: 3716
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.location; // L: 3717
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.population; // L: 3718
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; // L: 3719
+				} else {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3722
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3723
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3724
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3725
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3726
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3727
+				}
+
+				return 1; // L: 3729
+			} else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3731
+				var9 = Canvas.getNextWorldListWorld(); // L: 3732
+				if (var9 != null) { // L: 3733
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.id; // L: 3734
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.properties; // L: 3735
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.activity; // L: 3736
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.location; // L: 3737
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.population; // L: 3738
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var9.host; // L: 3739
+				} else {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3742
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3743
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3744
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3745
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3746
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3747
+				}
+
+				return 1; // L: 3749
+			} else {
+				int var3;
+				World var7;
+				int var8;
+				if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3751
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3752
+					var7 = null; // L: 3753
+
+					for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3754
+						if (var3 == class334.World_worlds[var8].id) { // L: 3755
+							var7 = class334.World_worlds[var8]; // L: 3756
+							break;
+						}
+					}
+
+					if (var7 != null) { // L: 3760
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.id; // L: 3761
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.properties; // L: 3762
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; // L: 3763
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.location; // L: 3764
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.population; // L: 3765
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; // L: 3766
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3769
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3770
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3771
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3772
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3773
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3774
+					}
+
+					return 1; // L: 3776
+				} else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3778
+					IsaacCipher.Interpreter_intStackSize -= 4; // L: 3779
+					var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3780
+					boolean var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 3781
+					var8 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3782
+					boolean var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3] == 1; // L: 3783
+					class118.sortWorldList(var3, var10, var8, var6); // L: 3784
+					return 1; // L: 3785
+				} else if (var0 != 6511) { // L: 3787
+					if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3808
+						Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 3809
+						return 1; // L: 3810
+					} else {
+						int var4;
+						ParamComposition var5;
+						if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3812
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 3813
+							var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3814
+							var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3815
+							var5 = VerticalAlignment.getParamDefinition(var4); // L: 3816
+							if (var5.isString()) { // L: 3817
+								Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = WorldMapLabelSize.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3818
+							} else {
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapLabelSize.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3821
+							}
+
+							return 1; // L: 3823
+						} else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3825
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 3826
+							var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3827
+							var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3828
+							var5 = VerticalAlignment.getParamDefinition(var4); // L: 3829
+							if (var5.isString()) { // L: 3830
+								Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class148.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3831
+							} else {
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class148.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3834
+							}
+
+							return 1; // L: 3836
+						} else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3838
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 3839
+							var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3840
+							var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3841
+							var5 = VerticalAlignment.getParamDefinition(var4); // L: 3842
+							if (var5.isString()) { // L: 3843
+								Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = UserComparator6.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3844
+							} else {
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3847
+							}
+
+							return 1; // L: 3849
+						} else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3851
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 3852
+							var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3853
+							var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3854
+							var5 = VerticalAlignment.getParamDefinition(var4); // L: 3855
+							if (var5.isString()) { // L: 3856
+								Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class18.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3857
+							} else {
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class18.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3860
+							}
+
+							return 1; // L: 3862
+						} else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3864
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3865
+							return 1; // L: 3866
+						} else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3868
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3869
+							return 1; // L: 3870
+						} else if (var0 == 6520) { // L: 3872
+							return 1; // L: 3873
+						} else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3875
+							return 1; // L: 3876
+						} else if (var0 == 6522) { // L: 3878
+							--class13.Interpreter_stringStackSize; // L: 3879
+							--IsaacCipher.Interpreter_intStackSize; // L: 3880
+							return 1; // L: 3881
+						} else if (var0 == 6523) { // L: 3883
+							--class13.Interpreter_stringStackSize; // L: 3884
+							--IsaacCipher.Interpreter_intStackSize; // L: 3885
+							return 1; // L: 3886
+						} else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 3888
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3889
+							return 1; // L: 3890
+						} else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 3892
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 3893
+							return 1; // L: 3894
+						} else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 3896
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 3897
+							return 1; // L: 3898
+						} else if (var0 == 6527) { // L: 3900
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field499; // L: 3901
+							return 1; // L: 3902
+						} else {
+							return 2; // L: 3904
+						}
+					}
+				} else {
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3788
+					if (var3 >= 0 && var3 < World.World_count) { // L: 3789
+						var7 = class334.World_worlds[var3]; // L: 3790
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.id; // L: 3791
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.properties; // L: 3792
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.activity; // L: 3793
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.location; // L: 3794
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.population; // L: 3795
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.host; // L: 3796
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3799
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3800
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3801
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3802
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3803
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3804
+					}
+
+					return 1; // L: 3806
+				}
+			}
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java
index 7f57aef9e7..d249502ae4 100644
--- a/runescape-client/src/main/java/Archive.java
+++ b/runescape-client/src/main/java/Archive.java
@@ -5,112 +5,106 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kd")
+@ObfuscatedName("kz")
 @Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("eg")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive15")
-	static Archive archive15;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmy;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmy;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1928964095
+		intValue = 1081704419
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("g")
-	volatile boolean field3673;
-	@ObfuscatedName("e")
-	boolean field3674;
-	@ObfuscatedName("p")
+	@ObfuscatedName("s")
+	volatile boolean field3821;
+	@ObfuscatedName("j")
+	boolean field3822;
+	@ObfuscatedName("w")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1953931107
+		intValue = -515391075
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 619553041
+		intValue = -98227937
 	)
 	@Export("indexVersion")
 	int indexVersion;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1459687887
+		intValue = 29264523
 	)
-	int field3679;
+	int field3816;
 
 	static {
 		Archive_crc = new CRC32(); // L: 17
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(Lmr;Lmr;IZZZ)V"
+		descriptor = "(Lmy;Lmy;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5); // L: 23
-		this.field3673 = false; // L: 14
-		this.field3674 = false; // L: 15
-		this.field3679 = -1; // L: 20
+		this.field3821 = false; // L: 14
+		this.field3822 = false; // L: 15
+		this.field3816 = -1; // L: 20
 		this.archiveDisk = var1; // L: 24
 		this.masterDisk = var2; // L: 25
 		this.index = var3; // L: 26
-		this.field3674 = var6; // L: 27
+		this.field3822 = var6; // L: 27
 		int var8 = this.index; // L: 29
-		if (class139.NetCache_reference != null) { // L: 31
-			class139.NetCache_reference.offset = var8 * 8 + 5; // L: 32
-			int var9 = class139.NetCache_reference.readInt(); // L: 33
-			int var10 = class139.NetCache_reference.readInt(); // L: 34
+		if (WorldMapLabel.NetCache_reference != null) { // L: 31
+			WorldMapLabel.NetCache_reference.offset = var8 * 8 + 5; // L: 32
+			int var9 = WorldMapLabel.NetCache_reference.readInt(); // L: 33
+			int var10 = WorldMapLabel.NetCache_reference.readInt(); // L: 34
 			this.loadIndex(var9, var10); // L: 35
 		} else {
-			AbstractByteArrayCopier.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38
+			class269.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38
 			NetCache.NetCache_archives[var8] = this; // L: 39
 		}
 
 	} // L: 41
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-625670103"
+		garbageValue = "782340670"
 	)
-	public boolean method5260() {
-		return this.field3673; // L: 44
+	public boolean method5540() {
+		return this.field3821; // L: 44
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1260592296"
+		garbageValue = "1520569672"
 	)
 	@Export("percentage")
 	public int percentage() {
-		if (this.field3673) { // L: 48
+		if (this.field3821) { // L: 48
 			return 100;
 		} else if (super.groups != null) { // L: 49
 			return 99;
 		} else {
-			int var1 = HealthBarUpdate.method2185(255, this.index); // L: 50
+			int var1 = IsaacCipher.method7886(255, this.index); // L: 50
 			if (var1 >= 100) { // L: 51
 				var1 = 99;
 			}
@@ -119,293 +113,542 @@ public int percentage() {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "297974277"
+		garbageValue = "-2090166080"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
-		AttackOption.method2297(this.index, var1); // L: 56
+		PendingSpawn.method2225(this.index, var1); // L: 56
 	} // L: 57
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "23"
+		descriptor = "(II)V",
+		garbageValue = "2024016984"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
-		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 60
-			class318.method5887(var1, this.archiveDisk, this);
+		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
+			class10.method122(var1, this.archiveDisk, this); // L: 60
 		} else {
-			AbstractByteArrayCopier.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 61
+			class269.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 61
 		}
 
 	} // L: 62
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "-60"
+		descriptor = "(III)V",
+		garbageValue = "-877437608"
 	)
 	@Export("loadIndex")
-	public void loadIndex(int var1, int var2) {
+	void loadIndex(int var1, int var2) {
 		this.indexCrc = var1; // L: 65
 		this.indexVersion = var2; // L: 66
 		if (this.masterDisk != null) { // L: 67
-			class318.method5887(this.index, this.masterDisk, this);
+			class10.method122(this.index, this.masterDisk, this);
 		} else {
-			AbstractByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 68
+			class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 68
 		}
 
 	} // L: 69
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I[BZZI)V",
-		garbageValue = "-1126308164"
+		garbageValue = "388189625"
 	)
 	@Export("write")
-	public void write(int var1, byte[] var2, boolean var3, boolean var4) {
+	void write(int var1, byte[] var2, boolean var3, boolean var4) {
 		if (var3) { // L: 72
-			if (this.field3673) { // L: 73
+			if (this.field3821) { // L: 73
 				throw new RuntimeException(); // L: 74
 			}
 
 			if (this.masterDisk != null) { // L: 76
-				int var5 = this.index; // L: 77
-				ArchiveDisk var6 = this.masterDisk; // L: 78
-				ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 80
-				var7.type = 0; // L: 81
-				var7.key = (long)var5; // L: 82
-				var7.data = var2; // L: 83
-				var7.archiveDisk = var6; // L: 84
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 85
-					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 86
-				} // L: 87
-
-				Login.method1952(); // L: 88
+				NPCComposition.method3321(this.index, var2, this.masterDisk);
 			}
 
-			this.decodeIndex(var2); // L: 91
-			this.loadAllLocal(); // L: 92
+			this.decodeIndex(var2); // L: 77
+			this.loadAllLocal(); // L: 78
 		} else {
-			var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 95
-			var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 96
-			if (this.archiveDisk != null) { // L: 97
-				ArchiveDisk var11 = this.archiveDisk; // L: 98
-				ArchiveDiskAction var16 = new ArchiveDiskAction(); // L: 100
-				var16.type = 0; // L: 101
-				var16.key = (long)var1; // L: 102
-				var16.data = var2; // L: 103
-				var16.archiveDisk = var11; // L: 104
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 105
-					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var16); // L: 106
-				} // L: 107
-
-				Login.method1952(); // L: 108
-				this.validGroups[var1] = true; // L: 110
+			var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 81
+			var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 82
+			if (this.archiveDisk != null) { // L: 83
+				NPCComposition.method3321(var1, var2, this.archiveDisk); // L: 84
+				this.validGroups[var1] = true; // L: 85
 			}
 
-			if (var4) { // L: 112
-				Object[] var15 = super.groups; // L: 113
-				Object var17;
-				if (var2 == null) { // L: 117
-					var17 = null; // L: 118
-				} else if (var2.length > 136) { // L: 121
-					DirectByteArrayCopier var8 = new DirectByteArrayCopier(); // L: 123
-					var8.set(var2); // L: 124
-					var17 = var8; // L: 125
+			if (var4) { // L: 87
+				Object[] var5 = super.groups; // L: 88
+				Object var7;
+				if (var2 == null) { // L: 92
+					var7 = null; // L: 93
+				} else if (var2.length > 136) { // L: 96
+					DirectByteArrayCopier var8 = new DirectByteArrayCopier(); // L: 98
+					var8.set(var2); // L: 99
+					var7 = var8; // L: 100
 				} else {
-					var17 = var2; // L: 130
+					var7 = var2; // L: 105
 				}
 
-				var15[var1] = var17; // L: 132
+				var5[var1] = var7; // L: 107
 			}
 		}
 
-	} // L: 135
+	} // L: 110
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lmr;I[BZI)V",
-		garbageValue = "702092430"
+		descriptor = "(Lmy;I[BZB)V",
+		garbageValue = "1"
 	)
 	@Export("load")
-	void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
+	public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
 		int var5;
-		if (var1 == this.masterDisk) { // L: 138
-			if (this.field3673) { // L: 139
-				throw new RuntimeException(); // L: 140
+		if (var1 == this.masterDisk) { // L: 113
+			if (this.field3821) { // L: 114
+				throw new RuntimeException(); // L: 115
 			}
 
-			if (var3 == null) { // L: 142
-				AbstractByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 143
-				return; // L: 144
+			if (var3 == null) { // L: 117
+				class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 118
+				return; // L: 119
 			}
 
-			Archive_crc.reset(); // L: 146
-			Archive_crc.update(var3, 0, var3.length); // L: 147
-			var5 = (int)Archive_crc.getValue(); // L: 148
-			if (var5 != this.indexCrc) { // L: 149
-				AbstractByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 150
-				return; // L: 151
+			Archive_crc.reset(); // L: 121
+			Archive_crc.update(var3, 0, var3.length); // L: 122
+			var5 = (int)Archive_crc.getValue(); // L: 123
+			if (var5 != this.indexCrc) { // L: 124
+				class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 125
+				return; // L: 126
 			}
 
-			Buffer var11 = new Buffer(ByteArrayPool.decompressBytes(var3)); // L: 153
-			int var12 = var11.readUnsignedByte(); // L: 154
-			if (var12 != 5 && var12 != 6) { // L: 155
+			Buffer var11 = new Buffer(ViewportMouse.decompressBytes(var3)); // L: 128
+			int var12 = var11.readUnsignedByte(); // L: 129
+			if (var12 != 5 && var12 != 6) { // L: 130
 				throw new RuntimeException(var12 + "," + this.index + "," + var2);
 			}
 
-			int var8 = 0; // L: 156
-			if (var12 >= 6) { // L: 157
+			int var8 = 0; // L: 131
+			if (var12 >= 6) { // L: 132
 				var8 = var11.readInt();
 			}
 
-			if (var8 != this.indexVersion) { // L: 158
-				AbstractByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 159
-				return; // L: 160
+			if (var8 != this.indexVersion) { // L: 133
+				class269.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 134
+				return; // L: 135
 			}
 
-			this.decodeIndex(var3); // L: 162
-			this.loadAllLocal(); // L: 163
+			this.decodeIndex(var3); // L: 137
+			this.loadAllLocal(); // L: 138
 		} else {
-			if (!var4 && var2 == this.field3679) { // L: 166
-				this.field3673 = true; // L: 167
+			if (!var4 && var2 == this.field3816) { // L: 141
+				this.field3821 = true; // L: 142
 			}
 
-			if (var3 == null || var3.length <= 2) { // L: 169
-				this.validGroups[var2] = false; // L: 170
-				if (this.field3674 || var4) { // L: 171
-					AbstractByteArrayCopier.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+			if (var3 == null || var3.length <= 2) { // L: 144
+				this.validGroups[var2] = false; // L: 145
+				if (this.field3822 || var4) { // L: 146
+					class269.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
-				return; // L: 172
+				return; // L: 147
 			}
 
-			Archive_crc.reset(); // L: 174
-			Archive_crc.update(var3, 0, var3.length - 2); // L: 175
-			var5 = (int)Archive_crc.getValue(); // L: 176
-			int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 177
-			if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 178
-				this.validGroups[var2] = false; // L: 179
-				if (this.field3674 || var4) {
-					AbstractByteArrayCopier.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); // L: 180
+			Archive_crc.reset(); // L: 149
+			Archive_crc.update(var3, 0, var3.length - 2); // L: 150
+			var5 = (int)Archive_crc.getValue(); // L: 151
+			int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 152
+			if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 153
+				this.validGroups[var2] = false; // L: 154
+				if (this.field3822 || var4) { // L: 155
+					class269.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
-				return; // L: 181
+				return; // L: 156
 			}
 
-			this.validGroups[var2] = true; // L: 183
-			if (var4) { // L: 184
-				Object[] var7 = super.groups; // L: 185
+			this.validGroups[var2] = true; // L: 158
+			if (var4) { // L: 159
+				Object[] var7 = super.groups; // L: 160
 				Object var9;
-				if (var3 == null) { // L: 189
-					var9 = null; // L: 190
-				} else if (var3.length > 136) { // L: 193
-					DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 195
-					var10.set(var3); // L: 196
-					var9 = var10; // L: 197
+				if (var3 == null) { // L: 164
+					var9 = null; // L: 165
+				} else if (var3.length > 136) { // L: 168
+					DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 170
+					var10.set(var3); // L: 171
+					var9 = var10; // L: 172
 				} else {
-					var9 = var3; // L: 202
+					var9 = var3; // L: 177
 				}
 
-				var7[var2] = var9; // L: 204
+				var7[var2] = var9; // L: 179
 			}
 		}
 
-	} // L: 207
+	} // L: 182
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1618182910"
+		garbageValue = "955312949"
 	)
 	@Export("loadAllLocal")
 	void loadAllLocal() {
-		this.validGroups = new boolean[super.groups.length]; // L: 210
+		this.validGroups = new boolean[super.groups.length]; // L: 185
 
 		int var1;
-		for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 211
+		for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 186
 			this.validGroups[var1] = false;
 		}
 
-		if (this.archiveDisk == null) { // L: 212
-			this.field3673 = true; // L: 213
+		if (this.archiveDisk == null) { // L: 187
+			this.field3821 = true; // L: 188
 		} else {
-			this.field3679 = -1; // L: 216
-
-			for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 217
-				if (super.fileCounts[var1] > 0) { // L: 218
-					ClanSettings.method2653(var1, this.archiveDisk, this); // L: 219
-					this.field3679 = var1; // L: 220
+			this.field3816 = -1; // L: 191
+
+			for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 192
+				if (super.fileCounts[var1] > 0) { // L: 193
+					ArchiveDisk var2 = this.archiveDisk; // L: 194
+					ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 197
+					var4.type = 1; // L: 198
+					var4.key = (long)var1; // L: 199
+					var4.archiveDisk = var2; // L: 200
+					var4.archive = this; // L: 201
+					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 202
+						ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 203
+					} // L: 204
+
+					class174.method3383(); // L: 205
+					this.field3816 = var1; // L: 207
 				}
 			}
 
-			if (this.field3679 == -1) { // L: 223
-				this.field3673 = true;
+			if (this.field3816 == -1) { // L: 210
+				this.field3821 = true;
 			}
 
 		}
-	} // L: 214 224
+	} // L: 189 211
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(IB)I",
-		garbageValue = "14"
+		garbageValue = "35"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
-		if (super.groups[var1] != null) { // L: 227
+		if (super.groups[var1] != null) { // L: 214
 			return 100;
 		} else {
-			return this.validGroups[var1] ? 100 : HealthBarUpdate.method2185(this.index, var1); // L: 228 229
+			return this.validGroups[var1] ? 100 : IsaacCipher.method7886(this.index, var1); // L: 215 216
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "836290734"
+		garbageValue = "-1796808817"
 	)
-	public boolean method5269(int var1) {
-		return this.validGroups[var1]; // L: 233
+	public boolean method5570(int var1) {
+		return this.validGroups[var1]; // L: 220
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "-9"
+		descriptor = "(II)Z",
+		garbageValue = "832467152"
 	)
-	public boolean method5270(int var1) {
-		return this.getGroupFileIds(var1) != null; // L: 237
+	public boolean method5584(int var1) {
+		return this.getGroupFileIds(var1) != null; // L: 224
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1624563419"
+		garbageValue = "838378005"
 	)
 	@Export("loadPercent")
 	public int loadPercent() {
-		int var1 = 0; // L: 241
-		int var2 = 0; // L: 242
+		int var1 = 0; // L: 228
+		int var2 = 0; // L: 229
 
 		int var3;
-		for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 243
-			if (super.fileCounts[var3] > 0) { // L: 244
-				var1 += 100; // L: 245
-				var2 += this.groupLoadPercent(var3); // L: 246
+		for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 230
+			if (super.fileCounts[var3] > 0) { // L: 231
+				var1 += 100; // L: 232
+				var2 += this.groupLoadPercent(var3); // L: 233
 			}
 		}
 
-		if (var1 == 0) { // L: 249
+		if (var1 == 0) { // L: 236
 			return 100;
 		} else {
-			var3 = var2 * 100 / var1; // L: 250
-			return var3; // L: 251
+			var3 = var2 * 100 / var1; // L: 237
+			return var3; // L: 238
 		}
 	}
+
+	@ObfuscatedName("hi")
+	@ObfuscatedSignature(
+		descriptor = "(Lck;IILgj;B)V",
+		garbageValue = "95"
+	)
+	static final void method5586(Player var0, int var1, int var2, class185 var3) {
+		int var4 = var0.pathX[0]; // L: 8574
+		int var5 = var0.pathY[0]; // L: 8575
+		int var6 = var0.transformedSize(); // L: 8576
+		if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 8577
+			if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 8578
+				int var8 = var0.transformedSize(); // L: 8580
+				Client.field754.approxDestinationX = var1; // L: 8583
+				Client.field754.approxDestinationY = var2; // L: 8584
+				Client.field754.field2117 = 1; // L: 8585
+				Client.field754.field2114 = 1; // L: 8586
+				ApproximateRouteStrategy var9 = Client.field754; // L: 8587
+				ApproximateRouteStrategy var10 = var9; // L: 8589
+				CollisionMap var11 = Client.collisionMaps[var0.plane]; // L: 8590
+				int[] var12 = Client.field755; // L: 8591
+				int[] var13 = Client.field756; // L: 8592
+
+				int var14;
+				int var15;
+				for (var14 = 0; var14 < 128; ++var14) { // L: 8594
+					for (var15 = 0; var15 < 128; ++var15) { // L: 8595
+						class186.directions[var14][var15] = 0; // L: 8596
+						class186.distances[var14][var15] = 99999999; // L: 8597
+					}
+				}
+
+				int var16;
+				int var17;
+				byte var19;
+				int var20;
+				int var21;
+				int var23;
+				int var25;
+				int var26;
+				int var27;
+				boolean var34;
+				int var36;
+				int var37;
+				int var39;
+				if (var8 == 1) { // L: 8601
+					var16 = var4; // L: 8604
+					var17 = var5; // L: 8605
+					byte var18 = 64; // L: 8606
+					var19 = 64; // L: 8607
+					var20 = var4 - var18; // L: 8608
+					var21 = var5 - var19; // L: 8609
+					class186.directions[var18][var19] = 99; // L: 8610
+					class186.distances[var18][var19] = 0; // L: 8611
+					byte var22 = 0; // L: 8612
+					var23 = 0; // L: 8613
+					class186.bufferX[var22] = var4; // L: 8614
+					var39 = var22 + 1;
+					class186.bufferY[var22] = var5; // L: 8615
+					int[][] var24 = var11.flags; // L: 8616
+
+					boolean var35;
+					while (true) {
+						if (var39 == var23) { // L: 8619
+							class186.field2129 = var16; // L: 8691
+							class186.field2130 = var17; // L: 8692
+							var35 = false; // L: 8693
+							break;
+						}
+
+						var16 = class186.bufferX[var23]; // L: 8620
+						var17 = class186.bufferY[var23]; // L: 8621
+						var23 = var23 + 1 & 4095; // L: 8622
+						var36 = var16 - var20; // L: 8623
+						var37 = var17 - var21; // L: 8624
+						var25 = var16 - var11.xInset; // L: 8625
+						var26 = var17 - var11.yInset; // L: 8626
+						if (var10.hasArrived(1, var16, var17, var11)) { // L: 8627
+							class186.field2129 = var16; // L: 8628
+							class186.field2130 = var17; // L: 8629
+							var35 = true; // L: 8630
+							break;
+						}
+
+						var27 = class186.distances[var36][var37] + 1; // L: 8633
+						if (var36 > 0 && class186.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136776) == 0) { // L: 8634
+							class186.bufferX[var39] = var16 - 1; // L: 8635
+							class186.bufferY[var39] = var17; // L: 8636
+							var39 = var39 + 1 & 4095; // L: 8637
+							class186.directions[var36 - 1][var37] = 2; // L: 8638
+							class186.distances[var36 - 1][var37] = var27; // L: 8639
+						}
+
+						if (var36 < 127 && class186.directions[var36 + 1][var37] == 0 && (var24[var25 + 1][var26] & 19136896) == 0) { // L: 8641
+							class186.bufferX[var39] = var16 + 1; // L: 8642
+							class186.bufferY[var39] = var17; // L: 8643
+							var39 = var39 + 1 & 4095; // L: 8644
+							class186.directions[var36 + 1][var37] = 8; // L: 8645
+							class186.distances[var36 + 1][var37] = var27; // L: 8646
+						}
+
+						if (var37 > 0 && class186.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { // L: 8648
+							class186.bufferX[var39] = var16; // L: 8649
+							class186.bufferY[var39] = var17 - 1; // L: 8650
+							var39 = var39 + 1 & 4095; // L: 8651
+							class186.directions[var36][var37 - 1] = 1; // L: 8652
+							class186.distances[var36][var37 - 1] = var27; // L: 8653
+						}
+
+						if (var37 < 127 && class186.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { // L: 8655
+							class186.bufferX[var39] = var16; // L: 8656
+							class186.bufferY[var39] = var17 + 1; // L: 8657
+							var39 = var39 + 1 & 4095; // L: 8658
+							class186.directions[var36][var37 + 1] = 4; // L: 8659
+							class186.distances[var36][var37 + 1] = var27; // L: 8660
+						}
+
+						if (var36 > 0 && var37 > 0 && class186.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { // L: 8662
+							class186.bufferX[var39] = var16 - 1; // L: 8663
+							class186.bufferY[var39] = var17 - 1; // L: 8664
+							var39 = var39 + 1 & 4095; // L: 8665
+							class186.directions[var36 - 1][var37 - 1] = 3; // L: 8666
+							class186.distances[var36 - 1][var37 - 1] = var27; // L: 8667
+						}
+
+						if (var36 < 127 && var37 > 0 && class186.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + 1][var26 - 1] & 19136899) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { // L: 8669
+							class186.bufferX[var39] = var16 + 1; // L: 8670
+							class186.bufferY[var39] = var17 - 1; // L: 8671
+							var39 = var39 + 1 & 4095; // L: 8672
+							class186.directions[var36 + 1][var37 - 1] = 9; // L: 8673
+							class186.distances[var36 + 1][var37 - 1] = var27; // L: 8674
+						}
+
+						if (var36 > 0 && var37 < 127 && class186.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + 1] & 19136824) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { // L: 8676
+							class186.bufferX[var39] = var16 - 1; // L: 8677
+							class186.bufferY[var39] = var17 + 1; // L: 8678
+							var39 = var39 + 1 & 4095; // L: 8679
+							class186.directions[var36 - 1][var37 + 1] = 6; // L: 8680
+							class186.distances[var36 - 1][var37 + 1] = var27; // L: 8681
+						}
+
+						if (var36 < 127 && var37 < 127 && class186.directions[var36 + 1][var37 + 1] == 0 && (var24[var25 + 1][var26 + 1] & 19136992) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { // L: 8683
+							class186.bufferX[var39] = var16 + 1; // L: 8684
+							class186.bufferY[var39] = var17 + 1; // L: 8685
+							var39 = var39 + 1 & 4095; // L: 8686
+							class186.directions[var36 + 1][var37 + 1] = 12; // L: 8687
+							class186.distances[var36 + 1][var37 + 1] = var27; // L: 8688
+						}
+					}
+
+					var34 = var35; // L: 8695
+				} else if (var8 == 2) { // L: 8697
+					var34 = Clock.method3132(var4, var5, var9, var11);
+				} else {
+					var34 = UserComparator2.method7617(var4, var5, var8, var9, var11); // L: 8698
+				}
+
+				int var7;
+				label346: {
+					var15 = var4 - 64; // L: 8699
+					var16 = var5 - 64; // L: 8700
+					var17 = class186.field2129; // L: 8701
+					var36 = class186.field2130; // L: 8702
+					if (!var34) { // L: 8703
+						var37 = Integer.MAX_VALUE; // L: 8705
+						var20 = Integer.MAX_VALUE; // L: 8706
+						byte var38 = 10; // L: 8707
+						var39 = var10.approxDestinationX; // L: 8708
+						var23 = var10.approxDestinationY; // L: 8709
+						int var33 = var10.field2117; // L: 8710
+						var25 = var10.field2114; // L: 8711
+
+						for (var26 = var39 - var38; var26 <= var38 + var39; ++var26) { // L: 8712
+							for (var27 = var23 - var38; var27 <= var23 + var38; ++var27) { // L: 8713
+								int var28 = var26 - var15; // L: 8714
+								int var29 = var27 - var16; // L: 8715
+								if (var28 >= 0 && var29 >= 0 && var28 < 128 && var29 < 128 && class186.distances[var28][var29] < 100) { // L: 8716 8717
+									int var30 = 0; // L: 8718
+									if (var26 < var39) { // L: 8719
+										var30 = var39 - var26;
+									} else if (var26 > var39 + var33 - 1) { // L: 8720
+										var30 = var26 - (var39 + var33 - 1);
+									}
+
+									int var31 = 0; // L: 8721
+									if (var27 < var23) { // L: 8722
+										var31 = var23 - var27;
+									} else if (var27 > var25 + var23 - 1) {
+										var31 = var27 - (var23 + var25 - 1); // L: 8723
+									}
+
+									int var32 = var30 * var30 + var31 * var31; // L: 8724
+									if (var32 < var37 || var32 == var37 && class186.distances[var28][var29] < var20) { // L: 8725
+										var37 = var32; // L: 8726
+										var20 = class186.distances[var28][var29]; // L: 8727
+										var17 = var26; // L: 8728
+										var36 = var27; // L: 8729
+									}
+								}
+							}
+						}
+
+						if (var37 == Integer.MAX_VALUE) { // L: 8735
+							var7 = -1; // L: 8736
+							break label346;
+						}
+					}
+
+					if (var4 == var17 && var36 == var5) { // L: 8745
+						var7 = 0; // L: 8746
+					} else {
+						var19 = 0; // L: 8749
+						class186.bufferX[var19] = var17; // L: 8752
+						var37 = var19 + 1;
+						class186.bufferY[var19] = var36; // L: 8753
+
+						for (var20 = var21 = class186.directions[var17 - var15][var36 - var16]; var17 != var4 || var36 != var5; var20 = class186.directions[var17 - var15][var36 - var16]) { // L: 8754 8755 8765
+							if (var20 != var21) { // L: 8756
+								var21 = var20; // L: 8757
+								class186.bufferX[var37] = var17; // L: 8758
+								class186.bufferY[var37++] = var36; // L: 8759
+							}
+
+							if ((var20 & 2) != 0) { // L: 8761
+								++var17;
+							} else if ((var20 & 8) != 0) { // L: 8762
+								--var17;
+							}
+
+							if ((var20 & 1) != 0) { // L: 8763
+								++var36;
+							} else if ((var20 & 4) != 0) { // L: 8764
+								--var36;
+							}
+						}
+
+						var39 = 0; // L: 8767
+
+						while (var37-- > 0) { // L: 8768
+							var12[var39] = class186.bufferX[var37]; // L: 8769
+							var13[var39++] = class186.bufferY[var37]; // L: 8770
+							if (var39 >= var12.length) { // L: 8771
+								break;
+							}
+						}
+
+						var7 = var39; // L: 8773
+					}
+				}
+
+				var14 = var7; // L: 8775
+				if (var7 >= 1) { // L: 8776
+					for (var15 = 0; var15 < var14 - 1; ++var15) { // L: 8777
+						var0.method2177(Client.field755[var15], Client.field756[var15], var3);
+					}
+
+				}
+			}
+		}
+	} // L: 8778
 }
diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java
index 84750adee1..fd6306e2a3 100644
--- a/runescape-client/src/main/java/ArchiveDisk.java
+++ b/runescape-client/src/main/java/ArchiveDisk.java
@@ -6,33 +6,33 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mr")
+@ObfuscatedName("my")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 668775777
-	)
-	@Export("archive")
-	int archive;
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lnw;"
+		descriptor = "Lof;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("a")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lnw;"
+		descriptor = "Lof;"
 	)
 	@Export("idxFile")
 	BufferedFile idxFile;
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -588931295
+		intValue = 1347947655
+	)
+	@Export("archive")
+	int archive;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = 186388605
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -42,7 +42,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(ILnw;Lnw;I)V"
+		descriptor = "(ILof;Lof;I)V"
 	)
 	public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.datFile = null; // L: 8
@@ -54,10 +54,10 @@ public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.maxEntrySize = var4; // L: 17
 	} // L: 18
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(II)[B",
-		garbageValue = "703320501"
+		garbageValue = "-676876689"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -82,14 +82,14 @@ public byte[] read(int var1) {
 						byte[] var5 = new byte[var3]; // L: 30
 						int var6 = 0; // L: 31
 
-						for (int var7 = 0; var6 < var3; ++var7) { // L: 32 33 65
-							if (var4 == 0) { // L: 34
+						for (int var7 = 0; var6 < var3; ++var7) { // L: 32 65
+							if (var4 == 0) {
 								var10000 = null;
 								return (byte[])var10000;
 							}
 
-							this.datFile.seek((long)var4 * 520L); // L: 35
-							int var8 = var3 - var6; // L: 36
+							this.datFile.seek(520L * (long)var4);
+							int var8 = var3 - var6;
 							int var9;
 							int var10;
 							int var11;
@@ -101,7 +101,7 @@ public byte[] read(int var1) {
 								}
 
 								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
@@ -112,7 +112,7 @@ public byte[] read(int var1) {
 								}
 
 								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
@@ -148,18 +148,18 @@ public byte[] read(int var1) {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I[BIB)Z",
-		garbageValue = "8"
+		garbageValue = "15"
 	)
 	@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) {
-					var5 = this.write0(var1, var2, var3, false); // L: 81
+				if (!var5) { // L: 81
+					var5 = this.write0(var1, var2, var3, false);
 				}
 
 				return var5; // L: 82
@@ -169,10 +169,10 @@ public boolean write(int var1, byte[] var2, int var3) {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I[BIZI)Z",
-		garbageValue = "-1304792790"
+		garbageValue = "-506428520"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -213,18 +213,18 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) {
 
 				while (true) {
 					if (var7 < var3) { // L: 111
-						label170: {
+						label171: {
 							int var9 = 0; // L: 112
 							int var10;
 							if (var4) { // L: 113
-								this.datFile.seek(520L * (long)var6); // L: 114
+								this.datFile.seek((long)var6 * 520L); // 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 label170; // L: 123
+										break label171; // L: 123
 									}
 
 									var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125
@@ -235,7 +235,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132
 									} catch (EOFException var16) { // L: 134
-										break label170; // L: 135
+										break label171; // L: 135
 									}
 
 									var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137
@@ -244,7 +244,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) {
 									var12 = ArchiveDisk_buffer[7] & 255; // L: 140
 								}
 
-								if (var10 != var1 || var8 != var11 || var12 != this.archive) { // L: 142
+								if (var10 != var1 || var11 != var8 || var12 != this.archive) { // L: 142
 									var10000 = false;
 									return var10000;
 								}
@@ -282,7 +282,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) {
 								ArchiveDisk_buffer[7] = (byte)(var9 >> 8); // L: 160
 								ArchiveDisk_buffer[8] = (byte)var9; // L: 161
 								ArchiveDisk_buffer[9] = (byte)this.archive; // L: 162
-								this.datFile.seek(520L * (long)var6); // L: 163
+								this.datFile.seek((long)var6 * 520L); // L: 163
 								this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164
 								var10 = var3 - var7; // L: 165
 								if (var10 > 510) { // L: 166
@@ -304,7 +304,7 @@ boolean write0(int var1, byte[] var2, int var3, boolean var4) {
 								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
@@ -334,15 +334,50 @@ public String toString() {
 		return "" + this.archive; // L: 198
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lfh;",
+		garbageValue = "-134790031"
+	)
+	@Export("KitDefinition_get")
+	public static KitDefinition KitDefinition_get(int var0) {
+		KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 33
+		if (var1 != null) { // L: 34
+			return var1;
+		} else {
+			byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 35
+			var1 = new KitDefinition(); // L: 36
+			if (var2 != null) { // L: 37
+				var1.decode(new Buffer(var2));
+			}
+
+			KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38
+			return var1; // L: 39
+		}
+	}
+
+	@ObfuscatedName("kj")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-4"
+		descriptor = "(IIIILpl;Ljr;I)V",
+		garbageValue = "1160102632"
 	)
-	public static void method6322() {
-		ObjectComposition.ObjectDefinition_cached.clear(); // L: 407
-		ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 408
-		ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 409
-		ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 410
-	} // L: 411
+	@Export("drawSpriteOnMinimap")
+	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
+		if (var4 != null) { // L: 12434
+			int var6 = Client.camAngleY & 2047; // L: 12435
+			int var7 = var3 * var3 + var2 * var2; // L: 12436
+			if (var7 <= 6400) { // L: 12437
+				int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 12438
+				int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 12439
+				int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12440
+				int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12441
+				if (var7 > 2500) {
+					var4.method7779(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 12442
+				} else {
+					var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 12443
+				}
+
+			}
+		}
+	} // L: 12444
 }
diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java
index 897199f894..85eb439a93 100644
--- a/runescape-client/src/main/java/ArchiveDiskAction.java
+++ b/runescape-client/src/main/java/ArchiveDiskAction.java
@@ -4,31 +4,57 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jc")
+@ObfuscatedName("km")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1877309383
+		intValue = 1029019227
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("data")
-	byte[] data;
-	@ObfuscatedName("s")
+	public byte[] data;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmy;"
 	)
 	@Export("archiveDisk")
-	ArchiveDisk archiveDisk;
-	@ObfuscatedName("a")
+	public ArchiveDisk archiveDisk;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Lkz;"
 	)
 	@Export("archive")
-	Archive archive;
+	public Archive archive;
 
 	ArchiveDiskAction() {
 	} // L: 12
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpl;IIIB)V",
+		garbageValue = "1"
+	)
+	static void method5526(SpritePixels var0, int var1, int var2, int var3) {
+		DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38
+		long var6 = (long)(var3 << 16 | var1 << 8 | var2); // L: 42
+		var4.put(var0, var6, var0.pixels.length * 4); // L: 44
+	} // L: 45
+
+	@ObfuscatedName("hp")
+	@ObfuscatedSignature(
+		descriptor = "(IIS)V",
+		garbageValue = "128"
+	)
+	static final void method5527(int var0, int var1) {
+		if (Client.hintArrowType == 2) { // L: 5578
+			ModeWhere.worldToScreen((Client.hintArrowX - class131.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - TileItem.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 5579
+			if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 5580
+				class260.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
+			}
+
+		}
+	} // L: 5581
 }
diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
index a09d19641a..b7460bd933 100644
--- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java
+++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
@@ -1,48 +1,37 @@
-import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("kg")
+@ObfuscatedName("ke")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
-	static NodeDeque ArchiveDiskActionHandler_requestQueue;
-	@ObfuscatedName("w")
+	public static NodeDeque ArchiveDiskActionHandler_requestQueue;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
-	static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 2039125055
-	)
-	public static int field3662;
-	@ObfuscatedName("a")
-	@Export("ArchiveDiskActionHandler_lock")
-	public static Object ArchiveDiskActionHandler_lock;
-	@ObfuscatedName("o")
-	@Export("ArchiveDiskActionHandler_thread")
-	static Thread ArchiveDiskActionHandler_thread;
+	public static NodeDeque ArchiveDiskActionHandler_responseQueue;
 	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1828605303
+		intValue = 449251955
 	)
-	@Export("musicTrackFileId")
-	public static int musicTrackFileId;
+	static int field3815;
+	@ObfuscatedName("m")
+	@Export("ArchiveDiskActionHandler_lock")
+	static Object ArchiveDiskActionHandler_lock;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10
-		field3662 = 0; // L: 11
+		field3815 = 0; // L: 11
 		ArchiveDiskActionHandler_lock = new Object();
 	} // L: 12
 
@@ -53,454 +42,82 @@ public void run() {
 		try {
 			while (true) {
 				ArchiveDiskAction var1;
-				synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 74
-					var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 75
-				} // L: 76
-
-				if (var1 != null) { // L: 77
-					if (var1.type == 0) { // L: 78
-						var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 79
-						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 80
-							var1.remove(); // L: 81
-						} // L: 82
-					} else if (var1.type == 1) { // L: 84
-						var1.data = var1.archiveDisk.read((int)var1.key); // L: 85
-						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 86
-							ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 87
-						} // L: 88
+				synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 63
+					var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 64
+				} // L: 65
+
+				if (var1 != null) { // L: 66
+					if (var1.type == 0) { // L: 67
+						var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 68
+						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 69
+							var1.remove(); // L: 70
+						} // L: 71
+					} else if (var1.type == 1) { // L: 73
+						var1.data = var1.archiveDisk.read((int)var1.key); // L: 74
+						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 75
+							ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 76
+						} // L: 77
 					}
 
-					synchronized(ArchiveDiskActionHandler_lock) { // L: 90
-						if (field3662 <= 1) { // L: 91
-							field3662 = 0; // L: 92
-							ArchiveDiskActionHandler_lock.notifyAll(); // L: 93
-							return; // L: 94
+					synchronized(ArchiveDiskActionHandler_lock) { // L: 79
+						if (field3815 <= 1) { // L: 80
+							field3815 = 0; // L: 81
+							ArchiveDiskActionHandler_lock.notifyAll(); // L: 82
+							return; // L: 83
 						}
 
-						field3662 = 600; // L: 96
+						field3815 = 600; // L: 85
 					}
 				} else {
-					FloorUnderlayDefinition.method3190(100L); // L: 100
-					synchronized(ArchiveDiskActionHandler_lock) { // L: 101
-						if (field3662 <= 1) { // L: 102
-							field3662 = 0; // L: 103
-							ArchiveDiskActionHandler_lock.notifyAll(); // L: 104
-							return; // L: 105
+					Bounds.method6608(100L); // L: 89
+					synchronized(ArchiveDiskActionHandler_lock) { // L: 90
+						if (field3815 <= 1) { // L: 91
+							field3815 = 0; // L: 92
+							ArchiveDiskActionHandler_lock.notifyAll(); // L: 93
+							return; // L: 94
 						}
 
-						--field3662; // L: 107
+						--field3815; // L: 96
 					}
 				}
 			}
-		} catch (Exception var13) { // L: 112
-			MilliClock.RunException_sendStackTrace((String)null, var13); // L: 113
+		} catch (Exception var13) { // L: 101
+			AccessFile.RunException_sendStackTrace((String)null, var13); // L: 102
 		}
-	} // L: 115
+	} // L: 104
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("gl")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "15810"
+		descriptor = "(Ljava/lang/String;ZB)V",
+		garbageValue = "-14"
 	)
-	static void method5258() {
-		if (Login.clearLoginScreen) { // L: 267
-			Login.titleboxSprite = null; // L: 268
-			Login.titlebuttonSprite = null; // L: 269
-			Login.runesSprite = null; // L: 270
-			RouteStrategy.leftTitleSprite = null; // L: 271
-			class139.rightTitleSprite = null; // L: 272
-			class16.logoSprite = null; // L: 273
-			VarpDefinition.title_muteSprite = null; // L: 274
-			NetSocket.options_buttons_0Sprite = null; // L: 275
-			class9.options_buttons_2Sprite = null; // L: 276
-			DirectByteArrayCopier.worldSelectBackSprites = null; // L: 277
-			UserComparator7.worldSelectFlagSprites = null; // L: 278
-			class54.worldSelectArrows = null; // L: 279
-			KeyHandler.worldSelectStars = null; // L: 280
-			class12.field54 = null; // L: 281
-			Login.loginScreenRunesAnimation.method2193(); // L: 282
-			class247.musicPlayerStatus = 1; // L: 284
-			class128.musicTrackArchive = null; // L: 285
-			FillMode.musicTrackGroupId = -1; // L: 286
-			musicTrackFileId = -1; // L: 287
-			class247.musicTrackVolume = 0; // L: 288
-			SecureRandomCallable.musicTrackBoolean = false; // L: 289
-			class247.pcmSampleLength = 2; // L: 290
-			if (NetCache.NetCache_socket != null) { // L: 293
-				try {
-					Buffer var0 = new Buffer(4); // L: 295
-					var0.writeByte(2); // L: 296
-					var0.writeMedium(0); // L: 297
-					NetCache.NetCache_socket.write(var0.array, 0, 4); // L: 298
-				} catch (IOException var3) {
-					try {
-						NetCache.NetCache_socket.close(); // L: 302
-					} catch (Exception var2) { // L: 304
-					}
-
-					++NetCache.NetCache_ioExceptions; // L: 305
-					NetCache.NetCache_socket = null; // L: 306
-				}
-			}
-
-			Login.clearLoginScreen = false; // L: 309
-		}
-	} // L: 310
-
-	@ObfuscatedName("an")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-146684783"
-	)
-	static int method5257(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == 6600) { // L: 3911
-			var3 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 3912
-			int var15 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX; // L: 3913
-			int var8 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY; // L: 3914
-			class54.getWorldMap().method6497(var3, var15, var8, true); // L: 3915
-			return 1; // L: 3916
-		} else {
-			WorldMapArea var9;
-			if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3918
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3919
-				String var16 = ""; // L: 3920
-				var9 = class54.getWorldMap().getMapArea(var3); // L: 3921
-				if (var9 != null) { // L: 3922
-					var16 = var9.getExternalName(); // L: 3923
-				}
-
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var16; // L: 3925
-				return 1; // L: 3926
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3928
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3929
-				class54.getWorldMap().setCurrentMapAreaId(var3); // L: 3930
-				return 1; // L: 3931
-			} else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3933
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getZoomLevel(); // L: 3934
-				return 1; // L: 3935
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3937
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3938
-				class54.getWorldMap().setZoomPercentage(var3); // L: 3939
-				return 1; // L: 3940
-			} else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3942
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3943
-				return 1; // L: 3944
+	@Export("drawLoadingMessage")
+	static final void drawLoadingMessage(String var0, boolean var1) {
+		if (Client.showLoadingMessages) { // L: 5120
+			byte var2 = 4; // L: 5121
+			int var3 = var2 + 6; // L: 5122
+			int var4 = var2 + 6; // L: 5123
+			int var5 = class114.fontPlain12.lineWidth(var0, 250); // L: 5124
+			int var6 = class114.fontPlain12.lineCount(var0, 250) * 13; // L: 5125
+			Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 0); // L: 5126
+			Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 16777215); // L: 5127
+			class114.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 5128
+			class10.method124(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2); // L: 5129
+			if (var1) { // L: 5130
+				class19.rasterProvider.drawFull(0, 0); // L: 5131
 			} else {
-				Coord var14;
-				if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3946
-					var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 3947
-					class54.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3948
-					return 1; // L: 3949
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3951
-					var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 3952
-					class54.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3953
-					return 1; // L: 3954
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3956
-					var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 3957
-					class54.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3958
-					return 1; // L: 3959
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3961
-					var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 3962
-					class54.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3963
-					return 1; // L: 3964
-				} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3966
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getDisplayX(); // L: 3967
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getDisplayY(); // L: 3968
-					return 1; // L: 3969
-				} else {
-					WorldMapArea var11;
-					if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3971
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3972
-						var11 = class54.getWorldMap().getMapArea(var3); // L: 3973
-						if (var11 == null) { // L: 3974
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3975
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3978
-						}
-
-						return 1; // L: 3980
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3982
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3983
-						var11 = class54.getWorldMap().getMapArea(var3); // L: 3984
-						if (var11 == null) { // L: 3985
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3986
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3987
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3990
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3991
-						}
-
-						return 1; // L: 3993
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3995
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3996
-						var11 = class54.getWorldMap().getMapArea(var3); // L: 3997
-						if (var11 == null) { // L: 3998
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3999
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4000
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4001
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4002
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4005
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4006
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4007
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4008
-						}
-
-						return 1; // L: 4010
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4012
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4013
-						var11 = class54.getWorldMap().getMapArea(var3); // L: 4014
-						if (var11 == null) { // L: 4015
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4016
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4019
-						}
-
-						return 1; // L: 4021
-					} else if (var0 == 6615) { // L: 4023
-						var14 = class54.getWorldMap().getDisplayCoord(); // L: 4024
-						if (var14 == null) { // L: 4025
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4026
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4027
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var14.x; // L: 4030
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var14.y; // L: 4031
-						}
-
-						return 1; // L: 4033
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4035
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().currentMapAreaId(); // L: 4036
-						return 1; // L: 4037
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4039
-						var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4040
-						var11 = class54.getWorldMap().getCurrentMapArea(); // L: 4041
-						if (var11 == null) { // L: 4042
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4043
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4044
-							return 1; // L: 4045
-						} else {
-							int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4047
-							if (var12 == null) { // L: 4048
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4049
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4050
-							} else {
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var12[0]; // L: 4053
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var12[1]; // L: 4054
-							}
-
-							return 1; // L: 4056
-						}
-					} else {
-						Coord var5;
-						if (var0 == 6618) { // L: 4058
-							var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4059
-							var11 = class54.getWorldMap().getCurrentMapArea(); // L: 4060
-							if (var11 == null) { // L: 4061
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4062
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4063
-								return 1; // L: 4064
-							} else {
-								var5 = var11.coord(var14.x, var14.y); // L: 4066
-								if (var5 == null) { // L: 4067
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4068
-								} else {
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.packed(); // L: 4071
-								}
-
-								return 1; // L: 4073
-							}
-						} else {
-							Coord var10;
-							if (var0 == 6619) { // L: 4075
-								class14.Interpreter_intStackSize -= 2; // L: 4076
-								var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4077
-								var10 = new Coord(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 4078
-								class16.method219(var3, var10, false); // L: 4079
-								return 1; // L: 4080
-							} else if (var0 == 6620) { // L: 4082
-								class14.Interpreter_intStackSize -= 2; // L: 4083
-								var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4084
-								var10 = new Coord(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 4085
-								class16.method219(var3, var10, true); // L: 4086
-								return 1; // L: 4087
-							} else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4089
-								class14.Interpreter_intStackSize -= 2; // L: 4090
-								var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4091
-								var10 = new Coord(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 4092
-								var9 = class54.getWorldMap().getMapArea(var3); // L: 4093
-								if (var9 == null) { // L: 4094
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4095
-									return 1; // L: 4096
-								} else {
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4098
-									return 1; // L: 4099
-								}
-							} else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4101
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getDisplayWith(); // L: 4102
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getDisplayHeight(); // L: 4103
-								return 1; // L: 4104
-							} else if (var0 == 6623) { // L: 4106
-								var14 = new Coord(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4107
-								var11 = class54.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4108
-								if (var11 == null) { // L: 4109
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4110
-								} else {
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var11.getId(); // L: 4113
-								}
-
-								return 1; // L: 4115
-							} else if (var0 == 6624) { // L: 4117
-								class54.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4118
-								return 1; // L: 4119
-							} else if (var0 == 6625) { // L: 4121
-								class54.getWorldMap().resetMaxFlashCount(); // L: 4122
-								return 1; // L: 4123
-							} else if (var0 == 6626) { // L: 4125
-								class54.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 4126
-								return 1; // L: 4127
-							} else if (var0 == 6627) { // L: 4129
-								class54.getWorldMap().resetCyclesPerFlash(); // L: 4130
-								return 1; // L: 4131
-							} else {
-								boolean var13;
-								if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4133
-									var13 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 4134
-									class54.getWorldMap().setPerpetualFlash(var13); // L: 4135
-									return 1; // L: 4136
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4138
-									var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4139
-									class54.getWorldMap().flashElement(var3); // L: 4140
-									return 1; // L: 4141
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4143
-									var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4144
-									class54.getWorldMap().flashCategory(var3); // L: 4145
-									return 1; // L: 4146
-								} else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4148
-									class54.getWorldMap().stopCurrentFlashes(); // L: 4149
-									return 1; // L: 4150
-								} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4152
-									var13 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 4153
-									class54.getWorldMap().setElementsDisabled(var13); // L: 4154
-									return 1; // L: 4155
-								} else {
-									boolean var7;
-									if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4157
-										class14.Interpreter_intStackSize -= 2; // L: 4158
-										var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4159
-										var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 4160
-										class54.getWorldMap().disableElement(var3, var7); // L: 4161
-										return 1; // L: 4162
-									} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4164
-										class14.Interpreter_intStackSize -= 2; // L: 4165
-										var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4166
-										var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 4167
-										class54.getWorldMap().setCategoryDisabled(var3, var7); // L: 4168
-										return 1; // L: 4169
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4171
-										Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4172
-										return 1; // L: 4173
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4175
-										var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4176
-										Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4177
-										return 1; // L: 4178
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4180
-										var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4181
-										Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class54.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4182
-										return 1; // L: 4183
-									} else if (var0 == 6638) { // L: 4185
-										class14.Interpreter_intStackSize -= 2; // L: 4186
-										var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 4187
-										var10 = new Coord(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 4188
-										var5 = class54.getWorldMap().method6666(var3, var10); // L: 4189
-										if (var5 == null) { // L: 4190
-											Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4191
-										} else {
-											Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.packed(); // L: 4194
-										}
-
-										return 1; // L: 4196
-									} else {
-										AbstractWorldMapIcon var6;
-										if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4198
-											var6 = class54.getWorldMap().iconStart(); // L: 4199
-											if (var6 == null) { // L: 4200
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4201
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4202
-											} else {
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4205
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4206
-											}
-
-											return 1; // L: 4208
-										} else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4210
-											var6 = class54.getWorldMap().iconNext(); // L: 4211
-											if (var6 == null) { // L: 4212
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4213
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4214
-											} else {
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4217
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4218
-											}
-
-											return 1; // L: 4220
-										} else {
-											WorldMapElement var4;
-											if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4222
-												var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4223
-												var4 = ItemComposition.WorldMapElement_get(var3); // L: 4224
-												if (var4.name == null) { // L: 4225
-													Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4226
-												} else {
-													Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.name; // L: 4229
-												}
-
-												return 1; // L: 4231
-											} else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4233
-												var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4234
-												var4 = ItemComposition.WorldMapElement_get(var3); // L: 4235
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.textSize; // L: 4236
-												return 1; // L: 4237
-											} else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4239
-												var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4240
-												var4 = ItemComposition.WorldMapElement_get(var3); // L: 4241
-												if (var4 == null) { // L: 4242
-													Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4243
-												} else {
-													Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.category; // L: 4246
-												}
-
-												return 1; // L: 4248
-											} else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4250
-												var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4251
-												var4 = ItemComposition.WorldMapElement_get(var3); // L: 4252
-												if (var4 == null) { // L: 4253
-													Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4254
-												} else {
-													Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4257
-												}
-
-												return 1; // L: 4259
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4261
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class7.worldMapEvent.mapElement; // L: 4262
-												return 1; // L: 4263
-											} else if (var0 == 6698) { // L: 4265
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class7.worldMapEvent.coord1.packed(); // L: 4266
-												return 1; // L: 4267
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4269
-												Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class7.worldMapEvent.coord2.packed(); // L: 4270
-												return 1; // L: 4271
-											} else {
-												return 2; // L: 4273
-											}
-										}
-									}
-								}
-							}
-						}
+				int var7 = var3; // L: 5134
+				int var8 = var4; // L: 5135
+				int var9 = var5; // L: 5136
+				int var10 = var6; // L: 5137
+
+				for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 5139
+					if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 5140
+						Client.field686[var11] = true;
 					}
 				}
 			}
+
 		}
-	}
+	} // L: 5144
 }
diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java
index bf4e5ddd86..fe460b86fc 100644
--- a/runescape-client/src/main/java/ArchiveLoader.java
+++ b/runescape-client/src/main/java/ArchiveLoader.java
@@ -3,47 +3,34 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ba")
+@ObfuscatedName("bf")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("sz")
-	@ObfuscatedGetter(
-		intValue = 1501018991
-	)
-	static int field985;
-	@ObfuscatedName("aa")
-	@Export("client")
-	@ObfuscatedSignature(
-		descriptor = "Lclient;"
-	)
-	static Client client;
-	@ObfuscatedName("bx")
-	@ObfuscatedSignature(
-		descriptor = "Ljk;"
-	)
-	static GameBuild field984;
-	@ObfuscatedName("w")
+	@ObfuscatedName("fr")
+	static int[] field984;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Lkz;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1984155091
+		intValue = 421357321
 	)
 	@Export("groupCount")
 	final int groupCount;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 756623687
+		intValue = -53898693
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lkd;Ljava/lang/String;)V"
+		descriptor = "(Lkz;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0; // L: 9
@@ -51,17 +38,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount(); // L: 13
 	} // L: 14
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "897874246"
+		garbageValue = "-1404548417"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0; // L: 17
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18
-			if (!this.archive.method5270(var1) || this.archive.method5269(var1)) {
+			if (!this.archive.method5584(var1) || this.archive.method5570(var1)) {
 				++this.loadedCount; // L: 19
 			}
 		}
@@ -69,34 +56,424 @@ boolean isLoaded() {
 		return this.loadedCount >= this.groupCount; // L: 21
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
+	static boolean method2123(long var0) {
+		int var2 = (int)(var0 >>> 14 & 3L); // L: 50
+		return var2 == 2; // L: 52
+	}
+
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lef;",
-		garbageValue = "-1421588196"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-1437384176"
 	)
-	@Export("VarpDefinition_get")
-	public static VarpDefinition VarpDefinition_get(int var0) {
-		VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 23
-		if (var1 != null) { // L: 24
-			return var1;
+	static int method2122(int var0, Script var1, boolean var2) {
+		String var7;
+		if (var0 == ScriptOpcodes.MES) { // L: 1409
+			var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1410
+			class194.addGameMessage(0, "", var7); // L: 1411
+			return 1; // L: 1412
+		} else if (var0 == ScriptOpcodes.ANIM) {
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 1415
+			class125.performPlayerAnimation(class340.localPlayer, Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 1416
+			return 1; // L: 1417
+		} else if (var0 == ScriptOpcodes.IF_CLOSE) {
+			if (!Interpreter.field816) { // L: 1420
+				Interpreter.field818 = true; // L: 1421
+			}
+
+			return 1; // L: 1423
 		} else {
-			byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 25
-			var1 = new VarpDefinition(); // L: 26
-			if (var2 != null) { // L: 27
-				var1.decode(new Buffer(var2));
+			int var16;
+			if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
+				var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1426
+				var16 = 0; // L: 1427
+				if (ClanSettings.isNumber(var7)) { // L: 1428
+					var16 = ClanChannelMember.method2778(var7);
+				}
+
+				PacketBufferNode var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2862, Client.packetWriter.isaacCipher); // L: 1430
+				var14.packetBuffer.writeInt(var16); // L: 1431
+				Client.packetWriter.addNode(var14); // L: 1432
+				return 1; // L: 1433
+			} else {
+				PacketBufferNode var12;
+				if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
+					var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1436
+					var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2845, Client.packetWriter.isaacCipher); // L: 1438
+					var12.packetBuffer.writeByte(var7.length() + 1); // L: 1439
+					var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1440
+					Client.packetWriter.addNode(var12); // L: 1441
+					return 1; // L: 1442
+				} else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
+					var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1445
+					var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2893, Client.packetWriter.isaacCipher); // L: 1447
+					var12.packetBuffer.writeByte(var7.length() + 1); // L: 1448
+					var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1449
+					Client.packetWriter.addNode(var12); // L: 1450
+					return 1; // L: 1451
+				} else {
+					String var4;
+					int var10;
+					if (var0 == ScriptOpcodes.OPPLAYER) {
+						var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1454
+						var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1455
+						class136.method2840(var10, var4); // L: 1456
+						return 1; // L: 1457
+					} else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
+						IsaacCipher.Interpreter_intStackSize -= 3; // L: 1460
+						var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1461
+						var16 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1462
+						int var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 1463
+						Widget var15 = ChatChannel.getWidget(var9); // L: 1464
+						class29.clickWidget(var15, var10, var16); // L: 1465
+						return 1; // L: 1466
+					} else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
+						IsaacCipher.Interpreter_intStackSize -= 2; // L: 1469
+						var10 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1470
+						var16 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1471
+						Widget var13 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1472
+						class29.clickWidget(var13, var10, var16); // L: 1473
+						return 1; // L: 1474
+					} else if (var0 == ScriptOpcodes.MOUSECAM) {
+						class150.mouseCam = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1477
+						return 1; // L: 1478
+					} else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.roofsHidden ? 1 : 0; // L: 1481
+						return 1; // L: 1482
+					} else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
+						SecureRandomFuture.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1485
+						class127.savePreferences(); // L: 1486
+						return 1; // L: 1487
+					} else if (var0 == ScriptOpcodes.OPENURL) {
+						var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1490
+						boolean var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1491
+						WorldMapSprite.openURL(var7, var8, false); // L: 1492
+						return 1; // L: 1493
+					} else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
+						var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1496
+						var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2808, Client.packetWriter.isaacCipher); // L: 1498
+						var12.packetBuffer.writeShort(var10); // L: 1499
+						Client.packetWriter.addNode(var12); // L: 1500
+						return 1; // L: 1501
+					} else if (var0 == ScriptOpcodes.BUG_REPORT) {
+						var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1504
+						class13.Interpreter_stringStackSize -= 2; // L: 1505
+						var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 1506
+						String var5 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 1507
+						if (var4.length() > 500) { // L: 1508
+							return 1;
+						} else if (var5.length() > 500) { // L: 1509
+							return 1;
+						} else {
+							PacketBufferNode var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2841, Client.packetWriter.isaacCipher); // L: 1510
+							var6.packetBuffer.writeShort(1 + class116.stringCp1252NullTerminatedByteSize(var4) + class116.stringCp1252NullTerminatedByteSize(var5)); // L: 1511
+							var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1512
+							var6.packetBuffer.method7343(var10); // L: 1513
+							var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1514
+							Client.packetWriter.addNode(var6); // L: 1515
+							return 1; // L: 1516
+						}
+					} else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
+						Client.shiftClickDrop = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1519
+						return 1; // L: 1520
+					} else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
+						Client.showMouseOverText = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1523
+						return 1; // L: 1524
+					} else if (var0 == ScriptOpcodes.RENDERSELF) {
+						Client.renderSelf = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1527
+						return 1; // L: 1528
+					} else if (var0 == 3120) {
+						if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 1531
+							Client.drawPlayerNames |= 1;
+						} else {
+							Client.drawPlayerNames &= -2; // L: 1532
+						}
+
+						return 1; // L: 1533
+					} else if (var0 == 3121) {
+						if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 1536
+							Client.drawPlayerNames |= 2;
+						} else {
+							Client.drawPlayerNames &= -3; // L: 1537
+						}
+
+						return 1; // L: 1538
+					} else if (var0 == 3122) {
+						if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 1541
+							Client.drawPlayerNames |= 4;
+						} else {
+							Client.drawPlayerNames &= -5; // L: 1542
+						}
+
+						return 1; // L: 1543
+					} else if (var0 == 3123) {
+						if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 1546
+							Client.drawPlayerNames |= 8;
+						} else {
+							Client.drawPlayerNames &= -9; // L: 1547
+						}
+
+						return 1; // L: 1548
+					} else if (var0 == 3124) {
+						Client.drawPlayerNames = 0; // L: 1551
+						return 1; // L: 1552
+					} else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
+						Client.showMouseCross = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1555
+						return 1; // L: 1556
+					} else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
+						Client.showLoadingMessages = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1559
+						return 1; // L: 1560
+					} else if (var0 == ScriptOpcodes.SETTAPTODROP) {
+						class12.setTapToDrop(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1); // L: 1563
+						return 1; // L: 1564
+					} else if (var0 == ScriptOpcodes.GETTAPTODROP) {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Tiles.getTapToDrop() ? 1 : 0; // L: 1567
+						return 1; // L: 1568
+					} else if (var0 == 3129) {
+						IsaacCipher.Interpreter_intStackSize -= 2; // L: 1571
+						Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1572
+						Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1573
+						return 1; // L: 1574
+					} else if (var0 == 3130) {
+						IsaacCipher.Interpreter_intStackSize -= 2; // L: 1577
+						return 1; // L: 1578
+					} else if (var0 == 3131) {
+						--IsaacCipher.Interpreter_intStackSize; // L: 1581
+						return 1; // L: 1582
+					} else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class186.canvasWidth; // L: 1585
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BoundaryObject.canvasHeight; // L: 1586
+						return 1; // L: 1587
+					} else if (var0 == ScriptOpcodes.MOBILE_SETFPS) {
+						--IsaacCipher.Interpreter_intStackSize; // L: 1590
+						return 1; // L: 1591
+					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) {
+						return 1; // L: 1594
+					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) {
+						IsaacCipher.Interpreter_intStackSize -= 2; // L: 1597
+						return 1; // L: 1598
+					} else if (var0 == 3136) {
+						Client.field638 = 3; // L: 1601
+						Client.field639 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1602
+						return 1; // L: 1603
+					} else if (var0 == 3137) {
+						Client.field638 = 2; // L: 1606
+						Client.field639 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1607
+						return 1; // L: 1608
+					} else if (var0 == 3138) {
+						Client.field638 = 0; // L: 1611
+						return 1; // L: 1612
+					} else if (var0 == 3139) {
+						Client.field638 = 1; // L: 1615
+						return 1; // L: 1616
+					} else if (var0 == 3140) {
+						Client.field638 = 3; // L: 1619
+						Client.field639 = var2 ? WorldMapArea.scriptDotWidget.id * 1695982371 * 2075239563 : Messages.scriptActiveWidget.id * 1695982371 * 2075239563; // L: 1620
+						return 1; // L: 1621
+					} else {
+						boolean var11;
+						if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
+							var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1624
+							SecureRandomFuture.clientPreferences.hideUsername = var11; // L: 1625
+							class127.savePreferences(); // L: 1626
+							return 1; // L: 1627
+						} else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.hideUsername ? 1 : 0; // L: 1630
+							return 1; // L: 1631
+						} else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
+							var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1634
+							Client.Login_isUsernameRemembered = var11; // L: 1635
+							if (!var11) { // L: 1636
+								SecureRandomFuture.clientPreferences.rememberedUsername = ""; // L: 1637
+								class127.savePreferences(); // L: 1638
+							}
+
+							return 1; // L: 1640
+						} else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1643
+							return 1; // L: 1644
+						} else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) {
+							return 1; // L: 1647
+						} else if (var0 == 3146) {
+							var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 1650
+							if (var11 == SecureRandomFuture.clientPreferences.titleMusicDisabled) { // L: 1651
+								SecureRandomFuture.clientPreferences.titleMusicDisabled = !var11; // L: 1652
+								class127.savePreferences(); // L: 1653
+							}
+
+							return 1; // L: 1655
+						} else if (var0 == 3147) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1658
+							return 1; // L: 1659
+						} else if (var0 == 3148) {
+							return 1; // L: 1662
+						} else if (var0 == 3149) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1665
+							return 1; // L: 1666
+						} else if (var0 == 3150) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1669
+							return 1; // L: 1670
+						} else if (var0 == 3151) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1673
+							return 1; // L: 1674
+						} else if (var0 == 3152) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1677
+							return 1; // L: 1678
+						} else if (var0 == 3153) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1681
+							return 1; // L: 1682
+						} else if (var0 == 3154) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = AbstractRasterProvider.method7714(); // L: 1685
+							return 1; // L: 1686
+						} else if (var0 == 3155) {
+							--class13.Interpreter_stringStackSize; // L: 1689
+							return 1; // L: 1690
+						} else if (var0 == 3156) {
+							return 1; // L: 1693
+						} else if (var0 == 3157) {
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 1696
+							return 1; // L: 1697
+						} else if (var0 == 3158) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1700
+							return 1; // L: 1701
+						} else if (var0 == 3159) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1704
+							return 1; // L: 1705
+						} else if (var0 == 3160) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1708
+							return 1; // L: 1709
+						} else if (var0 == 3161) {
+							--IsaacCipher.Interpreter_intStackSize; // L: 1712
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1713
+							return 1; // L: 1714
+						} else if (var0 == 3162) {
+							--IsaacCipher.Interpreter_intStackSize; // L: 1717
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1718
+							return 1; // L: 1719
+						} else if (var0 == 3163) {
+							--class13.Interpreter_stringStackSize; // L: 1722
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1723
+							return 1; // L: 1724
+						} else if (var0 == 3164) {
+							--IsaacCipher.Interpreter_intStackSize; // L: 1727
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1728
+							return 1; // L: 1729
+						} else if (var0 == 3165) {
+							--IsaacCipher.Interpreter_intStackSize; // L: 1732
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1733
+							return 1; // L: 1734
+						} else if (var0 == 3166) {
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 1737
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1738
+							return 1; // L: 1739
+						} else if (var0 == 3167) {
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 1742
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1743
+							return 1; // L: 1744
+						} else if (var0 == 3168) {
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 1747
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1748
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1749
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1750
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1751
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1752
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1753
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1754
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1755
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 1756
+							return 1; // L: 1757
+						} else if (var0 == 3169) {
+							return 1; // L: 1760
+						} else if (var0 == 3170) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1763
+							return 1; // L: 1764
+						} else if (var0 == 3171) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1767
+							return 1; // L: 1768
+						} else if (var0 == 3172) {
+							--IsaacCipher.Interpreter_intStackSize; // L: 1771
+							return 1; // L: 1772
+						} else if (var0 == 3173) {
+							--IsaacCipher.Interpreter_intStackSize; // L: 1775
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1776
+							return 1; // L: 1777
+						} else if (var0 == 3174) {
+							--IsaacCipher.Interpreter_intStackSize; // L: 1780
+							return 1; // L: 1781
+						} else if (var0 == 3175) {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1784
+							return 1; // L: 1785
+						} else if (var0 == 3176) {
+							return 1; // L: 1788
+						} else if (var0 == 3177) {
+							return 1; // L: 1791
+						} else if (var0 == 3178) {
+							--class13.Interpreter_stringStackSize; // L: 1794
+							return 1; // L: 1795
+						} else if (var0 == 3179) {
+							return 1; // L: 1798
+						} else if (var0 == 3180) {
+							--class13.Interpreter_stringStackSize; // L: 1801
+							return 1; // L: 1802
+						} else if (var0 == 3181) {
+							var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize], 0), 100); // L: 1805
+							InterfaceParent.method2142((double)(0.5F + (float)var10 / 200.0F)); // L: 1806
+							return 1; // L: 1807
+						} else if (var0 == 3182) {
+							float var3 = ((float)SecureRandomFuture.clientPreferences.brightness - 0.5F) * 200.0F; // L: 1810
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1811
+							return 1; // L: 1812
+						} else if (var0 != 3183 && var0 != 3184) {
+							return 2; // L: 1818
+						} else {
+							--IsaacCipher.Interpreter_intStackSize; // L: 1815
+							return 1; // L: 1816
+						}
+					}
+				}
 			}
+		}
+	}
 
-			VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28
-			return var1; // L: 29
+	@ObfuscatedName("aw")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "1046590636"
+	)
+	static int method2120(int var0, Script var1, boolean var2) {
+		if (var0 >= 7200 && var0 < 7204) { // L: 4429
+			IsaacCipher.Interpreter_intStackSize -= 5; // L: 4430
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4431
+			return 1; // L: 4432
+		} else if (var0 == 7204) { // L: 4434
+			IsaacCipher.Interpreter_intStackSize -= 6; // L: 4435
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4436
+			return 1; // L: 4437
+		} else if (var0 >= 7205 && var0 < 7209) { // L: 4439
+			Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4440
+			return 1; // L: 4441
+		} else if (var0 == 7209) { // L: 4443
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 4444
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4445
+			return 1; // L: 4446
+		} else if (var0 >= 7210 && var0 < 7214) { // L: 4448
+			--IsaacCipher.Interpreter_intStackSize; // L: 4449
+			return 1; // L: 4450
+		} else if (var0 == 7214) { // L: 4452
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 4453
+			return 1; // L: 4454
+		} else {
+			return 2; // L: 4456
 		}
 	}
 
-	@ObfuscatedName("lo")
+	@ObfuscatedName("ja")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-67"
+		descriptor = "(B)Z",
+		garbageValue = "-47"
 	)
-	static void method2056(int var0) {
-		Client.oculusOrbState = var0; // L: 12012
-	} // L: 12013
+	static boolean method2125() {
+		return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 11376
+	}
 }
diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java
index 4029a088cb..966c656a2b 100644
--- a/runescape-client/src/main/java/AttackOption.java
+++ b/runescape-client/src/main/java/AttackOption.java
@@ -4,257 +4,65 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cr")
+@ObfuscatedName("ca")
 @Implements("AttackOption")
 public enum AttackOption implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lcr;"
+		descriptor = "Lca;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lcr;"
+		descriptor = "Lca;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lcr;"
+		descriptor = "Lca;"
 	)
-	field1228(2),
-	@ObfuscatedName("a")
+	field1232(2),
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lcr;"
+		descriptor = "Lca;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3),
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lcr;"
+		descriptor = "Lca;"
 	)
-	field1226(4);
+	field1234(4);
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -495870189
+		intValue = -268107797
 	)
 	@Export("id")
 	final int id;
 
 	AttackOption(int var3) {
-		this.id = var3; // L: 12076
-	} // L: 12077
+		this.id = var3; // L: 12752
+	} // L: 12753
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 12080
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lei;",
-		garbageValue = "99"
-	)
-	@Export("getInvDefinition")
-	public static InvDefinition getInvDefinition(int var0) {
-		InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 17
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0);
-			var1 = new InvDefinition();
-			if (var2 != null) { // L: 21
-				var1.decode(new Buffer(var2));
-			}
-
-			InvDefinition.InvDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkz;I)I",
-		garbageValue = "-640916313"
-	)
-	@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) {
-				return 1;
-			}
-
-			char var9;
-			if (var7 != 0) {
-				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 = class28.method399(var9); // L: 33
-			var8 = class28.method399(var10); // L: 34
-			var9 = class317.standardizeChar(var9, var2); // L: 35
-			var10 = class317.standardizeChar(var10, var2); // L: 36
-			if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37
-				var9 = Character.toLowerCase(var9); // L: 38
-				var10 = Character.toLowerCase(var10); // L: 39
-				if (var9 != var10) { // L: 40
-					return WallDecoration.lowercaseChar(var9, var2) - WallDecoration.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 (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52
-				var11 = Character.toLowerCase(var11); // L: 53
-				var12 = Character.toLowerCase(var12); // L: 54
-				if (var12 != var11) {
-					return WallDecoration.lowercaseChar(var11, var2) - WallDecoration.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 WallDecoration.lowercaseChar(var12, var2) - WallDecoration.lowercaseChar(var13, var2);
-				}
-			}
-
-			return 0; // L: 65
-		}
+		return this.id; // L: 12757
 	}
 
-	@ObfuscatedName("w")
-	static final void method2308(long var0) {
-		try {
-			Thread.sleep(var0); // L: 20
-		} catch (InterruptedException var3) { // L: 22
-		}
-
-	} // L: 23
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "1018671860"
-	)
-	static void method2297(int var0, int var1) {
-		long var2 = (long)((var0 << 16) + var1); // L: 143
-		NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 144
-		if (var4 != null) { // L: 145
-			NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 146
-		}
-	} // L: 147
-
-	@ObfuscatedName("o")
+	@ObfuscatedName("lg")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;IZB)I",
-		garbageValue = "91"
+		descriptor = "(I)Z",
+		garbageValue = "-379261507"
 	)
-	static int method2304(CharSequence var0, int var1, boolean var2) {
-		if (var1 >= 2 && var1 <= 36) { // L: 84
-			boolean var3 = false; // L: 85
-			boolean var4 = false; // L: 86
-			int var5 = 0; // L: 87
-			int var6 = var0.length(); // L: 88
-
-			for (int var7 = 0; var7 < var6; ++var7) { // L: 89
-				char var8 = var0.charAt(var7); // L: 90
-				if (var7 == 0) { // L: 91
-					if (var8 == '-') { // L: 92
-						var3 = true; // L: 93
-						continue;
-					}
-
-					if (var8 == '+') { // L: 96
-						continue;
-					}
-				}
-
-				int var10;
-				if (var8 >= '0' && var8 <= '9') { // L: 98
-					var10 = var8 - '0';
-				} else if (var8 >= 'A' && var8 <= 'Z') { // L: 99
-					var10 = var8 - '7';
-				} else {
-					if (var8 < 'a' || var8 > 'z') { // L: 100
-						throw new NumberFormatException(); // L: 101
-					}
-
-					var10 = var8 - 'W';
-				}
-
-				if (var10 >= var1) { // L: 102
-					throw new NumberFormatException();
-				}
-
-				if (var3) { // L: 103
-					var10 = -var10;
-				}
-
-				int var9 = var10 + var5 * var1; // L: 104
-				if (var9 / var1 != var5) { // L: 105
-					throw new NumberFormatException();
-				}
-
-				var5 = var9; // L: 106
-				var4 = true; // L: 107
-			}
-
-			if (!var4) { // L: 109
-				throw new NumberFormatException();
-			} else {
-				return var5; // L: 110
-			}
-		} else {
-			throw new IllegalArgumentException("" + var1);
-		}
+	static boolean method2356() {
+		return SecureRandomFuture.clientPreferences.field1197 >= Client.field473; // L: 12724
 	}
 }
diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java
index 6e73ef65ae..34c6c8455c 100644
--- a/runescape-client/src/main/java/AudioFilter.java
+++ b/runescape-client/src/main/java/AudioFilter.java
@@ -3,154 +3,154 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ay")
+@ObfuscatedName("bd")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("g")
-	static float[][] field381;
-	@ObfuscatedName("e")
+	@ObfuscatedName("s")
+	static float[][] field407;
+	@ObfuscatedName("j")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("p")
-	static float field383;
-	@ObfuscatedName("j")
+	@ObfuscatedName("w")
+	static float field409;
+	@ObfuscatedName("n")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("s")
-	int[][][] field387;
-	@ObfuscatedName("a")
-	int[][][] field379;
-	@ObfuscatedName("o")
-	int[] field384;
+	@ObfuscatedName("p")
+	int[][][] field404;
+	@ObfuscatedName("m")
+	int[][][] field405;
+	@ObfuscatedName("t")
+	int[] field406;
 
 	static {
-		field381 = new float[2][8]; // L: 13
+		field407 = new float[2][8]; // L: 13
 		coefficients = new int[2][8]; // L: 14
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2]; // L: 8
-		this.field387 = new int[2][2][4]; // L: 10
-		this.field379 = new int[2][2][4]; // L: 11
-		this.field384 = new int[2]; // L: 12
+		this.field404 = new int[2][2][4]; // L: 10
+		this.field405 = new int[2][2][4]; // L: 11
+		this.field406 = new int[2]; // L: 12
 	} // L: 21
 
-	@ObfuscatedName("i")
-	float method1067(int var1, int var2, float var3) {
-		float var4 = (float)this.field379[var1][0][var2] + var3 * (float)(this.field379[var1][1][var2] - this.field379[var1][0][var2]); // L: 24
+	@ObfuscatedName("c")
+	float method1097(int var1, int var2, float var3) {
+		float var4 = (float)this.field405[var1][0][var2] + var3 * (float)(this.field405[var1][1][var2] - this.field405[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("s")
-	float method1069(int var1, int var2, float var3) {
-		float var4 = (float)this.field387[var1][0][var2] + var3 * (float)(this.field387[var1][1][var2] - this.field387[var1][0][var2]); // L: 35
+	@ObfuscatedName("p")
+	float method1091(int var1, int var2, float var3) {
+		float var4 = (float)this.field404[var1][0][var2] + var3 * (float)(this.field404[var1][1][var2] - this.field404[var1][0][var2]); // L: 35
 		var4 *= 1.2207031E-4F; // L: 36
 		return normalize(var4); // L: 37
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) { // L: 41
-			var3 = (float)this.field384[0] + (float)(this.field384[1] - this.field384[0]) * var2; // L: 42
+			var3 = (float)this.field406[0] + (float)(this.field406[1] - this.field406[0]) * var2; // L: 42
 			var3 *= 0.0030517578F; // L: 43
-			field383 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44
-			forwardMultiplier = (int)(field383 * 65536.0F); // L: 45
+			field409 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44
+			forwardMultiplier = (int)(field409 * 65536.0F); // L: 45
 		}
 
 		if (this.pairs[var1] == 0) { // L: 47
 			return 0;
 		} else {
-			var3 = this.method1067(var1, 0, var2); // L: 48
-			field381[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1069(var1, 0, var2)); // L: 49
-			field381[var1][1] = var3 * var3; // L: 50
+			var3 = this.method1097(var1, 0, var2); // L: 48
+			field407[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1091(var1, 0, var2)); // L: 49
+			field407[var1][1] = var3 * var3; // L: 50
 
 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51
-				var3 = this.method1067(var1, var4, var2); // L: 52
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1069(var1, var4, var2)); // L: 53
+				var3 = this.method1097(var1, var4, var2); // L: 52
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1091(var1, var4, var2)); // L: 53
 				float var6 = var3 * var3; // L: 54
-				field381[var1][var4 * 2 + 1] = field381[var1][var4 * 2 - 1] * var6; // L: 55
-				field381[var1][var4 * 2] = field381[var1][var4 * 2 - 1] * var5 + field381[var1][var4 * 2 - 2] * var6; // L: 56
+				field407[var1][var4 * 2 + 1] = field407[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
 
 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57
-					var10000 = field381[var1];
-					var10000[var7] += field381[var1][var7 - 1] * var5 + field381[var1][var7 - 2] * var6;
+					var10000 = field407[var1];
+					var10000[var7] += field407[var1][var7 - 1] * var5 + field407[var1][var7 - 2] * var6;
 				}
 
-				var10000 = field381[var1]; // L: 58
-				var10000[1] += field381[var1][0] * var5 + var6;
-				var10000 = field381[var1]; // L: 59
+				var10000 = field407[var1]; // L: 58
+				var10000[1] += field407[var1][0] * var5 + var6;
+				var10000 = field407[var1]; // L: 59
 				var10000[0] += var5;
 			}
 
 			if (var1 == 0) { // L: 61
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field381[0];
-					var10000[var4] *= field383;
+					var10000 = field407[0];
+					var10000[var4] *= field409;
 				}
 			}
 
 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62
-				coefficients[var1][var4] = (int)(field381[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field407[var1][var4] * 65536.0F);
 			}
 
 			return this.pairs[var1] * 2; // L: 63
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;Lab;)V"
+		descriptor = "(Lpi;Lag;)V"
 	)
-	final void method1082(Buffer var1, SoundEnvelope var2) {
+	final void method1089(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.field384[0] = var1.readUnsignedShort(); // L: 71
-			this.field384[1] = var1.readUnsignedShort(); // L: 72
+			this.field406[0] = var1.readUnsignedShort(); // L: 71
+			this.field406[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.field387[var5][0][var6] = var1.readUnsignedShort(); // L: 76
-					this.field379[var5][0][var6] = var1.readUnsignedShort(); // L: 77
+					this.field404[var5][0][var6] = var1.readUnsignedShort(); // L: 76
+					this.field405[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.field387[var5][1][var6] = var1.readUnsignedShort(); // L: 83
-						this.field379[var5][1][var6] = var1.readUnsignedShort(); // L: 84
+						this.field404[var5][1][var6] = var1.readUnsignedShort(); // L: 83
+						this.field405[var5][1][var6] = var1.readUnsignedShort(); // L: 84
 					} else {
-						this.field387[var5][1][var6] = this.field387[var5][0][var6]; // L: 87
-						this.field379[var5][1][var6] = this.field379[var5][0][var6]; // L: 88
+						this.field404[var5][1][var6] = this.field404[var5][0][var6]; // L: 87
+						this.field405[var5][1][var6] = this.field405[var5][0][var6]; // L: 88
 					}
 				}
 			}
 
-			if (var7 != 0 || this.field384[1] != this.field384[0]) { // L: 92
+			if (var7 != 0 || this.field406[1] != this.field406[0]) { // L: 92
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var4 = this.field384; // L: 95
-			this.field384[1] = 0; // L: 96
+			int[] var4 = this.field406; // L: 95
+			this.field406[1] = 0; // L: 96
 			var4[0] = 0; // L: 97
 		}
 
 	} // L: 99
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("normalize")
 	static float normalize(float var0) {
 		float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30
diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java
index f8ad9a13c0..1927959473 100644
--- a/runescape-client/src/main/java/BZip2Decompressor.java
+++ b/runescape-client/src/main/java/BZip2Decompressor.java
@@ -3,12 +3,12 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ol")
+@ObfuscatedName("ps")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lof;"
+		descriptor = "Lpk;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State(); // L: 13
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@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 static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var
 			BZip2Decompressor_state.bsLive = 0; // L: 26
 			BZip2Decompressor_state.bsBuff = 0; // L: 27
 			BZip2Decompressor_state.nextBit_unused = 0; // L: 28
-			BZip2Decompressor_state.field4303 = 0; // L: 29
+			BZip2Decompressor_state.field4489 = 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 static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lof;)V"
+		descriptor = "(Lpk;)V"
 	)
-	static void method7207(BZip2State var0) {
+	static void method7574(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 = class300.BZip2Decompressor_block; // L: 44
-		int var7 = var0.field4322; // L: 45
+		int[] var6 = class12.BZip2Decompressor_block; // L: 44
+		int var7 = var0.field4484; // L: 45
 		byte[] var8 = var0.outputArray; // L: 46
 		int var9 = var0.next_out; // L: 47
 		int var10 = var0.outputLength; // L: 48
-		int var12 = var0.field4326 + 1; // L: 50
+		int var12 = var0.field4478 + 1; // L: 50
 
 		label70:
 		while (true) {
@@ -148,25 +148,25 @@ static void method7207(BZip2State var0) {
 			break; // L: 73
 		}
 
-		int var13 = var0.field4303; // L: 133
-		var0.field4303 += var10 - var10; // L: 134
-		if (var0.field4303 < var13) { // L: 135
+		int var13 = var0.field4489; // L: 133
+		var0.field4489 += var10 - var10; // L: 134
+		if (var0.field4489 < 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
-		class300.BZip2Decompressor_block = var6; // L: 140
-		var0.field4322 = var7; // L: 141
+		class12.BZip2Decompressor_block = var6; // L: 140
+		var0.field4484 = var7; // L: 141
 		var0.outputArray = var8; // L: 142
 		var0.next_out = var9; // L: 143
 		var0.outputLength = var10; // L: 144
 	} // L: 145
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lof;)V"
+		descriptor = "(Lpk;)V"
 	)
 	@Export("BZip2Decompressor_decompress")
 	static void BZip2Decompressor_decompress(BZip2State var0) {
@@ -192,9 +192,9 @@ static void BZip2Decompressor_decompress(BZip2State var0) {
 		int[] var23 = null; // L: 170
 		int[] var24 = null; // L: 171
 		int[] var25 = null; // L: 172
-		var0.blockSize100k = -1020212041; // L: 173
-		if (class300.BZip2Decompressor_block == null) { // L: 174
-			class300.BZip2Decompressor_block = new int[var0.blockSize100k * -262975904];
+		var0.blockSize100k = 32259791; // L: 173
+		if (class12.BZip2Decompressor_block == null) { // L: 174
+			class12.BZip2Decompressor_block = new int[var0.blockSize100k * -230901920];
 		}
 
 		boolean var26 = true; // L: 175
@@ -430,7 +430,7 @@ static void BZip2Decompressor_decompress(BZip2State var0) {
 							}
 
 							var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396
-							class300.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397
+							class12.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 @@ static void BZip2Decompressor_decompress(BZip2State var0) {
 							var10000 = var0.unzftab; // L: 332
 
 							for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336
-								class300.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
+								class12.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
 								++var47; // L: 335
 							}
 						}
@@ -509,22 +509,22 @@ static void BZip2Decompressor_decompress(BZip2State var0) {
 					}
 
 					for (var36 = 0; var36 < var47; ++var36) { // L: 426
-						var1 = (byte)(class300.BZip2Decompressor_block[var36] & 255); // L: 427
-						var10000 = class300.BZip2Decompressor_block; // L: 428
+						var1 = (byte)(class12.BZip2Decompressor_block[var36] & 255); // L: 427
+						var10000 = class12.BZip2Decompressor_block; // L: 428
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++; // L: 429
 					}
 
-					var0.field4322 = class300.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
+					var0.field4484 = class12.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
 					var0.nblocks_used = 0; // L: 432
-					var0.field4322 = class300.BZip2Decompressor_block[var0.field4322]; // L: 433
-					var0.su_ch2 = (byte)(var0.field4322 & 255); // L: 434
-					var0.field4322 >>= 8; // L: 436
+					var0.field4484 = class12.BZip2Decompressor_block[var0.field4484]; // L: 433
+					var0.su_ch2 = (byte)(var0.field4484 & 255); // L: 434
+					var0.field4484 >>= 8; // L: 436
 					++var0.nblocks_used; // L: 437
-					var0.field4326 = var47; // L: 438
-					method7207(var0); // L: 439
-					if (var0.field4326 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440
+					var0.field4478 = var47; // L: 438
+					method7574(var0); // L: 439
+					if (var0.field4478 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440
 						var26 = true;
 						break;
 					}
@@ -538,27 +538,27 @@ static void BZip2Decompressor_decompress(BZip2State var0) {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lof;)B"
+		descriptor = "(Lpk;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0); // L: 447
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lof;)B"
+		descriptor = "(Lpk;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0); // L: 451
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(ILof;)I"
+		descriptor = "(ILpk;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
 		return var2; // L: 460
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lof;)V"
+		descriptor = "(Lpk;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ static void makeMaps(BZip2State var0) {
 
 	} // L: 479
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@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
diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java
index 21dbd539eb..538fa333ff 100644
--- a/runescape-client/src/main/java/BZip2State.java
+++ b/runescape-client/src/main/java/BZip2State.java
@@ -3,265 +3,195 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("of")
+@ObfuscatedName("pk")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("i")
-	final int field4325;
-	@ObfuscatedName("w")
-	final int field4304;
+	@ObfuscatedName("c")
+	final int field4513;
+	@ObfuscatedName("b")
+	final int field4481;
+	@ObfuscatedName("p")
+	final int field4479;
+	@ObfuscatedName("m")
+	final int field4480;
+	@ObfuscatedName("t")
+	final int field4502;
 	@ObfuscatedName("s")
-	final int field4305;
-	@ObfuscatedName("a")
-	final int field4306;
-	@ObfuscatedName("o")
-	final int field4334;
-	@ObfuscatedName("g")
-	final int field4315;
-	@ObfuscatedName("e")
+	final int field4482;
+	@ObfuscatedName("j")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -384998697
+		intValue = -629862431
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1728715717
+		intValue = 1582268749
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1596993239
+		intValue = -1671473769
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 292759791
+		intValue = -428614875
 	)
 	@Export("outputLength")
 	int outputLength;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -669806993
+		intValue = -982561829
 	)
-	int field4303;
-	@ObfuscatedName("t")
+	int field4489;
+	@ObfuscatedName("h")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 234713663
+		intValue = -1975911845
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 895907887
+		intValue = -1278928369
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -2081618431
+		intValue = -1731678281
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 2138397069
+		intValue = -540078153
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1184456773
+		intValue = -235028951
 	)
-	int field4322;
-	@ObfuscatedName("r")
+	int field4484;
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 159330307
+		intValue = 85714323
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1103656879
+		intValue = -1684289539
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1576280253
+		intValue = -620890433
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@Export("base")
 	int[][] base;
 	@ObfuscatedName("ac")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = -138275331
+		intValue = 1618540435
 	)
-	int field4326;
+	int field4478;
 
 	BZip2State() {
-		this.field4325 = 4096; // L: 4
-		this.field4304 = 16; // L: 5
-		this.field4305 = 258; // L: 6
-		this.field4306 = 6; // L: 7
-		this.field4334 = 50; // L: 8
-		this.field4315 = 18002; // L: 9
+		this.field4513 = 4096; // L: 4
+		this.field4481 = 16; // L: 5
+		this.field4479 = 258; // L: 6
+		this.field4480 = 6; // L: 7
+		this.field4502 = 50; // L: 8
+		this.field4482 = 18002; // L: 9
 		this.nextByte = 0; // L: 11
 		this.next_out = 0; // L: 14
 		this.unzftab = new int[256]; // L: 25
 		this.cftab = new int[257]; // L: 27
 		this.inUse = new boolean[256]; // L: 30
 		this.inUse16 = new boolean[16]; // L: 31
-		this.seqToUnseq = new byte[256];
-		this.ll8 = new byte[4096];
-		this.getAndMoveToFrontDecode_yy = new int[16];
-		this.selector = new byte[18002];
-		this.selectorMtf = new byte[18002];
-		this.temp_charArray2d = new byte[6][258];
-		this.limit = new int[6][258];
-		this.base = new int[6][258];
+		this.seqToUnseq = new byte[256]; // L: 32
+		this.ll8 = new byte[4096]; // L: 33
+		this.getAndMoveToFrontDecode_yy = new int[16]; // L: 34
+		this.selector = new byte[18002]; // L: 35
+		this.selectorMtf = new byte[18002]; // L: 36
+		this.temp_charArray2d = new byte[6][258]; // L: 37
+		this.limit = new int[6][258]; // L: 38
+		this.base = new int[6][258]; // L: 39
 		this.perm = new int[6][258]; // L: 40
 		this.minLens = new int[6]; // L: 41
 	} // L: 44
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("js")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lfh;",
-		garbageValue = "-360258293"
+		descriptor = "(II)Z",
+		garbageValue = "-1894772144"
 	)
-	@Export("SpotAnimationDefinition_get")
-	public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) {
-		SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 32
-		if (var1 != null) { // L: 33
-			return var1;
-		} else {
-			byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34
-			var1 = new SpotAnimationDefinition(); // L: 35
-			var1.id = var0; // L: 36
-			if (var2 != null) { // L: 37
-				var1.decode(new Buffer(var2));
+	static boolean method7571(int var0) {
+		for (int var1 = 0; var1 < Client.field701; ++var1) { // L: 11872
+			if (Client.field522[var1] == var0) { // L: 11873
+				return true;
 			}
-
-			SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38
-			return var1; // L: 39
 		}
-	}
 
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "0"
-	)
-	static int method7179(int var0, Script var1, boolean var2) {
-		int var3 = -1; // L: 566
-		Widget var4;
-		if (var0 >= 2000) { // L: 568
-			var0 -= 1000; // L: 569
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 570
-			var4 = UserComparator9.getWidget(var3); // L: 571
-		} else {
-			var4 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 573
-		}
-
-		if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 574
-			class14.Interpreter_intStackSize -= 4; // L: 575
-			var4.rawX = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 576
-			var4.rawY = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 577
-			var4.xAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 578
-			var4.yAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 579
-			class184.invalidateWidget(var4); // L: 580
-			ArchiveLoader.client.alignWidget(var4); // L: 581
-			if (var3 != -1 && var4.type == 0) { // L: 582
-				MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var3 >> 16], var4, false);
-			}
-
-			return 1; // L: 583
-		} else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 585
-			class14.Interpreter_intStackSize -= 4; // L: 586
-			var4.rawWidth = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 587
-			var4.rawHeight = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 588
-			var4.widthAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 589
-			var4.heightAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 590
-			class184.invalidateWidget(var4); // L: 591
-			ArchiveLoader.client.alignWidget(var4); // L: 592
-			if (var3 != -1 && var4.type == 0) { // L: 593
-				MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var3 >> 16], var4, false);
-			}
-
-			return 1; // L: 594
-		} else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 596
-			boolean var5 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 597
-			if (var5 != var4.isHidden) { // L: 598
-				var4.isHidden = var5; // L: 599
-				class184.invalidateWidget(var4); // L: 600
-			}
-
-			return 1; // L: 602
-		} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 604
-			var4.noClickThrough = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 605
-			return 1; // L: 606
-		} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 608
-			var4.noScrollThrough = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 609
-			return 1; // L: 610
-		} else {
-			return 2; // L: 612
-		}
+		return false; // L: 11875
 	}
 }
diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java
index a6790592f6..a0c1b89785 100644
--- a/runescape-client/src/main/java/BoundaryObject.java
+++ b/runescape-client/src/main/java/BoundaryObject.java
@@ -1,71 +1,77 @@
+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("hb")
+@ObfuscatedName("hg")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("bm")
-	static String field2618;
-	@ObfuscatedName("hi")
+	@ObfuscatedName("sv")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Lbp;"
 	)
-	@Export("redHintArrowSprite")
-	static SpritePixels redHintArrowSprite;
-	@ObfuscatedName("i")
+	@Export("decimator")
+	static Decimator decimator;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1005985993
+		intValue = 1063429417
+	)
+	@Export("canvasHeight")
+	public static int canvasHeight;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1211283293
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -906574175
+		intValue = 392897309
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -405320811
+		intValue = 1130231369
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -989748679
+		intValue = 1078743455
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -278128521
+		intValue = -1456059729
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lhj;"
+		descriptor = "Lgt;"
 	)
 	@Export("renderable1")
 	public Renderable renderable1;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lhj;"
+		descriptor = "Lgt;"
 	)
 	@Export("renderable2")
 	public Renderable renderable2;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		longValue = 4551271496275992869L
+		longValue = 7825076594130185971L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 709360475
+		intValue = -1681276427
 	)
 	@Export("flags")
 	int flags;
@@ -74,4 +80,59 @@ public final class BoundaryObject {
 		this.tag = 0L; // L: 11
 		this.flags = 0; // L: 12
 	} // L: 14
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/io/File;ZB)Z",
+		garbageValue = "15"
+	)
+	public static boolean method4321(File var0, boolean var1) {
+		try {
+			RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 58
+			int var3 = var2.read(); // L: 59
+			var2.seek(0L); // L: 60
+			var2.write(var3); // L: 61
+			var2.seek(0L); // L: 62
+			var2.close(); // L: 63
+			if (var1) { // L: 64
+				var0.delete();
+			}
+
+			return true; // L: 65
+		} catch (Exception var4) { // L: 67
+			return false; // L: 68
+		}
+	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(Lbw;B)V",
+		garbageValue = "2"
+	)
+	@Export("changeWorld")
+	static void changeWorld(World var0) {
+		if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1958
+			Client.isMembersWorld = var0.isMembersOnly(); // L: 1959
+			UserComparator6.method2552(var0.isMembersOnly()); // L: 1960
+		}
+
+		if (var0.properties != Client.worldProperties) { // L: 1962
+			Archive var1 = UserComparator6.archive8; // L: 1963
+			int var2 = var0.properties; // L: 1964
+			if ((var2 & 536870912) != 0) { // L: 1966
+				Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 1967
+			} else if ((var2 & 1073741824) != 0) { // L: 1969
+				Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 1970
+			} else {
+				Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 1973
+			}
+		}
+
+		class185.worldHost = var0.host; // L: 1977
+		Client.worldId = var0.id; // L: 1978
+		Client.worldProperties = var0.properties; // L: 1979
+		GameObject.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1980
+		class133.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1981
+		class129.currentPort = GameObject.worldPort; // L: 1982
+	} // L: 1983
 }
diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java
index 6297f16ada..cdbf6c9d83 100644
--- a/runescape-client/src/main/java/Bounds.java
+++ b/runescape-client/src/main/java/Bounds.java
@@ -4,47 +4,47 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mo")
+@ObfuscatedName("me")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1843320923
+		intValue = 726079895
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1031650591
+		intValue = -1444108263
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1371710773
+		intValue = 64358351
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -179878711
+		intValue = 1178509237
 	)
 	@Export("highY")
 	public int highY;
 
 	public Bounds(int var1, int var2, int var3, int var4) {
-		this.setLow(var1, var2); // L: 14
-		this.setHigh(var3, var4); // L: 15
+		this.setLow(var1, var2);
+		this.setHigh(var3, var4);
 	} // L: 16
 
 	public Bounds(int var1, int var2) {
-		this(0, 0, var1, var2); // L: 10
-	} // L: 11
+		this(0, 0, var1, var2);
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIS)V",
-		garbageValue = "7696"
+		descriptor = "(III)V",
+		garbageValue = "1930472817"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -52,10 +52,10 @@ public void setLow(int var1, int var2) {
 		this.lowY = var2; // L: 20
 	} // L: 21
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "101"
+		descriptor = "(IIS)V",
+		garbageValue = "-7113"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -63,40 +63,40 @@ public void setHigh(int var1, int var2) {
 		this.highY = var2; // L: 25
 	} // L: 26
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "-1805672690"
+		garbageValue = "922229094"
 	)
-	public boolean method6341(int var1, int var2) {
-		return var1 >= this.lowX && var1 < this.highX + this.lowX && var2 >= this.lowY && var2 < this.highY + this.lowY; // L: 29
+	public boolean method6577(int var1, int var2) {
+		return var1 >= this.lowX && var1 < this.lowX + this.highX && var2 >= this.lowY && var2 < this.highY + this.lowY; // L: 29
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lmo;Lmo;I)V",
-		garbageValue = "-1080090251"
+		descriptor = "(Lme;Lme;S)V",
+		garbageValue = "3129"
 	)
-	public void method6353(Bounds var1, Bounds var2) {
-		this.method6343(var1, var2); // L: 37
-		this.method6344(var1, var2); // L: 38
+	public void method6578(Bounds var1, Bounds var2) {
+		this.method6579(var1, var2); // L: 37
+		this.method6574(var1, var2); // L: 38
 	} // L: 39
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lmo;Lmo;I)V",
-		garbageValue = "-953724915"
+		descriptor = "(Lme;Lme;S)V",
+		garbageValue = "381"
 	)
-	void method6343(Bounds var1, Bounds var2) {
+	void method6579(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 * -373048605 - (var1.lowX * -373048605 - this.lowX * -373048605)) * -1371710773; // L: 45
+			var2.highX = (var2.highX * 288726831 - (var1.lowX * 288726831 - this.lowX * 288726831)) * 64358351; // L: 45
 			var2.lowX = var1.lowX; // L: 46
 		}
 
-		if (var2.method6345() > var1.method6345()) { // L: 48
-			var2.highX -= var2.method6345() - var1.method6345(); // L: 49
+		if (var2.method6581() > var1.method6581()) { // L: 48
+			var2.highX -= var2.method6581() - var1.method6581(); // L: 49
 		}
 
 		if (var2.highX < 0) { // L: 51
@@ -105,21 +105,21 @@ void method6343(Bounds var1, Bounds var2) {
 
 	} // L: 52
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lmo;Lmo;B)V",
-		garbageValue = "107"
+		descriptor = "(Lme;Lme;I)V",
+		garbageValue = "-1164608832"
 	)
-	void method6344(Bounds var1, Bounds var2) {
+	void method6574(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 * -447998599 - (var1.lowY * -447998599 - this.lowY * -447998599)) * -179878711; // L: 58
+			var2.highY = (var2.highY * -327903587 - (var1.lowY * -327903587 - this.lowY * -327903587)) * 1178509237; // L: 58
 			var2.lowY = var1.lowY; // L: 59
 		}
 
-		if (var2.method6369() > var1.method6369()) { // L: 61
-			var2.highY -= var2.method6369() - var1.method6369(); // L: 62
+		if (var2.method6582() > var1.method6582()) { // L: 61
+			var2.highY -= var2.method6582() - var1.method6582(); // L: 62
 		}
 
 		if (var2.highY < 0) { // L: 64
@@ -128,69 +128,38 @@ void method6344(Bounds var1, Bounds var2) {
 
 	} // L: 65
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-123662248"
+		garbageValue = "-1484273265"
 	)
-	int method6345() {
+	int method6581() {
 		return this.lowX + this.highX; // L: 68
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "539098241"
+		descriptor = "(B)I",
+		garbageValue = "-8"
 	)
-	int method6369() {
-		return this.highY + this.lowY; // L: 72
+	int method6582() {
+		return this.lowY + this.highY; // L: 72
 	}
 
 	public String toString() {
 		return null; // L: 33
 	}
 
-	@ObfuscatedName("ft")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-113"
-	)
-	static void method6370() {
-		Client.packetWriter.clearBuffer(); // L: 3043
-		Client.packetWriter.packetBuffer.offset = 0; // L: 3044
-		Client.packetWriter.serverPacket = null; // L: 3045
-		Client.packetWriter.field1277 = null; // L: 3046
-		Client.packetWriter.field1284 = null; // L: 3047
-		Client.packetWriter.field1285 = null; // L: 3048
-		Client.packetWriter.serverPacketLength = 0; // L: 3049
-		Client.packetWriter.field1275 = 0; // L: 3050
-		Client.rebootTimer = 0; // L: 3051
-		KeyHandler.method343(); // L: 3052
-		Client.minimapState = 0; // L: 3053
-		Client.destinationX = 0; // L: 3054
-
-		int var0;
-		for (var0 = 0; var0 < 2048; ++var0) { // L: 3055
-			Client.players[var0] = null;
-		}
-
-		HealthBarDefinition.localPlayer = null; // L: 3056
-
-		for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 3057
-			NPC var1 = Client.npcs[var0]; // L: 3058
-			if (var1 != null) { // L: 3059
-				var1.targetIndex = -1; // L: 3060
-				var1.false0 = false; // L: 3061
+	@ObfuscatedName("c")
+	public static final void method6608(long var0) {
+		if (var0 > 0L) { // L: 9
+			if (var0 % 10L == 0L) { // L: 10
+				class411.method7280(var0 - 1L); // L: 11
+				class411.method7280(1L); // L: 12
+			} else {
+				class411.method7280(var0); // L: 14
 			}
-		}
 
-		GrandExchangeOfferUnitPriceComparator.method5485(); // L: 3064
-		WorldMapData_1.updateGameState(30); // L: 3065
-
-		for (var0 = 0; var0 < 100; ++var0) { // L: 3066
-			Client.field594[var0] = true;
 		}
-
-		Frames.method4481(); // L: 3067
-	} // L: 3068
+	} // L: 15
 }
diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java
index 5e59affed4..56395f6f8e 100644
--- a/runescape-client/src/main/java/Buddy.java
+++ b/runescape-client/src/main/java/Buddy.java
@@ -4,24 +4,24 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mt")
+@ObfuscatedName("mp")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1034960897
+		intValue = -162440659
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -641382841
+		intValue = -79798009
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1056150373
+		intValue = 616576577
 	)
 	@Export("rank")
 	public int rank;
@@ -30,10 +30,10 @@ public class Buddy extends User {
 		this.world = -1; // L: 4
 	} // L: 8
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "1899366567"
+		garbageValue = "130615034"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -41,23 +41,63 @@ void set(int var1, int var2) {
 		this.int2 = var2; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-2060140127"
+		garbageValue = "-619942050"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world; // L: 16
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-28"
+		descriptor = "(I)Z",
+		garbageValue = "616550004"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {
 		return this.world > 0; // L: 20
 	}
+
+	@ObfuscatedName("ga")
+	@ObfuscatedSignature(
+		descriptor = "(Lck;ZB)V",
+		garbageValue = "94"
+	)
+	@Export("addPlayerToScene")
+	static void addPlayerToScene(Player var0, boolean var1) {
+		if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 5447
+			var0.isUnanimated = false; // L: 5448
+			if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 5449 5450
+				var0.isUnanimated = true;
+			}
+
+			int var2 = var0.x >> 7; // L: 5452
+			int var3 = var0.y >> 7; // L: 5453
+			if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 5454
+				long var4 = SecureRandomFuture.calculateTag(0, 0, 0, false, var0.index); // L: 5455
+				if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 5456
+					var0.isUnanimated = false; // L: 5457
+					var0.tileHeight = FaceNormal.getTileHeight(var0.x, var0.y, class20.Client_plane); // L: 5458
+					var0.playerCycle = Client.cycle; // L: 5459
+					class7.scene.addNullableObject(class20.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 5460
+				} else {
+					if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 5463
+						if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 5464
+							return;
+						}
+
+						Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 5465
+					}
+
+					var0.tileHeight = FaceNormal.getTileHeight(var0.x, var0.y, class20.Client_plane); // L: 5467
+					var0.playerCycle = Client.cycle; // L: 5468
+					class7.scene.drawEntity(class20.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 5469
+				}
+			}
+		}
+
+	} // L: 5473
 }
diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java
index 6dfc7c0893..ffb6a76633 100644
--- a/runescape-client/src/main/java/BuddyRankComparator.java
+++ b/runescape-client/src/main/java/BuddyRankComparator.java
@@ -1,27 +1,17 @@
 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("dn")
+@ObfuscatedName("do")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("rd")
+	@ObfuscatedName("pw")
 	@ObfuscatedSignature(
-		descriptor = "Las;"
+		descriptor = "Lnq;"
 	)
-	@Export("pcmStreamMixer")
-	static PcmStreamMixer pcmStreamMixer;
-	@ObfuscatedName("sn")
-	@ObfuscatedGetter(
-		intValue = 31962043
-	)
-	static int field1333;
-	@ObfuscatedName("p")
-	@Export("ItemDefinition_inMembersWorld")
-	public static boolean ItemDefinition_inMembersWorld;
-	@ObfuscatedName("i")
+	static class370 field1342;
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -29,10 +19,10 @@ public BuddyRankComparator(boolean var1) {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;Lmt;B)I",
-		garbageValue = "1"
+		descriptor = "(Lmp;Lmp;I)I",
+		garbageValue = "-1364999182"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -47,58 +37,17 @@ public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("ld")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;III)Z",
-		garbageValue = "2134321189"
+		descriptor = "(IIIZI)V",
+		garbageValue = "1683360444"
 	)
-	public static boolean method2502(AbstractArchive var0, int var1, int var2) {
-		byte[] var3 = var0.takeFile(var1, var2); // L: 208
-		if (var3 == null) { // L: 209
-			return false;
-		} else {
-			Script.SpriteBuffer_decode(var3); // L: 210
-			return true; // L: 211
-		}
-	}
-
-	@ObfuscatedName("gm")
-	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "459"
-	)
-	static void method2500() {
-		int var0 = Players.Players_count; // L: 5051
-		int[] var1 = Players.Players_indices; // L: 5052
-
-		for (int var2 = 0; var2 < var0; ++var2) { // L: 5053
-			if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 5054
-				class132.addPlayerToScene(Client.players[var1[var2]], true); // L: 5055
-			}
-		}
-
-	} // L: 5057
-
-	@ObfuscatedName("le")
-	@ObfuscatedSignature(
-		descriptor = "(Ljf;I)Ljf;",
-		garbageValue = "1540120138"
-	)
-	static Widget method2501(Widget var0) {
-		int var2 = PendingSpawn.getWidgetFlags(var0); // L: 11886
-		int var1 = var2 >> 17 & 7; // L: 11888
-		int var3 = var1; // L: 11890
-		if (var1 == 0) { // L: 11891
-			return null;
-		} else {
-			for (int var4 = 0; var4 < var3; ++var4) { // L: 11892
-				var0 = UserComparator9.getWidget(var0.parentId); // L: 11893
-				if (var0 == null) { // L: 11894
-					return null;
-				}
-			}
-
-			return var0; // L: 11896
-		}
-	}
+	public static void method2547(int var0, int var1, int var2, boolean var3) {
+		PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2819, Client.packetWriter.isaacCipher); // L: 12675
+		var4.packetBuffer.method7527(var3 ? Client.field607 * 1420477321 * -1761828167 : 0); // L: 12676
+		var4.packetBuffer.method7349(var0); // L: 12677
+		var4.packetBuffer.method7343(var2); // L: 12678
+		var4.packetBuffer.writeShort(var1); // L: 12679
+		Client.packetWriter.addNode(var4); // L: 12680
+	} // L: 12681
 }
diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java
index f19e7a4215..12c6b2f5f2 100644
--- a/runescape-client/src/main/java/Buffer.java
+++ b/runescape-client/src/main/java/Buffer.java
@@ -5,21 +5,21 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("op")
+@ObfuscatedName("pi")
 @Implements("Buffer")
 public class Buffer extends Node {
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("crc32Table")
 	static int[] crc32Table;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("crc64Table")
 	static long[] crc64Table;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("array")
 	public byte[] array;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1120023427
+		intValue = 880174523
 	)
 	@Export("offset")
 	public int offset;
@@ -35,14 +35,14 @@ public class Buffer extends Node {
 				if ((var4 & 1) == 1) { // L: 24
 					var4 = var4 >>> 1 ^ -306674912;
 				} else {
-					var4 >>>= 1;
+					var4 >>>= 1; // L: 25
 				}
 			}
 
-			crc32Table[var1] = var4;
+			crc32Table[var1] = var4; // L: 27
 		}
 
-		crc64Table = new long[256];
+		crc64Table = new long[256]; // L: 31
 
 		for (var2 = 0; var2 < 256; ++var2) { // L: 36
 			long var0 = (long)var2; // L: 37
@@ -61,1060 +61,960 @@ public class Buffer extends Node {
 	} // L: 44
 
 	public Buffer(int var1) {
-		this.array = class194.ByteArrayPool_getArray(var1); // L: 69
-		this.offset = 0; // L: 70
-	} // L: 71
+		this.array = class285.ByteArrayPool_getArray(var1); // L: 56
+		this.offset = 0; // L: 57
+	} // L: 58
 
 	public Buffer(byte[] var1) {
-		this.array = var1; // L: 74
-		this.offset = 0; // L: 75
-	} // L: 76
+		this.array = var1; // L: 61
+		this.offset = 0; // L: 62
+	} // L: 63
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "75"
+		descriptor = "(I)V",
+		garbageValue = "1554155181"
 	)
 	@Export("releaseArray")
 	public void releaseArray() {
-		if (this.array != null) { // L: 79
-			InvDefinition.ByteArrayPool_release(this.array);
+		if (this.array != null) { // L: 66
+			class144.ByteArrayPool_release(this.array);
 		}
 
-		this.array = null; // L: 80
-	} // L: 81
+		this.array = null; // L: 67
+	} // L: 68
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1682380921"
+		garbageValue = "1925776909"
 	)
 	@Export("writeByte")
 	public void writeByte(int var1) {
-		this.array[++this.offset - 1] = (byte)var1; // L: 84
-	} // L: 85
+		this.array[++this.offset - 1] = (byte)var1; // L: 71
+	} // L: 72
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1867178833"
+		garbageValue = "-705913708"
 	)
 	@Export("writeShort")
 	public void writeShort(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 88
-		this.array[++this.offset - 1] = (byte)var1; // L: 89
-	} // L: 90
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 75
+		this.array[++this.offset - 1] = (byte)var1; // L: 76
+	} // L: 77
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "52"
+		descriptor = "(II)V",
+		garbageValue = "981694226"
 	)
 	@Export("writeMedium")
 	public void writeMedium(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 93
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 94
-		this.array[++this.offset - 1] = (byte)var1; // L: 95
-	} // L: 96
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 80
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 81
+		this.array[++this.offset - 1] = (byte)var1; // L: 82
+	} // L: 83
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "28"
+		descriptor = "(II)V",
+		garbageValue = "-381919842"
 	)
 	@Export("writeInt")
 	public void writeInt(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 99
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 100
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 101
-		this.array[++this.offset - 1] = (byte)var1; // L: 102
-	} // L: 103
+		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 86
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 87
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 88
+		this.array[++this.offset - 1] = (byte)var1; // L: 89
+	} // L: 90
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("aa")
 	@Export("writeLongMedium")
 	public void writeLongMedium(long var1) {
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 106
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 107
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 108
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 109
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 110
-		this.array[++this.offset - 1] = (byte)((int)var1); // L: 111
-	} // L: 112
-
-	@ObfuscatedName("au")
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 93
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 94
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 95
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 96
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 97
+		this.array[++this.offset - 1] = (byte)((int)var1); // L: 98
+	} // L: 99
+
+	@ObfuscatedName("as")
 	@Export("writeLong")
 	public void writeLong(long var1) {
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 115
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 116
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 117
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 118
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 119
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 120
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 121
-		this.array[++this.offset - 1] = (byte)((int)var1); // L: 122
-	} // L: 123
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 102
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 103
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 104
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 105
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 106
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 107
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 108
+		this.array[++this.offset - 1] = (byte)((int)var1); // L: 109
+	} // L: 110
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
-		garbageValue = "123"
+		descriptor = "(ZI)V",
+		garbageValue = "1421662569"
 	)
 	@Export("writeBoolean")
 	public void writeBoolean(boolean var1) {
-		this.writeByte(var1 ? 1 : 0); // L: 126
-	} // L: 127
+		this.writeByte(var1 ? 1 : 0); // L: 113
+	} // L: 114
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1386368008"
+		garbageValue = "333905694"
 	)
 	@Export("writeStringCp1252NullTerminated")
 	public void writeStringCp1252NullTerminated(String var1) {
-		int var2 = var1.indexOf(0); // L: 134
-		if (var2 >= 0) { // L: 135
+		int var2 = var1.indexOf(0); // L: 121
+		if (var2 >= 0) { // L: 122
 			throw new IllegalArgumentException("");
 		} else {
-			this.offset += class280.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 136
-			this.array[++this.offset - 1] = 0; // L: 137
+			this.offset += HitSplatDefinition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 123
+			this.array[++this.offset - 1] = 0; // L: 124
 		}
-	} // L: 138
+	} // L: 125
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-474138065"
+		garbageValue = "-2030941550"
 	)
 	@Export("writeStringCp1252NullCircumfixed")
 	public void writeStringCp1252NullCircumfixed(String var1) {
-		int var2 = var1.indexOf(0); // L: 141
-		if (var2 >= 0) { // L: 142
+		int var2 = var1.indexOf(0); // L: 128
+		if (var2 >= 0) { // L: 129
 			throw new IllegalArgumentException("");
 		} else {
-			this.array[++this.offset - 1] = 0; // L: 143
-			this.offset += class280.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 144
-			this.array[++this.offset - 1] = 0; // L: 145
+			this.array[++this.offset - 1] = 0; // L: 130
+			this.offset += HitSplatDefinition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 131
+			this.array[++this.offset - 1] = 0; // L: 132
 		}
-	} // L: 146
+	} // L: 133
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/CharSequence;I)V",
-		garbageValue = "916484170"
+		garbageValue = "-1691255738"
 	)
 	@Export("writeCESU8")
 	public void writeCESU8(CharSequence var1) {
-		int var3 = var1.length(); // L: 151
-		int var4 = 0; // L: 152
+		int var3 = var1.length(); // L: 138
+		int var4 = 0; // L: 139
 
-		int var5;
-		for (var5 = 0; var5 < var3; ++var5) { // L: 153
-			char var12 = var1.charAt(var5); // L: 154
-			if (var12 <= 127) { // L: 155
+		for (int var5 = 0; var5 < var3; ++var5) { // L: 140
+			char var6 = var1.charAt(var5); // L: 141
+			if (var6 <= 127) { // L: 142
 				++var4;
-			} else if (var12 <= 2047) { // L: 156
+			} else if (var6 <= 2047) { // L: 143
 				var4 += 2;
 			} else {
-				var4 += 3; // L: 157
+				var4 += 3; // L: 144
 			}
 		}
 
-		this.array[++this.offset - 1] = 0; // L: 162
-		this.writeVarInt(var4); // L: 163
-		var4 = this.offset * -288034005; // L: 164
-		byte[] var6 = this.array; // L: 166
-		int var7 = this.offset; // L: 167
-		int var8 = var1.length(); // L: 169
-		int var9 = var7; // L: 170
-
-		for (int var10 = 0; var10 < var8; ++var10) { // L: 171
-			char var11 = var1.charAt(var10); // L: 172
-			if (var11 <= 127) { // L: 173
-				var6[var9++] = (byte)var11; // L: 174
-			} else if (var11 <= 2047) { // L: 176
-				var6[var9++] = (byte)(192 | var11 >> 6); // L: 177
-				var6[var9++] = (byte)(128 | var11 & '?'); // L: 178
-			} else {
-				var6[var9++] = (byte)(224 | var11 >> '\f'); // L: 181
-				var6[var9++] = (byte)(128 | var11 >> 6 & 63); // L: 182
-				var6[var9++] = (byte)(128 | var11 & '?'); // L: 183
-			}
-		}
+		this.array[++this.offset - 1] = 0; // L: 149
+		this.writeVarInt(var4); // L: 150
+		this.offset += class400.method7147(this.array, this.offset, var1); // L: 151
+	} // L: 152
 
-		var5 = var9 - var7; // L: 186
-		this.offset = (var5 * -288034005 + var4) * 1120023427; // L: 188
-	} // L: 189
-
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "1668528908"
+		garbageValue = "-635018597"
 	)
 	@Export("writeBytes")
 	public void writeBytes(byte[] var1, int var2, int var3) {
-		for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 192
+		for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 155
 			this.array[++this.offset - 1] = var1[var4];
 		}
 
-	} // L: 193
+	} // L: 156
 
-	@ObfuscatedName("bg")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1147634113"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "55"
 	)
-	public void method6960(Buffer var1) {
-		this.writeBytes(var1.array, 0, var1.offset); // L: 196
-	} // L: 197
+	public void method7356(Buffer var1) {
+		this.writeBytes(var1.array, 0, var1.offset); // L: 159
+	} // L: 160
 
-	@ObfuscatedName("bl")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		descriptor = "(IS)V",
-		garbageValue = "8192"
+		descriptor = "(IB)V",
+		garbageValue = "-10"
 	)
 	@Export("writeLengthInt")
 	public void writeLengthInt(int var1) {
-		if (var1 < 0) { // L: 200
-			throw new IllegalArgumentException(); // L: 201
+		if (var1 < 0) { // L: 163
+			throw new IllegalArgumentException(); // L: 164
 		} else {
-			this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 203
-			this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 204
-			this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 205
-			this.array[this.offset - var1 - 1] = (byte)var1; // L: 206
+			this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 166
+			this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 167
+			this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 168
+			this.array[this.offset - var1 - 1] = (byte)var1; // L: 169
 		}
-	} // L: 207
+	} // L: 170
 
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bp")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1853887744"
+		garbageValue = "-1377737481"
 	)
 	@Export("writeLengthShort")
 	public void writeLengthShort(int var1) {
-		if (var1 >= 0 && var1 <= 65535) { // L: 210
-			this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 213
-			this.array[this.offset - var1 - 1] = (byte)var1; // L: 214
+		if (var1 >= 0 && var1 <= 65535) { // L: 173
+			this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 176
+			this.array[this.offset - var1 - 1] = (byte)var1; // L: 177
 		} else {
-			throw new IllegalArgumentException(); // L: 211
+			throw new IllegalArgumentException(); // L: 174
 		}
-	} // L: 215
+	} // L: 178
 
 	@ObfuscatedName("bd")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1322948126"
+		garbageValue = "852369875"
 	)
-	public void method6963(int var1) {
-		if (var1 >= 0 && var1 <= 255) { // L: 218
-			this.array[this.offset - var1 - 1] = (byte)var1; // L: 221
+	public void method7357(int var1) {
+		if (var1 >= 0 && var1 <= 255) { // L: 181
+			this.array[this.offset - var1 - 1] = (byte)var1; // L: 184
 		} else {
-			throw new IllegalArgumentException(); // L: 219
+			throw new IllegalArgumentException(); // L: 182
 		}
-	} // L: 222
+	} // L: 185
 
-	@ObfuscatedName("bt")
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-642432279"
+		descriptor = "(IB)V",
+		garbageValue = "0"
 	)
 	@Export("writeSmartByteShort")
 	public void writeSmartByteShort(int var1) {
-		if (var1 >= 0 && var1 < 128) { // L: 225
-			this.writeByte(var1); // L: 226
-		} else if (var1 >= 0 && var1 < 32768) { // L: 229
-			this.writeShort(var1 + 32768); // L: 230
+		if (var1 >= 0 && var1 < 128) { // L: 188
+			this.writeByte(var1); // L: 189
+		} else if (var1 >= 0 && var1 < 32768) { // L: 192
+			this.writeShort(var1 + 32768); // L: 193
 		} else {
-			throw new IllegalArgumentException(); // L: 233
+			throw new IllegalArgumentException(); // L: 196
 		}
-	} // L: 227 231
+	} // L: 190 194
 
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1155174988"
+		descriptor = "(IB)V",
+		garbageValue = "68"
 	)
 	@Export("writeVarInt")
 	public void writeVarInt(int var1) {
-		if ((var1 & -128) != 0) { // L: 237
-			if ((var1 & -16384) != 0) { // L: 238
-				if ((var1 & -2097152) != 0) { // L: 239
-					if ((var1 & -268435456) != 0) { // L: 240
+		if ((var1 & -128) != 0) { // L: 200
+			if ((var1 & -16384) != 0) { // L: 201
+				if ((var1 & -2097152) != 0) { // L: 202
+					if ((var1 & -268435456) != 0) { // L: 203
 						this.writeByte(var1 >>> 28 | 128);
 					}
 
-					this.writeByte(var1 >>> 21 | 128); // L: 241
+					this.writeByte(var1 >>> 21 | 128); // L: 204
 				}
 
-				this.writeByte(var1 >>> 14 | 128); // L: 243
+				this.writeByte(var1 >>> 14 | 128); // L: 206
 			}
 
-			this.writeByte(var1 >>> 7 | 128); // L: 245
+			this.writeByte(var1 >>> 7 | 128); // L: 208
 		}
 
-		this.writeByte(var1 & 127); // L: 247
-	} // L: 248
+		this.writeByte(var1 & 127); // L: 210
+	} // L: 211
 
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bg")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1818316420"
+		descriptor = "(B)I",
+		garbageValue = "0"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() {
-		return this.array[++this.offset - 1] & 255; // L: 251
+		return this.array[++this.offset - 1] & 255; // L: 214
 	}
 
-	@ObfuscatedName("bm")
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
 		descriptor = "(I)B",
-		garbageValue = "567219171"
+		garbageValue = "1210775957"
 	)
 	@Export("readByte")
 	public byte readByte() {
-		return this.array[++this.offset - 1]; // L: 255
+		return this.array[++this.offset - 1]; // L: 218
 	}
 
-	@ObfuscatedName("br")
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-156888586"
+		garbageValue = "-1298737604"
 	)
 	@Export("readUnsignedShort")
 	public int readUnsignedShort() {
-		this.offset += 2; // L: 259
-		return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 260
+		this.offset += 2; // L: 222
+		return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 223
 	}
 
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bm")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "8"
+		garbageValue = "119"
 	)
 	@Export("readShort")
 	public int readShort() {
-		this.offset += 2; // L: 264
-		int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 265
-		if (var1 > 32767) { // L: 266
+		this.offset += 2; // L: 227
+		int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 228
+		if (var1 > 32767) { // L: 229
 			var1 -= 65536;
 		}
 
-		return var1; // L: 267
+		return var1; // L: 230
 	}
 
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bs")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "12"
+		descriptor = "(I)I",
+		garbageValue = "349737024"
 	)
 	@Export("readMedium")
 	public int readMedium() {
-		this.offset += 3; // L: 271
-		return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 272
+		this.offset += 3; // L: 234
+		return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 235
 	}
 
 	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-662873675"
+		garbageValue = "-2091317100"
 	)
 	@Export("readInt")
 	public int readInt() {
-		this.offset += 4; // L: 276
-		return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 277
+		this.offset += 4; // L: 239
+		return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 240
 	}
 
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
 		descriptor = "(I)J",
-		garbageValue = "1642712423"
+		garbageValue = "1235603148"
 	)
 	@Export("readLong")
 	public long readLong() {
-		long var1 = (long)this.readInt() & 4294967295L; // L: 281
-		long var3 = (long)this.readInt() & 4294967295L; // L: 282
-		return var3 + (var1 << 32); // L: 283
+		long var1 = (long)this.readInt() & 4294967295L; // L: 244
+		long var3 = (long)this.readInt() & 4294967295L; // L: 245
+		return (var1 << 32) + var3; // L: 246
+	}
+
+	@ObfuscatedName("bc")
+	@ObfuscatedSignature(
+		descriptor = "(I)F",
+		garbageValue = "-1631750820"
+	)
+	public float method7369() {
+		return Float.intBitsToFloat(this.readInt()); // L: 250
 	}
 
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-99"
+		descriptor = "(I)Z",
+		garbageValue = "-260130890"
 	)
 	@Export("readBoolean")
 	public boolean readBoolean() {
-		return (this.readUnsignedByte() & 1) == 1; // L: 287
+		return (this.readUnsignedByte() & 1) == 1; // L: 254
 	}
 
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bt")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "92"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "2019206156"
 	)
 	@Export("readStringCp1252NullTerminatedOrNull")
 	public String readStringCp1252NullTerminatedOrNull() {
-		if (this.array[this.offset] == 0) { // L: 291
-			++this.offset; // L: 292
-			return null; // L: 293
+		if (this.array[this.offset] == 0) { // L: 258
+			++this.offset; // L: 259
+			return null; // L: 260
 		} else {
-			return this.readStringCp1252NullTerminated(); // L: 295
+			return this.readStringCp1252NullTerminated(); // L: 262
 		}
 	}
 
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bh")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-2118366594"
+		descriptor = "(B)Ljava/lang/String;",
+		garbageValue = "-96"
 	)
 	@Export("readStringCp1252NullTerminated")
 	public String readStringCp1252NullTerminated() {
-		int var1 = this.offset; // L: 299
+		int var1 = this.offset; // L: 266
 
-		while (this.array[++this.offset - 1] != 0) { // L: 300
+		while (this.array[++this.offset - 1] != 0) { // L: 267
 		}
 
-		int var2 = this.offset - var1 - 1; // L: 301
-		return var2 == 0 ? "" : class264.decodeStringCp1252(this.array, var1, var2); // L: 302 303
+		int var2 = this.offset - var1 - 1; // L: 268
+		return var2 == 0 ? "" : PendingSpawn.decodeStringCp1252(this.array, var1, var2); // L: 269 270
 	}
 
-	@ObfuscatedName("bk")
+	@ObfuscatedName("bn")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "1836215149"
+		garbageValue = "1092064384"
 	)
 	@Export("readStringCp1252NullCircumfixed")
 	public String readStringCp1252NullCircumfixed() {
-		byte var1 = this.array[++this.offset - 1]; // L: 307
-		if (var1 != 0) { // L: 308
+		byte var1 = this.array[++this.offset - 1]; // L: 274
+		if (var1 != 0) { // L: 275
 			throw new IllegalStateException("");
 		} else {
-			int var2 = this.offset; // L: 309
+			int var2 = this.offset; // L: 276
 
-			while (this.array[++this.offset - 1] != 0) { // L: 310
+			while (this.array[++this.offset - 1] != 0) { // L: 277
 			}
 
-			int var3 = this.offset - var2 - 1; // L: 311
-			return var3 == 0 ? "" : class264.decodeStringCp1252(this.array, var2, var3); // L: 312 313
+			int var3 = this.offset - var2 - 1; // L: 278
+			return var3 == 0 ? "" : PendingSpawn.decodeStringCp1252(this.array, var2, var3); // L: 279 280
 		}
 	}
 
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bj")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "1"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "97950757"
 	)
 	@Export("readCESU8")
 	public String readCESU8() {
-		byte var1 = this.array[++this.offset - 1]; // L: 317
-		if (var1 != 0) { // L: 318
+		byte var1 = this.array[++this.offset - 1]; // L: 284
+		if (var1 != 0) { // L: 285
 			throw new IllegalStateException("");
 		} else {
-			int var2 = this.readVarInt(); // L: 319
-			if (var2 + this.offset > this.array.length) { // L: 320
-				throw new IllegalStateException("");
+			int var2 = this.readVarInt(); // L: 286
+			if (var2 + this.offset > this.array.length) {
+				throw new IllegalStateException(""); // L: 287
 			} else {
-				byte[] var4 = this.array; // L: 322
-				int var5 = this.offset; // L: 323
-				char[] var6 = new char[var2]; // L: 325
-				int var7 = 0; // L: 326
-				int var8 = var5; // L: 327
-
-				int var11;
-				for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 328 329 360
-					int var10 = var4[var8++] & 255; // L: 330
-					if (var10 < 128) { // L: 332
-						if (var10 == 0) { // L: 333
-							var11 = 65533;
-						} else {
-							var11 = var10; // L: 334
-						}
-					} else if (var10 < 192) { // L: 336
-						var11 = 65533;
-					} else if (var10 < 224) { // L: 337
-						if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 338
-							var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 339
-							if (var11 < 128) { // L: 340
-								var11 = 65533;
-							}
-						} else {
-							var11 = 65533; // L: 342
-						}
-					} else if (var10 < 240) { // L: 344
-						if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 345
-							var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 346
-							if (var11 < 2048) { // L: 347
-								var11 = 65533;
-							}
-						} else {
-							var11 = 65533; // L: 349
-						}
-					} else if (var10 < 248) { // L: 351
-						if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 352
-							var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 353
-							if (var11 >= 65536 && var11 <= 1114111) { // L: 354
-								var11 = 65533; // L: 355
-							} else {
-								var11 = 65533;
-							}
-						} else {
-							var11 = 65533; // L: 357
-						}
-					} else {
-						var11 = 65533; // L: 359
-					}
-				}
-
-				String var3 = new String(var6, 0, var7); // L: 362
-				this.offset += var2; // L: 365
-				return var3; // L: 366
+				String var3 = MusicPatchNode.method5294(this.array, this.offset, var2); // L: 288
+				this.offset += var2; // L: 289
+				return var3; // L: 290
 			}
 		}
 	}
 
-	@ObfuscatedName("bn")
+	@ObfuscatedName("by")
 	@ObfuscatedSignature(
-		descriptor = "([BIIS)V",
-		garbageValue = "-19541"
+		descriptor = "([BIII)V",
+		garbageValue = "-2125427032"
 	)
 	@Export("readBytes")
 	public void readBytes(byte[] var1, int var2, int var3) {
 		for (int var4 = var2; var4 < var3 + var2; ++var4) {
-			var1[var4] = this.array[++this.offset - 1]; // L: 370
+			var1[var4] = this.array[++this.offset - 1]; // L: 294
 		}
 
-	} // L: 371
+	} // L: 295
 
-	@ObfuscatedName("be")
+	@ObfuscatedName("bk")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "67024683"
+		garbageValue = "51904897"
 	)
 	@Export("readShortSmart")
 	public int readShortSmart() {
-		int var1 = this.array[this.offset] & 255; // L: 374
-		return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 375 376
+		int var1 = this.array[this.offset] & 255; // L: 298
+		return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 299 300
 	}
 
-	@ObfuscatedName("bb")
+	@ObfuscatedName("bo")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "58"
+		garbageValue = "76"
 	)
 	@Export("readUShortSmart")
 	public int readUShortSmart() {
-		int var1 = this.array[this.offset] & 255; // L: 380
-		return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 381 382
+		int var1 = this.array[this.offset] & 255; // L: 304
+		return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 305 306
 	}
 
-	@ObfuscatedName("by")
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
-		descriptor = "(S)I",
-		garbageValue = "160"
+		descriptor = "(I)I",
+		garbageValue = "-487591152"
 	)
-	public int method6981() {
-		int var1 = 0; // L: 386
+	public int method7378() {
+		int var1 = 0; // L: 310
 
 		int var2;
-		for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 387 388 390
-			var1 += 32767; // L: 389
+		for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 311 312 314
+			var1 += 32767; // L: 313
 		}
 
-		var1 += var2; // L: 392
-		return var1; // L: 393
+		var1 += var2; // L: 316
+		return var1; // L: 317
 	}
 
-	@ObfuscatedName("ba")
+	@ObfuscatedName("be")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1825334288"
+		garbageValue = "-2012313947"
 	)
-	public int method6982() {
-		return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 397 398
+	public int method7561() {
+		return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 321 322
 	}
 
-	@ObfuscatedName("bq")
+	@ObfuscatedName("ce")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "74"
+		descriptor = "(I)I",
+		garbageValue = "-745038115"
 	)
-	public int method6946() {
-		if (this.array[this.offset] < 0) { // L: 402
+	public int method7400() {
+		if (this.array[this.offset] < 0) { // L: 326
 			return this.readInt() & Integer.MAX_VALUE;
 		} else {
-			int var1 = this.readUnsignedShort(); // L: 403
-			return var1 == 32767 ? -1 : var1; // L: 404
+			int var1 = this.readUnsignedShort(); // L: 327
+			return var1 == 32767 ? -1 : var1; // L: 328
 		}
 	}
 
-	@ObfuscatedName("ca")
+	@ObfuscatedName("cl")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1116819358"
+		garbageValue = "-1765795058"
 	)
 	@Export("readVarInt")
 	public int readVarInt() {
-		byte var1 = this.array[++this.offset - 1]; // L: 409
+		byte var1 = this.array[++this.offset - 1]; // L: 333
 
 		int var2;
-		for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 410 411 413
-			var2 = (var2 | var1 & 127) << 7; // L: 412
+		for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 334 335 337
+			var2 = (var2 | var1 & 127) << 7; // L: 336
 		}
 
-		return var2 | var1; // L: 415
+		return var2 | var1; // L: 339
 	}
 
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cp")
 	@ObfuscatedSignature(
 		descriptor = "([IB)V",
-		garbageValue = "0"
+		garbageValue = "38"
 	)
 	@Export("xteaEncryptAll")
 	public void xteaEncryptAll(int[] var1) {
-		int var2 = this.offset / 8; // L: 419
-		this.offset = 0; // L: 420
-
-		for (int var3 = 0; var3 < var2; ++var3) { // L: 421
-			int var4 = this.readInt(); // L: 422
-			int var5 = this.readInt(); // L: 423
-			int var6 = 0; // L: 424
-			int var7 = -1640531527; // L: 425
-
-			for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 426 427 430
-				var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 428
-				var6 += var7; // L: 429
+		int var2 = this.offset / 8; // L: 343
+		this.offset = 0; // L: 344
+
+		for (int var3 = 0; var3 < var2; ++var3) { // L: 345
+			int var4 = this.readInt(); // L: 346
+			int var5 = this.readInt(); // L: 347
+			int var6 = 0; // L: 348
+			int var7 = -1640531527; // L: 349
+
+			for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 350 351 354
+				var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 352
+				var6 += var7; // L: 353
 			}
 
-			this.offset -= 8; // L: 432
-			this.writeInt(var4); // L: 433
-			this.writeInt(var5); // L: 434
+			this.offset -= 8; // L: 356
+			this.writeInt(var4); // L: 357
+			this.writeInt(var5); // L: 358
 		}
 
-	} // L: 436
+	} // L: 360
 
-	@ObfuscatedName("ck")
+	@ObfuscatedName("cd")
 	@ObfuscatedSignature(
-		descriptor = "([IB)V",
-		garbageValue = "-72"
+		descriptor = "([IS)V",
+		garbageValue = "128"
 	)
 	@Export("xteaDecryptAll")
 	public void xteaDecryptAll(int[] var1) {
-		int var2 = this.offset / 8; // L: 439
-		this.offset = 0; // L: 440
-
-		for (int var3 = 0; var3 < var2; ++var3) { // L: 441
-			int var4 = this.readInt(); // L: 442
-			int var5 = this.readInt(); // L: 443
-			int var6 = -957401312; // L: 444
-			int var7 = -1640531527; // L: 445
-
-			for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 446 447 450
-				var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 448
-				var6 -= var7; // L: 449
+		int var2 = this.offset / 8; // L: 363
+		this.offset = 0; // L: 364
+
+		for (int var3 = 0; var3 < var2; ++var3) { // L: 365
+			int var4 = this.readInt(); // L: 366
+			int var5 = this.readInt(); // L: 367
+			int var6 = -957401312; // L: 368
+			int var7 = -1640531527; // L: 369
+
+			for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 370 371 374
+				var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 372
+				var6 -= var7; // L: 373
 			}
 
-			this.offset -= 8; // L: 452
-			this.writeInt(var4); // L: 453
-			this.writeInt(var5); // L: 454
+			this.offset -= 8; // L: 376
+			this.writeInt(var4); // L: 377
+			this.writeInt(var5); // L: 378
 		}
 
-	} // L: 456
+	} // L: 380
 
-	@ObfuscatedName("ci")
+	@ObfuscatedName("ck")
 	@ObfuscatedSignature(
-		descriptor = "([IIII)V",
-		garbageValue = "-1821183174"
+		descriptor = "([IIIB)V",
+		garbageValue = "0"
 	)
 	@Export("xteaEncrypt")
 	public void xteaEncrypt(int[] var1, int var2, int var3) {
-		int var4 = this.offset; // L: 459
-		this.offset = var2; // L: 460
-		int var5 = (var3 - var2) / 8; // L: 461
-
-		for (int var6 = 0; var6 < var5; ++var6) { // L: 462
-			int var7 = this.readInt(); // L: 463
-			int var8 = this.readInt(); // L: 464
-			int var9 = 0; // L: 465
-			int var10 = -1640531527; // L: 466
-
-			for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 467 468 471
-				var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 469
-				var9 += var10; // L: 470
+		int var4 = this.offset; // L: 383
+		this.offset = var2; // L: 384
+		int var5 = (var3 - var2) / 8; // L: 385
+
+		for (int var6 = 0; var6 < var5; ++var6) { // L: 386
+			int var7 = this.readInt(); // L: 387
+			int var8 = this.readInt(); // L: 388
+			int var9 = 0; // L: 389
+			int var10 = -1640531527; // L: 390
+
+			for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 391 392 395
+				var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 393
+				var9 += var10; // L: 394
 			}
 
-			this.offset -= 8; // L: 473
-			this.writeInt(var7); // L: 474
-			this.writeInt(var8); // L: 475
+			this.offset -= 8; // L: 397
+			this.writeInt(var7); // L: 398
+			this.writeInt(var8); // L: 399
 		}
 
-		this.offset = var4; // L: 477
-	} // L: 478
+		this.offset = var4; // L: 401
+	} // L: 402
 
-	@ObfuscatedName("cx")
+	@ObfuscatedName("cg")
 	@ObfuscatedSignature(
 		descriptor = "([IIII)V",
-		garbageValue = "-1004860310"
+		garbageValue = "1333662453"
 	)
 	@Export("xteaDecrypt")
 	public void xteaDecrypt(int[] var1, int var2, int var3) {
-		int var4 = this.offset; // L: 481
-		this.offset = var2; // L: 482
-		int var5 = (var3 - var2) / 8; // L: 483
-
-		for (int var6 = 0; var6 < var5; ++var6) { // L: 484
-			int var7 = this.readInt(); // L: 485
-			int var8 = this.readInt(); // L: 486
-			int var9 = -957401312; // L: 487
-			int var10 = -1640531527; // L: 488
-
-			for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 489 490 493
-				var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 491
-				var9 -= var10; // L: 492
+		int var4 = this.offset; // L: 405
+		this.offset = var2; // L: 406
+		int var5 = (var3 - var2) / 8; // L: 407
+
+		for (int var6 = 0; var6 < var5; ++var6) { // L: 408
+			int var7 = this.readInt(); // L: 409
+			int var8 = this.readInt(); // L: 410
+			int var9 = -957401312; // L: 411
+			int var10 = -1640531527; // L: 412
+
+			for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 413 414 417
+				var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 415
+				var9 -= var10; // L: 416
 			}
 
-			this.offset -= 8; // L: 495
-			this.writeInt(var7); // L: 496
-			this.writeInt(var8); // L: 497
+			this.offset -= 8; // L: 419
+			this.writeInt(var7); // L: 420
+			this.writeInt(var8); // L: 421
 		}
 
-		this.offset = var4; // L: 499
-	} // L: 500
+		this.offset = var4; // L: 423
+	} // L: 424
 
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cy")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;B)V",
-		garbageValue = "-39"
+		descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V",
+		garbageValue = "377869795"
 	)
 	@Export("encryptRsa")
 	public void encryptRsa(BigInteger var1, BigInteger var2) {
-		int var3 = this.offset; // L: 503
-		this.offset = 0; // L: 504
-		byte[] var4 = new byte[var3]; // L: 505
-		this.readBytes(var4, 0, var3); // L: 506
-		BigInteger var5 = new BigInteger(var4); // L: 507
-		BigInteger var6 = var5.modPow(var1, var2); // L: 508
-		byte[] var7 = var6.toByteArray(); // L: 509
-		this.offset = 0; // L: 510
-		this.writeShort(var7.length); // L: 511
-		this.writeBytes(var7, 0, var7.length); // L: 512
-	} // L: 513
+		int var3 = this.offset; // L: 427
+		this.offset = 0; // L: 428
+		byte[] var4 = new byte[var3]; // L: 429
+		this.readBytes(var4, 0, var3); // L: 430
+		BigInteger var5 = new BigInteger(var4); // L: 431
+		BigInteger var6 = var5.modPow(var1, var2); // L: 432
+		byte[] var7 = var6.toByteArray(); // L: 433
+		this.offset = 0; // L: 434
+		this.writeShort(var7.length); // L: 435
+		this.writeBytes(var7, 0, var7.length); // L: 436
+	} // L: 437
 
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cn")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "651781584"
+		garbageValue = "-320777848"
 	)
 	@Export("writeCrc")
 	public int writeCrc(int var1) {
-		int var2 = class117.method2565(this.array, var1, this.offset); // L: 516
-		this.writeInt(var2); // L: 517
-		return var2; // L: 518
+		int var2 = Friend.method6298(this.array, var1, this.offset); // L: 440
+		this.writeInt(var2); // L: 441
+		return var2; // L: 442
 	}
 
-	@ObfuscatedName("cd")
+	@ObfuscatedName("cv")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1732705730"
+		garbageValue = "-1566510684"
 	)
 	@Export("checkCrc")
 	public boolean checkCrc() {
-		this.offset -= 4; // L: 522
-		int var1 = class117.method2565(this.array, 0, this.offset); // L: 523
-		int var2 = this.readInt(); // L: 524
-		return var1 == var2; // L: 525
+		this.offset -= 4; // L: 446
+		int var1 = Friend.method6298(this.array, 0, this.offset); // L: 447
+		int var2 = this.readInt(); // L: 448
+		return var2 == var1; // L: 449
 	}
 
-	@ObfuscatedName("cj")
+	@ObfuscatedName("co")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-803217558"
+		descriptor = "(IB)V",
+		garbageValue = "20"
 	)
-	public void method7171(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 530
-	} // L: 531
+	public void method7343(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 454
+	} // L: 455
 
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cc")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1557647527"
+		garbageValue = "-1424242195"
 	)
-	public void method6993(int var1) {
-		this.array[++this.offset - 1] = (byte)(0 - var1); // L: 534
-	} // L: 535
+	public void method7390(int var1) {
+		this.array[++this.offset - 1] = (byte)(0 - var1); // L: 458
+	} // L: 459
 
 	@ObfuscatedName("cs")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "27"
+		descriptor = "(II)V",
+		garbageValue = "-1515798115"
 	)
-	public void method6947(int var1) {
-		this.array[++this.offset - 1] = (byte)(128 - var1); // L: 538
-	} // L: 539
+	public void method7362(int var1) {
+		this.array[++this.offset - 1] = (byte)(128 - var1); // L: 462
+	} // L: 463
 
-	@ObfuscatedName("ce")
+	@ObfuscatedName("cr")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-933914321"
+		garbageValue = "786739447"
 	)
-	public int method6995() {
-		return this.array[++this.offset - 1] - 128 & 255; // L: 542
+	public int method7392() {
+		return this.array[++this.offset - 1] - 128 & 255; // L: 466
 	}
 
-	@ObfuscatedName("cp")
+	@ObfuscatedName("cb")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1659267158"
+		descriptor = "(B)I",
+		garbageValue = "-61"
 	)
-	public int method6996() {
-		return 0 - this.array[++this.offset - 1] & 255; // L: 546
+	public int method7520() {
+		return 0 - this.array[++this.offset - 1] & 255; // L: 470
 	}
 
-	@ObfuscatedName("cg")
+	@ObfuscatedName("cj")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "299017"
+		descriptor = "(B)I",
+		garbageValue = "100"
 	)
-	public int method6997() {
-		return 128 - this.array[++this.offset - 1] & 255; // L: 550
+	public int method7394() {
+		return 128 - this.array[++this.offset - 1] & 255; // L: 474
 	}
 
-	@ObfuscatedName("cw")
+	@ObfuscatedName("ca")
 	@ObfuscatedSignature(
 		descriptor = "(I)B",
-		garbageValue = "-466550700"
+		garbageValue = "-751409747"
 	)
-	public byte method6973() {
-		return (byte)(this.array[++this.offset - 1] - 128); // L: 554
+	public byte method7465() {
+		return (byte)(this.array[++this.offset - 1] - 128); // L: 478
 	}
 
-	@ObfuscatedName("cr")
+	@ObfuscatedName("cz")
 	@ObfuscatedSignature(
-		descriptor = "(I)B",
-		garbageValue = "-1366587411"
+		descriptor = "(B)B",
+		garbageValue = "91"
 	)
-	public byte method6999() {
-		return (byte)(0 - this.array[++this.offset - 1]); // L: 558
+	public byte method7396() {
+		return (byte)(0 - this.array[++this.offset - 1]); // L: 482
 	}
 
-	@ObfuscatedName("cu")
+	@ObfuscatedName("cw")
 	@ObfuscatedSignature(
-		descriptor = "(I)B",
-		garbageValue = "1916872137"
+		descriptor = "(B)B",
+		garbageValue = "31"
 	)
-	public byte method7128() {
-		return (byte)(128 - this.array[++this.offset - 1]); // L: 562
+	public byte method7397() {
+		return (byte)(128 - this.array[++this.offset - 1]); // L: 486
 	}
 
-	@ObfuscatedName("cc")
+	@ObfuscatedName("ct")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-355235162"
+		garbageValue = "-546649284"
 	)
-	public void method7001(int var1) {
-		this.array[++this.offset - 1] = (byte)var1; // L: 566
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 567
-	} // L: 568
+	public void method7398(int var1) {
+		this.array[++this.offset - 1] = (byte)var1; // L: 490
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 491
+	} // L: 492
 
-	@ObfuscatedName("ch")
+	@ObfuscatedName("ci")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "1"
+		descriptor = "(II)V",
+		garbageValue = "1845210605"
 	)
-	public void method6962(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 571
-		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 572
-	} // L: 573
+	public void method7349(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 495
+		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 496
+	} // L: 497
 
-	@ObfuscatedName("cz")
+	@ObfuscatedName("ch")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-2013527897"
+		garbageValue = "719222907"
 	)
-	public void method7003(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 576
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 577
-	} // L: 578
+	public void method7493(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 500
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 501
+	} // L: 502
 
-	@ObfuscatedName("cv")
+	@ObfuscatedName("cq")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "329550044"
+		garbageValue = "1146582636"
 	)
-	public int method7004() {
-		this.offset += 2; // L: 581
-		return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 582
+	public int method7401() {
+		this.offset += 2; // L: 505
+		return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 506
 	}
 
 	@ObfuscatedName("cf")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1756257139"
+		descriptor = "(B)I",
+		garbageValue = "-21"
 	)
-	public int method7120() {
-		this.offset += 2; // L: 586
-		return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 587
+	public int method7499() {
+		this.offset += 2; // L: 510
+		return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 511
 	}
 
-	@ObfuscatedName("cm")
+	@ObfuscatedName("cu")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-1"
+		descriptor = "(I)I",
+		garbageValue = "480164745"
 	)
-	public int method7006() {
-		this.offset += 2; // L: 591
-		return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 592
+	public int method7403() {
+		this.offset += 2; // L: 515
+		return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 516
 	}
 
-	@ObfuscatedName("co")
+	@ObfuscatedName("cx")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "123"
+		descriptor = "(I)I",
+		garbageValue = "-890444461"
 	)
-	public int method7007() {
-		this.offset += 2; // L: 596
-		int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 597
-		if (var1 > 32767) { // L: 598
+	public int method7404() {
+		this.offset += 2; // L: 520
+		int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 521
+		if (var1 > 32767) { // L: 522
 			var1 -= 65536;
 		}
 
-		return var1; // L: 599
+		return var1; // L: 523
 	}
 
-	@ObfuscatedName("cy")
+	@ObfuscatedName("cm")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "2144664606"
+		garbageValue = "-1356753455"
 	)
-	public int method7008() {
-		this.offset += 2; // L: 603
-		int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 604
-		if (var1 > 32767) { // L: 605
+	public int method7405() {
+		this.offset += 2; // L: 527
+		int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 528
+		if (var1 > 32767) { // L: 529
 			var1 -= 65536;
 		}
 
-		return var1; // L: 606
+		return var1; // L: 530
 	}
 
-	@ObfuscatedName("cb")
+	@ObfuscatedName("dm")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-123121164"
+	)
+	public int method7508() {
+		this.offset += 3; // L: 534
+		return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); // L: 535
+	}
+
+	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-410665583"
+		garbageValue = "441278727"
 	)
-	public void method7009(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 610
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 611
-		this.array[++this.offset - 1] = (byte)var1; // L: 612
-	} // L: 613
+	public void method7407(int var1) {
+		this.array[++this.offset - 1] = (byte)var1; // L: 539
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 540
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 541
+		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 542
+	} // L: 543
 
-	@ObfuscatedName("dq")
+	@ObfuscatedName("ds")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "-33"
+		garbageValue = "1"
 	)
-	public void method7010(int var1) {
-		this.array[++this.offset - 1] = (byte)var1; // L: 616
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 617
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 618
-		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 619
-	} // L: 620
+	public void method7527(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 546
+		this.array[++this.offset - 1] = (byte)var1; // L: 547
+		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 548
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 549
+	} // L: 550
 
-	@ObfuscatedName("df")
+	@ObfuscatedName("dv")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1586586045"
+		garbageValue = "-236068612"
 	)
 	@Export("writeIntME")
 	public void writeIntME(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 623
-		this.array[++this.offset - 1] = (byte)var1; // L: 624
-		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 625
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 626
-	} // L: 627
-
-	@ObfuscatedName("da")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1701296195"
-	)
-	public void method7126(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 630
-		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 631
-		this.array[++this.offset - 1] = (byte)var1; // L: 632
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 633
-	} // L: 634
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 553
+		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 554
+		this.array[++this.offset - 1] = (byte)var1; // L: 555
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 556
+	} // L: 557
 
-	@ObfuscatedName("dw")
+	@ObfuscatedName("do")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "268268119"
+		garbageValue = "520498881"
 	)
-	public int method7044() {
-		this.offset += 4; // L: 637
-		return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 638
+	public int method7568() {
+		this.offset += 4; // L: 560
+		return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 561
 	}
 
-	@ObfuscatedName("dn")
+	@ObfuscatedName("dt")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1588382751"
+		garbageValue = "1906700317"
 	)
-	public int method7021() {
-		this.offset += 4; // L: 642
-		return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 643
+	public int method7411() {
+		this.offset += 4; // L: 565
+		return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 566
 	}
 
-	@ObfuscatedName("dc")
+	@ObfuscatedName("dy")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-502850525"
+		garbageValue = "1988297097"
 	)
-	public int method7015() {
-		this.offset += 4; // L: 647
-		return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 648
+	public int method7412() {
+		this.offset += 4; // L: 570
+		return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 571
 	}
 
-	@ObfuscatedName("dh")
+	@ObfuscatedName("dk")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "742968975"
+		garbageValue = "640948899"
 	)
-	public void method7131(byte[] var1, int var2, int var3) {
-		for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 652
-			var1[var4] = this.array[++this.offset - 1];
-		}
-
-	} // L: 653
-
-	@ObfuscatedName("du")
-	@ObfuscatedSignature(
-		descriptor = "([BIIB)V",
-		garbageValue = "-86"
-	)
-	public void method7017(byte[] var1, int var2, int var3) {
+	public void method7413(byte[] var1, int var2, int var3) {
 		for (int var4 = var2; var4 < var3 + var2; ++var4) {
-			var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 656
+			var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 575
 		}
 
-	} // L: 657
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lfn;",
-		garbageValue = "-75"
-	)
-	@Export("getParamDefinition")
-	public static ParamComposition getParamDefinition(int var0) {
-		ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25
-		if (var1 != null) { // L: 26
-			return var1;
-		} else {
-			byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27
-			var1 = new ParamComposition(); // L: 28
-			if (var2 != null) { // L: 29
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode(); // L: 30
-			ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31
-			return var1; // L: 32
-		}
-	}
+	} // L: 576
 }
diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java
index a8f531b0b8..1a029ac198 100644
--- a/runescape-client/src/main/java/BufferedFile.java
+++ b/runescape-client/src/main/java/BufferedFile.java
@@ -6,72 +6,77 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nw")
+@ObfuscatedName("of")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("w")
+	@ObfuscatedName("of")
+	@ObfuscatedSignature(
+		descriptor = "[Ljm;"
+	)
+	static Widget[] field4430;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lnv;"
+		descriptor = "Loa;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = -6317381992095102917L
+		longValue = 5313238666665557627L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1221332547
+		intValue = 1559376933
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = -4589180679836101363L
+		longValue = -8337433420537901663L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -583652263
+		intValue = -909872049
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		longValue = -7053248549753571513L
+		longValue = 1615203526730876133L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		longValue = 546860634892874135L
+		longValue = 7909394256584759077L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		longValue = -7491440461977223765L
+		longValue = -3429143447233726345L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = 1371113279815841657L
+		longValue = 9073073567838288695L
 	)
 	@Export("fileOffset")
 	long fileOffset;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnv;II)V"
+		descriptor = "(Loa;II)V"
 	)
 	public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
 		this.readBufferOffset = -1L; // L: 9
@@ -84,10 +89,10 @@ public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
 		this.offset = 0L; // L: 24
 	} // L: 25
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-573814690"
+		garbageValue = "1200623510"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +100,7 @@ public void close() throws IOException {
 		this.accessFile.close(); // L: 29
 	} // L: 30
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) { // L: 33
@@ -105,30 +110,30 @@ public void seek(long var1) throws IOException {
 		}
 	} // L: 35
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)J",
-		garbageValue = "2046761239"
+		garbageValue = "2091243848"
 	)
 	@Export("length")
 	public long length() {
 		return this.length; // L: 38
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "([BI)V",
-		garbageValue = "1753178640"
+		garbageValue = "639492102"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length); // L: 42
 	} // L: 43
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "([BIII)V",
-		garbageValue = "265533303"
+		descriptor = "([BIIB)V",
+		garbageValue = "-122"
 	)
 	@Export("read")
 	public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -137,7 +142,7 @@ public void read(byte[] var1, int var2, int var3) throws IOException {
 				throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
 			}
 
-			if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48
+			if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { // 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 +151,7 @@ public void read(byte[] var1, int var2, int var3) throws IOException {
 			long var4 = this.offset; // L: 53
 			int var7 = var3; // L: 55
 			int var8;
-			if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56
+			if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56
 				var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57
 				if (var8 > var3) { // L: 58
 					var8 = var3;
@@ -184,7 +189,7 @@ public void read(byte[] var1, int var2, int var3) throws IOException {
 				this.offset += (long)var8; // L: 83
 			}
 
-			if (-1L != this.writeBufferOffset) { // L: 85
+			if (this.writeBufferOffset != -1L) { // L: 85
 				if (this.writeBufferOffset > this.offset && var3 > 0) { // L: 86
 					var8 = var2 + (int)(this.writeBufferOffset - this.offset); // L: 87
 					if (var8 > var3 + var2) { // L: 88
@@ -200,15 +205,15 @@ public void read(byte[] var1, int var2, int var3) throws IOException {
 
 				long var13 = -1L; // L: 95
 				long var10 = -1L; // L: 96
-				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { // L: 97
+				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { // L: 97
 					var13 = this.writeBufferOffset; // L: 98
 				} else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100
 					var13 = var4; // L: 101
 				}
 
-				if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { // L: 103
-					var10 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 104
-				} else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106
+				if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { // L: 103
+					var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104
+				} else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106
 					var10 = (long)var7 + var4; // L: 107
 				}
 
@@ -231,10 +236,10 @@ public void read(byte[] var1, int var2, int var3) throws IOException {
 		}
 	} // L: 125
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "255"
+		descriptor = "(I)V",
+		garbageValue = "429701892"
 	)
 	@Export("load")
 	void load() throws IOException {
@@ -261,10 +266,10 @@ void load() throws IOException {
 
 	} // L: 142
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)V",
-		garbageValue = "114"
+		descriptor = "([BIII)V",
+		garbageValue = "249074046"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
@@ -273,11 +278,11 @@ public void write(byte[] var1, int var2, int var3) throws IOException {
 				this.length = (long)var3 + this.offset;
 			}
 
-			if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147
+			if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147
 				this.flush(); // L: 148
 			}
 
-			if (this.writeBufferOffset != -1L && this.offset + (long)var3 > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150
+			if (-1L != this.writeBufferOffset && (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
@@ -289,7 +294,7 @@ public void write(byte[] var1, int var2, int var3) throws IOException {
 
 			if (var3 <= this.writeBuffer.length) { // L: 159
 				if (var3 > 0) { // L: 188
-					if (-1L == this.writeBufferOffset) { // L: 189
+					if (this.writeBufferOffset == -1L) { // L: 189
 						this.writeBufferOffset = this.offset;
 					}
 
@@ -314,21 +319,21 @@ public void write(byte[] var1, int var2, int var3) throws IOException {
 
 				long var9 = -1L; // L: 167
 				long var6 = -1L; // L: 168
-				if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169
+				if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // 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 ((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 && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { // L: 178
-					var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179
+				if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175
+					var6 = this.offset + (long)var3; // L: 176
+				} else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { // L: 178
+					var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179
 				}
 
 				if (var9 > -1L && var6 > var9) { // L: 181
 					int var8 = (int)(var6 - var9); // L: 182
-					System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); // L: 183
+					System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); // L: 183
 				}
 
 				this.offset += (long)var3; // L: 185
@@ -339,21 +344,21 @@ public void write(byte[] var1, int var2, int var3) throws IOException {
 		}
 	} // L: 186 193 200
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-435549947"
+		garbageValue = "826799242"
 	)
 	@Export("flush")
 	void flush() throws IOException {
-		if (this.writeBufferOffset != -1L) { // L: 203
-			if (this.fileOffset != this.writeBufferOffset) { // L: 204
+		if (-1L != this.writeBufferOffset) { // L: 203
+			if (this.writeBufferOffset != this.fileOffset) { // L: 204
 				this.accessFile.seek(this.writeBufferOffset); // L: 205
 				this.fileOffset = this.writeBufferOffset; // L: 206
 			}
 
 			this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208
-			this.fileOffset += (long)this.writeBufferLength * -485868214014705663L; // L: 209
+			this.fileOffset += (long)this.writeBufferLength * 1860547667617120257L; // L: 209
 			if (this.fileOffset > this.fileLength) { // L: 210
 				this.fileLength = this.fileOffset;
 			}
@@ -366,10 +371,10 @@ void flush() throws IOException {
 				var1 = this.readBufferOffset; // L: 217
 			}
 
-			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219
+			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219
 				var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220
-			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222
-				var3 = this.readBufferOffset + (long)this.readBufferLength; // L: 223
+			} else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222
+				var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223
 			}
 
 			if (var1 > -1L && var3 > var1) { // L: 225
diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java
index ed1042a536..3698662a03 100644
--- a/runescape-client/src/main/java/BufferedNetSocket.java
+++ b/runescape-client/src/main/java/BufferedNetSocket.java
@@ -5,19 +5,19 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mw")
+@ObfuscatedName("mg")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("socket")
 	Socket socket;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lme;"
+		descriptor = "Lmr;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "Lmb;"
 	)
@@ -34,74 +34,101 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18
 	} // L: 19
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "1"
+		descriptor = "(I)V",
+		garbageValue = "-2099219864"
 	)
 	@Export("close")
 	public void close() {
-		this.sink.close(); // L: 42
+		this.sink.close(); // L: 48
 
 		try {
-			this.socket.close(); // L: 44
-		} catch (IOException var2) { // L: 46
+			this.socket.close(); // L: 50
+		} catch (IOException var2) { // L: 52
 		}
 
-		this.source.close(); // L: 47
-	} // L: 48
+		this.source.close(); // L: 53
+	} // L: 54
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1953698452"
+		descriptor = "(B)I",
+		garbageValue = "-44"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
-		return this.source.readUnsignedByte(); // L: 30
+		return this.source.readUnsignedByte();
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1632705310"
+		garbageValue = "-1579083707"
 	)
 	@Export("available")
 	public int available() throws IOException {
-		return this.source.available(); // L: 26
+		return this.source.available(); // L: 28
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-1771919747"
+		garbageValue = "1654551476"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
-		return this.source.isAvailable(var1); // L: 22
+		return this.source.isAvailable(var1); // L: 23
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "([BIII)I",
-		garbageValue = "-1246528305"
+		descriptor = "([BIIS)I",
+		garbageValue = "909"
 	)
 	@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("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "-748791607"
+		garbageValue = "-1320460000"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
-		this.sink.write(var1, var2, var3); // L: 38
-	} // L: 39
+		this.sink.write(var1, var2, var3);
+	} // L: 44
 
 	protected void finalize() {
-		this.close(); // L: 51
-	} // L: 52
+		this.close(); // L: 58
+	} // L: 59
+
+	@ObfuscatedName("b")
+	public static String method6496(long var0) {
+		if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31
+			if (0L == var0 % 37L) { // L: 32
+				return null;
+			} else {
+				int var2 = 0; // L: 33
+
+				for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 34 35 37
+					++var2; // L: 36
+				}
+
+				StringBuilder var5 = new StringBuilder(var2); // L: 39
+
+				while (var0 != 0L) { // L: 40
+					long var6 = var0; // L: 41
+					var0 /= 37L; // L: 42
+					var5.append(class332.base37Table[(int)(var6 - var0 * 37L)]); // L: 43
+				}
+
+				return var5.reverse().toString(); // L: 45
+			}
+		} else {
+			return null;
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java
index 4f55b934a2..e456c57706 100644
--- a/runescape-client/src/main/java/BufferedSink.java
+++ b/runescape-client/src/main/java/BufferedSink.java
@@ -5,196 +5,263 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("mb")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("mk")
+	@ObfuscatedGetter(
+		intValue = -719644833
+	)
+	@Export("menuY")
+	static int menuY;
+	@ObfuscatedName("c")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 423842403
+		intValue = 345474963
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -23497381
+		intValue = 2075331091
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -756798361
+		intValue = 154665981
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("closed")
 	boolean closed;
 
 	BufferedSink(OutputStream var1, int var2) {
-		this.position = 0; // L: 186
-		this.limit = 0; // L: 187
-		this.outputStream = var1; // L: 192
-		this.capacity = var2 + 1; // L: 193
-		this.buffer = new byte[this.capacity]; // L: 194
-		this.thread = new Thread(this); // L: 195
-		this.thread.setDaemon(true); // L: 196
-		this.thread.start(); // L: 197
-	} // L: 198
-
-	@ObfuscatedName("i")
+		this.position = 0; // L: 193
+		this.limit = 0; // L: 194
+		this.outputStream = var1; // L: 199
+		this.capacity = var2 + 1; // L: 200
+		this.buffer = new byte[this.capacity]; // L: 201
+		this.thread = new Thread(this); // L: 202
+		this.thread.setDaemon(true); // L: 203
+		this.thread.start(); // L: 204
+	} // L: 205
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1714702657"
+		garbageValue = "1810348727"
 	)
 	@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
-				if (this.exception == null) {
-					this.exception = new IOException(var2); // L: 207
+			} catch (IOException var2) { // L: 213
+				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("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)V",
-		garbageValue = "127"
+		descriptor = "([BIII)V",
+		garbageValue = "103815641"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
-		if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 261
-			synchronized(this) { // L: 262
-				if (this.exception != null) { // L: 263
+		if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 268
+			synchronized(this) { // L: 269
+				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
-						throw new IOException("");
+					if (var5 < var3) {
+						throw new IOException(""); // L: 274
 					} else {
-						if (var3 + this.limit <= this.capacity) { // L: 268
-							System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 269
+						if (var3 + this.limit <= this.capacity) { // L: 275
+							System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 276
 						} else {
-							int var6 = this.capacity - this.limit; // L: 272
-							System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 273
-							System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 274
+							int var6 = this.capacity - this.limit; // L: 279
+							System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 280
+							System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 281
 						}
 
-						this.limit = (var3 + this.limit) % this.capacity; // L: 276
-						this.notifyAll(); // L: 277
+						this.limit = (var3 + this.limit) % this.capacity; // L: 283
+						this.notifyAll(); // L: 284
 					}
 				}
 			}
 		} else {
 			throw new IOException();
 		}
-	} // L: 279
+	} // L: 286
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1822143603"
+		garbageValue = "784609340"
 	)
 	@Export("close")
 	void close() {
-		synchronized(this) { // L: 282
-			this.closed = true; // L: 283
-			this.notifyAll(); // L: 284
-		} // L: 285
+		synchronized(this) { // L: 289
+			this.closed = true; // L: 290
+			this.notifyAll(); // L: 291
+		} // L: 292
 
 		try {
-			this.thread.join(); // L: 287
-		} catch (InterruptedException var3) { // L: 289
+			this.thread.join(); // L: 294
+		} 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
-					} catch (IOException var11) { // L: 226
-						this.exception = var11; // L: 227
-						return; // L: 228
+						this.outputStream.flush(); // L: 231
+					} catch (IOException var11) { // L: 233
+						this.exception = var11; // L: 234
+						return; // L: 235
 					}
 
-					if (this.isClosed()) { // L: 230
+					if (this.isClosed()) { // L: 237
 						return;
 					}
 
 					try {
-						this.wait(); // L: 232
-					} catch (InterruptedException var12) { // L: 234
+						this.wait(); // L: 239
+					} catch (InterruptedException var12) { // L: 241
 					}
 				}
 			}
 
 			try {
-				if (var1 + this.position <= this.capacity) { // L: 238
-					this.outputStream.write(this.buffer, this.position, var1); // L: 239
+				if (var1 + this.position <= this.capacity) { // L: 245
+					this.outputStream.write(this.buffer, this.position, var1); // L: 246
 				} else {
-					int var7 = this.capacity - this.position; // L: 242
-					this.outputStream.write(this.buffer, this.position, var7); // L: 243
-					this.outputStream.write(this.buffer, 0, var1 - var7); // L: 244
+					int var7 = this.capacity - this.position; // L: 249
+					this.outputStream.write(this.buffer, this.position, var7); // L: 250
+					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
-					this.exception = var2; // L: 249
-					return; // L: 250
+				synchronized(this) { // L: 255
+					this.exception = var2; // L: 256
+					return; // L: 257
 				}
 			}
 
-			synchronized(this) { // L: 253
-				this.position = (var1 + this.position) % this.capacity; // L: 254
-			} // L: 255
-		} while(!this.isClosed()); // L: 256
+			synchronized(this) { // L: 260
+				this.position = (var1 + this.position) % this.capacity; // L: 261
+			} // L: 262
+		} while(!this.isClosed()); // L: 263
+
+	}
 
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-1853043366"
+	)
+	static int method6551(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1113
+		if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1114
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1115
+			return 1; // L: 1116
+		} else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1118
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1119
+			return 1; // L: 1120
+		} else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1122
+			Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; // L: 1123
+			return 1; // L: 1124
+		} else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1126
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1127
+			return 1; // L: 1128
+		} else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1130
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1131
+			return 1; // L: 1132
+		} else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1134
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1135
+			return 1; // L: 1136
+		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1138
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1139
+			return 1; // L: 1140
+		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1142
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1143
+			return 1; // L: 1144
+		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1146
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1147
+			return 1; // L: 1148
+		} else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1150
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1151
+			return 1; // L: 1152
+		} else if (var0 == 1610) { // L: 1154
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1155
+			return 1; // L: 1156
+		} else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1158
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color; // L: 1159
+			return 1; // L: 1160
+		} else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1162
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color2; // L: 1163
+			return 1; // L: 1164
+		} else if (var0 == 1613) { // L: 1166
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1167
+			return 1; // L: 1168
+		} else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1170
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1171
+			return 1; // L: 1172
+		} else if (var0 != 1615 && var0 != 1616) { // L: 1174
+			return 2; // L: 1178
+		} else {
+			++IsaacCipher.Interpreter_intStackSize; // L: 1175
+			return 1; // L: 1176
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java
index 579bb3d216..e76f37cc14 100644
--- a/runescape-client/src/main/java/BufferedSource.java
+++ b/runescape-client/src/main/java/BufferedSource.java
@@ -1,84 +1,91 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
+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("me")
+@ObfuscatedName("mr")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("u")
+	@Export("cacheSubPaths")
+	public static String[] cacheSubPaths;
+	@ObfuscatedName("bv")
+	@Export("otp")
+	static String otp;
+	@ObfuscatedName("c")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 2040579907
+		intValue = -1854638595
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1771772075
+		intValue = 1353886439
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -207794261
+		intValue = 980101141
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("exception")
 	IOException exception;
 
 	BufferedSource(InputStream var1, int var2) {
-		this.position = 0; // L: 59
-		this.limit = 0; // L: 60
-		this.inputStream = var1; // L: 64
-		this.capacity = var2 + 1; // L: 65
-		this.buffer = new byte[this.capacity]; // L: 66
-		this.thread = new Thread(this); // L: 67
-		this.thread.setDaemon(true); // L: 68
-		this.thread.start(); // L: 69
-	} // L: 70
-
-	@ObfuscatedName("i")
+		this.position = 0; // L: 66
+		this.limit = 0;
+		this.inputStream = var1;
+		this.capacity = var2 + 1;
+		this.buffer = new byte[this.capacity];
+		this.thread = new Thread(this);
+		this.thread.setDaemon(true); // L: 75
+		this.thread.start();
+	}
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "529289225"
+		garbageValue = "1211615101"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
-		if (var1 == 0) { // L: 106
+		if (var1 == 0) {
 			return true;
-		} else if (var1 > 0 && var1 < this.capacity) { // L: 107
-			synchronized(this) { // L: 108
+		} else if (var1 > 0 && var1 < this.capacity) {
+			synchronized(this) { // L: 115
 				int var3;
-				if (this.position <= this.limit) { // L: 110
+				if (this.position <= this.limit) {
 					var3 = this.limit - this.position;
 				} else {
-					var3 = this.capacity - this.position + this.limit; // L: 111
+					var3 = this.capacity - this.position + this.limit;
 				}
 
-				if (var3 < var1) { // L: 112
-					if (this.exception != null) { // L: 113
+				if (var3 < var1) { // L: 119
+					if (this.exception != null) { // L: 120
 						throw new IOException(this.exception.toString());
 					} else {
-						this.notifyAll(); // L: 114
-						return false; // L: 115
+						this.notifyAll();
+						return false;
 					}
 				} else {
-					return true; // L: 117
+					return true;
 				}
 			}
 		} else {
@@ -86,87 +93,87 @@ boolean isAvailable(int var1) throws IOException {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-50"
+		descriptor = "(I)I",
+		garbageValue = "-146970254"
 	)
 	@Export("available")
 	int available() throws IOException {
-		synchronized(this) { // L: 122
+		synchronized(this) {
 			int var2;
-			if (this.position <= this.limit) { // L: 124
+			if (this.position <= this.limit) {
 				var2 = this.limit - this.position;
 			} else {
-				var2 = this.capacity - this.position + this.limit; // L: 125
+				var2 = this.capacity - this.position + this.limit;
 			}
 
-			if (var2 <= 0 && this.exception != null) { // L: 126
-				throw new IOException(this.exception.toString()); // L: 127
+			if (var2 <= 0 && this.exception != null) {
+				throw new IOException(this.exception.toString()); // L: 134
 			} else {
-				this.notifyAll(); // L: 129
-				return var2; // L: 130
+				this.notifyAll();
+				return var2;
 			}
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-42"
+		garbageValue = "52"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
-		synchronized(this) { // L: 135
-			if (this.position == this.limit) { // L: 136
-				if (this.exception != null) { // L: 137
+		synchronized(this) { // L: 142
+			if (this.position == this.limit) {
+				if (this.exception != null) {
 					throw new IOException(this.exception.toString());
 				} else {
-					return -1; // L: 138
+					return -1;
 				}
 			} else {
-				int var2 = this.buffer[this.position] & 255; // L: 140
-				this.position = (this.position + 1) % this.capacity; // L: 141
-				this.notifyAll(); // L: 142
-				return var2; // L: 143
+				int var2 = this.buffer[this.position] & 255; // L: 147
+				this.position = (this.position + 1) % this.capacity;
+				this.notifyAll();
+				return var2;
 			}
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "([BIIS)I",
-		garbageValue = "128"
+		descriptor = "([BIIB)I",
+		garbageValue = "126"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
-		if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 148
-			synchronized(this) { // L: 149
+		if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 155
+			synchronized(this) {
 				int var5;
-				if (this.position <= this.limit) { // L: 151
+				if (this.position <= this.limit) {
 					var5 = this.limit - this.position;
 				} else {
-					var5 = this.capacity - this.position + this.limit; // L: 152
+					var5 = this.capacity - this.position + this.limit; // L: 159
 				}
 
-				if (var3 > var5) { // L: 153
+				if (var3 > var5) {
 					var3 = var5;
 				}
 
-				if (var3 == 0 && this.exception != null) { // L: 154
+				if (var3 == 0 && this.exception != null) {
 					throw new IOException(this.exception.toString());
 				} else {
-					if (var3 + this.position <= this.capacity) { // L: 155
-						System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 156
+					if (var3 + this.position <= this.capacity) {
+						System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 163
 					} else {
-						int var6 = this.capacity - this.position; // L: 159
-						System.arraycopy(this.buffer, this.position, var1, var2, var6); // L: 160
-						System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); // L: 161
+						int var6 = this.capacity - this.position;
+						System.arraycopy(this.buffer, this.position, var1, var2, var6);
+						System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6);
 					}
 
-					this.position = (var3 + this.position) % this.capacity; // L: 163
-					this.notifyAll(); // L: 164
-					return var3; // L: 165
+					this.position = (var3 + this.position) % this.capacity; // L: 170
+					this.notifyAll();
+					return var3;
 				}
 			}
 		} else {
@@ -174,82 +181,223 @@ int read(byte[] var1, int var2, int var3) throws IOException {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-885928224"
+		garbageValue = "1858620597"
 	)
 	@Export("close")
 	void close() {
-		synchronized(this) { // L: 170
+		synchronized(this) { // L: 177
 			if (this.exception == null) {
-				this.exception = new IOException(""); // L: 171
+				this.exception = new IOException(""); // L: 178
 			}
 
-			this.notifyAll(); // L: 172
+			this.notifyAll(); // L: 179
 		}
 
 		try {
-			this.thread.join(); // L: 175
-		} catch (InterruptedException var3) { // L: 177
+			this.thread.join(); // L: 182
+		} catch (InterruptedException var3) { // L: 184
 		}
 
-	} // L: 178
+	} // L: 185
 
 	public void run() {
 		while (true) {
 			int var1;
-			synchronized(this) { // L: 75
+			synchronized(this) {
 				while (true) {
-					if (this.exception != null) { // L: 77
+					if (this.exception != null) {
 						return;
 					}
 
-					if (this.position == 0) { // L: 78
+					if (this.position == 0) {
 						var1 = this.capacity - this.limit - 1;
-					} else if (this.position <= this.limit) { // L: 79
+					} else if (this.position <= this.limit) {
 						var1 = this.capacity - this.limit;
 					} else {
-						var1 = this.position - this.limit - 1; // L: 80
+						var1 = this.position - this.limit - 1; // L: 87
 					}
 
-					if (var1 > 0) { // L: 81
+					if (var1 > 0) {
 						break;
 					}
 
 					try {
-						this.wait(); // L: 83
-					} catch (InterruptedException var10) { // L: 85
+						this.wait();
+					} catch (InterruptedException var10) {
 					}
 				}
 			}
 
 			int var7;
 			try {
-				var7 = this.inputStream.read(this.buffer, this.limit, var1); // L: 90
+				var7 = this.inputStream.read(this.buffer, this.limit, var1);
 				if (var7 == -1) {
-					throw new EOFException(); // L: 91
+					throw new EOFException();
 				}
-			} catch (IOException var11) { // L: 93
+			} catch (IOException var11) {
 				IOException var3 = var11;
-				synchronized(this) { // L: 94
-					this.exception = var3; // L: 95
-					return; // L: 96
+				synchronized(this) {
+					this.exception = var3;
+					return; // L: 103
 				}
 			}
 
-			synchronized(this) { // L: 99
-				this.limit = (var7 + this.limit) % this.capacity; // L: 100
-			} // L: 101
+			synchronized(this) {
+				this.limit = (var7 + this.limit) % this.capacity; // L: 107
+			}
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/String;Llf;II)Liw;",
+		garbageValue = "821161285"
+	)
+	public static PacketBufferNode method6527(int var0, String var1, Language var2, int var3) {
+		PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2897, 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());
+		} else if (var6.startsWith("glow1:")) { // L: 59
+			var7 = 9;
+			var1 = var1.substring("glow1:".length()); // L: 61
+		} else if (var6.startsWith("glow2:")) {
+			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
+		class370.method6755(var4.packetBuffer, var1); // L: 167
+		if (var0 == class282.field3379.rsOrdinal()) { // L: 168
+			var4.packetBuffer.writeByte(var3); // L: 169
+		}
+
+		var4.packetBuffer.method7357(var4.packetBuffer.offset - var5); // L: 171
+		return var4; // L: 172
+	}
+
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/String;[II)V",
-		garbageValue = "1983432139"
+		descriptor = "(I)V",
+		garbageValue = "843929154"
 	)
-	public static void method6301(String[] var0, int[] var1) {
-		class122.method2599(var0, var1, 0, var0.length - 1); // L: 43
-	} // L: 44
+	static void method6516() {
+		Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57
+
+		while (var0.hasNext()) {
+			Message var1 = (Message)var0.next(); // L: 58
+			var1.clearIsFromIgnored(); // L: 60
+		}
+
+	} // L: 63
 }
diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java
index a685792c14..eadabd7fc7 100644
--- a/runescape-client/src/main/java/ByteArrayNode.java
+++ b/runescape-client/src/main/java/ByteArrayNode.java
@@ -2,10 +2,10 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("nb")
+@ObfuscatedName("nm")
 @Implements("ByteArrayNode")
 public class ByteArrayNode extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("byteArray")
 	public byte[] byteArray;
 
diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java
index 58dd794245..d740777c36 100644
--- a/runescape-client/src/main/java/ByteArrayPool.java
+++ b/runescape-client/src/main/java/ByteArrayPool.java
@@ -6,177 +6,155 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lb")
+@ObfuscatedName("lj")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -476985145
+		intValue = 1756482419
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1576005085
+		intValue = 379141881
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -381672383
+		intValue = 173834125
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -2068379159
+		intValue = -521742755
 	)
-	static int field3891;
-	@ObfuscatedName("j")
+	static int field4026;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 450416009
+		intValue = -1862899705
 	)
-	static int field3881;
-	@ObfuscatedName("b")
+	static int field4023;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -358256925
+		intValue = 1634057369
 	)
-	static int field3882;
-	@ObfuscatedName("x")
+	static int field4028;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -477323591
+		intValue = 1124968779
 	)
-	static int field3883;
-	@ObfuscatedName("y")
+	static int field4021;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 231839197
+		intValue = -1777784581
 	)
-	static int field3884;
-	@ObfuscatedName("k")
+	static int field4030;
+	@ObfuscatedName("d")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("u")
-	static byte[][] field3888;
-	@ObfuscatedName("z")
-	@Export("ByteArrayPool_altSizeArrayCounts")
-	static int[] ByteArrayPool_altSizeArrayCounts;
-	@ObfuscatedName("d")
-	static ArrayList field3890;
+	@ObfuscatedName("e")
+	static byte[][] field4034;
+	@ObfuscatedName("f")
+	public static ArrayList field4035;
 
 	static {
 		ByteArrayPool_smallCount = 0; // L: 13
 		ByteArrayPool_mediumCount = 0; // L: 14
 		ByteArrayPool_largeCount = 0; // L: 15
-		field3891 = 0; // L: 16
-		field3881 = 1000; // L: 17
-		field3882 = 250; // L: 18
-		field3883 = 100; // L: 19
-		field3884 = 50; // L: 20
+		field4026 = 0; // L: 16
+		field4023 = 1000; // L: 17
+		field4028 = 250; // L: 18
+		field4021 = 100; // L: 19
+		field4030 = 50; // L: 20
 		ByteArrayPool_small = new byte[1000][]; // L: 21
 		ByteArrayPool_medium = new byte[250][]; // L: 22
 		ByteArrayPool_large = new byte[100][]; // L: 23
-		field3888 = new byte[50][]; // L: 24
-		field3890 = new ArrayList(); // L: 28
-		class301.method5508(); // L: 31
+		field4034 = new byte[50][]; // L: 24
+		field4035 = new ArrayList(); // L: 28
+		field4035.clear(); // L: 32
+		field4035.add(100); // L: 33
+		field4035.add(5000); // L: 34
+		field4035.add(10000); // L: 35
+		field4035.add(30000); // L: 36
 		new HashMap();
-	} // L: 36
+	} // L: 42
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IZB)[B",
-		garbageValue = "66"
+		descriptor = "(IZS)[B",
+		garbageValue = "-3055"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
 		byte[] var4;
-		if (var0 != 100) { // L: 70
+		if (var0 != 100) { // L: 50
 			if (var0 < 100) {
 			}
 		} else if (ByteArrayPool_smallCount > 0) {
-			var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 71
-			ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 72
-			return var4; // L: 73
+			var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 51
+			ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 52
+			return var4; // L: 53
 		}
 
-		if (var0 != 5000) { // L: 75
+		if (var0 != 5000) { // L: 55
 			if (var0 < 5000) {
 			}
 		} else if (ByteArrayPool_mediumCount > 0) {
-			var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 76
-			ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 77
-			return var4; // L: 78
+			var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 56
+			ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 57
+			return var4; // L: 58
 		}
 
-		if (var0 != 10000) { // L: 80
+		if (var0 != 10000) { // L: 60
 			if (var0 < 10000) {
 			}
 		} else if (ByteArrayPool_largeCount > 0) {
-			var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 81
-			ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 82
-			return var4; // L: 83
+			var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 61
+			ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 62
+			return var4; // L: 63
 		}
 
-		if (var0 != 30000) { // L: 85
+		if (var0 != 30000) { // L: 65
 			if (var0 < 30000) {
 			}
-		} else if (field3891 > 0) {
-			var4 = field3888[--field3891]; // L: 86
-			field3888[field3891] = null; // L: 87
-			return var4; // L: 88
+		} else if (field4026 > 0) {
+			var4 = field4034[--field4026]; // L: 66
+			field4034[field4026] = null; // L: 67
+			return var4; // L: 68
 		}
 
-		if (class260.ByteArrayPool_arrays != null) { // L: 90
-			for (int var2 = 0; var2 < class176.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 91
-				if (class176.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 92
-					if (var0 < class176.ByteArrayPool_alternativeSizes[var2]) {
+		if (World.ByteArrayPool_arrays != null) { // L: 70
+			for (int var2 = 0; var2 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 71
+				if (SoundCache.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 72
+					if (var0 < SoundCache.ByteArrayPool_alternativeSizes[var2]) {
 					}
-				} else if (ByteArrayPool_altSizeArrayCounts[var2] > 0) {
-					byte[] var3 = class260.ByteArrayPool_arrays[var2][--ByteArrayPool_altSizeArrayCounts[var2]]; // L: 93
-					class260.ByteArrayPool_arrays[var2][ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 94
-					return var3; // L: 95
+				} else if (ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2] > 0) {
+					byte[] var3 = World.ByteArrayPool_arrays[var2][--ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 73
+					World.ByteArrayPool_arrays[var2][ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 74
+					return var3; // L: 75
 				}
 			}
 		}
 
-		return new byte[var0]; // L: 108
+		return new byte[var0]; // L: 88
 	}
 
-	@ObfuscatedName("bc")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "([BB)[B",
-		garbageValue = "-21"
+		descriptor = "(IZB)Ljava/lang/String;",
+		garbageValue = "43"
 	)
-	@Export("decompressBytes")
-	static final byte[] decompressBytes(byte[] var0) {
-		Buffer var1 = new Buffer(var0); // L: 406
-		int var2 = var1.readUnsignedByte(); // L: 407
-		int var3 = var1.readInt(); // L: 408
-		if (var3 < 0 || AbstractArchive.field3702 != 0 && var3 > AbstractArchive.field3702) { // L: 409
-			throw new RuntimeException(); // L: 410
-		} else if (var2 == 0) { // L: 412
-			byte[] var6 = new byte[var3]; // L: 413
-			var1.readBytes(var6, 0, var3); // L: 414
-			return var6; // L: 415
-		} else {
-			int var4 = var1.readInt(); // L: 418
-			if (var4 >= 0 && (AbstractArchive.field3702 == 0 || var4 <= AbstractArchive.field3702)) { // L: 419
-				byte[] var5 = new byte[var4]; // L: 422
-				if (var2 == 1) { // L: 423
-					BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9);
-				} else {
-					AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 424
-				}
-
-				return var5; // L: 425
-			} else {
-				throw new RuntimeException(); // L: 420
-			}
-		}
+	@Export("intToString")
+	public static String intToString(int var0, boolean var1) {
+		return var1 && var0 >= 0 ? Skeleton.method3944(var0, 10, var1) : Integer.toString(var0); // L: 111 112
 	}
 }
diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java
index b671afceb8..4ab2ed221e 100644
--- a/runescape-client/src/main/java/Calendar.java
+++ b/runescape-client/src/main/java/Calendar.java
@@ -1,20 +1,28 @@
 import java.util.TimeZone;
 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("jj")
+@ObfuscatedName("jf")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
 	static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("DAYS_OF_THE_WEEK")
 	static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("Calendar_calendar")
 	static java.util.Calendar Calendar_calendar;
+	@ObfuscatedName("ne")
+	@ObfuscatedGetter(
+		intValue = -1622402519
+	)
+	@Export("selectedItemSlot")
+	static int selectedItemSlot;
 
 	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
@@ -22,4 +30,35 @@ public class Calendar {
 		java.util.Calendar.getInstance(); // L: 22
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 23
 	} // L: 24
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIII)I",
+		garbageValue = "880813540"
+	)
+	public static int method5320(int var0, int var1, int var2, int var3, int var4, int var5) {
+		if ((var5 & 1) == 1) { // L: 9
+			int var6 = var3; // L: 10
+			var3 = var4; // L: 11
+			var4 = var6; // L: 12
+		}
+
+		var2 &= 3; // L: 14
+		if (var2 == 0) { // L: 15
+			return var1;
+		} else if (var2 == 1) { // L: 16
+			return 7 - var0 - (var3 - 1);
+		} else {
+			return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 17
+		}
+	}
+
+	@ObfuscatedName("aj")
+	@ObfuscatedSignature(
+		descriptor = "(IB)I",
+		garbageValue = "1"
+	)
+	static int method5323(int var0) {
+		return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3627
+	}
 }
diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java
index 23306f53af..8a2a446fc2 100644
--- a/runescape-client/src/main/java/Canvas.java
+++ b/runescape-client/src/main/java/Canvas.java
@@ -2,19 +2,26 @@
 import java.awt.Graphics;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("v")
+@ObfuscatedName("y")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("ad")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lod;"
+		descriptor = "Lku;"
 	)
-	@Export("rasterProvider")
-	public static AbstractRasterProvider rasterProvider;
-	@ObfuscatedName("i")
+	@Export("SequenceDefinition_archive")
+	public static AbstractArchive SequenceDefinition_archive;
+	@ObfuscatedName("fu")
+	@ObfuscatedGetter(
+		intValue = 2126946355
+	)
+	static int field163;
+	@ObfuscatedName("c")
 	@Export("component")
 	Component component;
 
@@ -22,161 +29,272 @@ public final class Canvas extends java.awt.Canvas {
 		this.component = var1; // L: 11
 	} // L: 12
 
+	public final void paint(Graphics var1) {
+		this.component.paint(var1);
+	} // L: 20
+
 	public final void update(Graphics var1) {
 		this.component.update(var1); // L: 15
-	} // L: 16
+	}
 
-	public final void paint(Graphics var1) {
-		this.component.paint(var1); // L: 19
-	} // L: 20
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;Loz;I)Loz;",
+		garbageValue = "278803147"
+	)
+	@Export("readStringIntParameters")
+	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
+		int var2 = var0.readUnsignedByte(); // L: 16
+		int var3;
+		if (var1 == null) { // L: 17
+			var3 = SpotAnimationDefinition.method3362(var2); // L: 18
+			var1 = new IterableNodeHashTable(var3); // L: 19
+		}
+
+		for (var3 = 0; var3 < var2; ++var3) { // L: 21
+			boolean var4 = var0.readUnsignedByte() == 1; // L: 22
+			int var5 = var0.readMedium(); // L: 23
+			Object var6;
+			if (var4) {
+				var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 25
+			} else {
+				var6 = new IntegerNode(var0.readInt()); // L: 26
+			}
+
+			var1.put((Node)var6, (long)var5); // L: 27
+		}
+
+		return var1; // L: 29
+	}
+
+	@ObfuscatedName("c")
+	public static double method408(double var0) {
+		return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9
+	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lfl;",
-		garbageValue = "80"
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "-48"
 	)
-	public static HitSplatDefinition method372(int var0) {
-		HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 52
-		if (var1 != null) { // L: 53
-			return var1;
+	static int method404(int var0, Script var1, boolean var2) {
+		Widget var3;
+		if (var0 >= 2000) { // L: 802
+			var0 -= 1000; // L: 803
+			var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 804
+		} else {
+			var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 806
+		}
+
+		SecureRandomCallable.invalidateWidget(var3); // L: 807
+		if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 808
+			if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 828
+				var3.modelType = 2; // L: 829
+				var3.modelId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 830
+				return 1; // L: 831
+			} else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 833
+				var3.modelType = 3; // L: 834
+				var3.modelId = class340.localPlayer.appearance.getChatHeadId(); // L: 835
+				return 1; // L: 836
+			} else {
+				return 2; // L: 838
+			}
 		} else {
-			byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54
-			var1 = new HitSplatDefinition(); // L: 55
-			if (var2 != null) { // L: 56
-				var1.decode(new Buffer(var2));
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 809
+			int var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 810
+			int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 811
+			var3.itemId = var4; // L: 812
+			var3.itemQuantity = var5; // L: 813
+			ItemComposition var6 = UserComparator6.ItemDefinition_get(var4); // L: 814
+			var3.modelAngleX = var6.xan2d; // L: 815
+			var3.modelAngleY = var6.yan2d; // L: 816
+			var3.modelAngleZ = var6.zan2d; // L: 817
+			var3.modelOffsetX = var6.offsetX2d; // L: 818
+			var3.modelOffsetY = var6.offsetY2d; // L: 819
+			var3.modelZoom = var6.zoom2d; // L: 820
+			if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) {
+				var3.itemQuantityMode = 0; // L: 821
+			} else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 822
+				var3.itemQuantityMode = 1;
+			} else {
+				var3.itemQuantityMode = 2; // L: 823
+			}
+
+			if (var3.field3280 > 0) { // L: 824
+				var3.modelZoom = var3.modelZoom * 32 / var3.field3280;
+			} else if (var3.rawWidth > 0) { // L: 825
+				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
 			}
 
-			HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57
-			return var1; // L: 58
+			return 1; // L: 826
 		}
 	}
 
-	@ObfuscatedName("ha")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(ZLoj;I)V",
-		garbageValue = "-1681354127"
+		descriptor = "(B)Lbw;",
+		garbageValue = "1"
 	)
-	@Export("loadRegions")
-	static final void loadRegions(boolean var0, PacketBuffer var1) {
-		Client.isInInstance = var0; // L: 5700
-		int var2;
-		int var3;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		if (!Client.isInInstance) { // L: 5701
-			var2 = var1.method7120(); // L: 5702
-			var3 = var1.method7004(); // L: 5703
-			int var4 = var1.readUnsignedShort(); // L: 5704
-			Client.xteaKeys = new int[var4][4]; // L: 5705
-
-			for (var5 = 0; var5 < var4; ++var5) { // L: 5706
-				for (var6 = 0; var6 < 4; ++var6) { // L: 5707
-					Client.xteaKeys[var5][var6] = var1.readInt(); // L: 5708
-				}
+	@Export("getNextWorldListWorld")
+	static World getNextWorldListWorld() {
+		return World.World_listCount < World.World_count ? class334.World_worlds[++World.World_listCount - 1] : null; // L: 242 243
+	}
+
+	@ObfuscatedName("ar")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "1167859989"
+	)
+	static int method405(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3635
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 3636
+			Client.field690 = (short)Calendar.method5323(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]); // L: 3637
+			if (Client.field690 <= 0) { // L: 3638
+				Client.field690 = 256;
 			}
 
-			LoginScreenAnimation.regions = new int[var4]; // L: 5711
-			class119.regionMapArchiveIds = new int[var4]; // L: 5712
-			class21.regionLandArchiveIds = new int[var4]; // L: 5713
-			ModeWhere.regionLandArchives = new byte[var4][]; // L: 5714
-			class184.regionMapArchives = new byte[var4][]; // L: 5715
-			boolean var16 = false; // L: 5716
-			if (Client.field619) { // L: 5717
-				if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 5718
-					var16 = true;
-				}
+			Client.field707 = (short)Calendar.method5323(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 3639
+			if (Client.field707 <= 0) { // L: 3640
+				Client.field707 = 256;
+			}
 
-				if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5719
-					var16 = true;
-				}
+			return 1; // L: 3641
+		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3643
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 3644
+			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3645
+			if (Client.zoomHeight <= 0) { // L: 3646
+				Client.zoomHeight = 256;
 			}
 
-			var4 = 0; // L: 5721
+			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3647
+			if (Client.zoomWidth <= 0) { // L: 3648
+				Client.zoomWidth = 320;
+			}
 
-			for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 5722
-				for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 5723
-					var8 = var7 + (var6 << 8); // L: 5724
-					if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5725
-						LoginScreenAnimation.regions[var4] = var8; // L: 5726
-						class119.regionMapArchiveIds[var4] = class11.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5727
-						class21.regionLandArchiveIds[var4] = class11.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5728
-						++var4; // L: 5729
-					}
-				}
+			return 1; // L: 3649
+		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3651
+			IsaacCipher.Interpreter_intStackSize -= 4; // L: 3652
+			Client.field619 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3653
+			if (Client.field619 <= 0) { // L: 3654
+				Client.field619 = 1;
+			}
+
+			Client.field735 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3655
+			if (Client.field735 <= 0) { // L: 3656
+				Client.field735 = 32767;
+			} else if (Client.field735 < Client.field619) { // L: 3657
+				Client.field735 = Client.field619;
+			}
+
+			Client.field736 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3658
+			if (Client.field736 <= 0) { // L: 3659
+				Client.field736 = 1;
+			}
+
+			Client.field737 = (short)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 3660
+			if (Client.field737 <= 0) { // L: 3661
+				Client.field737 = 32767;
+			} else if (Client.field737 < Client.field736) { // L: 3662
+				Client.field737 = Client.field736;
+			}
+
+			return 1; // L: 3663
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3665
+			if (Client.viewportWidget != null) { // L: 3666
+				WorldMapDecoration.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3667
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3668
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3669
+			} else {
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3672
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3673
 			}
 
-			EnumComposition.method3107(var3, var2, true); // L: 5732
+			return 1; // L: 3675
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3677
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3678
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3679
+			return 1; // L: 3680
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3682
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class67.method1962(Client.field690); // L: 3683
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class67.method1962(Client.field707); // L: 3684
+			return 1; // L: 3685
+		} else if (var0 == 6220) { // L: 3687
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3688
+			return 1; // L: 3689
+		} else if (var0 == 6221) { // L: 3691
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3692
+			return 1; // L: 3693
+		} else if (var0 == 6222) { // L: 3695
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class186.canvasWidth; // L: 3696
+			return 1; // L: 3697
+		} else if (var0 == 6223) { // L: 3699
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BoundaryObject.canvasHeight; // L: 3700
+			return 1; // L: 3701
 		} else {
-			var2 = var1.method7120(); // L: 5735
-			var3 = var1.readUnsignedShort(); // L: 5736
-			boolean var15 = var1.readUnsignedByte() == 1; // L: 5737
-			var5 = var1.readUnsignedShort(); // L: 5738
-			var1.importIndex(); // L: 5739
-
-			int var9;
-			for (var6 = 0; var6 < 4; ++var6) { // L: 5740
-				for (var7 = 0; var7 < 13; ++var7) { // L: 5741
-					for (var8 = 0; var8 < 13; ++var8) { // L: 5742
-						var9 = var1.readBits(1); // L: 5743
-						if (var9 == 1) {
-							Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5744
-						} else {
-							Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5745
-						}
-					}
-				}
+			return 2; // L: 3703
+		}
+	}
+
+	@ObfuscatedName("gs")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1717871248"
+	)
+	static final void method406() {
+		for (int var0 = 0; var0 < Client.npcCount; ++var0) { // L: 4614
+			int var1 = Client.npcIndices[var0]; // L: 4615
+			NPC var2 = Client.npcs[var1]; // L: 4616
+			if (var2 != null) { // L: 4617
+				ItemLayer.updateActorSequence(var2, var2.definition.size); // L: 4618
 			}
+		}
+
+	} // L: 4621
+
+	@ObfuscatedName("ks")
+	@ObfuscatedSignature(
+		descriptor = "([Ljm;IB)V",
+		garbageValue = "-55"
+	)
+	@Export("runComponentCloseListeners")
+	static final void runComponentCloseListeners(Widget[] var0, int var1) {
+		for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11884
+			Widget var3 = var0[var2]; // L: 11885
+			if (var3 != null) { // L: 11886
+				if (var3.type == 0) { // L: 11887
+					if (var3.children != null) { // L: 11888
+						runComponentCloseListeners(var3.children, var1);
+					}
 
-			var1.exportIndex(); // L: 5749
-			Client.xteaKeys = new int[var5][4]; // L: 5750
+					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11889
+					if (var4 != null) { // L: 11890
+						Message.runIntfCloseListeners(var4.group, var1);
+					}
+				}
 
-			for (var6 = 0; var6 < var5; ++var6) { // L: 5751
-				for (var7 = 0; var7 < 4; ++var7) { // L: 5752
-					Client.xteaKeys[var6][var7] = var1.readInt(); // L: 5753
+				ScriptEvent var5;
+				if (var1 == 0 && var3.onDialogAbort != null) { // L: 11892
+					var5 = new ScriptEvent(); // L: 11893
+					var5.widget = var3; // L: 11894
+					var5.args = var3.onDialogAbort; // L: 11895
+					class285.runScriptEvent(var5); // L: 11896
 				}
-			}
 
-			LoginScreenAnimation.regions = new int[var5]; // L: 5756
-			class119.regionMapArchiveIds = new int[var5]; // L: 5757
-			class21.regionLandArchiveIds = new int[var5]; // L: 5758
-			ModeWhere.regionLandArchives = new byte[var5][]; // L: 5759
-			class184.regionMapArchives = new byte[var5][]; // L: 5760
-			var5 = 0; // L: 5761
-
-			for (var6 = 0; var6 < 4; ++var6) { // L: 5762
-				for (var7 = 0; var7 < 13; ++var7) { // L: 5763
-					for (var8 = 0; var8 < 13; ++var8) { // L: 5764
-						var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5765
-						if (var9 != -1) { // L: 5766
-							int var10 = var9 >> 14 & 1023; // L: 5767
-							int var11 = var9 >> 3 & 2047; // L: 5768
-							int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5769
-
-							int var13;
-							for (var13 = 0; var13 < var5; ++var13) { // L: 5770
-								if (LoginScreenAnimation.regions[var13] == var12) {
-									var12 = -1; // L: 5771
-									break; // L: 5772
-								}
-							}
-
-							if (var12 != -1) { // L: 5774
-								LoginScreenAnimation.regions[var5] = var12; // L: 5775
-								var13 = var12 >> 8 & 255; // L: 5776
-								int var14 = var12 & 255; // L: 5777
-								class119.regionMapArchiveIds[var5] = class11.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5778
-								class21.regionLandArchiveIds[var5] = class11.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5779
-								++var5; // L: 5780
-							}
+				if (var1 == 1 && var3.onSubChange != null) { // L: 11898
+					if (var3.childIndex >= 0) { // L: 11899
+						Widget var6 = ChatChannel.getWidget(var3.id); // L: 11900
+						if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11901
+							continue;
 						}
 					}
+
+					var5 = new ScriptEvent(); // L: 11905
+					var5.widget = var3; // L: 11906
+					var5.args = var3.onSubChange; // L: 11907
+					class285.runScriptEvent(var5); // L: 11908
 				}
 			}
-
-			EnumComposition.method3107(var2, var3, !var15); // L: 5786
 		}
 
-	} // L: 5788
+	} // L: 11911
 }
diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java
index aa9b44a998..c77c39ae70 100644
--- a/runescape-client/src/main/java/ChatChannel.java
+++ b/runescape-client/src/main/java/ChatChannel.java
@@ -4,116 +4,170 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("be")
+@ObfuscatedName("by")
 @Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("el")
+	@ObfuscatedName("sm")
+	@ObfuscatedGetter(
+		intValue = 1987554027
+	)
+	static int field956;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = -764291983
+	)
+	@Export("musicTrackVolume")
+	public static int musicTrackVolume;
+	@ObfuscatedName("en")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Lkz;"
 	)
-	@Export("archive10")
-	static Archive archive10;
-	@ObfuscatedName("w")
+	@Export("archive14")
+	static Archive archive14;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "[Lbf;"
+		descriptor = "[Lbr;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1060618387
+		intValue = 587145695
 	)
 	@Export("count")
 	int count;
 
 	ChatChannel() {
-		this.messages = new Message[100]; // L: 85
-	} // L: 88
+		this.messages = new Message[100]; // L: 92
+	} // L: 95
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbf;",
-		garbageValue = "-1998830550"
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbr;",
+		garbageValue = "358093741"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
-		Message var5 = this.messages[99]; // L: 91
+		Message var5 = this.messages[99]; // L: 98
 
-		for (int var6 = this.count; var6 > 0; --var6) { // L: 92
-			if (var6 != 100) { // L: 93
-				this.messages[var6] = this.messages[var6 - 1]; // L: 94
+		for (int var6 = this.count; var6 > 0; --var6) { // L: 99
+			if (var6 != 100) { // L: 100
+				this.messages[var6] = this.messages[var6 - 1]; // L: 101
 			}
 		}
 
-		if (var5 == null) { // L: 96
+		if (var5 == null) { // L: 103
 			var5 = new Message(var1, var2, var4, var3);
 		} else {
-			var5.remove(); // L: 98
-			var5.removeDual(); // L: 99
-			var5.set(var1, var2, var4, var3); // L: 100
+			var5.remove(); // L: 105
+			var5.removeDual(); // L: 106
+			var5.set(var1, var2, var4, var3); // L: 107
 		}
 
-		this.messages[0] = var5; // L: 102
-		if (this.count < 100) { // L: 103
+		this.messages[0] = var5; // L: 109
+		if (this.count < 100) { // L: 110
 			++this.count;
 		}
 
-		return var5; // L: 104
+		return var5; // L: 111
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lbf;",
-		garbageValue = "5"
+		descriptor = "(IB)Lbr;",
+		garbageValue = "-91"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
-		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 108 109
+		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 115 116
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1220983055"
+		garbageValue = "1262269232"
 	)
 	@Export("size")
 	int size() {
-		return this.count; // L: 113
+		return this.count; // L: 120
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;ZI)[B",
-		garbageValue = "558752868"
+		descriptor = "(Ljava/lang/CharSequence;B)J",
+		garbageValue = "-84"
 	)
-	public static byte[] method2013(Object var0, boolean var1) {
-		if (var0 == null) { // L: 8
-			return null;
-		} else if (var0 instanceof byte[]) { // L: 9
-			byte[] var3 = (byte[])((byte[])var0); // L: 10
-			return var1 ? EnumComposition.method3106(var3) : var3; // L: 11
-		} else if (var0 instanceof AbstractByteArrayCopier) { // L: 14
-			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 15
-			return var2.get(); // L: 16
-		} else {
-			throw new IllegalArgumentException(); // L: 18
+	static long method2054(CharSequence var0) {
+		long var1 = 0L; // L: 16
+		int var3 = var0.length(); // L: 17
+
+		for (int var4 = 0; var4 < var3; ++var4) { // L: 18
+			var1 *= 37L; // L: 19
+			char var5 = var0.charAt(var4); // L: 20
+			if (var5 >= 'A' && var5 <= 'Z') { // L: 21
+				var1 += (long)(var5 + 1 - 65);
+			} else if (var5 >= 'a' && var5 <= 'z') { // L: 22
+				var1 += (long)(var5 + 1 - 97);
+			} else if (var5 >= '0' && var5 <= '9') { // L: 23
+				var1 += (long)(var5 + 27 - 48);
+			}
+
+			if (var1 >= 177917621779460413L) { // L: 24
+				break;
+			}
 		}
+
+		while (var1 % 37L == 0L && 0L != var1) { // L: 26
+			var1 /= 37L;
+		}
+
+		return var1; // L: 27
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "1766338115"
+		descriptor = "(II)Ljm;",
+		garbageValue = "1761147769"
 	)
-	static int method2012(int var0, Script var1, boolean var2) {
-		if (var0 == 6900) { // L: 4328
-			Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4329
-			return 1; // L: 4330
-		} else if (var0 == 6950) { // L: 4332
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4333
-			return 1; // L: 4334
-		} else {
-			return 2; // L: 4336
+	@Export("getWidget")
+	public static Widget getWidget(int var0) {
+		int var1 = var0 >> 16; // L: 199
+		int var2 = var0 & 65535; // L: 200
+		if (MouseRecorder.Widget_interfaceComponents[var1] == null || MouseRecorder.Widget_interfaceComponents[var1][var2] == null) { // L: 201
+			boolean var3 = class242.loadInterface(var1); // L: 202
+			if (!var3) { // L: 203
+				return null;
+			}
 		}
+
+		return MouseRecorder.Widget_interfaceComponents[var1][var2]; // L: 205
+	}
+
+	@ObfuscatedName("ka")
+	@ObfuscatedSignature(
+		descriptor = "(IIIB)Lcl;",
+		garbageValue = "3"
+	)
+	static final InterfaceParent method2058(int var0, int var1, int var2) {
+		InterfaceParent var3 = new InterfaceParent(); // L: 12265
+		var3.group = var1; // L: 12266
+		var3.type = var2; // L: 12267
+		Client.interfaceParents.put(var3, (long)var0); // L: 12268
+		class140.Widget_resetModelFrames(var1); // L: 12269
+		Widget var4 = getWidget(var0); // L: 12270
+		SecureRandomCallable.invalidateWidget(var4); // L: 12271
+		if (Client.meslayerContinueWidget != null) { // L: 12272
+			SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); // L: 12273
+			Client.meslayerContinueWidget = null; // L: 12274
+		}
+
+		FileSystem.method3084(); // L: 12276
+		class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 12277
+		class33.runWidgetOnLoadListener(var1); // L: 12278
+		if (Client.rootInterface != -1) { // L: 12279
+			Message.runIntfCloseListeners(Client.rootInterface, 1);
+		}
+
+		return var3; // L: 12280
 	}
 }
diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java
index 7f40e22fac..73bbd10157 100644
--- a/runescape-client/src/main/java/ClanChannel.java
+++ b/runescape-client/src/main/java/ClanChannel.java
@@ -7,51 +7,49 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ea")
+@ObfuscatedName("ei")
 @Implements("ClanChannel")
 public class ClanChannel extends Node {
-	@ObfuscatedName("y")
-	public static short[][] field1512;
-	@ObfuscatedName("i")
-	boolean field1510;
-	@ObfuscatedName("w")
-	boolean field1518;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
+	boolean field1637;
+	@ObfuscatedName("b")
+	boolean field1642;
+	@ObfuscatedName("p")
 	@Export("members")
 	public List members;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("sortedMembers")
 	int[] sortedMembers;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		longValue = -4755117634906331749L
+		longValue = -6629358270265648135L
 	)
-	long field1514;
-	@ObfuscatedName("g")
+	long field1640;
+	@ObfuscatedName("s")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("e")
-	public byte field1516;
-	@ObfuscatedName("p")
-	public byte field1511;
+	@ObfuscatedName("j")
+	public byte field1636;
+	@ObfuscatedName("w")
+	public byte field1643;
 
 	static {
 		new BitSet(65536); // L: 22
 	} // L: 23
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	public ClanChannel(Buffer var1) {
-		this.field1518 = true; // L: 13
+		this.field1642 = true; // L: 13
 		this.name = null; // L: 17
-		this.method2806(var1); // L: 26
+		this.method2992(var1); // L: 26
 	} // L: 27
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)[I",
-		garbageValue = "32"
+		descriptor = "(I)[I",
+		garbageValue = "1790223696"
 	)
 	@Export("getSortedMembers")
 	public int[] getSortedMembers() {
@@ -60,20 +58,20 @@ public int[] getSortedMembers() {
 			this.sortedMembers = new int[this.members.size()]; // L: 32
 
 			for (int var2 = 0; var2 < this.members.size(); this.sortedMembers[var2] = var2++) { // L: 33 35
-				var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7579(); // L: 34
+				var1[var2] = ((ClanChannelMember)this.members.get(var2)).username.method7914(); // L: 34
 			}
 
 			int[] var3 = this.sortedMembers; // L: 37
-			class122.method2599(var1, var3, 0, var1.length - 1); // L: 39
+			class292.method5504(var1, var3, 0, var1.length - 1); // L: 39
 		}
 
 		return this.sortedMembers; // L: 42
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lde;B)V",
-		garbageValue = "8"
+		descriptor = "(Ldz;B)V",
+		garbageValue = "-47"
 	)
 	@Export("addMember")
 	void addMember(ClanChannelMember var1) {
@@ -81,10 +79,10 @@ void addMember(ClanChannelMember var1) {
 		this.sortedMembers = null; // L: 47
 	} // L: 48
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1989668553"
+		garbageValue = "1232070979"
 	)
 	@Export("removeMember")
 	void removeMember(int var1) {
@@ -92,22 +90,22 @@ void removeMember(int var1) {
 		this.sortedMembers = null; // L: 52
 	} // L: 53
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-77"
+		garbageValue = "1"
 	)
-	public int method2809() {
+	public int method2990() {
 		return this.members.size(); // L: 56
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-328026821"
+		garbageValue = "2014586653"
 	)
-	public int method2817(String var1) {
-		if (!this.field1518) { // L: 60
+	public int method2991(String var1) {
+		if (!this.field1642) { // L: 60
 			throw new RuntimeException("Displaynames not available");
 		} else {
 			for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 61
@@ -120,19 +118,19 @@ public int method2817(String var1) {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "1502263315"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "-517363636"
 	)
-	void method2806(Buffer var1) {
+	void method2992(Buffer var1) {
 		int var2 = var1.readUnsignedByte(); // L: 68
 		if ((var2 & 1) != 0) { // L: 69
-			this.field1510 = true;
+			this.field1637 = true;
 		}
 
 		if ((var2 & 2) != 0) { // L: 70
-			this.field1518 = true;
+			this.field1642 = true;
 		}
 
 		int var3 = 2; // L: 71
@@ -141,22 +139,22 @@ void method2806(Buffer var1) {
 		}
 
 		super.key = var1.readLong(); // L: 73
-		this.field1514 = var1.readLong(); // L: 74
+		this.field1640 = var1.readLong(); // L: 74
 		this.name = var1.readStringCp1252NullTerminated(); // L: 75
 		var1.readBoolean(); // L: 76
-		this.field1511 = var1.readByte(); // L: 77
-		this.field1516 = var1.readByte(); // L: 78
+		this.field1643 = var1.readByte(); // L: 77
+		this.field1636 = var1.readByte(); // L: 78
 		int var4 = var1.readUnsignedShort(); // L: 79
 		if (var4 > 0) { // L: 80
 			this.members = new ArrayList(var4); // L: 81
 
 			for (int var5 = 0; var5 < var4; ++var5) { // L: 82
 				ClanChannelMember var6 = new ClanChannelMember(); // L: 83
-				if (this.field1510) { // L: 84
+				if (this.field1637) { // L: 84
 					var1.readLong(); // L: 85
 				}
 
-				if (this.field1518) { // L: 87
+				if (this.field1642) { // L: 87
 					var6.username = new Username(var1.readStringCp1252NullTerminated());
 				}
 
@@ -174,619 +172,390 @@ void method2806(Buffer var1) {
 
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)I",
-		garbageValue = "-894225257"
+		descriptor = "(IIIIIILgy;Lgf;B)V",
+		garbageValue = "-30"
 	)
-	public static int method2824(CharSequence var0) {
-		int var1 = var0.length(); // L: 147
-		int var2 = 0; // L: 148
+	static final void method2996(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
+		if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 183 184 185
+			if (var0 < Tiles.Tiles_minPlane) { // L: 188
+				Tiles.Tiles_minPlane = var0;
+			}
 
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 149
-			var2 = (var2 << 5) - var2 + var0.charAt(var3);
-		}
+			ObjectComposition var8 = class148.getObjectDefinition(var3); // L: 189
+			int var9;
+			int var10;
+			if (var4 != 1 && var4 != 3) { // L: 192
+				var9 = var8.sizeX; // L: 197
+				var10 = var8.sizeY; // L: 198
+			} else {
+				var9 = var8.sizeY; // L: 193
+				var10 = var8.sizeX; // L: 194
+			}
 
-		return var2; // L: 150
-	}
+			int var11;
+			int var12;
+			if (var9 + var1 <= 104) { // L: 204
+				var11 = (var9 >> 1) + var1; // L: 205
+				var12 = (var9 + 1 >> 1) + var1; // L: 206
+			} else {
+				var11 = var1; // L: 209
+				var12 = var1 + 1; // L: 210
+			}
 
-	@ObfuscatedName("jh")
-	@ObfuscatedSignature(
-		descriptor = "([Ljf;IIIIIIII)V",
-		garbageValue = "-879561434"
-	)
-	@Export("updateInterface")
-	static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		for (int var8 = 0; var8 < var0.length; ++var8) { // L: 10628
-			Widget var9 = var0[var8]; // L: 10629
-			if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || PendingSpawn.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10630 10631 10632
-				if (var9.isIf3) { // L: 10633
-					if (Varcs.isComponentHidden(var9)) { // L: 10634
-						continue;
-					}
-				} else if (var9.type == 0 && var9 != WorldMapData_0.mousedOverWidgetIf1 && Varcs.isComponentHidden(var9)) { // L: 10637
-					continue;
+			int var13;
+			int var14;
+			if (var10 + var2 <= 104) { // L: 212
+				var13 = (var10 >> 1) + var2; // L: 213
+				var14 = var2 + (var10 + 1 >> 1); // L: 214
+			} else {
+				var13 = var2; // L: 217
+				var14 = var2 + 1; // L: 218
+			}
+
+			int[][] var15 = Tiles.Tiles_heights[var0]; // L: 220
+			int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 221
+			int var17 = (var1 << 7) + (var9 << 6); // L: 222
+			int var18 = (var2 << 7) + (var10 << 6); // L: 223
+			long var19 = SecureRandomFuture.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 224
+			int var21 = var5 + (var4 << 6); // L: 225
+			if (var8.int3 == 1) { // L: 226
+				var21 += 256;
+			}
+
+			int var23;
+			int var24;
+			if (var8.hasSound()) { // L: 227
+				ObjectSound var22 = new ObjectSound(); // L: 228
+				var22.plane = var0; // L: 229
+				var22.x = var1 * 128; // L: 230
+				var22.y = var2 * 128; // L: 231
+				var23 = var8.sizeX; // L: 232
+				var24 = var8.sizeY; // L: 233
+				if (var4 == 1 || var4 == 3) { // L: 234
+					var23 = var8.sizeY; // L: 235
+					var24 = var8.sizeX; // L: 236
 				}
 
-				int var10 = var9.x + var6; // L: 10639
-				int var11 = var7 + var9.y; // L: 10640
-				int var12;
-				int var13;
-				int var14;
-				int var15;
-				int var17;
-				int var18;
-				if (var9.type == 2) { // L: 10645
-					var12 = var2; // L: 10646
-					var13 = var3; // L: 10647
-					var14 = var4; // L: 10648
-					var15 = var5; // L: 10649
-				} else {
-					int var16;
-					if (var9.type == 9) { // L: 10651
-						var16 = var10; // L: 10652
-						var17 = var11; // L: 10653
-						var18 = var10 + var9.width; // L: 10654
-						int var19 = var11 + var9.height; // L: 10655
-						if (var18 < var10) { // L: 10656
-							var16 = var18; // L: 10658
-							var18 = var10; // L: 10659
-						}
+				var22.maxX = (var23 + var1) * 128; // L: 238
+				var22.maxY = (var24 + var2) * 128; // L: 239
+				var22.soundEffectId = var8.ambientSoundId; // L: 240
+				var22.field793 = var8.int7 * 128; // L: 241
+				var22.field796 = var8.int5; // L: 242
+				var22.field797 = var8.int6; // L: 243
+				var22.soundEffectIds = var8.soundEffectIds; // L: 244
+				if (var8.transforms != null) { // L: 245
+					var22.obj = var8; // L: 246
+					var22.set(); // L: 247
+				}
 
-						if (var19 < var11) { // L: 10661
-							var17 = var19; // L: 10663
-							var19 = var11; // L: 10664
-						}
+				ObjectSound.objectSounds.addFirst(var22); // L: 249
+				if (var22.soundEffectIds != null) { // L: 250
+					var22.field789 = var22.field796 + (int)(Math.random() * (double)(var22.field797 - var22.field796));
+				}
+			}
 
-						++var18; // L: 10666
-						++var19; // L: 10667
-						var12 = var16 > var2 ? var16 : var2; // L: 10668
-						var13 = var17 > var3 ? var17 : var3; // L: 10669
-						var14 = var18 < var4 ? var18 : var4; // L: 10670
-						var15 = var19 < var5 ? var19 : var5; // L: 10671
+			Object var34;
+			if (var5 == 22) { // L: 252
+				if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 253
+					if (var8.animationId == -1 && var8.transforms == null) { // L: 255
+						var34 = var8.getEntity(22, var4, var15, var17, var16, var18);
 					} else {
-						var16 = var10 + var9.width; // L: 10674
-						var17 = var11 + var9.height; // L: 10675
-						var12 = var10 > var2 ? var10 : var2; // L: 10676
-						var13 = var11 > var3 ? var11 : var3; // L: 10677
-						var14 = var16 < var4 ? var16 : var4; // L: 10678
-						var15 = var17 < var5 ? var17 : var5; // L: 10679
+						var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 256
+					}
+
+					var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 257
+					if (var8.interactType == 1 && var7 != null) { // L: 258
+						var7.setBlockedByFloorDec(var1, var2);
 					}
-				}
 
-				if (var9 == Client.clickedWidget) { // L: 10681
-					Client.field680 = true; // L: 10682
-					Client.field652 = var10; // L: 10683
-					Client.field468 = var11; // L: 10684
 				}
+			} else if (var5 != 10 && var5 != 11) { // L: 261
+				int[] var10000;
+				if (var5 >= 12) { // L: 282
+					if (var8.animationId == -1 && var8.transforms == null) { // L: 284
+						var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
+					} else {
+						var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 285
+					}
+
+					var6.method3960(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 286
+					if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 287
+						var10000 = ClanChannelMember.field1504[var0][var1];
+						var10000[var2] |= 2340;
+					}
+
+					if (var8.interactType != 0 && var7 != null) { // L: 288
+						var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+					}
+
+				} else if (var5 == 0) { // L: 291
+					if (var8.animationId == -1 && var8.transforms == null) { // L: 293
+						var34 = var8.getEntity(0, var4, var15, var17, var16, var18);
+					} else {
+						var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 294
+					}
 
-				boolean var33 = false; // L: 10686
-				if (var9.field3125) { // L: 10687
-					switch(Client.field479) { // L: 10688
-					case 0:
-						var33 = true; // L: 10695
-					case 1:
-					default:
-						break;
-					case 2:
-						if (Client.field633 == var9.id >>> 16) { // L: 10698
-							var33 = true; // L: 10699
+					var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field969[var4], 0, var19, var21); // L: 295
+					if (var4 == 0) { // L: 296
+						if (var8.clipped) { // L: 297
+							SoundCache.field321[var0][var1][var2] = 50; // L: 298
+							SoundCache.field321[var0][var1][var2 + 1] = 50; // L: 299
 						}
-						break;
-					case 3:
-						if (var9.id == Client.field633) { // L: 10690
-							var33 = true; // L: 10691
+
+						if (var8.modelClipped) { // L: 301
+							var10000 = ClanChannelMember.field1504[var0][var1];
+							var10000[var2] |= 585;
+						}
+					} else if (var4 == 1) { // L: 303
+						if (var8.clipped) { // L: 304
+							SoundCache.field321[var0][var1][var2 + 1] = 50; // L: 305
+							SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; // L: 306
 						}
-					}
-				}
 
-				if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10704
-					if (var9.isIf3) { // L: 10705
-						ScriptEvent var26;
-						if (var9.noClickThrough) { // L: 10706
-							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10707
-								for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10708
-									if (var26.isMouseInputEvent) { // L: 10709
-										var26.remove(); // L: 10710
-										var26.widget.containsMouse = false; // L: 10711
-									}
-								}
-
-								if (class134.widgetDragDuration == 0) { // L: 10714
-									Client.clickedWidget = null; // L: 10715
-									Client.clickedWidgetParent = null; // L: 10716
-								}
-
-								if (!Client.isMenuOpen) { // L: 10718
-									FriendSystem.addCancelMenuEntry(); // L: 10719
-								}
-							}
-						} else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10723 10724
-							for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10725
-								if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10726
-									var26.remove(); // L: 10727
-								}
-							}
+						if (var8.modelClipped) { // L: 308
+							var10000 = ClanChannelMember.field1504[var0][var1];
+							var10000[1 + var2] |= 1170;
+						}
+					} else if (var4 == 2) { // L: 310
+						if (var8.clipped) { // L: 311
+							SoundCache.field321[var0][var1 + 1][var2] = 50; // L: 312
+							SoundCache.field321[var0][var1 + 1][var2 + 1] = 50; // L: 313
+						}
+
+						if (var8.modelClipped) { // L: 315
+							var10000 = ClanChannelMember.field1504[var0][var1 + 1];
+							var10000[var2] |= 585;
+						}
+					} else if (var4 == 3) { // L: 317
+						if (var8.clipped) { // L: 318
+							SoundCache.field321[var0][var1][var2] = 50; // L: 319
+							SoundCache.field321[var0][var1 + 1][var2] = 50; // L: 320
+						}
+
+						if (var8.modelClipped) { // L: 322
+							var10000 = ClanChannelMember.field1504[var0][var1];
+							var10000[var2] |= 1170;
 						}
 					}
 
-					var17 = MouseHandler.MouseHandler_x; // L: 10733
-					var18 = MouseHandler.MouseHandler_y; // L: 10734
-					if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10735
-						var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10736
-						var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10737
+					if (var8.interactType != 0 && var7 != null) { // L: 324
+						var7.method3721(var1, var2, var5, var4, var8.boolean1);
 					}
 
-					boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10739
-					if (var9.contentType == 1337) { // L: 10740
-						if (!Client.isLoading && !Client.isMenuOpen && var34) { // L: 10741
-							DevicePcmPlayerProvider.addSceneMenuOptions(var17, var18, var12, var13);
-						}
-					} else if (var9.contentType == 1338) { // L: 10744
-						class1.checkIfMinimapClicked(var9, var10, var11); // L: 10745
+					if (var8.int2 != 16) { // L: 325
+						var6.method3966(var0, var1, var2, var8.int2);
+					}
+
+				} else if (var5 == 1) { // L: 328
+					if (var8.animationId == -1 && var8.transforms == null) { // L: 330
+						var34 = var8.getEntity(1, var4, var15, var17, var16, var18);
 					} else {
-						if (var9.contentType == 1400) { // L: 10748
-							class133.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); // L: 10749
+						var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 331
+					}
+
+					var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field970[var4], 0, var19, var21); // L: 332
+					if (var8.clipped) { // L: 333
+						if (var4 == 0) { // L: 334
+							SoundCache.field321[var0][var1][var2 + 1] = 50;
+						} else if (var4 == 1) { // L: 335
+							SoundCache.field321[var0][var1 + 1][var2 + 1] = 50;
+						} else if (var4 == 2) { // L: 336
+							SoundCache.field321[var0][var1 + 1][var2] = 50;
+						} else if (var4 == 3) { // L: 337
+							SoundCache.field321[var0][var1][var2] = 50;
 						}
+					}
 
-						if (!Client.isMenuOpen && var34) { // L: 10751
-							if (var9.contentType == 1400) { // L: 10752
-								class133.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10753
-							} else {
-								class114.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10756
-							}
+					if (var8.interactType != 0 && var7 != null) { // L: 339
+						var7.method3721(var1, var2, var5, var4, var8.boolean1);
+					}
+
+				} else {
+					int var28;
+					if (var5 == 2) { // L: 342
+						var28 = var4 + 1 & 3; // L: 343
+						Object var31;
+						Object var32;
+						if (var8.animationId == -1 && var8.transforms == null) { // L: 346
+							var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 347
+							var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 348
+						} else {
+							var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 351
+							var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 352
 						}
 
-						boolean var21;
-						int var23;
-						if (var33) { // L: 10759
-							for (int var20 = 0; var20 < var9.field3180.length; ++var20) { // L: 10760
-								var21 = false; // L: 10761
-								boolean var27 = false; // L: 10762
-								if (!var21 && var9.field3180[var20] != null) { // L: 10763
-									for (var23 = 0; var23 < var9.field3180[var20].length; ++var23) { // L: 10764
-										boolean var24 = false; // L: 10765
-										if (var9.field3194 != null) { // L: 10766
-											var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3180[var20][var23]]; // L: 10767
-										}
-
-										if (InterfaceParent.method2080(var9.field3180[var20][var23]) || var24) { // L: 10769
-											var21 = true; // L: 10770
-											if (var9.field3194 != null && var9.field3194[var20] > Client.cycle) { // L: 10771
-												break;
-											}
-
-											byte var32 = var9.field3105[var20][var23]; // L: 10772
-											if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10773 10774 10775 10776 10777
-												var27 = true; // L: 10779
-												break;
-											}
-										}
-									}
-								}
-
-								if (var27) { // L: 10785
-									if (var20 < 10) { // L: 10786
-										GrandExchangeEvents.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
-									} else if (var20 == 10) { // L: 10787
-										class262.Widget_runOnTargetLeave(); // L: 10788
-										Decimator.selectSpell(var9.id, var9.childIndex, SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var9)), var9.itemId); // L: 10789
-										Client.selectedSpellActionName = class20.Widget_getSpellActionName(var9); // L: 10790
-										if (Client.selectedSpellActionName == null) { // L: 10791
-											Client.selectedSpellActionName = "null";
-										}
-
-										Client.selectedSpellName = var9.dataText + MouseHandler.colorStartTag(16777215); // L: 10792
-									}
-
-									var23 = var9.field3128[var20]; // L: 10794
-									if (var9.field3194 == null) { // L: 10795
-										var9.field3194 = new int[var9.field3180.length];
-									}
-
-									if (var9.field3129 == null) { // L: 10796
-										var9.field3129 = new int[var9.field3180.length];
-									}
-
-									if (var23 != 0) { // L: 10797
-										if (var9.field3194[var20] == 0) { // L: 10798
-											var9.field3194[var20] = var23 + Client.cycle + var9.field3129[var20];
-										} else {
-											var9.field3194[var20] = var23 + Client.cycle; // L: 10799
-										}
-									} else {
-										var9.field3194[var20] = Integer.MAX_VALUE; // L: 10801
-									}
-								}
-
-								if (!var21 && var9.field3194 != null) { // L: 10803 10804
-									var9.field3194[var20] = 0;
-								}
+						var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field969[var4], Tiles.field969[var28], var19, var21); // L: 354
+						if (var8.modelClipped) { // L: 355
+							if (var4 == 0) { // L: 356
+								var10000 = ClanChannelMember.field1504[var0][var1]; // L: 357
+								var10000[var2] |= 585;
+								var10000 = ClanChannelMember.field1504[var0][var1]; // L: 358
+								var10000[var2 + 1] |= 1170;
+							} else if (var4 == 1) { // L: 360
+								var10000 = ClanChannelMember.field1504[var0][var1]; // L: 361
+								var10000[var2 + 1] |= 1170;
+								var10000 = ClanChannelMember.field1504[var0][var1 + 1]; // L: 362
+								var10000[var2] |= 585;
+							} else if (var4 == 2) { // L: 364
+								var10000 = ClanChannelMember.field1504[var0][var1 + 1]; // L: 365
+								var10000[var2] |= 585;
+								var10000 = ClanChannelMember.field1504[var0][var1]; // L: 366
+								var10000[var2] |= 1170;
+							} else if (var4 == 3) { // L: 368
+								var10000 = ClanChannelMember.field1504[var0][var1]; // L: 369
+								var10000[var2] |= 1170;
+								var10000 = ClanChannelMember.field1504[var0][var1]; // L: 370
+								var10000[var2] |= 585;
 							}
 						}
 
-						if (var9.isIf3) { // L: 10808
-							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10809
-								var34 = true;
-							} else {
-								var34 = false; // L: 10810
-							}
+						if (var8.interactType != 0 && var7 != null) { // L: 373
+							var7.method3721(var1, var2, var5, var4, var8.boolean1);
+						}
 
-							boolean var35 = false; // L: 10811
-							if ((MouseHandler.MouseHandler_currentButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { // L: 10812
-								var35 = true;
-							}
+						if (var8.int2 != 16) { // L: 374
+							var6.method3966(var0, var1, var2, var8.int2);
+						}
 
-							var21 = false; // L: 10813
-							if ((MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10814
-								var21 = true;
-							}
+					} else if (var5 == 3) { // L: 377
+						if (var8.animationId == -1 && var8.transforms == null) { // L: 379
+							var34 = var8.getEntity(3, var4, var15, var17, var16, var18);
+						} else {
+							var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 380
+						}
 
-							if (var21) { // L: 10815
-								UserComparator6.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
+						var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field970[var4], 0, var19, var21); // L: 381
+						if (var8.clipped) { // L: 382
+							if (var4 == 0) { // L: 383
+								SoundCache.field321[var0][var1][var2 + 1] = 50;
+							} else if (var4 == 1) { // L: 384
+								SoundCache.field321[var0][var1 + 1][var2 + 1] = 50;
+							} else if (var4 == 2) { // L: 385
+								SoundCache.field321[var0][var1 + 1][var2] = 50;
+							} else if (var4 == 3) { // L: 386
+								SoundCache.field321[var0][var1][var2] = 50;
 							}
+						}
 
-							if (var9.contentType == 1400) { // L: 10816
-								class133.worldMap.method6625(var17, var18, var34 & var35, var34 & var21); // L: 10817
-							}
+						if (var8.interactType != 0 && var7 != null) { // L: 388
+							var7.method3721(var1, var2, var5, var4, var8.boolean1);
+						}
+
+					} else if (var5 == 9) { // L: 391
+						if (var8.animationId == -1 && var8.transforms == null) { // L: 393
+							var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
+						} else {
+							var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 394
+						}
+
+						var6.method3960(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 395
+						if (var8.interactType != 0 && var7 != null) { // L: 396
+							var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+						}
 
-							if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && PlayerComposition.method5067(PendingSpawn.getWidgetFlags(var9))) { // L: 10819
-								Client.draggedOnWidget = var9;
+						if (var8.int2 != 16) { // L: 397
+							var6.method3966(var0, var1, var2, var8.int2);
+						}
+
+					} else if (var5 == 4) { // L: 400
+						if (var8.animationId == -1 && var8.transforms == null) { // L: 402
+							var34 = var8.getEntity(4, var4, var15, var17, var16, var18);
+						} else {
+							var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 403
+						}
+
+						var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field969[var4], 0, 0, 0, var19, var21); // L: 404
+					} else {
+						Object var25;
+						long var29;
+						if (var5 == 5) { // L: 407
+							var28 = 16; // L: 408
+							var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 409
+							if (0L != var29) { // L: 410
+								var28 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var29)).int2;
 							}
 
-							if (var9 == Client.clickedWidgetParent) { // L: 10820
-								Client.field648 = true; // L: 10821
-								Client.field649 = var10; // L: 10822
-								Client.field650 = var11; // L: 10823
+							if (var8.animationId == -1 && var8.transforms == null) { // L: 412
+								var25 = var8.getEntity(4, var4, var15, var17, var16, var18);
+							} else {
+								var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 413
 							}
 
-							if (var9.hasListener) { // L: 10825
-								ScriptEvent var22;
-								if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10826
-									var22 = new ScriptEvent(); // L: 10827
-									var22.isMouseInputEvent = true; // L: 10828
-									var22.widget = var9; // L: 10829
-									var22.mouseY = Client.mouseWheelRotation; // L: 10830
-									var22.args = var9.onScroll; // L: 10831
-									Client.scriptEvents.addFirst(var22); // L: 10832
-								}
-
-								if (Client.clickedWidget != null || class247.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10834
-									var21 = false; // L: 10835
-									var35 = false; // L: 10836
-									var34 = false; // L: 10837
-								}
-
-								if (!var9.isClicked && var21) { // L: 10839
-									var9.isClicked = true; // L: 10840
-									if (var9.onClick != null) { // L: 10841
-										var22 = new ScriptEvent(); // L: 10842
-										var22.isMouseInputEvent = true; // L: 10843
-										var22.widget = var9; // L: 10844
-										var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10845
-										var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10846
-										var22.args = var9.onClick; // L: 10847
-										Client.scriptEvents.addFirst(var22); // L: 10848
-									}
-								}
-
-								if (var9.isClicked && var35 && var9.onClickRepeat != null) { // L: 10851 10852
-									var22 = new ScriptEvent(); // L: 10853
-									var22.isMouseInputEvent = true; // L: 10854
-									var22.widget = var9; // L: 10855
-									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10856
-									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10857
-									var22.args = var9.onClickRepeat; // L: 10858
-									Client.scriptEvents.addFirst(var22); // L: 10859
-								}
-
-								if (var9.isClicked && !var35) { // L: 10862
-									var9.isClicked = false; // L: 10863
-									if (var9.onRelease != null) { // L: 10864
-										var22 = new ScriptEvent(); // L: 10865
-										var22.isMouseInputEvent = true; // L: 10866
-										var22.widget = var9; // L: 10867
-										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10868
-										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10869
-										var22.args = var9.onRelease; // L: 10870
-										Client.field675.addFirst(var22); // L: 10871
-									}
-								}
-
-								if (var35 && var9.onHold != null) { // L: 10874 10875
-									var22 = new ScriptEvent(); // L: 10876
-									var22.isMouseInputEvent = true; // L: 10877
-									var22.widget = var9; // L: 10878
-									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10879
-									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10880
-									var22.args = var9.onHold; // L: 10881
-									Client.scriptEvents.addFirst(var22); // L: 10882
-								}
-
-								if (!var9.containsMouse && var34) { // L: 10885
-									var9.containsMouse = true; // L: 10886
-									if (var9.onMouseOver != null) { // L: 10887
-										var22 = new ScriptEvent(); // L: 10888
-										var22.isMouseInputEvent = true; // L: 10889
-										var22.widget = var9; // L: 10890
-										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10891
-										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10892
-										var22.args = var9.onMouseOver; // L: 10893
-										Client.scriptEvents.addFirst(var22); // L: 10894
-									}
-								}
-
-								if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { // L: 10897 10898
-									var22 = new ScriptEvent(); // L: 10899
-									var22.isMouseInputEvent = true; // L: 10900
-									var22.widget = var9; // L: 10901
-									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10902
-									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10903
-									var22.args = var9.onMouseRepeat; // L: 10904
-									Client.scriptEvents.addFirst(var22); // L: 10905
-								}
-
-								if (var9.containsMouse && !var34) { // L: 10908
-									var9.containsMouse = false; // L: 10909
-									if (var9.onMouseLeave != null) { // L: 10910
-										var22 = new ScriptEvent(); // L: 10911
-										var22.isMouseInputEvent = true; // L: 10912
-										var22.widget = var9; // L: 10913
-										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10914
-										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10915
-										var22.args = var9.onMouseLeave; // L: 10916
-										Client.field675.addFirst(var22); // L: 10917
-									}
-								}
-
-								if (var9.onTimer != null) { // L: 10920
-									var22 = new ScriptEvent(); // L: 10921
-									var22.widget = var9; // L: 10922
-									var22.args = var9.onTimer; // L: 10923
-									Client.field674.addFirst(var22); // L: 10924
-								}
-
-								ScriptEvent var25;
-								int var36;
-								int var37;
-								if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3189) { // L: 10926
-									if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3189 <= 32) { // L: 10927
-										label818:
-										for (var37 = var9.field3189; var37 < Client.changedVarpCount; ++var37) { // L: 10934
-											var23 = Client.changedVarps[var37 & 31]; // L: 10935
-
-											for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { // L: 10936
-												if (var23 == var9.varTransmitTriggers[var36]) { // L: 10937
-													var25 = new ScriptEvent(); // L: 10938
-													var25.widget = var9; // L: 10939
-													var25.args = var9.onVarTransmit; // L: 10940
-													Client.scriptEvents.addFirst(var25); // L: 10941
-													break label818; // L: 10942
-												}
-											}
-										}
-									} else {
-										var22 = new ScriptEvent(); // L: 10928
-										var22.widget = var9; // L: 10929
-										var22.args = var9.onVarTransmit; // L: 10930
-										Client.scriptEvents.addFirst(var22); // L: 10931
-									}
-
-									var9.field3189 = Client.changedVarpCount; // L: 10947
-								}
-
-								if (var9.onInvTransmit != null && Client.field659 > var9.field3073) { // L: 10949
-									if (var9.invTransmitTriggers != null && Client.field659 - var9.field3073 <= 32) { // L: 10950
-										label794:
-										for (var37 = var9.field3073; var37 < Client.field659; ++var37) { // L: 10957
-											var23 = Client.changedItemContainers[var37 & 31]; // L: 10958
-
-											for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { // L: 10959
-												if (var23 == var9.invTransmitTriggers[var36]) { // L: 10960
-													var25 = new ScriptEvent(); // L: 10961
-													var25.widget = var9; // L: 10962
-													var25.args = var9.onInvTransmit; // L: 10963
-													Client.scriptEvents.addFirst(var25); // L: 10964
-													break label794; // L: 10965
-												}
-											}
-										}
-									} else {
-										var22 = new ScriptEvent(); // L: 10951
-										var22.widget = var9; // L: 10952
-										var22.args = var9.onInvTransmit; // L: 10953
-										Client.scriptEvents.addFirst(var22); // L: 10954
-									}
-
-									var9.field3073 = Client.field659; // L: 10970
-								}
-
-								if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3191) { // L: 10972
-									if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3191 <= 32) { // L: 10973
-										label770:
-										for (var37 = var9.field3191; var37 < Client.changedSkillsCount; ++var37) { // L: 10980
-											var23 = Client.changedSkills[var37 & 31]; // L: 10981
-
-											for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { // L: 10982
-												if (var23 == var9.statTransmitTriggers[var36]) { // L: 10983
-													var25 = new ScriptEvent(); // L: 10984
-													var25.widget = var9; // L: 10985
-													var25.args = var9.onStatTransmit; // L: 10986
-													Client.scriptEvents.addFirst(var25); // L: 10987
-													break label770; // L: 10988
-												}
-											}
-										}
-									} else {
-										var22 = new ScriptEvent(); // L: 10974
-										var22.widget = var9; // L: 10975
-										var22.args = var9.onStatTransmit; // L: 10976
-										Client.scriptEvents.addFirst(var22); // L: 10977
-									}
-
-									var9.field3191 = Client.changedSkillsCount; // L: 10993
-								}
-
-								if (Client.chatCycle > var9.field3188 && var9.onChatTransmit != null) { // L: 10995
-									var22 = new ScriptEvent(); // L: 10996
-									var22.widget = var9; // L: 10997
-									var22.args = var9.onChatTransmit; // L: 10998
-									Client.scriptEvents.addFirst(var22); // L: 10999
-								}
-
-								if (Client.field679 > var9.field3188 && var9.onFriendTransmit != null) { // L: 11001
-									var22 = new ScriptEvent(); // L: 11002
-									var22.widget = var9; // L: 11003
-									var22.args = var9.onFriendTransmit; // L: 11004
-									Client.scriptEvents.addFirst(var22); // L: 11005
-								}
-
-								if (Client.field666 > var9.field3188 && var9.onClanTransmit != null) { // L: 11007
-									var22 = new ScriptEvent(); // L: 11008
-									var22.widget = var9; // L: 11009
-									var22.args = var9.onClanTransmit; // L: 11010
-									Client.scriptEvents.addFirst(var22); // L: 11011
-								}
-
-								if (Client.field681 > var9.field3188 && var9.field3056 != null) { // L: 11013
-									var22 = new ScriptEvent(); // L: 11014
-									var22.widget = var9; // L: 11015
-									var22.args = var9.field3056; // L: 11016
-									Client.scriptEvents.addFirst(var22); // L: 11017
-								}
-
-								if (Client.field724 > var9.field3188 && var9.field3166 != null) { // L: 11019
-									var22 = new ScriptEvent(); // L: 11020
-									var22.widget = var9; // L: 11021
-									var22.args = var9.field3166; // L: 11022
-									Client.scriptEvents.addFirst(var22); // L: 11023
-								}
-
-								if (Client.field536 > var9.field3188 && var9.onStockTransmit != null) { // L: 11025
-									var22 = new ScriptEvent(); // L: 11026
-									var22.widget = var9; // L: 11027
-									var22.args = var9.onStockTransmit; // L: 11028
-									Client.scriptEvents.addFirst(var22); // L: 11029
-								}
-
-								if (Client.field670 > var9.field3188 && var9.field3172 != null) { // L: 11031
-									var22 = new ScriptEvent(); // L: 11032
-									var22.widget = var9; // L: 11033
-									var22.args = var9.field3172; // L: 11034
-									Client.scriptEvents.addFirst(var22); // L: 11035
-								}
-
-								if (Client.field494 > var9.field3188 && var9.onMiscTransmit != null) { // L: 11037
-									var22 = new ScriptEvent(); // L: 11038
-									var22.widget = var9; // L: 11039
-									var22.args = var9.onMiscTransmit; // L: 11040
-									Client.scriptEvents.addFirst(var22); // L: 11041
-								}
-
-								var9.field3188 = Client.cycleCntr; // L: 11043
-								if (var9.onKey != null) { // L: 11044
-									for (var37 = 0; var37 < Client.field695; ++var37) { // L: 11045
-										ScriptEvent var31 = new ScriptEvent(); // L: 11046
-										var31.widget = var9; // L: 11047
-										var31.keyTyped = Client.field697[var37]; // L: 11048
-										var31.keyPressed = Client.field696[var37]; // L: 11049
-										var31.args = var9.onKey; // L: 11050
-										Client.scriptEvents.addFirst(var31); // L: 11051
-									}
-								}
-
-								ScriptEvent var30;
-								int[] var38;
-								if (var9.field3161 != null) { // L: 11054
-									var38 = class7.method57(); // L: 11055
-
-									for (var23 = 0; var23 < var38.length; ++var23) { // L: 11056
-										var30 = new ScriptEvent(); // L: 11057
-										var30.widget = var9; // L: 11058
-										var30.keyTyped = var38[var23]; // L: 11059
-										var30.args = var9.field3161; // L: 11060
-										Client.scriptEvents.addFirst(var30); // L: 11061
-									}
-								}
-
-								if (var9.field3162 != null) { // L: 11064
-									var38 = TaskHandler.method2879(); // L: 11065
-
-									for (var23 = 0; var23 < var38.length; ++var23) { // L: 11066
-										var30 = new ScriptEvent(); // L: 11067
-										var30.widget = var9; // L: 11068
-										var30.keyTyped = var38[var23]; // L: 11069
-										var30.args = var9.field3162; // L: 11070
-										Client.scriptEvents.addFirst(var30); // L: 11071
-									}
-								}
+							var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field969[var4], 0, var28 * Tiles.field976[var4], var28 * Tiles.field966[var4], var19, var21); // L: 414
+						} else if (var5 == 6) { // L: 417
+							var28 = 8; // L: 418
+							var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 419
+							if (0L != var29) { // L: 420
+								var28 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var29)).int2 / 2;
 							}
-						}
 
-						if (!var9.isIf3) { // L: 11076
-							if (Client.clickedWidget != null || class247.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11077
-								continue;
+							if (var8.animationId == -1 && var8.transforms == null) { // L: 422
+								var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
+							} else {
+								var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 423
 							}
 
-							if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11078
-								if (var9.mouseOverRedirect >= 0) { // L: 11079
-									WorldMapData_0.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
-								} else {
-									WorldMapData_0.mousedOverWidgetIf1 = var9; // L: 11080
-								}
+							var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field973[var4], var28 * Tiles.field974[var4], var19, var21); // L: 424
+						} else if (var5 == 7) { // L: 427
+							var23 = var4 + 2 & 3; // L: 429
+							if (var8.animationId == -1 && var8.transforms == null) { // L: 430
+								var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18);
+							} else {
+								var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 431
 							}
 
-							if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11082
-								Skills.field3247 = var9; // L: 11083
+							var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 432
+						} else if (var5 == 8) { // L: 435
+							var28 = 8; // L: 436
+							var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 437
+							if (var29 != 0L) { // L: 438
+								var28 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var29)).int2 / 2;
 							}
 
-							if (var9.scrollHeight > var9.height) { // L: 11085
-								class13.method177(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
+							int var27 = var4 + 2 & 3; // L: 441
+							Object var26;
+							if (var8.animationId == -1 && var8.transforms == null) { // L: 442
+								var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 443
+								var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 444
+							} else {
+								var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 447
+								var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 448
 							}
+
+							var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field973[var4], var28 * Tiles.field974[var4], var19, var21); // L: 450
 						}
+					}
+				}
+			} else {
+				if (var8.animationId == -1 && var8.transforms == null) { // L: 263
+					var34 = var8.getEntity(10, var4, var15, var17, var16, var18);
+				} else {
+					var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 264
+				}
 
-						if (var9.type == 0) { // L: 11087
-							updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 11088
-							if (var9.children != null) { // L: 11089
-								updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
-							}
+				if (var34 != null && var6.method3960(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 265 266
+					var23 = 15; // L: 267
+					if (var34 instanceof Model) { // L: 268
+						var23 = ((Model)var34).method4222() / 4; // L: 269
+						if (var23 > 30) { // L: 270
+							var23 = 30;
+						}
+					}
 
-							InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11090
-							if (var28 != null) { // L: 11091
-								if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11092
-									for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11093
-										if (var29.isMouseInputEvent) { // L: 11094
-											var29.remove(); // L: 11095
-											var29.widget.containsMouse = false; // L: 11096
-										}
-									}
-
-									if (class134.widgetDragDuration == 0) { // L: 11099
-										Client.clickedWidget = null; // L: 11100
-										Client.clickedWidgetParent = null; // L: 11101
-									}
-
-									if (!Client.isMenuOpen) { // L: 11103
-										FriendSystem.addCancelMenuEntry(); // L: 11104
-									}
-								}
-
-								Messages.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 11107
+					for (var24 = 0; var24 <= var9; ++var24) { // L: 272
+						for (int var33 = 0; var33 <= var10; ++var33) { // L: 273
+							if (var23 > SoundCache.field321[var0][var24 + var1][var33 + var2]) { // L: 274
+								SoundCache.field321[var0][var24 + var1][var33 + var2] = (byte)var23;
 							}
 						}
 					}
 				}
-			}
-		}
 
-	} // L: 11111
+				if (var8.interactType != 0 && var7 != null) { // L: 279
+					var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+				}
 
-	@ObfuscatedName("kj")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "76"
-	)
-	static final void method2825(int var0) {
-		var0 = Math.min(Math.max(var0, 0), 127); // L: 11409
-		class408.clientPreferences.areaSoundEffectsVolume = var0; // L: 11410
-		Login.savePreferences(); // L: 11411
-	} // L: 11412
+			}
+		}
+	} // L: 259 280 289 326 340 375 389 398 405 415 425 433 451 453
 }
diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java
index 953209ceb4..0f551f8480 100644
--- a/runescape-client/src/main/java/ClanChannelMember.java
+++ b/runescape-client/src/main/java/ClanChannelMember.java
@@ -4,21 +4,23 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("de")
+@ObfuscatedName("dz")
 @Implements("ClanChannelMember")
 public class ClanChannelMember {
-	@ObfuscatedName("i")
+	@ObfuscatedName("g")
+	static int[][][] field1504;
+	@ObfuscatedName("c")
 	@Export("rank")
 	public byte rank;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 717344231
+		intValue = -1187334187
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lpb;"
+		descriptor = "Lpo;"
 	)
 	@Export("username")
 	public Username username;
@@ -26,18 +28,60 @@ public class ClanChannelMember {
 	ClanChannelMember() {
 	} // L: 10
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "1349383488"
+		descriptor = "(ILpi;B)Lfe;",
+		garbageValue = "-47"
 	)
-	@Export("Messages_getLastChatID")
-	static int Messages_getLastChatID(int var0) {
-		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 77
-		if (var1 == null) { // L: 78
-			return -1;
-		} else {
-			return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 79 80
+	public static class160 method2777(int var0, Buffer var1) {
+		int var2 = var1.readUnsignedByte(); // L: 24
+		boolean var3 = (var2 & 1) != 0; // L: 25
+		boolean var4 = (var2 & 2) != 0; // L: 26
+		class160 var5 = new class160(var0); // L: 27
+		int var6;
+		int[] var7;
+		boolean var8;
+		int var9;
+		short var10;
+		if (var3) { // L: 28
+			var6 = var1.readUnsignedByte(); // L: 29
+			var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32
+			var8 = var5.field1732 != null && var7.length == var5.field1732.length; // L: 33
+
+			for (var9 = 0; var9 < 2; ++var9) { // L: 34
+				if (var7[var9] != 15) { // L: 35
+					var10 = (short)var1.readUnsignedShort(); // L: 36
+					if (var8) { // L: 37
+						var5.field1732[var7[var9]] = var10; // L: 38
+					}
+				}
+			}
+		}
+
+		if (var4) { // L: 43
+			var6 = var1.readUnsignedByte(); // L: 44
+			var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47
+			var8 = var5.field1738 != null && var7.length == var5.field1738.length; // L: 48
+
+			for (var9 = 0; var9 < 2; ++var9) { // L: 49
+				if (var7[var9] != 15) { // L: 50
+					var10 = (short)var1.readUnsignedShort(); // L: 51
+					if (var8) { // L: 52
+						var5.field1738[var7[var9]] = var10; // L: 53
+					}
+				}
+			}
 		}
+
+		return var5; // L: 58
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;I)I",
+		garbageValue = "1180078382"
+	)
+	public static int method2778(CharSequence var0) {
+		return MusicPatchNode.method5293(var0, 10, true); // L: 77
 	}
 }
diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java
index 6657bbd29f..b68c52b0bf 100644
--- a/runescape-client/src/main/java/ClanMate.java
+++ b/runescape-client/src/main/java/ClanMate.java
@@ -3,23 +3,18 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lp")
+@ObfuscatedName("mx")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
-	)
-	static IndexedSprite field3950;
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -29,20 +24,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown; // L: 7
 	} // L: 9
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-519741566"
+		descriptor = "(B)V",
+		garbageValue = "-39"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1866693709"
+		descriptor = "(S)Z",
+		garbageValue = "-2883"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -50,33 +45,33 @@ public final boolean isFriend() {
 			this.fillIsFriend(); // L: 17
 		}
 
-		return this.friend == TriBool.TriBool_true; // L: 19
+		return this.friend == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-587982231"
+		garbageValue = "935555842"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = class112.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23
+		this.friend = GameEngine.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23
 	} // L: 24
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-45"
+		descriptor = "(I)V",
+		garbageValue = "1459328233"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown; // L: 27
 	} // L: 28
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-2"
+		descriptor = "(I)Z",
+		garbageValue = "-463248448"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -87,13 +82,23 @@ public final boolean isIgnored() {
 		return this.ignored == TriBool.TriBool_true; // L: 34
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "28"
+		garbageValue = "-115"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = class112.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38
+		this.ignored = GameEngine.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38
 	} // L: 39
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "-714139435"
+	)
+	@Export("isWorldMapEvent")
+	public static boolean isWorldMapEvent(int var0) {
+		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19
+	}
 }
diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java
index 8349d17d34..fc11c6b84a 100644
--- a/runescape-client/src/main/java/ClanSettings.java
+++ b/runescape-client/src/main/java/ClanSettings.java
@@ -4,199 +4,188 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dm")
+@ObfuscatedName("ej")
 @Implements("ClanSettings")
 public class ClanSettings {
-	@ObfuscatedName("uu")
-	@ObfuscatedSignature(
-		descriptor = "Lkv;"
-	)
-	public static class300 field1440;
-	@ObfuscatedName("tw")
-	@ObfuscatedGetter(
-		intValue = -1256129645
-	)
-	@Export("foundItemIndex")
-	static int foundItemIndex;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("useHashes")
 	boolean useHashes;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("useNames")
 	boolean useNames;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = 7512820562405009479L
+		longValue = 8766302659820766593L
 	)
-	long field1456;
-	@ObfuscatedName("o")
+	long field1562;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 83798711
+		intValue = 363602855
 	)
-	int field1465;
-	@ObfuscatedName("g")
+	int field1563;
+	@ObfuscatedName("s")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 627794383
+		intValue = -1019301091
 	)
-	int field1442;
-	@ObfuscatedName("p")
+	int field1565;
+	@ObfuscatedName("w")
 	@Export("allowGuests")
 	public boolean allowGuests;
-	@ObfuscatedName("j")
-	public byte field1444;
-	@ObfuscatedName("b")
-	public byte field1439;
-	@ObfuscatedName("x")
-	public byte field1446;
-	@ObfuscatedName("y")
-	public byte field1447;
-	@ObfuscatedName("k")
+	@ObfuscatedName("n")
+	public byte field1567;
+	@ObfuscatedName("r")
+	public byte field1568;
+	@ObfuscatedName("o")
+	public byte field1569;
+	@ObfuscatedName("v")
+	public byte field1570;
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 287156229
+		intValue = 1483279855
 	)
 	@Export("memberCount")
 	public int memberCount;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("memberHashes")
 	long[] memberHashes;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("memberRanks")
 	public byte[] memberRanks;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("sortedMembers")
 	int[] sortedMembers;
-	@ObfuscatedName("n")
-	int[] field1452;
-	@ObfuscatedName("z")
-	public int[] field1453;
-	@ObfuscatedName("q")
-	public boolean[] field1454;
-	@ObfuscatedName("d")
+	@ObfuscatedName("a")
+	int[] field1575;
+	@ObfuscatedName("u")
+	public int[] field1582;
+	@ObfuscatedName("k")
+	public boolean[] field1577;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1564397769
+		intValue = 1883852465
 	)
 	@Export("currentOwner")
 	public int currentOwner;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1945382455
+		intValue = -571851789
 	)
-	public int field1438;
-	@ObfuscatedName("m")
+	public int field1579;
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1604545471
+		intValue = 2147323589
 	)
 	@Export("bannedMemberCount")
 	public int bannedMemberCount;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("bannedMemberHashes")
 	long[] bannedMemberHashes;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@Export("memberNames")
 	public String[] memberNames;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@Export("bannedMemberNames")
 	public String[] bannedMemberNames;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Loz;"
 	)
 	@Export("parameters")
 	IterableNodeHashTable parameters;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	public ClanSettings(Buffer var1) {
-		this.field1465 = 0; // L: 14
+		this.field1563 = 0; // L: 14
 		this.name = null; // L: 15
-		this.field1442 = 0; // L: 16
+		this.field1565 = 0; // L: 16
 		this.currentOwner = -1; // L: 29
-		this.field1438 = -1; // L: 30
-		this.method2715(var1); // L: 43
-	} // L: 44
+		this.field1579 = -1; // L: 30
+		this.method2895(var1);
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-21"
+		descriptor = "(II)V",
+		garbageValue = "-1038575948"
 	)
-	void method2650(int var1) {
+	void method2844(int var1) {
 		if (this.useHashes) { // L: 47
 			if (this.memberHashes != null) { // L: 48
 				System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount);
 			} else {
-				this.memberHashes = new long[var1]; // L: 49
+				this.memberHashes = new long[var1];
 			}
 		}
 
-		if (this.useNames) { // L: 51
-			if (this.memberNames != null) { // L: 52
+		if (this.useNames) {
+			if (this.memberNames != null) {
 				System.arraycopy(this.memberNames, 0, this.memberNames = new String[var1], 0, this.memberCount);
 			} else {
-				this.memberNames = new String[var1]; // L: 53
+				this.memberNames = new String[var1];
 			}
 		}
 
 		if (this.memberRanks != null) {
-			System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount); // L: 55
+			System.arraycopy(this.memberRanks, 0, this.memberRanks = new byte[var1], 0, this.memberCount);
 		} else {
 			this.memberRanks = new byte[var1]; // L: 56
 		}
 
-		if (this.field1452 != null) { // L: 57
-			System.arraycopy(this.field1452, 0, this.field1452 = new int[var1], 0, this.memberCount);
+		if (this.field1575 != null) { // L: 57
+			System.arraycopy(this.field1575, 0, this.field1575 = new int[var1], 0, this.memberCount);
 		} else {
-			this.field1452 = new int[var1]; // L: 58
+			this.field1575 = new int[var1];
 		}
 
-		if (this.field1453 != null) { // L: 59
-			System.arraycopy(this.field1453, 0, this.field1453 = new int[var1], 0, this.memberCount);
+		if (this.field1582 != null) {
+			System.arraycopy(this.field1582, 0, this.field1582 = new int[var1], 0, this.memberCount);
 		} else {
-			this.field1453 = new int[var1]; // L: 60
+			this.field1582 = new int[var1];
 		}
 
-		if (this.field1454 != null) { // L: 61
-			System.arraycopy(this.field1454, 0, this.field1454 = new boolean[var1], 0, this.memberCount);
+		if (this.field1577 != null) { // L: 61
+			System.arraycopy(this.field1577, 0, this.field1577 = new boolean[var1], 0, this.memberCount);
 		} else {
-			this.field1454 = new boolean[var1]; // L: 62
+			this.field1577 = new boolean[var1];
 		}
 
-	} // L: 63
+	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1402687223"
+		garbageValue = "748691102"
 	)
-	void method2711(int var1) {
+	void method2845(int var1) {
 		if (this.useHashes) {
-			if (this.bannedMemberHashes != null) {
+			if (this.bannedMemberHashes != null) { // L: 67
 				System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount);
 			} else {
-				this.bannedMemberHashes = new long[var1]; // L: 68
+				this.bannedMemberHashes = new long[var1];
 			}
 		}
 
 		if (this.useNames) { // L: 70
-			if (this.bannedMemberNames != null) { // L: 71
+			if (this.bannedMemberNames != null) {
 				System.arraycopy(this.bannedMemberNames, 0, this.bannedMemberNames = new String[var1], 0, this.bannedMemberCount);
 			} else {
-				this.bannedMemberNames = new String[var1];
+				this.bannedMemberNames = new String[var1]; // L: 72
 			}
 		}
 
-	}
+	} // L: 74
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)I",
-		garbageValue = "0"
+		descriptor = "(Ljava/lang/String;I)I",
+		garbageValue = "1765572452"
 	)
-	public int method2649(String var1) {
+	public int method2881(String var1) {
 		if (var1 != null && var1.length() != 0) { // L: 77
 			for (int var2 = 0; var2 < this.memberCount; ++var2) { // L: 78
 				if (this.memberNames[var2].equals(var1)) { // L: 79
@@ -210,20 +199,20 @@ public int method2649(String var1) {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(IIIB)I",
-		garbageValue = "-83"
+		garbageValue = "-120"
 	)
-	public int method2652(int var1, int var2, int var3) {
+	public int method2847(int var1, int var2, int var3) {
 		int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85
-		return (this.field1452[var1] & var4) >>> var2; // L: 86
+		return (this.field1575[var1] & var4) >>> var2; // L: 86
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/lang/Integer;",
-		garbageValue = "688025424"
+		garbageValue = "-2063029032"
 	)
 	@Export("getTitleGroupValue")
 	public Integer getTitleGroupValue(int var1) {
@@ -235,10 +224,10 @@ public Integer getTitleGroupValue(int var1) {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I)[I",
-		garbageValue = "-723355828"
+		garbageValue = "-2085124588"
 	)
 	@Export("getSortedMembers")
 	public int[] getSortedMembers() {
@@ -253,538 +242,523 @@ public int[] getSortedMembers() {
 				}
 			}
 
-			BufferedSource.method6301(var1, this.sortedMembers); // L: 105
+			int[] var3 = this.sortedMembers; // L: 105
+			class292.method5504(var1, var3, 0, var1.length - 1); // L: 107
 		}
 
-		return this.sortedMembers; // L: 107
+		return this.sortedMembers; // L: 110
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(JLjava/lang/String;IB)V",
-		garbageValue = "86"
+		descriptor = "(JLjava/lang/String;II)V",
+		garbageValue = "1014767431"
 	)
-	void method2655(long var1, String var3, int var4) {
-		if (var3 != null && var3.length() == 0) { // L: 111
+	void method2850(long var1, String var3, int var4) {
+		if (var3 != null && var3.length() == 0) { // L: 114
 			var3 = null;
 		}
 
-		if (var1 > 0L != this.useHashes) { // L: 112
+		if (this.useHashes != var1 > 0L) { // L: 115
 			throw new RuntimeException("");
-		} else if (var3 != null != this.useNames) { // L: 113
+		} else if (var3 != null != this.useNames) { // L: 116
 			throw new RuntimeException("");
 		} else {
-			if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 114
-				this.method2650(this.memberCount + 5);
+			if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 117
+				this.method2844(this.memberCount + 5);
 			}
 
-			if (this.memberHashes != null) { // L: 115
+			if (this.memberHashes != null) { // L: 118
 				this.memberHashes[this.memberCount] = var1;
 			}
 
-			if (this.memberNames != null) { // L: 116
+			if (this.memberNames != null) { // L: 119
 				this.memberNames[this.memberCount] = var3;
 			}
 
-			if (this.currentOwner == -1) { // L: 117
-				this.currentOwner = this.memberCount; // L: 118
-				this.memberRanks[this.memberCount] = 126; // L: 119
+			if (this.currentOwner == -1) { // L: 120
+				this.currentOwner = this.memberCount; // L: 121
+				this.memberRanks[this.memberCount] = 126; // L: 122
 			} else {
-				this.memberRanks[this.memberCount] = 0; // L: 122
+				this.memberRanks[this.memberCount] = 0; // L: 125
 			}
 
-			this.field1452[this.memberCount] = 0; // L: 124
-			this.field1453[this.memberCount] = var4; // L: 125
-			this.field1454[this.memberCount] = false; // L: 126
-			++this.memberCount; // L: 127
-			this.sortedMembers = null; // L: 128
+			this.field1575[this.memberCount] = 0; // L: 127
+			this.field1582[this.memberCount] = var4; // L: 128
+			this.field1577[this.memberCount] = false; // L: 129
+			++this.memberCount; // L: 130
+			this.sortedMembers = null; // L: 131
 		}
-	} // L: 129
+	} // L: 132
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1629682496"
+		descriptor = "(IB)V",
+		garbageValue = "0"
 	)
-	void method2656(int var1) {
-		if (var1 >= 0 && var1 < this.memberCount) { // L: 132
-			--this.memberCount; // L: 133
-			this.sortedMembers = null; // L: 134
-			if (this.memberCount == 0) { // L: 135
-				this.memberHashes = null; // L: 136
-				this.memberNames = null; // L: 137
-				this.memberRanks = null; // L: 138
-				this.field1452 = null; // L: 139
-				this.field1453 = null; // L: 140
-				this.field1454 = null; // L: 141
-				this.currentOwner = -1; // L: 142
-				this.field1438 = -1; // L: 143
+	void method2862(int var1) {
+		if (var1 >= 0 && var1 < this.memberCount) { // L: 135
+			--this.memberCount; // L: 136
+			this.sortedMembers = null; // L: 137
+			if (this.memberCount == 0) { // L: 138
+				this.memberHashes = null; // L: 139
+				this.memberNames = null; // L: 140
+				this.memberRanks = null; // L: 141
+				this.field1575 = null; // L: 142
+				this.field1582 = null; // L: 143
+				this.field1577 = null; // L: 144
+				this.currentOwner = -1; // L: 145
+				this.field1579 = -1; // L: 146
 			} else {
-				System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 146
-				System.arraycopy(this.field1452, var1 + 1, this.field1452, var1, this.memberCount - var1); // L: 147
-				System.arraycopy(this.field1453, var1 + 1, this.field1453, var1, this.memberCount - var1); // L: 148
-				System.arraycopy(this.field1454, var1 + 1, this.field1454, var1, this.memberCount - var1); // L: 149
-				if (this.memberHashes != null) { // L: 150
+				System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 149
+				System.arraycopy(this.field1575, var1 + 1, this.field1575, var1, this.memberCount - var1); // L: 150
+				System.arraycopy(this.field1582, var1 + 1, this.field1582, var1, this.memberCount - var1); // L: 151
+				System.arraycopy(this.field1577, var1 + 1, this.field1577, var1, this.memberCount - var1); // L: 152
+				if (this.memberHashes != null) { // L: 153
 					System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1);
 				}
 
-				if (this.memberNames != null) { // L: 151
+				if (this.memberNames != null) { // L: 154
 					System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1);
 				}
 
-				this.updateOwner(); // L: 152
+				this.updateOwner(); // L: 155
 			}
 
 		} else {
 			throw new RuntimeException("");
 		}
-	} // L: 154
+	} // L: 157
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-67"
+		descriptor = "(S)V",
+		garbageValue = "128"
 	)
 	@Export("updateOwner")
 	void updateOwner() {
-		if (this.memberCount == 0) { // L: 157
-			this.currentOwner = -1; // L: 158
-			this.field1438 = -1; // L: 159
+		if (this.memberCount == 0) { // L: 160
+			this.currentOwner = -1; // L: 161
+			this.field1579 = -1; // L: 162
 		} else {
-			this.currentOwner = -1; // L: 162
-			this.field1438 = -1; // L: 163
-			int var1 = 0; // L: 164
-			byte var2 = this.memberRanks[0]; // L: 165
-
-			for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 166
-				if (this.memberRanks[var3] > var2) { // L: 167
-					if (var2 == 125) {
-						this.field1438 = var1; // L: 168
+			this.currentOwner = -1; // L: 165
+			this.field1579 = -1; // L: 166
+			int var1 = 0; // L: 167
+			byte var2 = this.memberRanks[0]; // L: 168
+
+			for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 169
+				if (this.memberRanks[var3] > var2) { // L: 170
+					if (var2 == 125) { // L: 171
+						this.field1579 = var1;
 					}
 
-					var1 = var3; // L: 169
-					var2 = this.memberRanks[var3]; // L: 170
-				} else if (this.field1438 == -1 && this.memberRanks[var3] == 125) { // L: 172
-					this.field1438 = var3; // L: 173
+					var1 = var3; // L: 172
+					var2 = this.memberRanks[var3]; // L: 173
+				} else if (this.field1579 == -1 && this.memberRanks[var3] == 125) { // L: 175
+					this.field1579 = var3; // L: 176
 				}
 			}
 
-			this.currentOwner = var1; // L: 176
-			if (this.currentOwner != -1) { // L: 177
+			this.currentOwner = var1; // L: 179
+			if (this.currentOwner != -1) { // L: 180
 				this.memberRanks[this.currentOwner] = 126;
 			}
 
 		}
-	} // L: 160 178
+	} // L: 163 181
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(JLjava/lang/String;I)V",
-		garbageValue = "1006184517"
+		garbageValue = "1813028559"
 	)
-	void method2658(long var1, String var3) {
-		if (var3 != null && var3.length() == 0) { // L: 181
+	void method2853(long var1, String var3) {
+		if (var3 != null && var3.length() == 0) { // L: 184
 			var3 = null;
 		}
 
-		if (var1 > 0L != this.useHashes) { // L: 182
+		if (var1 > 0L != this.useHashes) { // L: 185
 			throw new RuntimeException("");
-		} else if (this.useNames != (var3 != null)) { // L: 183
+		} else if (var3 != null != this.useNames) { // L: 186
 			throw new RuntimeException("");
 		} else {
-			if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 184
-				this.method2711(this.bannedMemberCount + 5);
+			if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 187
+				this.method2845(this.bannedMemberCount + 5);
 			}
 
-			if (this.bannedMemberHashes != null) { // L: 185
+			if (this.bannedMemberHashes != null) { // L: 188
 				this.bannedMemberHashes[this.bannedMemberCount] = var1;
 			}
 
-			if (this.bannedMemberNames != null) { // L: 186
+			if (this.bannedMemberNames != null) { // L: 189
 				this.bannedMemberNames[this.bannedMemberCount] = var3;
 			}
 
-			++this.bannedMemberCount; // L: 187
+			++this.bannedMemberCount; // L: 190
 		}
-	} // L: 188
+	} // L: 191
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-465841653"
+		garbageValue = "579963053"
 	)
-	void method2687(int var1) {
-		--this.bannedMemberCount; // L: 191
-		if (this.bannedMemberCount == 0) { // L: 192
-			this.bannedMemberHashes = null; // L: 193
-			this.bannedMemberNames = null; // L: 194
+	void method2854(int var1) {
+		--this.bannedMemberCount; // L: 194
+		if (this.bannedMemberCount == 0) { // L: 195
+			this.bannedMemberHashes = null; // L: 196
+			this.bannedMemberNames = null; // L: 197
 		} else {
-			if (this.bannedMemberHashes != null) { // L: 197
+			if (this.bannedMemberHashes != null) { // L: 200
 				System.arraycopy(this.bannedMemberHashes, var1 + 1, this.bannedMemberHashes, var1, this.bannedMemberCount - var1);
 			}
 
 			if (this.bannedMemberNames != null) {
-				System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 198
+				System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 201
 			}
 		}
 
-	} // L: 200
+	} // L: 203
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IBI)I",
-		garbageValue = "-1408414552"
+		descriptor = "(IBB)I",
+		garbageValue = "5"
 	)
-	int method2673(int var1, byte var2) {
-		if (var2 != 126 && var2 != 127) { // L: 203
-			if (this.currentOwner == var1 && (this.field1438 == -1 || this.memberRanks[this.field1438] < 125)) { // L: 204
-				return -1;
-			} else if (this.memberRanks[var1] == var2) { // L: 205
+	int method2887(int var1, byte var2) {
+		if (var2 != 126 && var2 != 127) { // L: 206
+			if (this.currentOwner == var1 && (this.field1579 == -1 || this.memberRanks[this.field1579] < 125)) { // L: 207
 				return -1;
+			} else if (this.memberRanks[var1] == var2) {
+				return -1; // L: 208
 			} else {
-				this.memberRanks[var1] = var2; // L: 206
-				this.updateOwner(); // L: 207
-				return var1; // L: 208
+				this.memberRanks[var1] = var2; // L: 209
+				this.updateOwner(); // L: 210
+				return var1; // L: 211
 			}
 		} else {
 			return -1;
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-1614826959"
-	)
-	boolean method2661(int var1) {
-		if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 212
-			this.memberRanks[this.currentOwner] = 125; // L: 213
-			this.field1438 = this.currentOwner; // L: 214
-			this.memberRanks[var1] = 126; // L: 215
-			this.currentOwner = var1; // L: 216
-			return true; // L: 217
+		descriptor = "(IB)Z",
+		garbageValue = "-1"
+	)
+	boolean method2863(int var1) {
+		if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 215
+			this.memberRanks[this.currentOwner] = 125; // L: 216
+			this.field1579 = this.currentOwner; // L: 217
+			this.memberRanks[var1] = 126; // L: 218
+			this.currentOwner = var1; // L: 219
+			return true; // L: 220
 		} else {
 			return false;
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(IZB)I",
-		garbageValue = "32"
+		descriptor = "(IZI)I",
+		garbageValue = "412346820"
 	)
-	int method2662(int var1, boolean var2) {
-		if (this.field1454[var1] == var2) { // L: 221
+	int method2857(int var1, boolean var2) {
+		if (this.field1577[var1] == var2) { // L: 224
 			return -1;
 		} else {
-			this.field1454[var1] = var2; // L: 222
-			return var1; // L: 223
+			this.field1577[var1] = var2; // L: 225
+			return var1; // L: 226
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIB)I",
-		garbageValue = "1"
-	)
-	int method2663(int var1, int var2, int var3, int var4) {
-		int var5 = (1 << var3) - 1; // L: 227
-		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 228
-		int var7 = var6 ^ var5; // L: 229
-		var2 <<= var3; // L: 230
-		var2 &= var7; // L: 231
-		int var8 = this.field1452[var1]; // L: 232
+		descriptor = "(IIIII)I",
+		garbageValue = "1783713997"
+	)
+	int method2858(int var1, int var2, int var3, int var4) {
+		int var5 = (1 << var3) - 1; // L: 230
+		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 231
+		int var7 = var6 ^ var5; // L: 232
+		var2 <<= var3; // L: 233
+		var2 &= var7; // L: 234
+		int var8 = this.field1575[var1]; // L: 235
 		if ((var8 & var7) == var2) {
-			return -1; // L: 233
+			return -1; // L: 236
 		} else {
-			var8 &= ~var7; // L: 234
-			this.field1452[var1] = var8 | var2; // L: 235
-			return var1; // L: 236
+			var8 &= ~var7; // L: 237
+			this.field1575[var1] = var8 | var2; // L: 238
+			return var1; // L: 239
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(III)Z",
-		garbageValue = "1591029993"
+		descriptor = "(IIB)Z",
+		garbageValue = "0"
 	)
-	boolean method2664(int var1, int var2) {
-		if (this.parameters != null) { // L: 240
-			Node var3 = this.parameters.get((long)var1); // L: 241
-			if (var3 != null) { // L: 242
-				if (var3 instanceof IntegerNode) { // L: 243
-					IntegerNode var4 = (IntegerNode)var3; // L: 244
-					if (var2 == var4.integer) { // L: 245
+	boolean method2859(int var1, int var2) {
+		if (this.parameters != null) { // L: 243
+			Node var3 = this.parameters.get((long)var1); // L: 244
+			if (var3 != null) { // L: 245
+				if (var3 instanceof IntegerNode) { // L: 246
+					IntegerNode var4 = (IntegerNode)var3; // L: 247
+					if (var2 == var4.integer) { // L: 248
 						return false;
 					}
 
-					var4.integer = var2; // L: 246
-					return true; // L: 247
+					var4.integer = var2; // L: 249
+					return true; // L: 250
 				}
 
-				var3.remove(); // L: 249
+				var3.remove(); // L: 252
 			}
 		} else {
-			this.parameters = new IterableNodeHashTable(4); // L: 252
+			this.parameters = new IterableNodeHashTable(4); // L: 255
 		}
 
-		this.parameters.put(new IntegerNode(var2), (long)var1); // L: 253
-		return true; // L: 254
+		this.parameters.put(new IntegerNode(var2), (long)var1); // L: 256
+		return true; // L: 257
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIB)Z",
-		garbageValue = "32"
-	)
-	boolean method2665(int var1, int var2, int var3, int var4) {
-		int var5 = (1 << var3) - 1; // L: 258
-		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 259
-		int var7 = var6 ^ var5; // L: 260
-		var2 <<= var3; // L: 261
-		var2 &= var7; // L: 262
-		if (this.parameters != null) { // L: 263
-			Node var8 = this.parameters.get((long)var1); // L: 264
-			if (var8 != null) { // L: 265
-				if (var8 instanceof IntegerNode) { // L: 266
-					IntegerNode var9 = (IntegerNode)var8; // L: 267
-					if ((var9.integer & var7) == var2) { // L: 268
+		garbageValue = "50"
+	)
+	boolean method2860(int var1, int var2, int var3, int var4) {
+		int var5 = (1 << var3) - 1; // L: 261
+		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 262
+		int var7 = var6 ^ var5; // L: 263
+		var2 <<= var3; // L: 264
+		var2 &= var7; // L: 265
+		if (this.parameters != null) { // L: 266
+			Node var8 = this.parameters.get((long)var1); // L: 267
+			if (var8 != null) { // L: 268
+				if (var8 instanceof IntegerNode) { // L: 269
+					IntegerNode var9 = (IntegerNode)var8; // L: 270
+					if ((var9.integer & var7) == var2) { // L: 271
 						return false;
 					}
 
-					var9.integer &= ~var7; // L: 269
-					var9.integer |= var2; // L: 270
-					return true; // L: 271
+					var9.integer &= ~var7; // L: 272
+					var9.integer |= var2; // L: 273
+					return true; // L: 274
 				}
 
-				var8.remove(); // L: 273
+				var8.remove(); // L: 276
 			}
 		} else {
-			this.parameters = new IterableNodeHashTable(4); // L: 276
+			this.parameters = new IterableNodeHashTable(4); // L: 279
 		}
 
-		this.parameters.put(new IntegerNode(var2), (long)var1); // L: 277
-		return true; // L: 278
+		this.parameters.put(new IntegerNode(var2), (long)var1); // L: 280
+		return true; // L: 281
 	}
 
-	@ObfuscatedName("z")
-	boolean method2666(int var1, long var2) {
-		if (this.parameters != null) { // L: 282
-			Node var4 = this.parameters.get((long)var1); // L: 283
-			if (var4 != null) { // L: 284
-				if (var4 instanceof class367) { // L: 285
-					class367 var5 = (class367)var4; // L: 286
-					if (var2 == var5.field4071) { // L: 287
+	@ObfuscatedName("u")
+	boolean method2856(int var1, long var2) {
+		if (this.parameters != null) { // L: 285
+			Node var4 = this.parameters.get((long)var1); // L: 286
+			if (var4 != null) { // L: 287
+				if (var4 instanceof class384) { // L: 288
+					class384 var5 = (class384)var4; // L: 289
+					if (var5.field4254 == var2) { // L: 290
 						return false;
 					}
 
-					var5.field4071 = var2; // L: 288
-					return true; // L: 289
+					var5.field4254 = var2; // L: 291
+					return true; // L: 292
 				}
 
-				var4.remove(); // L: 291
+				var4.remove(); // L: 294
 			}
 		} else {
-			this.parameters = new IterableNodeHashTable(4); // L: 294
+			this.parameters = new IterableNodeHashTable(4); // L: 297
 		}
 
-		this.parameters.put(new class367(var2), (long)var1); // L: 295
-		return true; // L: 296
+		this.parameters.put(new class384(var2), (long)var1); // L: 298
+		return true; // L: 299
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;I)Z",
-		garbageValue = "-203243509"
+		garbageValue = "1780674005"
 	)
-	boolean method2667(int var1, String var2) {
-		if (var2 == null) { // L: 300
+	boolean method2873(int var1, String var2) {
+		if (var2 == null) { // L: 303
 			var2 = "";
-		} else if (var2.length() > 80) { // L: 301
+		} else if (var2.length() > 80) { // L: 304
 			var2 = var2.substring(0, 80);
 		}
 
-		if (this.parameters != null) { // L: 302
-			Node var3 = this.parameters.get((long)var1); // L: 303
-			if (var3 != null) { // L: 304
-				if (var3 instanceof ObjectNode) { // L: 305
-					ObjectNode var4 = (ObjectNode)var3; // L: 306
-					if (var4.obj instanceof String) { // L: 307
-						if (var2.equals(var4.obj)) { // L: 308
+		if (this.parameters != null) { // L: 305
+			Node var3 = this.parameters.get((long)var1); // L: 306
+			if (var3 != null) { // L: 307
+				if (var3 instanceof ObjectNode) { // L: 308
+					ObjectNode var4 = (ObjectNode)var3; // L: 309
+					if (var4.obj instanceof String) { // L: 310
+						if (var2.equals(var4.obj)) { // L: 311
 							return false;
 						}
 
-						var4.remove(); // L: 309
-						this.parameters.put(new ObjectNode(var2), var4.key); // L: 310
-						return true; // L: 311
+						var4.remove(); // L: 312
+						this.parameters.put(new ObjectNode(var2), var4.key); // L: 313
+						return true; // L: 314
 					}
 				}
 
-				var3.remove(); // L: 314
+				var3.remove(); // L: 317
 			}
 		} else {
-			this.parameters = new IterableNodeHashTable(4); // L: 317
+			this.parameters = new IterableNodeHashTable(4); // L: 320
 		}
 
-		this.parameters.put(new ObjectNode(var2), (long)var1); // L: 318
-		return true; // L: 319
+		this.parameters.put(new ObjectNode(var2), (long)var1); // L: 321
+		return true; // L: 322
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1240053331"
-	)
-	void method2715(Buffer var1) {
-		int var2 = var1.readUnsignedByte(); // L: 323
-		if (var2 >= 1 && var2 <= 6) { // L: 324
-			int var3 = var1.readUnsignedByte(); // L: 325
-			if ((var3 & 1) != 0) { // L: 326
+		descriptor = "(Lpi;I)V",
+		garbageValue = "-684455751"
+	)
+	void method2895(Buffer var1) {
+		int var2 = var1.readUnsignedByte(); // L: 326
+		if (var2 >= 1 && var2 <= 6) { // L: 327
+			int var3 = var1.readUnsignedByte(); // L: 328
+			if ((var3 & 1) != 0) { // L: 329
 				this.useHashes = true;
 			}
 
-			if ((var3 & 2) != 0) { // L: 327
+			if ((var3 & 2) != 0) { // L: 330
 				this.useNames = true;
 			}
 
-			if (!this.useHashes) { // L: 328
-				this.memberHashes = null; // L: 329
-				this.bannedMemberHashes = null; // L: 330
+			if (!this.useHashes) { // L: 331
+				this.memberHashes = null; // L: 332
+				this.bannedMemberHashes = null; // L: 333
 			}
 
-			if (!this.useNames) { // L: 332
-				this.memberNames = null; // L: 333
-				this.bannedMemberNames = null; // L: 334
+			if (!this.useNames) { // L: 335
+				this.memberNames = null; // L: 336
+				this.bannedMemberNames = null; // L: 337
 			}
 
-			this.field1465 = var1.readInt(); // L: 336
-			this.field1442 = var1.readInt(); // L: 337
-			if (var2 <= 3 && this.field1442 != 0) { // L: 338
-				this.field1442 += 16912800;
+			this.field1563 = var1.readInt(); // L: 339
+			this.field1565 = var1.readInt(); // L: 340
+			if (var2 <= 3 && this.field1565 != 0) { // L: 341
+				this.field1565 += 16912800;
 			}
 
-			this.memberCount = var1.readUnsignedShort(); // L: 339
-			this.bannedMemberCount = var1.readUnsignedByte(); // L: 340
-			this.name = var1.readStringCp1252NullTerminated(); // L: 341
-			if (var2 >= 4) { // L: 342
-				var1.readInt(); // L: 343
+			this.memberCount = var1.readUnsignedShort(); // L: 342
+			this.bannedMemberCount = var1.readUnsignedByte(); // L: 343
+			this.name = var1.readStringCp1252NullTerminated(); // L: 344
+			if (var2 >= 4) { // L: 345
+				var1.readInt(); // L: 346
 			}
 
-			this.allowGuests = var1.readUnsignedByte() == 1; // L: 345
-			this.field1444 = var1.readByte(); // L: 346
-			this.field1439 = var1.readByte(); // L: 347
-			this.field1446 = var1.readByte(); // L: 348
-			this.field1447 = var1.readByte(); // L: 349
+			this.allowGuests = var1.readUnsignedByte() == 1; // L: 348
+			this.field1567 = var1.readByte(); // L: 349
+			this.field1568 = var1.readByte(); // L: 350
+			this.field1569 = var1.readByte(); // L: 351
+			this.field1570 = var1.readByte(); // L: 352
 			int var4;
-			if (this.memberCount > 0) { // L: 350
-				if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 351
+			if (this.memberCount > 0) { // L: 353
+				if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 354
 					this.memberHashes = new long[this.memberCount];
 				}
 
-				if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 352
+				if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 355
 					this.memberNames = new String[this.memberCount];
 				}
 
-				if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 353
+				if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 356
 					this.memberRanks = new byte[this.memberCount];
 				}
 
-				if (this.field1452 == null || this.field1452.length < this.memberCount) { // L: 354
-					this.field1452 = new int[this.memberCount];
+				if (this.field1575 == null || this.field1575.length < this.memberCount) { // L: 357
+					this.field1575 = new int[this.memberCount];
 				}
 
-				if (this.field1453 == null || this.field1453.length < this.memberCount) { // L: 355
-					this.field1453 = new int[this.memberCount];
+				if (this.field1582 == null || this.field1582.length < this.memberCount) { // L: 358
+					this.field1582 = new int[this.memberCount];
 				}
 
-				if (this.field1454 == null || this.field1454.length < this.memberCount) { // L: 356
-					this.field1454 = new boolean[this.memberCount];
+				if (this.field1577 == null || this.field1577.length < this.memberCount) { // L: 359
+					this.field1577 = new boolean[this.memberCount];
 				}
 
-				for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 357
-					if (this.useHashes) { // L: 358
+				for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 360
+					if (this.useHashes) { // L: 361
 						this.memberHashes[var4] = var1.readLong();
 					}
 
-					if (this.useNames) { // L: 359
+					if (this.useNames) { // L: 362
 						this.memberNames[var4] = var1.readStringCp1252NullTerminatedOrNull();
 					}
 
-					this.memberRanks[var4] = var1.readByte(); // L: 360
-					if (var2 >= 2) { // L: 361
-						this.field1452[var4] = var1.readInt();
+					this.memberRanks[var4] = var1.readByte(); // L: 363
+					if (var2 >= 2) { // L: 364
+						this.field1575[var4] = var1.readInt();
 					}
 
-					if (var2 >= 5) { // L: 362
-						this.field1453[var4] = var1.readUnsignedShort();
+					if (var2 >= 5) { // L: 365
+						this.field1582[var4] = var1.readUnsignedShort();
 					} else {
-						this.field1453[var4] = 0; // L: 363
+						this.field1582[var4] = 0; // L: 366
 					}
 
-					if (var2 >= 6) { // L: 364
-						this.field1454[var4] = var1.readUnsignedByte() == 1;
+					if (var2 >= 6) { // L: 367
+						this.field1577[var4] = var1.readUnsignedByte() == 1;
 					} else {
-						this.field1454[var4] = false; // L: 365
+						this.field1577[var4] = false; // L: 368
 					}
 				}
 
-				this.updateOwner(); // L: 367
+				this.updateOwner(); // L: 370
 			}
 
-			if (this.bannedMemberCount > 0) { // L: 369
-				if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 370
-					this.bannedMemberHashes = new long[this.bannedMemberCount];
+			if (this.bannedMemberCount > 0) { // L: 372
+				if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) {
+					this.bannedMemberHashes = new long[this.bannedMemberCount]; // L: 373
 				}
 
-				if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 371
+				if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 374
 					this.bannedMemberNames = new String[this.bannedMemberCount];
 				}
 
-				for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 372
-					if (this.useHashes) { // L: 373
+				for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 375
+					if (this.useHashes) { // L: 376
 						this.bannedMemberHashes[var4] = var1.readLong();
 					}
 
-					if (this.useNames) { // L: 374
+					if (this.useNames) { // L: 377
 						this.bannedMemberNames[var4] = var1.readStringCp1252NullTerminatedOrNull();
 					}
 				}
 			}
 
-			if (var2 >= 3) { // L: 377
-				var4 = var1.readUnsignedShort(); // L: 378
-				if (var4 > 0) { // L: 379
-					int var5;
-					int var6;
-					int var7;
-					if (var4 < 16) { // L: 381
-						var7 = var4 - 1; // L: 385
-						var7 |= var7 >>> 1; // L: 386
-						var7 |= var7 >>> 2; // L: 387
-						var7 |= var7 >>> 4; // L: 388
-						var7 |= var7 >>> 8; // L: 389
-						var7 |= var7 >>> 16; // L: 390
-						var6 = var7 + 1; // L: 391
-						var5 = var6; // L: 393
-					} else {
-						var5 = 16; // L: 395
-					}
-
-					this.parameters = new IterableNodeHashTable(var5); // L: 396
-
-					while (var4-- > 0) { // L: 397
-						var6 = var1.readInt(); // L: 398
-						var7 = var6 & 1073741823; // L: 399
-						int var8 = var6 >>> 30; // L: 400
-						if (var8 == 0) { // L: 401
-							int var13 = var1.readInt(); // L: 402
-							this.parameters.put(new IntegerNode(var13), (long)var7); // L: 403
-						} else if (var8 == 1) { // L: 405
-							long var11 = var1.readLong(); // L: 406
-							this.parameters.put(new class367(var11), (long)var7); // L: 407
-						} else if (var8 == 2) { // L: 409
-							String var9 = var1.readStringCp1252NullTerminated(); // L: 410
-							this.parameters.put(new ObjectNode(var9), (long)var7); // L: 411
+			if (var2 >= 3) { // L: 380
+				var4 = var1.readUnsignedShort(); // L: 381
+				if (var4 > 0) { // L: 382
+					this.parameters = new IterableNodeHashTable(var4 < 16 ? SpotAnimationDefinition.method3362(var4) : 16); // L: 383
+
+					while (var4-- > 0) { // L: 384
+						int var5 = var1.readInt(); // L: 385
+						int var6 = var5 & 1073741823; // L: 386
+						int var7 = var5 >>> 30; // L: 387
+						if (var7 == 0) { // L: 388
+							int var12 = var1.readInt(); // L: 389
+							this.parameters.put(new IntegerNode(var12), (long)var6); // L: 390
+						} else if (var7 == 1) { // L: 392
+							long var10 = var1.readLong(); // L: 393
+							this.parameters.put(new class384(var10), (long)var6); // L: 394
+						} else if (var7 == 2) { // L: 396
+							String var8 = var1.readStringCp1252NullTerminated(); // L: 397
+							this.parameters.put(new ObjectNode(var8), (long)var6); // L: 398
 						}
 					}
 				}
@@ -793,74 +767,77 @@ void method2715(Buffer var1) {
 		} else {
 			throw new RuntimeException("" + var2);
 		}
-	} // L: 416
+	} // L: 403
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(ILmr;Lkd;B)V",
-		garbageValue = "-44"
-	)
-	static void method2653(int var0, ArchiveDisk var1, Archive var2) {
-		ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18
-		var3.type = 1; // L: 19
-		var3.key = (long)var0; // L: 20
-		var3.archiveDisk = var1; // L: 21
-		var3.archive = var2; // L: 22
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23
-			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24
-		} // L: 25
-
-		Login.method1952(); // L: 26
-	} // L: 27
+		descriptor = "(Ljava/lang/CharSequence;I)Z",
+		garbageValue = "-174391632"
+	)
+	@Export("isNumber")
+	public static boolean isNumber(CharSequence var0) {
+		boolean var2 = false; // L: 38
+		boolean var3 = false; // L: 39
+		int var4 = 0; // L: 40
+		int var5 = var0.length(); // L: 41
+		int var6 = 0;
+
+		boolean var1;
+		while (true) {
+			if (var6 >= var5) {
+				var1 = var3; // L: 71
+				break;
+			}
+
+			label85: {
+				char var7 = var0.charAt(var6); // L: 43
+				if (var6 == 0) { // L: 44
+					if (var7 == '-') { // L: 45
+						var2 = true; // L: 46
+						break label85;
+					}
 
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-80"
-	)
-	public static void method2703(int var0) {
-		MouseHandler.MouseHandler_idleCycles = var0; // L: 66
-	} // L: 67
+					if (var7 == '+') { // L: 49
+						break label85;
+					}
+				}
 
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1184927599"
-	)
-	static void method2714(int var0) {
-		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72
-		if (var1 != null) {
-			var1.remove(); // L: 74
-		}
-	} // L: 73 75
+				int var9;
+				if (var7 >= '0' && var7 <= '9') { // L: 51
+					var9 = var7 - '0';
+				} else if (var7 >= 'A' && var7 <= 'Z') { // L: 52
+					var9 = var7 - '7';
+				} else {
+					if (var7 < 'a' || var7 > 'z') { // L: 53
+						var1 = false; // L: 55
+						break;
+					}
 
-	@ObfuscatedName("gx")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "257088762"
-	)
-	@Export("addNpcsToScene")
-	static final void addNpcsToScene(boolean var0) {
-		for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 5089
-			NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 5090
-			if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 5091
-				int var3 = var2.x >> 7; // L: 5092
-				int var4 = var2.y >> 7; // L: 5093
-				if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 5094
-					if (var2.field1087 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 5095
-						if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 5096
-							continue;
-						}
+					var9 = var7 - 'W';
+				}
 
-						Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 5097
-					}
+				if (var9 >= 10) { // L: 58
+					var1 = false; // L: 59
+					break; // L: 60
+				}
+
+				if (var2) { // L: 62
+					var9 = -var9;
+				}
 
-					long var5 = PacketBuffer.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 5099
-					var2.playerCycle = Client.cycle; // L: 5100
-					GameBuild.scene.drawEntity(GrandExchangeOfferTotalQuantityComparator.Client_plane, var2.x, var2.y, class392.getTileHeight(var2.field1087 * 64 - 64 + var2.x, var2.field1087 * 64 - 64 + var2.y, GrandExchangeOfferTotalQuantityComparator.Client_plane), var2.field1087 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 5101
+				int var8 = var9 + var4 * 10; // L: 63
+				if (var4 != var8 / 10) { // L: 64
+					var1 = false; // L: 65
+					break; // L: 66
 				}
+
+				var4 = var8; // L: 68
+				var3 = true; // L: 69
 			}
+
+			++var6; // L: 42
 		}
 
-	} // L: 5105
+		return var1; // L: 73
+	}
 }
diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java
index 49d981ada0..187f3cb59f 100644
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -1,12 +1,15 @@
-import com.jagex.oldscape.pub.OAuthTokens;
+import java.io.File;
 import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.net.MalformedURLException;
 import java.net.Socket;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
@@ -19,2010 +22,2150 @@
 public final class Client extends GameEngine implements Usernamed, OAuthTokens {
 	@ObfuscatedName("rv")
 	@ObfuscatedSignature(
-		descriptor = "[Ldm;"
+		descriptor = "[Lej;"
 	)
 	@Export("currentClanSettings")
 	static ClanSettings[] currentClanSettings;
-	@ObfuscatedName("pu")
-	@ObfuscatedGetter(
-		intValue = 1318637709
-	)
-	@Export("rootWidgetCount")
-	static int rootWidgetCount;
-	@ObfuscatedName("pm")
-	@ObfuscatedGetter(
-		intValue = -538262805
-	)
-	static int field678;
-	@ObfuscatedName("qb")
+	@ObfuscatedName("qk")
 	@ObfuscatedGetter(
-		longValue = 3974849306413912327L
+		longValue = 380245954858485035L
 	)
-	static long field687;
-	@ObfuscatedName("rg")
-	static boolean field710;
-	@ObfuscatedName("pf")
-	static boolean[] field594;
-	@ObfuscatedName("pc")
-	static boolean[] field651;
-	@ObfuscatedName("pn")
-	static boolean[] field553;
-	@ObfuscatedName("qe")
+	static long field514;
+	@ObfuscatedName("qd")
 	@Export("isResizable")
 	static boolean isResizable;
-	@ObfuscatedName("us")
+	@ObfuscatedName("ul")
 	@ObfuscatedGetter(
-		intValue = -1647730605
-	)
-	public static int field742;
-	@ObfuscatedName("pi")
-	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		intValue = 594272369
 	)
-	@Export("widgetFlags")
-	static NodeHashTable widgetFlags;
-	@ObfuscatedName("qa")
-	@Export("rootWidgetWidths")
-	static int[] rootWidgetWidths;
-	@ObfuscatedName("pa")
-	@Export("rootWidgetXs")
-	static int[] rootWidgetXs;
+	public static int field559;
+	@ObfuscatedName("rx")
+	static boolean field743;
 	@ObfuscatedName("qs")
 	@ObfuscatedGetter(
-		intValue = -1255487241
+		intValue = -1584933369
 	)
 	@Export("gameDrawingMode")
 	static int gameDrawingMode;
-	@ObfuscatedName("qq")
+	@ObfuscatedName("qf")
 	@Export("rootWidgetHeights")
 	static int[] rootWidgetHeights;
-	@ObfuscatedName("ut")
-	@ObfuscatedSignature(
-		descriptor = "Lbs;"
-	)
-	static final ApproximateRouteStrategy field743;
-	@ObfuscatedName("pt")
-	@Export("rootWidgetYs")
-	static int[] rootWidgetYs;
-	@ObfuscatedName("su")
-	@Export("isCameraLocked")
-	static boolean isCameraLocked;
-	@ObfuscatedName("pq")
-	@ObfuscatedSignature(
-		descriptor = "Lkn;"
-	)
-	@Export("scriptEvents")
-	static NodeDeque scriptEvents;
-	@ObfuscatedName("tl")
+	@ObfuscatedName("uu")
 	@ObfuscatedSignature(
-		descriptor = "[Lkh;"
-	)
-	@Export("grandExchangeOffers")
-	static GrandExchangeOffer[] grandExchangeOffers;
-	@ObfuscatedName("ug")
-	static int[] field538;
-	@ObfuscatedName("um")
-	static int[] field748;
-	@ObfuscatedName("sc")
-	static boolean[] field718;
-	@ObfuscatedName("ra")
-	@ObfuscatedGetter(
-		intValue = 211285431
+		descriptor = "Lbi;"
 	)
-	@Export("currentTrackGroupId")
-	static int currentTrackGroupId;
-	@ObfuscatedName("sr")
-	static int[] field719;
-	@ObfuscatedName("sq")
-	static int[] field598;
-	@ObfuscatedName("so")
-	static int[] field721;
-	@ObfuscatedName("sh")
-	static int[] field722;
-	@ObfuscatedName("rb")
+	static final ApproximateRouteStrategy field754;
+	@ObfuscatedName("ri")
 	@ObfuscatedGetter(
-		intValue = -595533075
+		intValue = 633351775
 	)
 	@Export("destinationX")
 	static int destinationX;
-	@ObfuscatedName("rc")
+	@ObfuscatedName("rr")
 	@ObfuscatedGetter(
-		intValue = 2048545999
+		intValue = 962993013
 	)
 	@Export("destinationY")
 	static int destinationY;
-	@ObfuscatedName("tj")
+	@ObfuscatedName("st")
 	@ObfuscatedGetter(
-		intValue = 1780596505
+		intValue = 1358957623
 	)
-	static int field737;
-	@ObfuscatedName("rr")
+	@Export("soundEffectCount")
+	static int soundEffectCount;
+	@ObfuscatedName("so")
+	@Export("soundEffectIds")
+	static int[] soundEffectIds;
+	@ObfuscatedName("sj")
+	@Export("queuedSoundEffectLoops")
+	static int[] queuedSoundEffectLoops;
+	@ObfuscatedName("sk")
+	@Export("queuedSoundEffectDelays")
+	static int[] queuedSoundEffectDelays;
+	@ObfuscatedName("sf")
 	@ObfuscatedSignature(
-		descriptor = "[Lea;"
+		descriptor = "[Lac;"
 	)
-	@Export("currentClanChannels")
-	static ClanChannel[] currentClanChannels;
-	@ObfuscatedName("pe")
+	@Export("soundEffects")
+	static SoundEffect[] soundEffects;
+	@ObfuscatedName("uq")
+	static int[] field755;
+	@ObfuscatedName("uh")
+	static int[] field756;
+	@ObfuscatedName("sc")
+	@Export("soundLocations")
+	static int[] soundLocations;
+	@ObfuscatedName("rt")
 	@ObfuscatedGetter(
-		intValue = 2141771055
+		intValue = 1358189471
 	)
-	@Export("mouseWheelRotation")
-	static int mouseWheelRotation;
-	@ObfuscatedName("ty")
+	@Export("currentTrackGroupId")
+	static int currentTrackGroupId;
+	@ObfuscatedName("th")
+	@ObfuscatedGetter(
+		intValue = -769855681
+	)
+	static int field744;
+	@ObfuscatedName("se")
+	@Export("isCameraLocked")
+	static boolean isCameraLocked;
+	@ObfuscatedName("tw")
 	@ObfuscatedSignature(
-		descriptor = "Lit;"
+		descriptor = "Ljo;"
 	)
 	@Export("playerAppearance")
 	static PlayerComposition playerAppearance;
-	@ObfuscatedName("tt")
+	@ObfuscatedName("sb")
+	static boolean field724;
+	@ObfuscatedName("tr")
 	@ObfuscatedGetter(
-		intValue = -1984953373
+		intValue = -129722411
 	)
-	static int field581;
-	@ObfuscatedName("uj")
-	@Export("archiveLoaders")
-	static ArrayList archiveLoaders;
-	@ObfuscatedName("re")
+	static int field571;
+	@ObfuscatedName("rn")
+	@ObfuscatedSignature(
+		descriptor = "[Lei;"
+	)
+	@Export("currentClanChannels")
+	static ClanChannel[] currentClanChannels;
+	@ObfuscatedName("rw")
 	@ObfuscatedGetter(
-		intValue = 1418203349
+		intValue = -1920478573
 	)
 	@Export("minimapState")
 	static int minimapState;
-	@ObfuscatedName("sf")
-	@ObfuscatedGetter(
-		intValue = 1404229279
-	)
-	@Export("soundEffectCount")
-	static int soundEffectCount;
-	@ObfuscatedName("ub")
+	@ObfuscatedName("un")
+	@Export("archiveLoaders")
+	static ArrayList archiveLoaders;
+	@ObfuscatedName("tu")
+	static boolean[] field725;
+	@ObfuscatedName("ue")
 	@ObfuscatedGetter(
-		intValue = 1629793717
+		intValue = 1616263669
 	)
 	@Export("archiveLoadersDone")
 	static int archiveLoadersDone;
-	@ObfuscatedName("se")
-	@Export("soundEffectIds")
-	static int[] soundEffectIds;
-	@ObfuscatedName("sv")
-	@Export("queuedSoundEffectLoops")
-	static int[] queuedSoundEffectLoops;
-	@ObfuscatedName("sa")
-	@Export("queuedSoundEffectDelays")
-	static int[] queuedSoundEffectDelays;
-	@ObfuscatedName("sj")
-	@ObfuscatedSignature(
-		descriptor = "[Lat;"
-	)
-	@Export("soundEffects")
-	static SoundEffect[] soundEffects;
-	@ObfuscatedName("sy")
-	@Export("soundLocations")
-	static int[] soundLocations;
-	@ObfuscatedName("qn")
+	@ObfuscatedName("qy")
 	@Export("crossWorldMessageIds")
 	static long[] crossWorldMessageIds;
-	@ObfuscatedName("rf")
-	@ObfuscatedGetter(
-		intValue = -136098309
-	)
-	static int field701;
-	@ObfuscatedName("qi")
+	@ObfuscatedName("qx")
 	@ObfuscatedGetter(
-		intValue = 1315900691
+		intValue = 375303139
 	)
 	@Export("crossWorldMessageIdsIndex")
 	static int crossWorldMessageIdsIndex;
-	@ObfuscatedName("qh")
+	@ObfuscatedName("qu")
 	@ObfuscatedGetter(
-		longValue = 6414008887290405915L
+		longValue = -6601646598285595847L
 	)
-	static long field565;
-	@ObfuscatedName("sw")
-	static short field464;
-	@ObfuscatedName("st")
-	static short field550;
-	@ObfuscatedName("to")
-	static short field729;
-	@ObfuscatedName("th")
-	static short field730;
-	@ObfuscatedName("tk")
+	static long field676;
+	@ObfuscatedName("tp")
 	@ObfuscatedSignature(
-		descriptor = "Lnm;"
+		descriptor = "Lnb;"
 	)
 	@Export("platformInfoProvider")
 	static PlatformInfoProvider platformInfoProvider;
 	@ObfuscatedName("ti")
-	static short field600;
-	@ObfuscatedName("rw")
+	static short field690;
+	@ObfuscatedName("tz")
+	static short field707;
+	@ObfuscatedName("rm")
+	@ObfuscatedGetter(
+		intValue = 795865193
+	)
+	static int field570;
+	@ObfuscatedName("tq")
+	static short field736;
+	@ObfuscatedName("tk")
+	static short field737;
+	@ObfuscatedName("rh")
 	@ObfuscatedGetter(
-		intValue = -1202743261
+		intValue = 1614235025
 	)
 	@Export("mapIconCount")
 	static int mapIconCount;
-	@ObfuscatedName("tz")
+	@ObfuscatedName("tx")
+	static short field735;
+	@ObfuscatedName("rb")
+	@Export("mapIconXs")
+	static int[] mapIconXs;
+	@ObfuscatedName("tc")
 	@ObfuscatedGetter(
-		intValue = 1171128355
+		intValue = -477293141
 	)
 	@Export("viewportZoom")
 	static int viewportZoom;
-	@ObfuscatedName("tf")
-	static short field727;
-	@ObfuscatedName("tp")
+	@ObfuscatedName("te")
+	static short field619;
+	@ObfuscatedName("tt")
 	@ObfuscatedGetter(
-		intValue = -1988115801
+		intValue = -1712028747
 	)
 	@Export("viewportWidth")
 	static int viewportWidth;
-	@ObfuscatedName("rh")
-	@Export("mapIconXs")
-	static int[] mapIconXs;
-	@ObfuscatedName("rk")
+	@ObfuscatedName("tj")
+	@ObfuscatedGetter(
+		intValue = 648823865
+	)
+	@Export("viewportHeight")
+	static int viewportHeight;
+	@ObfuscatedName("ry")
 	@Export("mapIconYs")
 	static int[] mapIconYs;
-	@ObfuscatedName("ro")
+	@ObfuscatedName("re")
 	@ObfuscatedSignature(
-		descriptor = "[Low;"
+		descriptor = "[Lpl;"
 	)
 	@Export("mapIcons")
 	static SpritePixels[] mapIcons;
 	@ObfuscatedName("tg")
-	@ObfuscatedGetter(
-		intValue = -943486725
+	@ObfuscatedSignature(
+		descriptor = "[Lkb;"
 	)
-	@Export("viewportHeight")
-	static int viewportHeight;
-	@ObfuscatedName("ts")
+	@Export("grandExchangeOffers")
+	static GrandExchangeOffer[] grandExchangeOffers;
+	@ObfuscatedName("ty")
 	@ObfuscatedGetter(
-		intValue = 452108079
+		intValue = -677299157
 	)
 	@Export("viewportOffsetX")
 	static int viewportOffsetX;
-	@ObfuscatedName("tq")
+	@ObfuscatedName("tm")
 	@ObfuscatedGetter(
-		intValue = 1749362703
+		intValue = -215790417
 	)
 	@Export("viewportOffsetY")
 	static int viewportOffsetY;
-	@ObfuscatedName("tx")
-	@Export("zoomWidth")
-	static short zoomWidth;
-	@ObfuscatedName("tn")
+	@ObfuscatedName("td")
 	@Export("zoomHeight")
 	static short zoomHeight;
-	@ObfuscatedName("qm")
+	@ObfuscatedName("to")
+	@Export("zoomWidth")
+	static short zoomWidth;
+	@ObfuscatedName("qi")
 	@ObfuscatedGetter(
-		intValue = 1275977781
+		intValue = -2053041951
 	)
-	@Export("publicChatMode")
-	static int publicChatMode;
-	@ObfuscatedName("uf")
+	static int field701;
+	@ObfuscatedName("uc")
 	@ObfuscatedGetter(
-		intValue = 1680846629
+		intValue = 1186068583
 	)
-	static int field745;
-	@ObfuscatedName("qu")
+	static int field753;
+	@ObfuscatedName("tv")
+	static int[] field679;
+	@ObfuscatedName("tn")
+	static int[] field726;
+	@ObfuscatedName("qb")
+	static int[] field522;
+	@ObfuscatedName("tf")
+	static int[] field618;
+	@ObfuscatedName("tl")
+	static int[] field729;
+	@ObfuscatedName("qz")
+	static int[] field758;
+	@ObfuscatedName("qp")
 	@ObfuscatedGetter(
-		intValue = -1572669425
+		intValue = 1425340839
 	)
-	static int field695;
-	@ObfuscatedName("qo")
+	@Export("publicChatMode")
+	static int publicChatMode;
+	@ObfuscatedName("qr")
 	@ObfuscatedGetter(
-		intValue = 1785278473
+		intValue = 494366655
 	)
 	@Export("tradeChatMode")
 	static int tradeChatMode;
-	@ObfuscatedName("qy")
-	static int[] field697;
-	@ObfuscatedName("pj")
-	@ObfuscatedSignature(
-		descriptor = "Lkn;"
-	)
-	static NodeDeque field674;
-	@ObfuscatedName("qp")
-	static int[] field696;
-	@ObfuscatedName("pk")
+	@ObfuscatedName("uf")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Lka;"
 	)
-	static NodeDeque field675;
-	@ObfuscatedName("qg")
-	static int[] field689;
-	@ObfuscatedName("qd")
-	static String field692;
-	@ObfuscatedName("ta")
+	@Export("grandExchangeEvents")
+	static GrandExchangeEvents grandExchangeEvents;
+	@ObfuscatedName("qm")
+	static int[] field749;
+	@ObfuscatedName("qe")
+	static String field645;
+	@ObfuscatedName("uw")
 	@ObfuscatedSignature(
-		descriptor = "Lbh;"
+		descriptor = "Lbm;"
 	)
 	@Export("GrandExchangeEvents_worldComparator")
 	static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator;
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "[Lfq;"
+		descriptor = "[Lgf;"
 	)
 	@Export("collisionMaps")
 	static CollisionMap[] collisionMaps;
-	@ObfuscatedName("ay")
-	static boolean field497;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "Lcv;"
+	)
+	@Export("loginScreenRunesAnimation")
+	static LoginScreenAnimation loginScreenRunesAnimation;
+	@ObfuscatedName("ad")
+	static boolean field713;
+	@ObfuscatedName("bp")
 	@ObfuscatedGetter(
-		intValue = 351012489
+		intValue = -1047026675
 	)
 	@Export("worldId")
 	public static int worldId;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bd")
 	@ObfuscatedGetter(
-		intValue = 2034448565
+		intValue = -148495881
 	)
 	@Export("worldProperties")
 	static int worldProperties;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = 1913834087
+		intValue = 406374125
 	)
 	@Export("gameBuild")
 	static int gameBuild;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bi")
 	@Export("isMembersWorld")
 	public static boolean isMembersWorld;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bm")
 	@Export("isLowDetail")
 	static boolean isLowDetail;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = -168480125
+		intValue = 78796799
 	)
-	static int field467;
+	static int field473;
 	@ObfuscatedName("bv")
 	@ObfuscatedGetter(
-		intValue = 1336183037
+		intValue = -275050283
 	)
 	@Export("clientType")
 	static int clientType;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bb")
 	@ObfuscatedGetter(
-		intValue = -1541445221
+		intValue = -1450677759
 	)
-	static int field469;
-	@ObfuscatedName("bz")
+	static int field499;
+	@ObfuscatedName("bc")
 	@Export("onMobile")
 	static boolean onMobile;
-	@ObfuscatedName("ca")
+	@ObfuscatedName("ce")
 	@ObfuscatedGetter(
-		intValue = 235091161
+		intValue = -1847663853
 	)
 	@Export("gameState")
 	static int gameState;
-	@ObfuscatedName("cm")
+	@ObfuscatedName("cf")
 	@Export("isLoading")
 	static boolean isLoading;
-	@ObfuscatedName("co")
+	@ObfuscatedName("cu")
 	@ObfuscatedGetter(
-		intValue = -1803490967
+		intValue = 1674489649
 	)
 	@Export("cycle")
 	static int cycle;
-	@ObfuscatedName("cy")
+	@ObfuscatedName("cx")
 	@ObfuscatedGetter(
-		longValue = 4321776978045133027L
+		longValue = -1983586746320389363L
 	)
 	@Export("mouseLastLastPressedTimeMillis")
 	static long mouseLastLastPressedTimeMillis;
-	@ObfuscatedName("dq")
+	@ObfuscatedName("cm")
+	@ObfuscatedSignature(
+		descriptor = "Lcd;"
+	)
+	@Export("mouseRecorder")
+	static MouseRecorder mouseRecorder;
+	@ObfuscatedName("dm")
 	@ObfuscatedGetter(
-		intValue = -1993769567
+		intValue = -2087310985
 	)
-	static int field475;
-	@ObfuscatedName("df")
+	static int field483;
+	@ObfuscatedName("dr")
 	@ObfuscatedGetter(
-		intValue = 1440855955
+		intValue = 1122347211
 	)
-	static int field476;
-	@ObfuscatedName("da")
+	static int field746;
+	@ObfuscatedName("ds")
 	@ObfuscatedGetter(
-		longValue = -3998157933727729695L
+		longValue = 3088441328861095551L
 	)
-	static long field477;
-	@ObfuscatedName("dw")
+	static long field485;
+	@ObfuscatedName("dv")
 	@Export("hadFocus")
 	static boolean hadFocus;
-	@ObfuscatedName("dn")
+	@ObfuscatedName("do")
 	@Export("displayFps")
 	static boolean displayFps;
-	@ObfuscatedName("dc")
+	@ObfuscatedName("dt")
 	@ObfuscatedGetter(
-		intValue = 524609557
+		intValue = -808894481
 	)
 	@Export("rebootTimer")
 	static int rebootTimer;
-	@ObfuscatedName("dh")
+	@ObfuscatedName("dy")
 	@ObfuscatedGetter(
-		intValue = 207642979
+		intValue = -1504010063
 	)
 	@Export("hintArrowType")
 	static int hintArrowType;
-	@ObfuscatedName("du")
+	@ObfuscatedName("dk")
 	@ObfuscatedGetter(
-		intValue = 704173975
+		intValue = -789774913
 	)
 	@Export("hintArrowNpcIndex")
 	static int hintArrowNpcIndex;
-	@ObfuscatedName("db")
+	@ObfuscatedName("de")
 	@ObfuscatedGetter(
-		intValue = -1671516751
+		intValue = -1385232855
 	)
 	@Export("hintArrowPlayerIndex")
 	static int hintArrowPlayerIndex;
-	@ObfuscatedName("dp")
+	@ObfuscatedName("df")
 	@ObfuscatedGetter(
-		intValue = -1956341453
+		intValue = -1355919591
 	)
 	@Export("hintArrowX")
 	static int hintArrowX;
-	@ObfuscatedName("dj")
+	@ObfuscatedName("dh")
 	@ObfuscatedGetter(
-		intValue = 747205027
+		intValue = 686364275
 	)
 	@Export("hintArrowY")
 	static int hintArrowY;
-	@ObfuscatedName("dt")
+	@ObfuscatedName("dn")
 	@ObfuscatedGetter(
-		intValue = 825806311
+		intValue = -1327714015
 	)
 	@Export("hintArrowHeight")
 	static int hintArrowHeight;
-	@ObfuscatedName("dy")
+	@ObfuscatedName("dx")
 	@ObfuscatedGetter(
-		intValue = -1204566063
+		intValue = -521195687
 	)
 	@Export("hintArrowSubX")
 	static int hintArrowSubX;
-	@ObfuscatedName("ds")
+	@ObfuscatedName("dp")
 	@ObfuscatedGetter(
-		intValue = -1072899901
+		intValue = -1689030643
 	)
 	@Export("hintArrowSubY")
 	static int hintArrowSubY;
-	@ObfuscatedName("dg")
+	@ObfuscatedName("dq")
 	@ObfuscatedSignature(
-		descriptor = "Lcr;"
+		descriptor = "Lca;"
 	)
 	@Export("playerAttackOption")
 	static AttackOption playerAttackOption;
-	@ObfuscatedName("di")
+	@ObfuscatedName("db")
 	@ObfuscatedSignature(
-		descriptor = "Lcr;"
+		descriptor = "Lca;"
 	)
 	@Export("npcAttackOption")
 	static AttackOption npcAttackOption;
-	@ObfuscatedName("dz")
+	@ObfuscatedName("du")
 	@ObfuscatedGetter(
-		intValue = 974303941
+		intValue = -799405801
 	)
 	@Export("titleLoadingStage")
 	static int titleLoadingStage;
-	@ObfuscatedName("dl")
+	@ObfuscatedName("dg")
 	@ObfuscatedGetter(
-		intValue = 1817594467
+		intValue = -1227560011
 	)
 	@Export("js5ConnectState")
 	static int js5ConnectState;
-	@ObfuscatedName("dm")
+	@ObfuscatedName("di")
 	@ObfuscatedGetter(
-		intValue = 622774087
+		intValue = 856515511
 	)
-	static int field572;
-	@ObfuscatedName("ee")
+	static int field517;
+	@ObfuscatedName("ex")
 	@ObfuscatedGetter(
-		intValue = 1010630599
+		intValue = -323349495
 	)
 	@Export("js5Errors")
 	static int js5Errors;
-	@ObfuscatedName("ei")
+	@ObfuscatedName("es")
 	@ObfuscatedGetter(
-		intValue = -1726990903
+		intValue = 993112849
 	)
 	@Export("loginState")
 	static int loginState;
-	@ObfuscatedName("ef")
+	@ObfuscatedName("eb")
 	@ObfuscatedGetter(
-		intValue = -957566801
+		intValue = -1252225801
 	)
-	static int field496;
-	@ObfuscatedName("en")
+	static int field545;
+	@ObfuscatedName("ey")
 	@ObfuscatedGetter(
-		intValue = -549727883
+		intValue = 670531889
 	)
-	static int field685;
+	static int field541;
 	@ObfuscatedName("eq")
 	@ObfuscatedGetter(
-		intValue = 921847519
+		intValue = 1972488979
 	)
-	static int field498;
-	@ObfuscatedName("es")
+	static int field506;
+	@ObfuscatedName("ew")
 	@ObfuscatedSignature(
-		descriptor = "Ldb;"
+		descriptor = "Ldd;"
 	)
-	static class112 field693;
-	@ObfuscatedName("fd")
+	static class122 field507;
+	@ObfuscatedName("ff")
 	@ObfuscatedSignature(
-		descriptor = "Los;"
+		descriptor = "Lpf;"
 	)
-	static class404 field500;
-	@ObfuscatedName("fc")
+	static class422 field508;
+	@ObfuscatedName("fl")
 	@Export("Login_isUsernameRemembered")
 	static boolean Login_isUsernameRemembered;
-	@ObfuscatedName("fs")
+	@ObfuscatedName("fy")
 	@ObfuscatedSignature(
-		descriptor = "Lbk;"
+		descriptor = "Lbh;"
 	)
 	@Export("secureRandomFuture")
 	static SecureRandomFuture secureRandomFuture;
-	@ObfuscatedName("fx")
+	@ObfuscatedName("fm")
 	@Export("randomDatData")
 	static byte[] randomDatData;
-	@ObfuscatedName("gi")
+	@ObfuscatedName("gf")
 	@ObfuscatedSignature(
-		descriptor = "[Lcp;"
+		descriptor = "[Lcr;"
 	)
 	@Export("npcs")
 	static NPC[] npcs;
-	@ObfuscatedName("gd")
+	@ObfuscatedName("gv")
 	@ObfuscatedGetter(
-		intValue = -1362315605
+		intValue = 1929700921
 	)
 	@Export("npcCount")
 	static int npcCount;
-	@ObfuscatedName("go")
+	@ObfuscatedName("gj")
 	@Export("npcIndices")
 	static int[] npcIndices;
-	@ObfuscatedName("gh")
+	@ObfuscatedName("gm")
 	@ObfuscatedGetter(
-		intValue = -2135073429
+		intValue = 1848423267
 	)
-	static int field512;
-	@ObfuscatedName("gn")
-	static int[] field513;
-	@ObfuscatedName("gb")
+	static int field520;
+	@ObfuscatedName("gw")
+	static int[] field605;
+	@ObfuscatedName("gs")
 	@ObfuscatedSignature(
-		descriptor = "Lcv;"
+		descriptor = "Lch;"
 	)
 	@Export("packetWriter")
 	public static final PacketWriter packetWriter;
-	@ObfuscatedName("gg")
+	@ObfuscatedName("gb")
 	@ObfuscatedGetter(
-		intValue = 225699983
+		intValue = 1696118819
 	)
 	@Export("logoutTimer")
 	static int logoutTimer;
-	@ObfuscatedName("ga")
+	@ObfuscatedName("gp")
 	@Export("hadNetworkError")
 	static boolean hadNetworkError;
-	@ObfuscatedName("gs")
+	@ObfuscatedName("gq")
 	@Export("useBufferedSocket")
 	static boolean useBufferedSocket;
-	@ObfuscatedName("gz")
-	static boolean field619;
-	@ObfuscatedName("gr")
+	@ObfuscatedName("gi")
+	static boolean field526;
+	@ObfuscatedName("gy")
 	@ObfuscatedSignature(
-		descriptor = "Llo;"
+		descriptor = "Llg;"
 	)
 	@Export("timer")
 	static Timer timer;
-	@ObfuscatedName("ge")
+	@ObfuscatedName("gc")
 	@Export("fontsMap")
 	static HashMap fontsMap;
-	@ObfuscatedName("hm")
+	@ObfuscatedName("hj")
 	@ObfuscatedGetter(
-		intValue = 2056665983
+		intValue = -628851273
 	)
-	static int field521;
-	@ObfuscatedName("hx")
+	static int field529;
+	@ObfuscatedName("hp")
 	@ObfuscatedGetter(
-		intValue = 25303697
+		intValue = -747625611
 	)
-	static int field522;
-	@ObfuscatedName("ha")
+	static int field530;
+	@ObfuscatedName("hl")
 	@ObfuscatedGetter(
-		intValue = 363989163
+		intValue = -826572867
 	)
-	static int field523;
-	@ObfuscatedName("hf")
+	static int field617;
+	@ObfuscatedName("hn")
 	@ObfuscatedGetter(
-		intValue = -313172501
+		intValue = -1786172371
 	)
-	static int field524;
-	@ObfuscatedName("hj")
+	static int field532;
+	@ObfuscatedName("hd")
 	@ObfuscatedGetter(
-		intValue = 132761911
+		intValue = 1982308495
 	)
-	static int field485;
-	@ObfuscatedName("hr")
-	@Export("xteaKeys")
-	static int[][] xteaKeys;
-	@ObfuscatedName("hp")
+	static int field602;
+	@ObfuscatedName("hy")
 	@Export("isInInstance")
 	static boolean isInInstance;
-	@ObfuscatedName("hg")
+	@ObfuscatedName("hc")
 	@Export("instanceChunkTemplates")
 	static int[][][] instanceChunkTemplates;
-	@ObfuscatedName("hc")
-	static final int[] field530;
-	@ObfuscatedName("hn")
-	@ObfuscatedGetter(
-		intValue = 1163249681
-	)
-	static int field531;
+	@ObfuscatedName("hf")
+	static final int[] field537;
 	@ObfuscatedName("hz")
-	@ObfuscatedSignature(
-		descriptor = "[Low;"
-	)
-	@Export("headIconPkSprites")
-	static SpritePixels[] headIconPkSprites;
-	@ObfuscatedName("ik")
 	@ObfuscatedGetter(
-		intValue = -2143676759
+		intValue = 374050087
 	)
-	static int field628;
-	@ObfuscatedName("ii")
+	static int field538;
+	@ObfuscatedName("it")
+	@Export("selectedItemName")
+	static String selectedItemName;
+	@ObfuscatedName("ig")
 	@ObfuscatedGetter(
-		intValue = 170443145
+		intValue = 327781137
 	)
-	static int field534;
+	static int field693;
+	@ObfuscatedName("im")
+	@ObfuscatedGetter(
+		intValue = -331478875
+	)
+	static int field716;
 	@ObfuscatedName("ib")
 	@ObfuscatedGetter(
-		intValue = -125520475
+		intValue = -979832185
 	)
-	static int field535;
+	static int field509;
 	@ObfuscatedName("ia")
 	@ObfuscatedGetter(
-		intValue = 1324928345
+		intValue = 321039709
 	)
-	static int field506;
-	@ObfuscatedName("im")
-	static boolean field465;
-	@ObfuscatedName("ih")
+	static int field544;
+	@ObfuscatedName("ik")
+	static boolean field543;
+	@ObfuscatedName("iy")
 	@ObfuscatedGetter(
-		intValue = 1325089479
+		intValue = -83589583
 	)
 	@Export("alternativeScrollbarWidth")
 	static int alternativeScrollbarWidth;
-	@ObfuscatedName("iu")
+	@ObfuscatedName("if")
 	@ObfuscatedGetter(
-		intValue = -613321371
+		intValue = 2024018565
 	)
 	@Export("camAngleX")
 	static int camAngleX;
-	@ObfuscatedName("ic")
+	@ObfuscatedName("iw")
 	@ObfuscatedGetter(
-		intValue = -999156139
+		intValue = 576864047
 	)
 	@Export("camAngleY")
 	static int camAngleY;
-	@ObfuscatedName("iw")
+	@ObfuscatedName("ir")
 	@ObfuscatedGetter(
-		intValue = -567570165
+		intValue = 1332183157
 	)
 	@Export("camAngleDY")
 	static int camAngleDY;
-	@ObfuscatedName("iq")
+	@ObfuscatedName("ih")
 	@ObfuscatedGetter(
-		intValue = 503166845
+		intValue = 1090882813
 	)
 	@Export("camAngleDX")
 	static int camAngleDX;
-	@ObfuscatedName("ie")
+	@ObfuscatedName("ii")
 	@ObfuscatedGetter(
-		intValue = 1038338863
+		intValue = -229171215
 	)
 	@Export("mouseCamClickedX")
 	static int mouseCamClickedX;
-	@ObfuscatedName("is")
+	@ObfuscatedName("il")
 	@ObfuscatedGetter(
-		intValue = 851159249
+		intValue = -939566641
 	)
 	@Export("mouseCamClickedY")
 	static int mouseCamClickedY;
-	@ObfuscatedName("it")
-	@Export("selectedItemName")
-	static String selectedItemName;
-	@ObfuscatedName("jx")
+	@ObfuscatedName("jd")
 	@ObfuscatedGetter(
-		intValue = 682763337
+		intValue = 964987821
 	)
 	@Export("oculusOrbState")
 	static int oculusOrbState;
-	@ObfuscatedName("jf")
+	@ObfuscatedName("jp")
 	@ObfuscatedGetter(
-		intValue = -953648473
+		intValue = 579441507
 	)
 	@Export("camFollowHeight")
 	static int camFollowHeight;
-	@ObfuscatedName("jt")
+	@ObfuscatedName("jk")
 	@ObfuscatedGetter(
-		intValue = -1959842021
+		intValue = 1740034233
 	)
-	static int field547;
-	@ObfuscatedName("jj")
+	static int field542;
+	@ObfuscatedName("jq")
 	@ObfuscatedGetter(
-		intValue = -612526431
+		intValue = 1436075295
 	)
-	static int field520;
-	@ObfuscatedName("jz")
+	static int field584;
+	@ObfuscatedName("jc")
 	@ObfuscatedGetter(
-		intValue = 1932679935
+		intValue = -890677005
 	)
-	static int field549;
-	@ObfuscatedName("je")
+	static int field555;
+	@ObfuscatedName("jh")
 	@ObfuscatedGetter(
-		intValue = -567507933
+		intValue = -535945653
 	)
 	@Export("oculusOrbNormalSpeed")
 	static int oculusOrbNormalSpeed;
-	@ObfuscatedName("jv")
+	@ObfuscatedName("jx")
 	@ObfuscatedGetter(
-		intValue = 2001475371
+		intValue = 1403293651
 	)
 	@Export("oculusOrbSlowedSpeed")
 	static int oculusOrbSlowedSpeed;
-	@ObfuscatedName("ji")
+	@ObfuscatedName("jf")
 	@ObfuscatedGetter(
-		intValue = -2052313535
+		intValue = 1420477321
 	)
-	static int field552;
-	@ObfuscatedName("js")
-	static boolean field511;
-	@ObfuscatedName("jh")
+	static int field607;
+	@ObfuscatedName("jz")
+	static boolean field612;
+	@ObfuscatedName("jj")
 	@ObfuscatedGetter(
-		intValue = -1449900521
+		intValue = -1475270389
 	)
-	static int field620;
+	static int field560;
+	@ObfuscatedName("jr")
+	static boolean field561;
 	@ObfuscatedName("jg")
-	static boolean field555;
-	@ObfuscatedName("jm")
 	@ObfuscatedGetter(
-		intValue = 1902791501
+		intValue = -26905361
 	)
-	static int field556;
-	@ObfuscatedName("jp")
+	static int field562;
+	@ObfuscatedName("ju")
 	@ObfuscatedGetter(
-		intValue = -384375877
+		intValue = -773892707
 	)
 	@Export("overheadTextCount")
 	static int overheadTextCount;
-	@ObfuscatedName("jk")
+	@ObfuscatedName("jn")
 	@ObfuscatedGetter(
-		intValue = -367077625
+		intValue = -1644053899
 	)
 	@Export("overheadTextLimit")
 	static int overheadTextLimit;
-	@ObfuscatedName("jd")
+	@ObfuscatedName("jo")
 	@Export("overheadTextXs")
 	static int[] overheadTextXs;
-	@ObfuscatedName("jo")
+	@ObfuscatedName("jb")
 	@Export("overheadTextYs")
 	static int[] overheadTextYs;
-	@ObfuscatedName("jq")
+	@ObfuscatedName("jm")
 	@Export("overheadTextAscents")
 	static int[] overheadTextAscents;
-	@ObfuscatedName("ja")
+	@ObfuscatedName("je")
 	@Export("overheadTextXOffsets")
 	static int[] overheadTextXOffsets;
-	@ObfuscatedName("jr")
+	@ObfuscatedName("ja")
 	@Export("overheadTextColors")
 	static int[] overheadTextColors;
-	@ObfuscatedName("ju")
+	@ObfuscatedName("jy")
 	@Export("overheadTextEffects")
 	static int[] overheadTextEffects;
-	@ObfuscatedName("jb")
+	@ObfuscatedName("ji")
 	@Export("overheadTextCyclesRemaining")
 	static int[] overheadTextCyclesRemaining;
-	@ObfuscatedName("jc")
+	@ObfuscatedName("js")
 	@Export("overheadText")
 	static String[] overheadText;
-	@ObfuscatedName("kg")
+	@ObfuscatedName("kf")
 	@Export("tileLastDrawnActor")
 	static int[][] tileLastDrawnActor;
-	@ObfuscatedName("kd")
+	@ObfuscatedName("ks")
 	@ObfuscatedGetter(
-		intValue = -538809643
+		intValue = 1916144699
 	)
 	@Export("viewportDrawCount")
 	static int viewportDrawCount;
-	@ObfuscatedName("kj")
+	@ObfuscatedName("kt")
 	@ObfuscatedGetter(
-		intValue = 1177959045
+		intValue = 840193893
 	)
 	@Export("viewportTempX")
 	static int viewportTempX;
-	@ObfuscatedName("ko")
+	@ObfuscatedName("kd")
 	@ObfuscatedGetter(
-		intValue = -1589309887
+		intValue = -1886866651
 	)
 	@Export("viewportTempY")
 	static int viewportTempY;
-	@ObfuscatedName("kk")
+	@ObfuscatedName("ko")
 	@ObfuscatedGetter(
-		intValue = -1580074049
+		intValue = 1160360799
 	)
 	@Export("mouseCrossX")
 	static int mouseCrossX;
-	@ObfuscatedName("kx")
+	@ObfuscatedName("ky")
 	@ObfuscatedGetter(
-		intValue = -1310849273
+		intValue = 1838440319
 	)
 	@Export("mouseCrossY")
 	static int mouseCrossY;
-	@ObfuscatedName("ki")
+	@ObfuscatedName("kp")
 	@ObfuscatedGetter(
-		intValue = 1284537869
+		intValue = 1581021399
 	)
 	@Export("mouseCrossState")
 	static int mouseCrossState;
-	@ObfuscatedName("km")
+	@ObfuscatedName("kn")
 	@ObfuscatedGetter(
-		intValue = -776648095
+		intValue = 1288921139
 	)
 	@Export("mouseCrossColor")
 	static int mouseCrossColor;
-	@ObfuscatedName("kr")
+	@ObfuscatedName("kl")
 	@Export("showMouseCross")
 	static boolean showMouseCross;
-	@ObfuscatedName("ku")
+	@ObfuscatedName("kw")
 	@ObfuscatedGetter(
-		intValue = -1997052949
+		intValue = 1920336167
 	)
-	static int field576;
-	@ObfuscatedName("kt")
+	static int field582;
+	@ObfuscatedName("km")
 	@ObfuscatedGetter(
-		intValue = -1194890067
+		intValue = -1813426121
 	)
-	static int field577;
-	@ObfuscatedName("kv")
+	static int field599;
+	@ObfuscatedName("kx")
 	@ObfuscatedGetter(
-		intValue = -1781843123
+		intValue = 968662689
 	)
 	@Export("dragItemSlotSource")
 	static int dragItemSlotSource;
-	@ObfuscatedName("kq")
+	@ObfuscatedName("ku")
 	@ObfuscatedGetter(
-		intValue = 1331142965
+		intValue = 304129153
 	)
 	@Export("draggedWidgetX")
 	static int draggedWidgetX;
-	@ObfuscatedName("kl")
+	@ObfuscatedName("kg")
 	@ObfuscatedGetter(
-		intValue = -115957737
+		intValue = 403550005
 	)
 	@Export("draggedWidgetY")
 	static int draggedWidgetY;
-	@ObfuscatedName("ke")
+	@ObfuscatedName("ka")
 	@ObfuscatedGetter(
-		intValue = 445396889
+		intValue = 1141132311
 	)
 	@Export("dragItemSlotDestination")
 	static int dragItemSlotDestination;
-	@ObfuscatedName("kz")
-	static boolean field667;
-	@ObfuscatedName("ks")
+	@ObfuscatedName("kh")
+	static boolean field572;
+	@ObfuscatedName("ki")
 	@ObfuscatedGetter(
-		intValue = 2009355879
+		intValue = 316645859
 	)
 	@Export("itemDragDuration")
 	static int itemDragDuration;
 	@ObfuscatedName("kc")
 	@ObfuscatedGetter(
-		intValue = -839662267
+		intValue = -1256248427
 	)
-	static int field539;
-	@ObfuscatedName("kn")
+	static int field590;
+	@ObfuscatedName("kv")
 	@Export("showLoadingMessages")
 	static boolean showLoadingMessages;
-	@ObfuscatedName("kf")
+	@ObfuscatedName("kb")
 	@ObfuscatedSignature(
-		descriptor = "[Lcx;"
+		descriptor = "[Lck;"
 	)
 	@Export("players")
 	static Player[] players;
-	@ObfuscatedName("ld")
+	@ObfuscatedName("lw")
 	@ObfuscatedGetter(
-		intValue = -296903929
+		intValue = 74597849
 	)
 	@Export("localPlayerIndex")
 	static int localPlayerIndex;
-	@ObfuscatedName("lm")
+	@ObfuscatedName("lp")
 	@ObfuscatedGetter(
-		intValue = 1537694345
+		intValue = -1592996163
 	)
-	static int field588;
-	@ObfuscatedName("ls")
+	static int field594;
+	@ObfuscatedName("li")
 	@Export("renderSelf")
 	static boolean renderSelf;
-	@ObfuscatedName("lk")
+	@ObfuscatedName("lh")
 	@ObfuscatedGetter(
-		intValue = 484882315
+		intValue = 1840251113
 	)
 	@Export("drawPlayerNames")
 	static int drawPlayerNames;
-	@ObfuscatedName("li")
+	@ObfuscatedName("lk")
 	@ObfuscatedGetter(
-		intValue = 1643293445
+		intValue = 1123511093
 	)
-	static int field591;
-	@ObfuscatedName("lx")
-	static int[] field592;
-	@ObfuscatedName("ln")
+	static int field597;
+	@ObfuscatedName("lr")
+	static int[] field598;
+	@ObfuscatedName("lo")
 	@Export("playerMenuOpcodes")
 	static final int[] playerMenuOpcodes;
-	@ObfuscatedName("lo")
+	@ObfuscatedName("ls")
 	@Export("playerMenuActions")
 	static String[] playerMenuActions;
-	@ObfuscatedName("lu")
+	@ObfuscatedName("lx")
 	@Export("playerOptionsPriorities")
 	static boolean[] playerOptionsPriorities;
-	@ObfuscatedName("lh")
+	@ObfuscatedName("lm")
 	@Export("defaultRotations")
 	static int[] defaultRotations;
-	@ObfuscatedName("lt")
+	@ObfuscatedName("lv")
 	@ObfuscatedGetter(
-		intValue = 398938707
+		intValue = -1073316529
 	)
 	@Export("combatTargetPlayerIndex")
 	static int combatTargetPlayerIndex;
-	@ObfuscatedName("lj")
+	@ObfuscatedName("lt")
 	@ObfuscatedSignature(
-		descriptor = "[[[Lkn;"
+		descriptor = "[[[Llh;"
 	)
 	@Export("groundItems")
 	static NodeDeque[][][] groundItems;
-	@ObfuscatedName("lr")
+	@ObfuscatedName("ly")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("pendingSpawns")
 	static NodeDeque pendingSpawns;
-	@ObfuscatedName("lc")
+	@ObfuscatedName("lu")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("projectiles")
 	static NodeDeque projectiles;
-	@ObfuscatedName("lg")
+	@ObfuscatedName("ld")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("graphicsObjects")
 	static NodeDeque graphicsObjects;
-	@ObfuscatedName("lz")
+	@ObfuscatedName("le")
 	@Export("currentLevels")
 	static int[] currentLevels;
-	@ObfuscatedName("lv")
+	@ObfuscatedName("lb")
 	@Export("levels")
 	static int[] levels;
-	@ObfuscatedName("lw")
+	@ObfuscatedName("lj")
 	@Export("experience")
 	static int[] experience;
-	@ObfuscatedName("lp")
+	@ObfuscatedName("ln")
 	@ObfuscatedGetter(
-		intValue = -195460363
+		intValue = -2127848453
 	)
 	@Export("leftClickOpensMenu")
 	static int leftClickOpensMenu;
-	@ObfuscatedName("la")
+	@ObfuscatedName("lg")
 	@Export("isMenuOpen")
 	static boolean isMenuOpen;
-	@ObfuscatedName("mp")
+	@ObfuscatedName("mz")
 	@ObfuscatedGetter(
-		intValue = -2068095649
+		intValue = 423776093
 	)
 	@Export("menuOptionsCount")
 	static int menuOptionsCount;
-	@ObfuscatedName("mw")
+	@ObfuscatedName("mm")
 	@Export("menuArguments1")
 	static int[] menuArguments1;
-	@ObfuscatedName("me")
+	@ObfuscatedName("mw")
 	@Export("menuArguments2")
 	static int[] menuArguments2;
-	@ObfuscatedName("mb")
+	@ObfuscatedName("mc")
 	@Export("menuOpcodes")
 	static int[] menuOpcodes;
-	@ObfuscatedName("mr")
+	@ObfuscatedName("ml")
 	@Export("menuIdentifiers")
 	static int[] menuIdentifiers;
-	@ObfuscatedName("mq")
+	@ObfuscatedName("mx")
 	@Export("menuActions")
 	static String[] menuActions;
-	@ObfuscatedName("ms")
+	@ObfuscatedName("mv")
 	@Export("menuTargets")
 	static String[] menuTargets;
-	@ObfuscatedName("mo")
+	@ObfuscatedName("mn")
 	@Export("menuShiftClick")
 	static boolean[] menuShiftClick;
-	@ObfuscatedName("mc")
+	@ObfuscatedName("mo")
 	@Export("followerOpsLowPriority")
 	static boolean followerOpsLowPriority;
-	@ObfuscatedName("md")
+	@ObfuscatedName("mp")
 	@Export("shiftClickDrop")
 	static boolean shiftClickDrop;
-	@ObfuscatedName("ml")
+	@ObfuscatedName("mu")
 	@Export("tapToDrop")
 	static boolean tapToDrop;
-	@ObfuscatedName("mf")
+	@ObfuscatedName("md")
 	@Export("showMouseOverText")
 	static boolean showMouseOverText;
-	@ObfuscatedName("mn")
+	@ObfuscatedName("mg")
 	@ObfuscatedGetter(
-		intValue = -96034183
+		intValue = -1753321203
 	)
 	@Export("viewportX")
 	static int viewportX;
-	@ObfuscatedName("mi")
+	@ObfuscatedName("mr")
 	@ObfuscatedGetter(
-		intValue = 501918403
+		intValue = 1204843373
 	)
 	@Export("viewportY")
 	static int viewportY;
-	@ObfuscatedName("mz")
+	@ObfuscatedName("mh")
 	@ObfuscatedGetter(
-		intValue = 1898641855
+		intValue = -1381888941
 	)
-	static int field621;
-	@ObfuscatedName("mj")
+	static int field714;
+	@ObfuscatedName("me")
 	@ObfuscatedGetter(
-		intValue = 786548003
+		intValue = 289077449
 	)
-	static int field714;
-	@ObfuscatedName("mk")
+	static int field628;
+	@ObfuscatedName("mt")
 	@ObfuscatedGetter(
-		intValue = -1422128073
+		intValue = -1313040449
 	)
 	@Export("isItemSelected")
 	static int isItemSelected;
-	@ObfuscatedName("nh")
+	@ObfuscatedName("ns")
 	@Export("isSpellSelected")
 	static boolean isSpellSelected;
-	@ObfuscatedName("na")
+	@ObfuscatedName("nu")
 	@ObfuscatedGetter(
-		intValue = 124054907
+		intValue = -2020933549
 	)
 	@Export("selectedSpellChildIndex")
 	static int selectedSpellChildIndex;
-	@ObfuscatedName("nl")
+	@ObfuscatedName("nr")
 	@ObfuscatedGetter(
-		intValue = 1744337675
+		intValue = 170882311
 	)
-	static int field627;
-	@ObfuscatedName("nj")
+	static int field633;
+	@ObfuscatedName("nq")
 	@Export("selectedSpellActionName")
 	static String selectedSpellActionName;
-	@ObfuscatedName("np")
+	@ObfuscatedName("nl")
 	@Export("selectedSpellName")
 	static String selectedSpellName;
-	@ObfuscatedName("nm")
+	@ObfuscatedName("nv")
 	@ObfuscatedGetter(
-		intValue = 562838955
+		intValue = 1900367295
 	)
 	@Export("rootInterface")
 	static int rootInterface;
-	@ObfuscatedName("nc")
+	@ObfuscatedName("np")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("interfaceParents")
 	static NodeHashTable interfaceParents;
 	@ObfuscatedName("nf")
 	@ObfuscatedGetter(
-		intValue = -1369344199
+		intValue = 862490937
 	)
-	static int field479;
-	@ObfuscatedName("nq")
+	static int field638;
+	@ObfuscatedName("nk")
 	@ObfuscatedGetter(
-		intValue = 467301507
+		intValue = 957984195
 	)
-	static int field633;
+	static int field639;
 	@ObfuscatedName("nz")
 	@ObfuscatedGetter(
-		intValue = -1388268323
+		intValue = -1526655765
 	)
 	@Export("chatEffects")
 	static int chatEffects;
-	@ObfuscatedName("nx")
+	@ObfuscatedName("nc")
 	@ObfuscatedGetter(
-		intValue = -1981485819
+		intValue = 32014173
 	)
-	static int field656;
-	@ObfuscatedName("ni")
+	static int field641;
+	@ObfuscatedName("nx")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+		descriptor = "Ljm;"
 	)
 	@Export("meslayerContinueWidget")
 	static Widget meslayerContinueWidget;
-	@ObfuscatedName("nn")
+	@ObfuscatedName("nm")
 	@ObfuscatedGetter(
-		intValue = -1598051109
+		intValue = 2084747083
 	)
 	@Export("runEnergy")
 	static int runEnergy;
-	@ObfuscatedName("nv")
+	@ObfuscatedName("nd")
 	@ObfuscatedGetter(
-		intValue = 878706649
+		intValue = 1192464333
 	)
 	@Export("weight")
 	static int weight;
-	@ObfuscatedName("nw")
+	@ObfuscatedName("nj")
 	@ObfuscatedGetter(
-		intValue = -755396483
+		intValue = 1043298277
 	)
 	@Export("staffModLevel")
 	public static int staffModLevel;
-	@ObfuscatedName("nk")
+	@ObfuscatedName("nw")
 	@ObfuscatedGetter(
-		intValue = 1189338431
+		intValue = -730109587
 	)
 	@Export("followerIndex")
 	static int followerIndex;
-	@ObfuscatedName("no")
+	@ObfuscatedName("na")
 	@Export("playerMod")
 	static boolean playerMod;
-	@ObfuscatedName("nd")
+	@ObfuscatedName("nn")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+		descriptor = "Ljm;"
 	)
 	@Export("viewportWidget")
 	static Widget viewportWidget;
-	@ObfuscatedName("ne")
+	@ObfuscatedName("nb")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+		descriptor = "Ljm;"
 	)
 	@Export("clickedWidget")
 	static Widget clickedWidget;
 	@ObfuscatedName("ok")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+		descriptor = "Ljm;"
 	)
 	@Export("clickedWidgetParent")
 	static Widget clickedWidgetParent;
-	@ObfuscatedName("ot")
+	@ObfuscatedName("ov")
 	@ObfuscatedGetter(
-		intValue = 641959691
+		intValue = -1392233693
 	)
 	@Export("widgetClickX")
 	static int widgetClickX;
-	@ObfuscatedName("og")
+	@ObfuscatedName("oh")
 	@ObfuscatedGetter(
-		intValue = 902517461
+		intValue = -1441412951
 	)
 	@Export("widgetClickY")
 	static int widgetClickY;
-	@ObfuscatedName("on")
+	@ObfuscatedName("ot")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+		descriptor = "Ljm;"
 	)
 	@Export("draggedOnWidget")
 	static Widget draggedOnWidget;
-	@ObfuscatedName("oo")
-	static boolean field648;
-	@ObfuscatedName("oq")
+	@ObfuscatedName("or")
+	static boolean field531;
+	@ObfuscatedName("oz")
 	@ObfuscatedGetter(
-		intValue = 1606030359
+		intValue = 1396470941
 	)
-	static int field649;
-	@ObfuscatedName("oh")
+	static int field681;
+	@ObfuscatedName("on")
 	@ObfuscatedGetter(
-		intValue = 1355964353
+		intValue = -1204222991
 	)
-	static int field650;
-	@ObfuscatedName("oi")
-	static boolean field680;
-	@ObfuscatedName("oz")
+	static int field659;
+	@ObfuscatedName("oc")
+	static boolean field657;
+	@ObfuscatedName("om")
 	@ObfuscatedGetter(
-		intValue = -30477907
+		intValue = 446488355
 	)
-	static int field652;
-	@ObfuscatedName("oj")
+	static int field658;
+	@ObfuscatedName("ow")
 	@ObfuscatedGetter(
-		intValue = -1581362061
+		intValue = 22597875
 	)
-	static int field468;
-	@ObfuscatedName("op")
+	static int field660;
+	@ObfuscatedName("ol")
 	@Export("isDraggingWidget")
 	static boolean isDraggingWidget;
-	@ObfuscatedName("ox")
+	@ObfuscatedName("oq")
 	@ObfuscatedGetter(
-		intValue = 105350317
+		intValue = -697121075
 	)
 	@Export("cycleCntr")
 	static int cycleCntr;
-	@ObfuscatedName("ov")
+	@ObfuscatedName("os")
 	@Export("changedVarps")
 	static int[] changedVarps;
-	@ObfuscatedName("ob")
+	@ObfuscatedName("od")
 	@ObfuscatedGetter(
-		intValue = -346434099
+		intValue = -1549689841
 	)
 	@Export("changedVarpCount")
 	static int changedVarpCount;
-	@ObfuscatedName("od")
+	@ObfuscatedName("oi")
 	@Export("changedItemContainers")
 	static int[] changedItemContainers;
-	@ObfuscatedName("om")
+	@ObfuscatedName("oj")
 	@ObfuscatedGetter(
-		intValue = -1624807725
+		intValue = 840565577
 	)
-	static int field659;
-	@ObfuscatedName("oe")
+	static int field665;
+	@ObfuscatedName("ob")
 	@Export("changedSkills")
 	static int[] changedSkills;
-	@ObfuscatedName("ow")
+	@ObfuscatedName("ox")
 	@ObfuscatedGetter(
-		intValue = 936825
+		intValue = -1130299111
 	)
 	@Export("changedSkillsCount")
 	static int changedSkillsCount;
-	@ObfuscatedName("ou")
-	static int[] field662;
-	@ObfuscatedName("oc")
+	@ObfuscatedName("oy")
+	static int[] field695;
+	@ObfuscatedName("op")
 	@ObfuscatedGetter(
-		intValue = 101503795
+		intValue = -441533413
 	)
-	static int field663;
-	@ObfuscatedName("pw")
+	static int field734;
+	@ObfuscatedName("py")
 	@ObfuscatedGetter(
-		intValue = 550781787
+		intValue = -439883039
 	)
 	@Export("chatCycle")
 	static int chatCycle;
-	@ObfuscatedName("pz")
+	@ObfuscatedName("pj")
 	@ObfuscatedGetter(
-		intValue = 651234723
+		intValue = 985856881
 	)
-	static int field679;
-	@ObfuscatedName("pd")
+	static int field671;
+	@ObfuscatedName("pi")
+	@ObfuscatedGetter(
+		intValue = 1529981945
+	)
+	static int field672;
+	@ObfuscatedName("pk")
+	@ObfuscatedGetter(
+		intValue = -1376380489
+	)
+	static int field673;
+	@ObfuscatedName("ps")
 	@ObfuscatedGetter(
-		intValue = -1548223605
+		intValue = -223800901
 	)
-	static int field666;
+	static int field583;
 	@ObfuscatedName("pp")
 	@ObfuscatedGetter(
-		intValue = -1373827689
+		intValue = 1659284265
 	)
-	static int field681;
-	@ObfuscatedName("pl")
+	static int field675;
+	@ObfuscatedName("pf")
 	@ObfuscatedGetter(
-		intValue = 2096555667
+		intValue = 1108839673
 	)
-	static int field724;
-	@ObfuscatedName("pb")
+	static int field669;
+	@ObfuscatedName("pd")
 	@ObfuscatedGetter(
-		intValue = -1852458019
+		intValue = 45782605
 	)
-	static int field536;
-	@ObfuscatedName("py")
+	static int field471;
+	@ObfuscatedName("pg")
 	@ObfuscatedGetter(
-		intValue = -789131501
+		intValue = 1320259871
+	)
+	@Export("mouseWheelRotation")
+	static int mouseWheelRotation;
+	@ObfuscatedName("pa")
+	@ObfuscatedSignature(
+		descriptor = "Llh;"
+	)
+	@Export("scriptEvents")
+	static NodeDeque scriptEvents;
+	@ObfuscatedName("pl")
+	@ObfuscatedSignature(
+		descriptor = "Llh;"
 	)
-	static int field670;
+	static NodeDeque field680;
 	@ObfuscatedName("px")
+	@ObfuscatedSignature(
+		descriptor = "Llh;"
+	)
+	static NodeDeque field579;
+	@ObfuscatedName("pe")
+	@ObfuscatedSignature(
+		descriptor = "Lon;"
+	)
+	@Export("widgetFlags")
+	static NodeHashTable widgetFlags;
+	@ObfuscatedName("pc")
 	@ObfuscatedGetter(
-		intValue = 863379247
+		intValue = 1020186199
 	)
-	static int field494;
-	@ObfuscatedName("ft")
-	String field501;
-	@ObfuscatedName("fl")
+	@Export("rootWidgetCount")
+	static int rootWidgetCount;
+	@ObfuscatedName("pt")
+	@ObfuscatedGetter(
+		intValue = -140051155
+	)
+	static int field684;
+	@ObfuscatedName("pu")
+	static boolean[] field504;
+	@ObfuscatedName("pv")
+	static boolean[] field686;
+	@ObfuscatedName("po")
+	static boolean[] field687;
+	@ObfuscatedName("pm")
+	@Export("rootWidgetXs")
+	static int[] rootWidgetXs;
+	@ObfuscatedName("pb")
+	@Export("rootWidgetYs")
+	static int[] rootWidgetYs;
+	@ObfuscatedName("qg")
+	@Export("rootWidgetWidths")
+	static int[] rootWidgetWidths;
+	@ObfuscatedName("fd")
+	String field576;
+	@ObfuscatedName("fq")
 	@ObfuscatedSignature(
-		descriptor = "Ll;"
+		descriptor = "Lg;"
 	)
-	class14 field491;
-	@ObfuscatedName("fe")
+	class14 field510;
+	@ObfuscatedName("fz")
 	@ObfuscatedSignature(
-		descriptor = "Ld;"
+		descriptor = "Lf;"
 	)
-	class19 field537;
-	@ObfuscatedName("fo")
+	class19 field613;
+	@ObfuscatedName("fp")
 	@ObfuscatedSignature(
-		descriptor = "Lop;"
+		descriptor = "Lpi;"
 	)
-	Buffer field579;
-	@ObfuscatedName("fr")
+	Buffer field710;
+	@ObfuscatedName("fn")
 	@ObfuscatedSignature(
-		descriptor = "Lp;"
+		descriptor = "Lw;"
 	)
-	class7 field507;
+	class7 field515;
 
 	static {
-		field497 = true; // L: 133
-		worldId = 1; // L: 134
-		worldProperties = 0; // L: 135
-		gameBuild = 0; // L: 137
-		isMembersWorld = false; // L: 140
-		isLowDetail = false; // L: 141
-		field467 = -1; // L: 146
-		clientType = -1; // L: 147
-		field469 = -1; // L: 148
-		onMobile = false; // L: 149
-		gameState = 0; // L: 160
-		isLoading = true; // L: 182
-		cycle = 0; // L: 183
-		mouseLastLastPressedTimeMillis = -1L; // L: 184
-		field475 = -1; // L: 186
-		field476 = -1; // L: 187
-		field477 = -1L; // L: 188
-		hadFocus = true; // L: 189
-		displayFps = false; // L: 190
-		rebootTimer = 0; // L: 191
-		hintArrowType = 0; // L: 192
-		hintArrowNpcIndex = 0; // L: 193
-		hintArrowPlayerIndex = 0; // L: 194
-		hintArrowX = 0; // L: 195
-		hintArrowY = 0; // L: 196
-		hintArrowHeight = 0; // L: 197
-		hintArrowSubX = 0; // L: 198
-		hintArrowSubY = 0; // L: 199
-		playerAttackOption = AttackOption.AttackOption_hidden; // L: 201
-		npcAttackOption = AttackOption.AttackOption_hidden; // L: 202
-		titleLoadingStage = 0; // L: 205
-		js5ConnectState = 0; // L: 208
-		field572 = 0; // L: 209
-		js5Errors = 0; // L: 231
-		loginState = 0; // L: 233
-		field496 = 0; // L: 234
-		field685 = 0; // L: 235
-		field498 = 0; // L: 236
-		field693 = class112.field1346; // L: 237
-		field500 = class404.field4351; // L: 238
-		Login_isUsernameRemembered = false; // L: 255
-		secureRandomFuture = new SecureRandomFuture(); // L: 256
-		randomDatData = null; // L: 261
-		npcs = new NPC[32768]; // L: 265
-		npcCount = 0; // L: 266
-		npcIndices = new int[32768]; // L: 267
-		field512 = 0; // L: 268
-		field513 = new int[250]; // L: 269
-		packetWriter = new PacketWriter(); // L: 272
-		logoutTimer = 0; // L: 274
-		hadNetworkError = false; // L: 275
-		useBufferedSocket = true; // L: 276
-		field619 = false; // L: 277
-		timer = new Timer(); // L: 278
-		fontsMap = new HashMap(); // L: 284
-		field521 = 0; // L: 291
-		field522 = 1; // L: 292
-		field523 = 0; // L: 293
-		field524 = 1; // L: 294
-		field485 = 0; // L: 295
-		collisionMaps = new CollisionMap[4]; // L: 303
-		isInInstance = false; // L: 304
-		instanceChunkTemplates = new int[4][13][13]; // L: 305
-		field530 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 306
-		field531 = 0; // L: 309
-		field628 = 2301979; // L: 321
-		field534 = 5063219; // L: 322
-		field535 = 3353893; // L: 323
-		field506 = 7759444; // L: 324
-		field465 = false; // L: 325
-		alternativeScrollbarWidth = 0; // L: 326
-		camAngleX = 128; // L: 334
-		camAngleY = 0; // L: 335
-		camAngleDY = 0; // L: 336
-		camAngleDX = 0; // L: 337
-		mouseCamClickedX = 0; // L: 338
-		mouseCamClickedY = 0; // L: 339
-		oculusOrbState = 0; // L: 340
-		camFollowHeight = 50; // L: 341
-		field547 = 0; // L: 345
-		field520 = 0; // L: 346
-		field549 = 0; // L: 347
-		oculusOrbNormalSpeed = 12; // L: 349
-		oculusOrbSlowedSpeed = 6; // L: 350
-		field552 = 0; // L: 351
-		field511 = false; // L: 352
-		field620 = 0; // L: 353
-		field555 = false; // L: 354
-		field556 = 0; // L: 355
-		overheadTextCount = 0; // L: 356
-		overheadTextLimit = 50; // L: 357
-		overheadTextXs = new int[overheadTextLimit]; // L: 358
-		overheadTextYs = new int[overheadTextLimit]; // L: 359
-		overheadTextAscents = new int[overheadTextLimit]; // L: 360
-		overheadTextXOffsets = new int[overheadTextLimit]; // L: 361
-		overheadTextColors = new int[overheadTextLimit]; // L: 362
-		overheadTextEffects = new int[overheadTextLimit]; // L: 363
-		overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 364
-		overheadText = new String[overheadTextLimit]; // L: 365
-		tileLastDrawnActor = new int[104][104]; // L: 366
-		viewportDrawCount = 0; // L: 367
-		viewportTempX = -1; // L: 368
-		viewportTempY = -1; // L: 369
-		mouseCrossX = 0; // L: 370
-		mouseCrossY = 0; // L: 371
-		mouseCrossState = 0; // L: 372
-		mouseCrossColor = 0; // L: 373
-		showMouseCross = true; // L: 374
-		field576 = 0; // L: 376
-		field577 = 0; // L: 377
-		dragItemSlotSource = 0; // L: 380
-		draggedWidgetX = 0; // L: 381
-		draggedWidgetY = 0; // L: 382
-		dragItemSlotDestination = 0; // L: 383
-		field667 = false; // L: 384
-		itemDragDuration = 0; // L: 385
-		field539 = 0; // L: 386
-		showLoadingMessages = true; // L: 388
-		players = new Player[2048]; // L: 390
-		localPlayerIndex = -1; // L: 392
-		field588 = 0; // L: 393
-		renderSelf = true; // L: 395
-		drawPlayerNames = 0; // L: 400
-		field591 = 0; // L: 401
-		field592 = new int[1000]; // L: 402
-		playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 404
-		playerMenuActions = new String[8]; // L: 405
-		playerOptionsPriorities = new boolean[8]; // L: 406
-		defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 407
-		combatTargetPlayerIndex = -1; // L: 408
-		groundItems = new NodeDeque[4][104][104]; // L: 409
-		pendingSpawns = new NodeDeque(); // L: 410
-		projectiles = new NodeDeque(); // L: 411
-		graphicsObjects = new NodeDeque(); // L: 412
-		currentLevels = new int[25]; // L: 413
-		levels = new int[25]; // L: 414
-		experience = new int[25]; // L: 415
-		leftClickOpensMenu = 0; // L: 416
-		isMenuOpen = false; // L: 417
-		menuOptionsCount = 0; // L: 423
-		menuArguments1 = new int[500]; // L: 424
-		menuArguments2 = new int[500]; // L: 425
-		menuOpcodes = new int[500]; // L: 426
-		menuIdentifiers = new int[500]; // L: 427
-		menuActions = new String[500]; // L: 428
-		menuTargets = new String[500]; // L: 429
-		menuShiftClick = new boolean[500]; // L: 430
-		followerOpsLowPriority = false; // L: 431
-		shiftClickDrop = false; // L: 433
-		tapToDrop = false; // L: 434
-		showMouseOverText = true; // L: 435
-		viewportX = -1; // L: 436
-		viewportY = -1; // L: 437
-		field621 = 0; // L: 441
-		field714 = 50; // L: 442
-		isItemSelected = 0; // L: 443
-		selectedItemName = null; // L: 447
-		isSpellSelected = false; // L: 448
-		selectedSpellChildIndex = -1; // L: 450
-		field627 = -1; // L: 451
-		selectedSpellActionName = null; // L: 453
-		selectedSpellName = null; // L: 454
-		rootInterface = -1; // L: 455
-		interfaceParents = new NodeHashTable(8); // L: 456
-		field479 = 0; // L: 461
-		field633 = -1; // L: 462
-		chatEffects = 0; // L: 463
-		field656 = 0; // L: 464
-		meslayerContinueWidget = null; // L: 465
-		runEnergy = 0; // L: 466
-		weight = 0; // L: 467
-		staffModLevel = 0; // L: 468
-		followerIndex = -1; // L: 469
-		playerMod = false; // L: 470
-		viewportWidget = null; // L: 471
-		clickedWidget = null; // L: 472
-		clickedWidgetParent = null; // L: 473
-		widgetClickX = 0; // L: 474
-		widgetClickY = 0; // L: 475
-		draggedOnWidget = null; // L: 476
-		field648 = false; // L: 477
-		field649 = -1; // L: 478
-		field650 = -1; // L: 479
-		field680 = false; // L: 480
-		field652 = -1; // L: 481
-		field468 = -1; // L: 482
-		isDraggingWidget = false; // L: 483
-		cycleCntr = 1; // L: 488
-		changedVarps = new int[32]; // L: 491
-		changedVarpCount = 0; // L: 492
-		changedItemContainers = new int[32]; // L: 493
-		field659 = 0; // L: 494
-		changedSkills = new int[32]; // L: 495
-		changedSkillsCount = 0; // L: 496
-		field662 = new int[32]; // L: 497
-		field663 = 0; // L: 498
-		chatCycle = 0; // L: 499
-		field679 = 0; // L: 500
-		field666 = 0; // L: 501
-		field681 = 0; // L: 502
-		field724 = 0; // L: 503
-		field536 = 0; // L: 504
-		field670 = 0; // L: 505
-		field494 = 0; // L: 506
-		mouseWheelRotation = 0; // L: 512
-		scriptEvents = new NodeDeque(); // L: 513
-		field674 = new NodeDeque(); // L: 514
-		field675 = new NodeDeque(); // L: 515
-		widgetFlags = new NodeHashTable(512); // L: 516
-		rootWidgetCount = 0; // L: 518
-		field678 = -2; // L: 519
-		field594 = new boolean[100]; // L: 520
-		field553 = new boolean[100]; // L: 521
-		field651 = new boolean[100]; // L: 522
-		rootWidgetXs = new int[100]; // L: 523
-		rootWidgetYs = new int[100]; // L: 524
-		rootWidgetWidths = new int[100]; // L: 525
-		rootWidgetHeights = new int[100]; // L: 526
-		gameDrawingMode = 0; // L: 527
-		field687 = 0L; // L: 528
-		isResizable = true; // L: 529
-		field689 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 536
-		publicChatMode = 0; // L: 537
-		tradeChatMode = 0; // L: 539
-		field692 = ""; // L: 540
-		crossWorldMessageIds = new long[100]; // L: 542
-		crossWorldMessageIdsIndex = 0; // L: 543
-		field695 = 0; // L: 545
-		field696 = new int[128]; // L: 546
-		field697 = new int[128]; // L: 547
-		field565 = -1L; // L: 548
-		currentClanSettings = new ClanSettings[2]; // L: 552
-		currentClanChannels = new ClanChannel[2]; // L: 554
-		field701 = -1; // L: 556
-		mapIconCount = 0; // L: 557
-		mapIconXs = new int[1000]; // L: 558
-		mapIconYs = new int[1000]; // L: 559
-		mapIcons = new SpritePixels[1000]; // L: 560
-		destinationX = 0; // L: 561
-		destinationY = 0; // L: 562
-		minimapState = 0; // L: 569
-		currentTrackGroupId = -1; // L: 570
-		field710 = false; // L: 571
-		soundEffectCount = 0; // L: 577
-		soundEffectIds = new int[50]; // L: 578
-		queuedSoundEffectLoops = new int[50]; // L: 579
-		queuedSoundEffectDelays = new int[50]; // L: 580
-		soundLocations = new int[50]; // L: 581
-		soundEffects = new SoundEffect[50]; // L: 582
-		isCameraLocked = false; // L: 584
-		field718 = new boolean[5]; // L: 596
-		field719 = new int[5]; // L: 597
-		field598 = new int[5]; // L: 598
-		field721 = new int[5]; // L: 599
-		field722 = new int[5]; // L: 600
-		field464 = 256; // L: 601
-		field550 = 205; // L: 602
-		zoomHeight = 256; // L: 603
-		zoomWidth = 320; // L: 604
-		field727 = 1; // L: 605
-		field600 = 32767; // L: 606
-		field729 = 1; // L: 607
-		field730 = 32767; // L: 608
-		viewportOffsetX = 0; // L: 609
-		viewportOffsetY = 0; // L: 610
-		viewportWidth = 0; // L: 611
-		viewportHeight = 0; // L: 612
-		viewportZoom = 0; // L: 613
-		playerAppearance = new PlayerComposition(); // L: 615
-		field737 = -1; // L: 616
-		field581 = -1; // L: 617
-		platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 619
-		grandExchangeOffers = new GrandExchangeOffer[8]; // L: 621
-		GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 624
-		field742 = -1; // L: 631
-		archiveLoaders = new ArrayList(10); // L: 632
-		archiveLoadersDone = 0; // L: 633
-		field745 = 0; // L: 634
-		field743 = new ApproximateRouteStrategy(); // L: 643
-		field538 = new int[50]; // L: 644
-		field748 = new int[50]; // L: 645
+		field713 = true;
+		worldId = 1; // L: 135
+		worldProperties = 0; // L: 136
+		gameBuild = 0;
+		isMembersWorld = false;
+		isLowDetail = false;
+		field473 = -1;
+		clientType = -1; // L: 148
+		field499 = -1; // L: 149
+		onMobile = false;
+		gameState = 0;
+		isLoading = true; // L: 183
+		cycle = 0;
+		mouseLastLastPressedTimeMillis = -1L; // L: 185
+		field483 = -1; // L: 187
+		field746 = -1; // L: 188
+		field485 = -1L; // L: 189
+		hadFocus = true; // L: 190
+		displayFps = false; // L: 191
+		rebootTimer = 0; // L: 192
+		hintArrowType = 0; // L: 193
+		hintArrowNpcIndex = 0; // L: 194
+		hintArrowPlayerIndex = 0; // L: 195
+		hintArrowX = 0; // L: 196
+		hintArrowY = 0; // L: 197
+		hintArrowHeight = 0; // L: 198
+		hintArrowSubX = 0; // L: 199
+		hintArrowSubY = 0; // L: 200
+		playerAttackOption = AttackOption.AttackOption_hidden; // L: 202
+		npcAttackOption = AttackOption.AttackOption_hidden; // L: 203
+		titleLoadingStage = 0; // L: 206
+		js5ConnectState = 0; // L: 209
+		field517 = 0; // L: 210
+		js5Errors = 0; // L: 232
+		loginState = 0; // L: 234
+		field545 = 0; // L: 235
+		field541 = 0; // L: 236
+		field506 = 0; // L: 237
+		field507 = class122.field1473; // L: 238
+		field508 = class422.field4523; // L: 239
+		Login_isUsernameRemembered = false; // L: 256
+		secureRandomFuture = new SecureRandomFuture(); // L: 257
+		randomDatData = null; // L: 262
+		npcs = new NPC[32768]; // L: 266
+		npcCount = 0; // L: 267
+		npcIndices = new int[32768]; // L: 268
+		field520 = 0; // L: 269
+		field605 = new int[250]; // L: 270
+		packetWriter = new PacketWriter(); // L: 273
+		logoutTimer = 0; // L: 275
+		hadNetworkError = false; // L: 276
+		useBufferedSocket = true; // L: 277
+		field526 = false; // L: 278
+		timer = new Timer(); // L: 279
+		fontsMap = new HashMap(); // L: 285
+		field529 = 0; // L: 292
+		field530 = 1; // L: 293
+		field617 = 0; // L: 294
+		field532 = 1; // L: 295
+		field602 = 0; // L: 296
+		collisionMaps = new CollisionMap[4]; // L: 304
+		isInInstance = false; // L: 305
+		instanceChunkTemplates = new int[4][13][13]; // L: 306
+		field537 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 307
+		field538 = 0; // L: 310
+		field693 = 2301979; // L: 322
+		field716 = 5063219; // L: 323
+		field509 = 3353893; // L: 324
+		field544 = 7759444; // L: 325
+		field543 = false; // L: 326
+		alternativeScrollbarWidth = 0; // L: 327
+		camAngleX = 128; // L: 335
+		camAngleY = 0; // L: 336
+		camAngleDY = 0; // L: 337
+		camAngleDX = 0; // L: 338
+		mouseCamClickedX = 0; // L: 339
+		mouseCamClickedY = 0; // L: 340
+		oculusOrbState = 0; // L: 341
+		camFollowHeight = 50; // L: 342
+		field542 = 0; // L: 346
+		field584 = 0; // L: 347
+		field555 = 0; // L: 348
+		oculusOrbNormalSpeed = 12; // L: 350
+		oculusOrbSlowedSpeed = 6; // L: 351
+		field607 = 0; // L: 352
+		field612 = false; // L: 353
+		field560 = 0; // L: 354
+		field561 = false; // L: 355
+		field562 = 0; // L: 356
+		overheadTextCount = 0; // L: 357
+		overheadTextLimit = 50; // L: 358
+		overheadTextXs = new int[overheadTextLimit]; // L: 359
+		overheadTextYs = new int[overheadTextLimit]; // L: 360
+		overheadTextAscents = new int[overheadTextLimit]; // L: 361
+		overheadTextXOffsets = new int[overheadTextLimit]; // L: 362
+		overheadTextColors = new int[overheadTextLimit]; // L: 363
+		overheadTextEffects = new int[overheadTextLimit]; // L: 364
+		overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 365
+		overheadText = new String[overheadTextLimit]; // L: 366
+		tileLastDrawnActor = new int[104][104]; // L: 367
+		viewportDrawCount = 0; // L: 368
+		viewportTempX = -1; // L: 369
+		viewportTempY = -1; // L: 370
+		mouseCrossX = 0; // L: 371
+		mouseCrossY = 0; // L: 372
+		mouseCrossState = 0; // L: 373
+		mouseCrossColor = 0; // L: 374
+		showMouseCross = true; // L: 375
+		field582 = 0; // L: 377
+		field599 = 0; // L: 378
+		dragItemSlotSource = 0; // L: 381
+		draggedWidgetX = 0; // L: 382
+		draggedWidgetY = 0; // L: 383
+		dragItemSlotDestination = 0; // L: 384
+		field572 = false; // L: 385
+		itemDragDuration = 0; // L: 386
+		field590 = 0; // L: 387
+		showLoadingMessages = true; // L: 389
+		players = new Player[2048]; // L: 391
+		localPlayerIndex = -1; // L: 393
+		field594 = 0; // L: 394
+		renderSelf = true; // L: 396
+		drawPlayerNames = 0; // L: 401
+		field597 = 0; // L: 402
+		field598 = new int[1000]; // L: 403
+		playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 405
+		playerMenuActions = new String[8]; // L: 406
+		playerOptionsPriorities = new boolean[8]; // L: 407
+		defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 408
+		combatTargetPlayerIndex = -1; // L: 409
+		groundItems = new NodeDeque[4][104][104]; // L: 410
+		pendingSpawns = new NodeDeque(); // L: 411
+		projectiles = new NodeDeque(); // L: 412
+		graphicsObjects = new NodeDeque(); // L: 413
+		currentLevels = new int[25]; // L: 414
+		levels = new int[25]; // L: 415
+		experience = new int[25]; // L: 416
+		leftClickOpensMenu = 0; // L: 417
+		isMenuOpen = false; // L: 418
+		menuOptionsCount = 0; // L: 424
+		menuArguments1 = new int[500]; // L: 425
+		menuArguments2 = new int[500]; // L: 426
+		menuOpcodes = new int[500]; // L: 427
+		menuIdentifiers = new int[500]; // L: 428
+		menuActions = new String[500]; // L: 429
+		menuTargets = new String[500]; // L: 430
+		menuShiftClick = new boolean[500]; // L: 431
+		followerOpsLowPriority = false; // L: 432
+		shiftClickDrop = false; // L: 434
+		tapToDrop = false; // L: 435
+		showMouseOverText = true; // L: 436
+		viewportX = -1; // L: 437
+		viewportY = -1; // L: 438
+		field714 = 0; // L: 442
+		field628 = 50; // L: 443
+		isItemSelected = 0; // L: 444
+		selectedItemName = null; // L: 448
+		isSpellSelected = false; // L: 449
+		selectedSpellChildIndex = -1; // L: 451
+		field633 = -1; // L: 452
+		selectedSpellActionName = null; // L: 454
+		selectedSpellName = null; // L: 455
+		rootInterface = -1; // L: 456
+		interfaceParents = new NodeHashTable(8); // L: 457
+		field638 = 0; // L: 462
+		field639 = -1; // L: 463
+		chatEffects = 0; // L: 464
+		field641 = 0; // L: 465
+		meslayerContinueWidget = null; // L: 466
+		runEnergy = 0; // L: 467
+		weight = 0; // L: 468
+		staffModLevel = 0; // L: 469
+		followerIndex = -1; // L: 470
+		playerMod = false; // L: 471
+		viewportWidget = null; // L: 472
+		clickedWidget = null; // L: 473
+		clickedWidgetParent = null; // L: 474
+		widgetClickX = 0; // L: 475
+		widgetClickY = 0; // L: 476
+		draggedOnWidget = null; // L: 477
+		field531 = false; // L: 478
+		field681 = -1; // L: 479
+		field659 = -1; // L: 480
+		field657 = false; // L: 481
+		field658 = -1; // L: 482
+		field660 = -1; // L: 483
+		isDraggingWidget = false; // L: 484
+		cycleCntr = 1; // L: 489
+		changedVarps = new int[32]; // L: 492
+		changedVarpCount = 0; // L: 493
+		changedItemContainers = new int[32]; // L: 494
+		field665 = 0; // L: 495
+		changedSkills = new int[32]; // L: 496
+		changedSkillsCount = 0; // L: 497
+		field695 = new int[32]; // L: 498
+		field734 = 0; // L: 499
+		chatCycle = 0; // L: 500
+		field671 = 0; // L: 501
+		field672 = 0; // L: 502
+		field673 = 0; // L: 503
+		field583 = 0; // L: 504
+		field675 = 0; // L: 505
+		field669 = 0; // L: 506
+		field471 = 0; // L: 507
+		mouseWheelRotation = 0; // L: 513
+		scriptEvents = new NodeDeque(); // L: 514
+		field680 = new NodeDeque(); // L: 515
+		field579 = new NodeDeque(); // L: 516
+		widgetFlags = new NodeHashTable(512); // L: 517
+		rootWidgetCount = 0; // L: 519
+		field684 = -2; // L: 520
+		field504 = new boolean[100]; // L: 521
+		field686 = new boolean[100]; // L: 522
+		field687 = new boolean[100]; // L: 523
+		rootWidgetXs = new int[100]; // L: 524
+		rootWidgetYs = new int[100]; // L: 525
+		rootWidgetWidths = new int[100]; // L: 526
+		rootWidgetHeights = new int[100]; // L: 527
+		gameDrawingMode = 0; // L: 528
+		field514 = 0L; // L: 529
+		isResizable = true; // L: 530
+		field749 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 537
+		publicChatMode = 0; // L: 538
+		tradeChatMode = 0; // L: 540
+		field645 = ""; // L: 541
+		crossWorldMessageIds = new long[100]; // L: 543
+		crossWorldMessageIdsIndex = 0; // L: 544
+		field701 = 0; // L: 546
+		field758 = new int[128]; // L: 547
+		field522 = new int[128]; // L: 548
+		field676 = -1L; // L: 549
+		currentClanSettings = new ClanSettings[2]; // L: 553
+		currentClanChannels = new ClanChannel[2]; // L: 555
+		field570 = -1; // L: 557
+		mapIconCount = 0; // L: 558
+		mapIconXs = new int[1000]; // L: 559
+		mapIconYs = new int[1000]; // L: 560
+		mapIcons = new SpritePixels[1000]; // L: 561
+		destinationX = 0; // L: 562
+		destinationY = 0; // L: 563
+		minimapState = 0; // L: 570
+		currentTrackGroupId = -1; // L: 571
+		field743 = false; // L: 572
+		soundEffectCount = 0; // L: 578
+		soundEffectIds = new int[50]; // L: 579
+		queuedSoundEffectLoops = new int[50]; // L: 580
+		queuedSoundEffectDelays = new int[50]; // L: 581
+		soundLocations = new int[50]; // L: 582
+		soundEffects = new SoundEffect[50]; // L: 583
+		isCameraLocked = false; // L: 585
+		field724 = false; // L: 596
+		field725 = new boolean[5]; // L: 604
+		field726 = new int[5]; // L: 605
+		field679 = new int[5]; // L: 606
+		field618 = new int[5]; // L: 607
+		field729 = new int[5]; // L: 608
+		field690 = 256; // L: 609
+		field707 = 205; // L: 610
+		zoomHeight = 256; // L: 611
+		zoomWidth = 320; // L: 612
+		field619 = 1; // L: 613
+		field735 = 32767; // L: 614
+		field736 = 1; // L: 615
+		field737 = 32767; // L: 616
+		viewportOffsetX = 0; // L: 617
+		viewportOffsetY = 0; // L: 618
+		viewportWidth = 0; // L: 619
+		viewportHeight = 0; // L: 620
+		viewportZoom = 0; // L: 621
+		playerAppearance = new PlayerComposition(); // L: 623
+		field744 = -1; // L: 624
+		field571 = -1; // L: 625
+		platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 627
+		grandExchangeOffers = new GrandExchangeOffer[8]; // L: 629
+		GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 632
+		field559 = -1; // L: 639
+		archiveLoaders = new ArrayList(10); // L: 640
+		archiveLoadersDone = 0; // L: 641
+		field753 = 0; // L: 642
+		field754 = new ApproximateRouteStrategy(); // L: 651
+		field755 = new int[50]; // L: 652
+		field756 = new int[50]; // L: 653
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1701018417"
+		garbageValue = "-2122855875"
 	)
 	@Export("resizeGame")
 	protected final void resizeGame() {
-		field687 = class111.method2516() + 500L; // L: 4578
-		this.resizeJS(); // L: 4579
-		if (rootInterface != -1) { // L: 4580
+		field514 = Ignored.method6459() + 500L; // L: 4994
+		this.resizeJS(); // L: 4995
+		if (rootInterface != -1) { // L: 4996
 			this.resizeRoot(true);
 		}
 
-	} // L: 4581
+	} // L: 4997
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-2071280922"
+		garbageValue = "264122801"
 	)
 	@Export("setUp")
 	protected final void setUp() {
-		ItemComposition.method3408(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 794
-		ApproximateRouteStrategy.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 795
-		ParamComposition.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 796
-		ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 797
-		DesktopPlatformInfoProvider.field4081 = class260.field3035; // L: 798
-		class137.field1519 = class260.field3039; // L: 799
-		Varps.field3013 = class260.field3036; // L: 800
-		ClanChannel.field1512 = class260.field3037; // L: 801
-		class320.urlRequester = new UrlRequester(); // L: 802
-		this.setUpKeyboard(); // L: 803
-		this.method440(); // L: 804
-		MouseHandler.mouseWheel = this.mouseWheel(); // L: 805
-		WorldMapArea.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 806
-		AccessFile var2 = null; // L: 809
-		ClientPreferences var3 = new ClientPreferences(); // L: 810
+		int[] var1 = new int[]{20, 260, 10000}; // L: 986
+		int[] var2 = new int[]{1000, 100, 500}; // L: 987
+		if (var1 != null && var2 != null) { // L: 989
+			SoundCache.ByteArrayPool_alternativeSizes = var1; // L: 1002
+			ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; // L: 1003
+			World.ByteArrayPool_arrays = new byte[var1.length][][]; // L: 1004
+
+			for (int var3 = 0; var3 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var3) { // L: 1005
+				World.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; // L: 1006
+				ByteArrayPool.field4035.add(var1[var3]); // L: 1007
+			}
+
+			Collections.sort(ByteArrayPool.field4035); // L: 1009
+		} else {
+			SoundCache.ByteArrayPool_alternativeSizes = null; // L: 990
+			ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts = null; // L: 991
+			World.ByteArrayPool_arrays = null; // L: 992
+			ByteArrayPool.field4035.clear(); // L: 994
+			ByteArrayPool.field4035.add(100); // L: 995
+			ByteArrayPool.field4035.add(5000); // L: 996
+			ByteArrayPool.field4035.add(10000); // L: 997
+			ByteArrayPool.field4035.add(30000); // L: 998
+		}
+
+		GameObject.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 1011
+		class133.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 1012
+		class129.currentPort = GameObject.worldPort; // L: 1013
+		PlayerComposition.field3197 = class279.field3209; // L: 1014
+		class114.field1382 = class279.field3208; // L: 1015
+		class132.field1540 = class279.field3211; // L: 1016
+		PlayerComposition.field3203 = class279.field3210; // L: 1017
+		WorldMapData_1.urlRequester = new UrlRequester(); // L: 1018
+		this.setUpKeyboard(); // L: 1019
+		this.method472(); // L: 1020
+		WorldMapDecorationType.mouseWheel = this.mouseWheel(); // L: 1021
+		ParamComposition.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 1022
+		AccessFile var4 = null; // L: 1025
+		ClientPreferences var5 = new ClientPreferences(); // L: 1026
 
 		try {
-			var2 = DevicePcmPlayerProvider.getPreferencesFile("", RouteStrategy.field1986.name, false); // L: 812
-			byte[] var4 = new byte[(int)var2.length()]; // L: 813
+			var4 = class231.getPreferencesFile("", class338.field4054.name, false); // L: 1028
+			byte[] var6 = new byte[(int)var4.length()]; // L: 1029
 
-			int var6;
-			for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 814 815 818
-				var6 = var2.read(var4, var5, var4.length - var5); // L: 816
-				if (var6 == -1) { // L: 817
+			int var8;
+			for (int var7 = 0; var7 < var6.length; var7 += var8) { // L: 1030 1031 1034
+				var8 = var4.read(var6, var7, var6.length - var7); // L: 1032
+				if (var8 == -1) { // L: 1033
 					throw new IOException();
 				}
 			}
 
-			var3 = new ClientPreferences(new Buffer(var4)); // L: 820
-		} catch (Exception var8) { // L: 822
+			var5 = new ClientPreferences(new Buffer(var6)); // L: 1036
+		} catch (Exception var11) { // L: 1038
 		}
 
 		try {
-			if (var2 != null) { // L: 824
-				var2.close();
+			if (var4 != null) { // L: 1040
+				var4.close();
 			}
-		} catch (Exception var7) { // L: 826
+		} catch (Exception var10) { // L: 1042
+		}
+
+		SecureRandomFuture.clientPreferences = var5; // L: 1045
+		this.setUpClipboard(); // L: 1046
+		String var12 = GrandExchangeOfferAgeComparator.field3882; // L: 1048
+		class29.field172 = this; // L: 1050
+		if (var12 != null) { // L: 1051
+			class29.field177 = var12;
 		}
 
-		class408.clientPreferences = var3; // L: 829
-		this.setUpClipboard(); // L: 830
-		GrandExchangeOfferWorldComparator.method5440(this, VarcInt.field1645); // L: 831
-		if (gameBuild != 0) { // L: 832
+		if (gameBuild != 0) { // L: 1053
 			displayFps = true;
 		}
 
-		HorizontalAlignment.setWindowedMode(class408.clientPreferences.windowMode); // L: 833
-		class112.friendSystem = new FriendSystem(GrandExchangeOfferUnitPriceComparator.loginType); // L: 834
-		this.field491 = new class14("tokenRequest", 1, 1); // L: 835
-	} // L: 836
+		Occluder.setWindowedMode(SecureRandomFuture.clientPreferences.windowMode); // L: 1054
+		GameEngine.friendSystem = new FriendSystem(class194.loginType); // L: 1055
+		this.field510 = new class14("tokenRequest", 1, 1); // L: 1056
+	} // L: 1057
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "466223513"
+		descriptor = "(S)V",
+		garbageValue = "-24240"
 	)
 	@Export("doCycle")
 	protected final void doCycle() {
-		++cycle; // L: 839
-		this.doCycleJs5(); // L: 840
-		Coord.method5011(); // L: 841
-		class131.method2753(); // L: 842
-		class14.playPcmPlayers(); // L: 843
-		int var2;
-		synchronized(KeyHandler.KeyHandler_instance) { // L: 845
-			++KeyHandler.KeyHandler_idleCycles; // L: 846
-			KeyHandler.field107 = KeyHandler.field131; // L: 847
-			KeyHandler.field110 = 0; // L: 848
-			KeyHandler.field135 = 0; // L: 849
-			Arrays.fill(KeyHandler.field118, false); // L: 850
-			Arrays.fill(KeyHandler.field119, false); // L: 851
-			if (KeyHandler.field122 < 0) { // L: 852
-				Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 853
-				KeyHandler.field122 = KeyHandler.field133; // L: 854
-			} else {
-				while (KeyHandler.field133 != KeyHandler.field122) { // L: 857
-					var2 = KeyHandler.field120[KeyHandler.field133]; // L: 858
-					KeyHandler.field133 = KeyHandler.field133 + 1 & 127; // L: 859
-					if (var2 < 0) { // L: 860
-						var2 = ~var2; // L: 861
-						if (KeyHandler.KeyHandler_pressedKeys[var2]) { // L: 862
-							KeyHandler.KeyHandler_pressedKeys[var2] = false; // L: 863
-							KeyHandler.field119[var2] = true; // L: 864
-							KeyHandler.field127[KeyHandler.field135] = var2; // L: 865
-							++KeyHandler.field135; // L: 866
-						}
+		++cycle; // L: 1061
+		this.doCycleJs5(); // L: 1062
+
+		while (true) {
+			ArchiveDiskAction var1;
+			synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 1066
+				var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 1067
+			} // L: 1068
+
+			if (var1 == null) { // L: 1069
+				class91.method2336(); // L: 1073
+				class148.playPcmPlayers(); // L: 1074
+				int var45;
+				synchronized(KeyHandler.KeyHandler_instance) { // L: 1076
+					++KeyHandler.KeyHandler_idleCycles; // L: 1077
+					KeyHandler.field143 = KeyHandler.field145; // L: 1078
+					KeyHandler.field140 = 0; // L: 1079
+					KeyHandler.field142 = 0; // L: 1080
+					Arrays.fill(KeyHandler.field132, false); // L: 1081
+					Arrays.fill(KeyHandler.field130, false); // L: 1082
+					if (KeyHandler.field120 < 0) { // L: 1083
+						Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 1084
+						KeyHandler.field120 = KeyHandler.field135; // L: 1085
 					} else {
-						if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field110 < KeyHandler.field125.length - 1) { // L: 870
-							KeyHandler.field118[var2] = true; // L: 871
-							KeyHandler.field125[++KeyHandler.field110 - 1] = var2; // L: 872
+						while (KeyHandler.field120 != KeyHandler.field135) { // L: 1088
+							var45 = KeyHandler.field134[KeyHandler.field135]; // L: 1089
+							KeyHandler.field135 = KeyHandler.field135 + 1 & 127; // L: 1090
+							if (var45 < 0) { // L: 1091
+								var45 = ~var45; // L: 1092
+								if (KeyHandler.KeyHandler_pressedKeys[var45]) { // L: 1093
+									KeyHandler.KeyHandler_pressedKeys[var45] = false; // L: 1094
+									KeyHandler.field130[var45] = true; // L: 1095
+									KeyHandler.field141[KeyHandler.field142] = var45; // L: 1096
+									++KeyHandler.field142; // L: 1097
+								}
+							} else {
+								if (!KeyHandler.KeyHandler_pressedKeys[var45] && KeyHandler.field140 < KeyHandler.field139.length - 1) { // L: 1101
+									KeyHandler.field132[var45] = true; // L: 1102
+									KeyHandler.field139[++KeyHandler.field140 - 1] = var45; // L: 1103
+								}
+
+								KeyHandler.KeyHandler_pressedKeys[var45] = true; // L: 1105
+							}
 						}
+					}
 
-						KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 874
+					if (KeyHandler.field140 > 0) { // L: 1109
+						KeyHandler.KeyHandler_idleCycles = 0;
 					}
+
+					KeyHandler.field145 = KeyHandler.field144; // L: 1110
 				}
-			}
 
-			if (KeyHandler.field110 > 0) { // L: 878
-				KeyHandler.KeyHandler_idleCycles = 0;
-			}
+				MenuAction.method1961(); // L: 1113
+				int var46;
+				if (WorldMapDecorationType.mouseWheel != null) { // L: 1114
+					var46 = WorldMapDecorationType.mouseWheel.useRotation(); // L: 1115
+					mouseWheelRotation = var46; // L: 1116
+				}
 
-			KeyHandler.field131 = KeyHandler.field130; // L: 879
-		}
+				if (gameState == 0) { // L: 1118
+					UserComparator10.load(); // L: 1119
+					class17.method292(); // L: 1120
+				} else if (gameState == 5) { // L: 1122
+					Skeleton.method3947(this, class114.fontPlain12); // L: 1123
+					UserComparator10.load(); // L: 1124
+					class91.clock.mark(); // L: 1126
 
-		ModeWhere.method5542(); // L: 882
-		int var45;
-		if (MouseHandler.mouseWheel != null) { // L: 883
-			var45 = MouseHandler.mouseWheel.useRotation(); // L: 884
-			mouseWheelRotation = var45; // L: 885
-		}
+					for (var46 = 0; var46 < 32; ++var46) { // L: 1127
+						GameEngine.graphicsTickTimes[var46] = 0L;
+					}
 
-		if (gameState == 0) { // L: 887
-			NetSocket.load(); // L: 888
-			Clock.clock.mark(); // L: 890
+					for (var46 = 0; var46 < 32; ++var46) { // L: 1128
+						GameEngine.clientTickTimes[var46] = 0L;
+					}
 
-			for (var45 = 0; var45 < 32; ++var45) { // L: 891
-				GameEngine.graphicsTickTimes[var45] = 0L;
-			}
+					GameEngine.gameCyclesToDo = 0; // L: 1129
+				} else if (gameState != 10 && gameState != 11) { // L: 1132
+					if (gameState == 20) { // L: 1133
+						Skeleton.method3947(this, class114.fontPlain12); // L: 1134
+						this.doCycleLoggedOut(); // L: 1135
+					} else if (gameState == 25) { // L: 1137
+						ClientPacket.method5001(false); // L: 1138
+						field529 = 0; // L: 1139
+						boolean var77 = true; // L: 1140
 
-			for (var45 = 0; var45 < 32; ++var45) { // L: 892
-				GameEngine.clientTickTimes[var45] = 0L;
-			}
+						for (var45 = 0; var45 < TileItem.regionLandArchives.length; ++var45) { // L: 1141
+							if (Tiles.regionMapArchiveIds[var45] != -1 && TileItem.regionLandArchives[var45] == null) { // L: 1142 1143
+								TileItem.regionLandArchives[var45] = class140.archive5.takeFile(Tiles.regionMapArchiveIds[var45], 0); // L: 1144
+								if (TileItem.regionLandArchives[var45] == null) { // L: 1145
+									var77 = false; // L: 1146
+									++field529; // L: 1147
+								}
+							}
 
-			class1.gameCyclesToDo = 0; // L: 893
-		} else if (gameState == 5) { // L: 896
-			class272.method5197(this, class6.fontPlain12); // L: 897
-			NetSocket.load(); // L: 898
-			Clock.clock.mark(); // L: 900
+							if (class10.regionLandArchiveIds[var45] != -1 && VarpDefinition.regionMapArchives[var45] == null) { // L: 1151 1152
+								VarpDefinition.regionMapArchives[var45] = class140.archive5.takeFileEncrypted(class10.regionLandArchiveIds[var45], 0, WorldMapID.xteaKeys[var45]); // L: 1153
+								if (VarpDefinition.regionMapArchives[var45] == null) { // L: 1154
+									var77 = false; // L: 1155
+									++field529; // L: 1156
+								}
+							}
+						}
 
-			for (var45 = 0; var45 < 32; ++var45) { // L: 901
-				GameEngine.graphicsTickTimes[var45] = 0L;
-			}
+						if (!var77) { // L: 1161
+							field602 = 1; // L: 1162
+						} else {
+							field617 = 0; // L: 1165
+							var77 = true; // L: 1166
 
-			for (var45 = 0; var45 < 32; ++var45) { // L: 902
-				GameEngine.clientTickTimes[var45] = 0L;
-			}
+							int var5;
+							boolean var8;
+							Buffer var9;
+							int var10;
+							int var11;
+							int var12;
+							int var14;
+							int var15;
+							int var16;
+							int var17;
+							int var18;
+							int var19;
+							int var47;
+							for (var45 = 0; var45 < TileItem.regionLandArchives.length; ++var45) { // L: 1167
+								byte[] var3 = VarpDefinition.regionMapArchives[var45]; // L: 1168
+								if (var3 != null) { // L: 1169
+									var47 = (class269.regions[var45] >> 8) * 64 - class131.baseX; // L: 1170
+									var5 = (class269.regions[var45] & 255) * 64 - TileItem.baseY; // L: 1171
+									if (isInInstance) { // L: 1172
+										var47 = 10; // L: 1173
+										var5 = 10; // L: 1174
+									}
 
-			class1.gameCyclesToDo = 0; // L: 903
-		} else if (gameState != 10 && gameState != 11) { // L: 906
-			if (gameState == 20) { // L: 907
-				class272.method5197(this, class6.fontPlain12); // L: 908
-				this.doCycleLoggedOut(); // L: 909
-			} else if (gameState == 25) { // L: 911
-				MenuAction.method1912(false); // L: 912
-				field521 = 0; // L: 913
-				boolean var70 = true; // L: 914
-
-				for (var2 = 0; var2 < ModeWhere.regionLandArchives.length; ++var2) { // L: 915
-					if (class119.regionMapArchiveIds[var2] != -1 && ModeWhere.regionLandArchives[var2] == null) { // L: 916 917
-						ModeWhere.regionLandArchives[var2] = class11.archive5.takeFile(class119.regionMapArchiveIds[var2], 0); // L: 918
-						if (ModeWhere.regionLandArchives[var2] == null) { // L: 919
-							var70 = false; // L: 920
-							++field521; // L: 921
-						}
-					}
+									var8 = true; // L: 1179
+									var9 = new Buffer(var3); // L: 1180
+									var10 = -1; // L: 1181
 
-					if (class21.regionLandArchiveIds[var2] != -1 && class184.regionMapArchives[var2] == null) { // L: 925 926
-						class184.regionMapArchives[var2] = class11.archive5.takeFileEncrypted(class21.regionLandArchiveIds[var2], 0, xteaKeys[var2]); // L: 927
-						if (class184.regionMapArchives[var2] == null) { // L: 928
-							var70 = false; // L: 929
-							++field521; // L: 930
-						}
-					}
-				}
+									label1403:
+									while (true) {
+										var11 = var9.method7378(); // L: 1183
+										if (var11 == 0) { // L: 1184
+											var77 &= var8; // L: 1217
+											break;
+										}
 
-				if (!var70) { // L: 935
-					field485 = 1; // L: 936
-				} else {
-					field523 = 0; // L: 939
-					var70 = true; // L: 940
-
-					int var4;
-					int var5;
-					for (var2 = 0; var2 < ModeWhere.regionLandArchives.length; ++var2) { // L: 941
-						byte[] var3 = class184.regionMapArchives[var2]; // L: 942
-						if (var3 != null) { // L: 943
-							var4 = (LoginScreenAnimation.regions[var2] >> 8) * 64 - class19.baseX; // L: 944
-							var5 = (LoginScreenAnimation.regions[var2] & 255) * 64 - DefaultsGroup.baseY; // L: 945
-							if (isInInstance) { // L: 946
-								var4 = 10; // L: 947
-								var5 = 10; // L: 948
-							}
+										var10 += var11; // L: 1185
+										var12 = 0; // L: 1186
+										boolean var13 = false; // L: 1187
 
-							var70 &= class9.method69(var3, var4, var5); // L: 950
-						}
-					}
+										while (true) {
+											while (!var13) { // L: 1189
+												var14 = var9.readUShortSmart(); // L: 1195
+												if (var14 == 0) { // L: 1196
+													continue label1403;
+												}
 
-					if (!var70) { // L: 953
-						field485 = 2; // L: 954
-					} else {
-						if (field485 != 0) { // L: 957
-							class91.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + 100 + "%" + ")", true);
-						}
+												var12 += var14 - 1; // L: 1197
+												var15 = var12 & 63; // L: 1198
+												var16 = var12 >> 6 & 63; // L: 1199
+												var17 = var9.readUnsignedByte() >> 2; // L: 1200
+												var18 = var16 + var47; // L: 1201
+												var19 = var15 + var5; // L: 1202
+												if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { // L: 1203
+													ObjectComposition var20 = class148.getObjectDefinition(var10); // L: 1204
+													if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { // L: 1205
+														if (!var20.needsModelFiles()) { // L: 1206
+															++field617; // L: 1207
+															var8 = false; // L: 1208
+														}
 
-						class14.playPcmPlayers(); // L: 958
-						GameBuild.scene.clear(); // L: 959
+														var13 = true; // L: 1210
+													}
+												}
+											}
 
-						for (var2 = 0; var2 < 4; ++var2) { // L: 960
-							collisionMaps[var2].clear();
-						}
+											var14 = var9.readUShortSmart(); // L: 1190
+											if (var14 == 0) { // L: 1191
+												break;
+											}
 
-						int var46;
-						for (var2 = 0; var2 < 4; ++var2) { // L: 961
-							for (var46 = 0; var46 < 104; ++var46) { // L: 962
-								for (var4 = 0; var4 < 104; ++var4) { // L: 963
-									Tiles.Tiles_renderFlags[var2][var46][var4] = 0; // L: 964
+											var9.readUnsignedByte(); // L: 1192
+										}
+									}
 								}
 							}
-						}
 
-						class14.playPcmPlayers(); // L: 968
-						Tiles.Tiles_minPlane = 99; // L: 970
-						Tiles.Tiles_underlays = new byte[4][104][104]; // L: 971
-						Tiles.Tiles_overlays = new byte[4][104][104]; // L: 972
-						Tiles.Tiles_shapes = new byte[4][104][104]; // L: 973
-						Tiles.field969 = new byte[4][104][104]; // L: 974
-						Tiles.field962 = new int[4][105][105]; // L: 975
-						class54.field419 = new byte[4][105][105]; // L: 976
-						DirectByteArrayCopier.field3212 = new int[105][105]; // L: 977
-						TileItem.Tiles_hue = new int[104]; // L: 978
-						class397.Tiles_saturation = new int[104]; // L: 979
-						Tiles.Tiles_lightness = new int[104]; // L: 980
-						class1.Tiles_hueMultiplier = new int[104]; // L: 981
-						MouseRecorder.field1039 = new int[104]; // L: 982
-						var2 = ModeWhere.regionLandArchives.length; // L: 984
-
-						for (ObjectSound var59 = (ObjectSound)ObjectSound.objectSounds.last(); var59 != null; var59 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 986
-							if (var59.stream1 != null) { // L: 987
-								BuddyRankComparator.pcmStreamMixer.removeSubStream(var59.stream1); // L: 988
-								var59.stream1 = null; // L: 989
-							}
+							if (!var77) { // L: 1220
+								field602 = 2; // L: 1221
+							} else {
+								if (field602 != 0) { // L: 1224
+									ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + 100 + "%" + ")", true);
+								}
 
-							if (var59.stream2 != null) { // L: 991
-								BuddyRankComparator.pcmStreamMixer.removeSubStream(var59.stream2); // L: 992
-								var59.stream2 = null; // L: 993
-							}
-						}
+								class148.playPcmPlayers(); // L: 1225
+								class7.scene.clear(); // L: 1226
 
-						ObjectSound.objectSounds.clear(); // L: 996
-						MenuAction.method1912(true); // L: 998
-						int var48;
-						if (!isInInstance) { // L: 999
-							byte[] var6;
-							for (var46 = 0; var46 < var2; ++var46) { // L: 1000
-								var4 = (LoginScreenAnimation.regions[var46] >> 8) * 64 - class19.baseX; // L: 1001
-								var5 = (LoginScreenAnimation.regions[var46] & 255) * 64 - DefaultsGroup.baseY; // L: 1002
-								var6 = ModeWhere.regionLandArchives[var46]; // L: 1003
-								if (var6 != null) { // L: 1004
-									class14.playPcmPlayers(); // L: 1005
-									FontName.method6688(var6, var4, var5, ItemLayer.field2243 * 8 - 48, WallDecoration.field2630 * 8 - 48, collisionMaps); // L: 1006
+								for (var45 = 0; var45 < 4; ++var45) { // L: 1227
+									collisionMaps[var45].clear();
 								}
-							}
 
-							for (var46 = 0; var46 < var2; ++var46) { // L: 1009
-								var4 = (LoginScreenAnimation.regions[var46] >> 8) * 64 - class19.baseX; // L: 1010
-								var5 = (LoginScreenAnimation.regions[var46] & 255) * 64 - DefaultsGroup.baseY; // L: 1011
-								var6 = ModeWhere.regionLandArchives[var46]; // L: 1012
-								if (var6 == null && WallDecoration.field2630 < 800) { // L: 1013
-									class14.playPcmPlayers(); // L: 1014
-									class247.method4751(var4, var5, 64, 64); // L: 1015
+								int var48;
+								for (var45 = 0; var45 < 4; ++var45) { // L: 1228
+									for (var48 = 0; var48 < 104; ++var48) { // L: 1229
+										for (var47 = 0; var47 < 104; ++var47) { // L: 1230
+											Tiles.Tiles_renderFlags[var45][var48][var47] = 0; // L: 1231
+										}
+									}
 								}
-							}
 
-							MenuAction.method1912(true); // L: 1018
+								class148.playPcmPlayers(); // L: 1235
+								class118.method2686(); // L: 1236
+								var45 = TileItem.regionLandArchives.length; // L: 1237
+								GrandExchangeEvent.method5760(); // L: 1238
+								ClientPacket.method5001(true); // L: 1239
+								int var6;
+								int var21;
+								int var22;
+								int var52;
+								int var72;
+								if (!isInInstance) { // L: 1240
+									byte[] var49;
+									for (var48 = 0; var48 < var45; ++var48) { // L: 1241
+										var47 = (class269.regions[var48] >> 8) * 64 - class131.baseX; // L: 1242
+										var5 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; // L: 1243
+										var49 = TileItem.regionLandArchives[var48]; // L: 1244
+										if (var49 != null) { // L: 1245
+											class148.playPcmPlayers(); // L: 1246
+											class10.method119(var49, var47, var5, Messages.field1277 * 8 - 48, class4.field9 * 8 - 48, collisionMaps); // L: 1247
+										}
+									}
 
-							for (var46 = 0; var46 < var2; ++var46) { // L: 1019
-								byte[] var47 = class184.regionMapArchives[var46]; // L: 1020
-								if (var47 != null) { // L: 1021
-									var5 = (LoginScreenAnimation.regions[var46] >> 8) * 64 - class19.baseX; // L: 1022
-									var48 = (LoginScreenAnimation.regions[var46] & 255) * 64 - DefaultsGroup.baseY; // L: 1023
-									class14.playPcmPlayers(); // L: 1024
-									PendingSpawn.method2162(var47, var5, var48, GameBuild.scene, collisionMaps); // L: 1025
-								}
-							}
-						}
+									for (var48 = 0; var48 < var45; ++var48) { // L: 1250
+										var47 = (class269.regions[var48] >> 8) * 64 - class131.baseX; // L: 1251
+										var5 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; // L: 1252
+										var49 = TileItem.regionLandArchives[var48]; // L: 1253
+										if (var49 == null && class4.field9 < 800) { // L: 1254
+											class148.playPcmPlayers(); // L: 1255
+											class112.method2572(var47, var5, 64, 64); // L: 1256
+										}
+									}
 
-						int var7;
-						int var8;
-						int var9;
-						int var10;
-						int var11;
-						int var12;
-						int var13;
-						int var14;
-						int var15;
-						int var16;
-						int var17;
-						int var21;
-						int var22;
-						int var23;
-						int var24;
-						int var25;
-						int var26;
-						int var27;
-						int var28;
-						int var29;
-						int var30;
-						int var32;
-						int var33;
-						int var34;
-						if (isInInstance) { // L: 1029
-							var46 = 0;
-
-							label1259:
-							while (true) {
-								if (var46 >= 4) {
-									for (var46 = 0; var46 < 13; ++var46) { // L: 1072
-										for (var4 = 0; var4 < 13; ++var4) { // L: 1073
-											var5 = instanceChunkTemplates[0][var46][var4]; // L: 1074
-											if (var5 == -1) { // L: 1075
-												class247.method4751(var46 * 8, var4 * 8, 8, 8); // L: 1076
+									ClientPacket.method5001(true); // L: 1259
+
+									for (var48 = 0; var48 < var45; ++var48) { // L: 1260
+										byte[] var4 = VarpDefinition.regionMapArchives[var48]; // L: 1261
+										if (var4 != null) { // L: 1262
+											var5 = (class269.regions[var48] >> 8) * 64 - class131.baseX; // L: 1263
+											var6 = (class269.regions[var48] & 255) * 64 - TileItem.baseY; // L: 1264
+											class148.playPcmPlayers(); // L: 1265
+											Scene var50 = class7.scene; // L: 1266
+											CollisionMap[] var51 = collisionMaps; // L: 1267
+											var9 = new Buffer(var4); // L: 1269
+											var10 = -1; // L: 1270
+
+											while (true) {
+												var11 = var9.method7378(); // L: 1272
+												if (var11 == 0) { // L: 1273
+													break;
+												}
+
+												var10 += var11; // L: 1274
+												var12 = 0; // L: 1275
+
+												while (true) {
+													var72 = var9.readUShortSmart(); // L: 1277
+													if (var72 == 0) { // L: 1278
+														break;
+													}
+
+													var12 += var72 - 1; // L: 1279
+													var14 = var12 & 63; // L: 1280
+													var15 = var12 >> 6 & 63; // L: 1281
+													var16 = var12 >> 12; // L: 1282
+													var17 = var9.readUnsignedByte(); // L: 1283
+													var18 = var17 >> 2; // L: 1284
+													var19 = var17 & 3; // L: 1285
+													var52 = var5 + var15; // L: 1286
+													var21 = var6 + var14; // L: 1287
+													if (var52 > 0 && var21 > 0 && var52 < 103 && var21 < 103) { // L: 1288
+														var22 = var16; // L: 1289
+														if ((Tiles.Tiles_renderFlags[1][var52][var21] & 2) == 2) { // L: 1290
+															var22 = var16 - 1;
+														}
+
+														CollisionMap var23 = null; // L: 1291
+														if (var22 >= 0) { // L: 1292
+															var23 = var51[var22];
+														}
+
+														ClanChannel.method2996(var16, var52, var21, var10, var19, var18, var50, var23); // L: 1293
+													}
+												}
 											}
 										}
 									}
+								}
 
-									MenuAction.method1912(true); // L: 1080
-									var46 = 0;
-
+								int var7;
+								int[] var10000;
+								int var25;
+								int var26;
+								int var27;
+								int var28;
+								int var29;
+								int var30;
+								int var33;
+								int var34;
+								int var35;
+								int var36;
+								int var37;
+								int var39;
+								int var40;
+								int var41;
+								int var53;
+								int var56;
+								int var59;
+								int var69;
+								if (isInInstance) { // L: 1301
+									var48 = 0;
+
+									label1308:
 									while (true) {
-										if (var46 >= 4) {
-											break label1259;
-										}
+										int var38;
+										CollisionMap[] var55;
+										Buffer var73;
+										if (var48 >= 4) {
+											for (var48 = 0; var48 < 13; ++var48) { // L: 1398
+												for (var47 = 0; var47 < 13; ++var47) { // L: 1399
+													var5 = instanceChunkTemplates[0][var48][var47]; // L: 1400
+													if (var5 == -1) { // L: 1401
+														class112.method2572(var48 * 8, var47 * 8, 8, 8); // L: 1402
+													}
+												}
+											}
 
-										class14.playPcmPlayers(); // L: 1082
-
-										for (var4 = 0; var4 < 13; ++var4) { // L: 1083
-											label1182:
-											for (var5 = 0; var5 < 13; ++var5) { // L: 1084
-												var48 = instanceChunkTemplates[var46][var4][var5]; // L: 1085
-												if (var48 != -1) { // L: 1086
-													var7 = var48 >> 24 & 3; // L: 1087
-													var8 = var48 >> 1 & 3; // L: 1088
-													var9 = var48 >> 14 & 1023; // L: 1089
-													var10 = var48 >> 3 & 2047; // L: 1090
-													var11 = (var9 / 8 << 8) + var10 / 8; // L: 1091
-
-													for (var12 = 0; var12 < LoginScreenAnimation.regions.length; ++var12) { // L: 1092
-														if (LoginScreenAnimation.regions[var12] == var11 && class184.regionMapArchives[var12] != null) { // L: 1093
-															byte[] var49 = class184.regionMapArchives[var12]; // L: 1094
-															var14 = var4 * 8; // L: 1095
-															var15 = var5 * 8; // L: 1096
-															var16 = (var9 & 7) * 8; // L: 1097
-															var17 = (var10 & 7) * 8; // L: 1098
-															Scene var18 = GameBuild.scene; // L: 1099
-															CollisionMap[] var19 = collisionMaps; // L: 1100
-															Buffer var20 = new Buffer(var49); // L: 1102
-															var21 = -1; // L: 1103
-
-															while (true) {
-																var22 = var20.method6981(); // L: 1105
-																if (var22 == 0) { // L: 1106
-																	continue label1182;
-																}
+											ClientPacket.method5001(true); // L: 1406
+											var48 = 0;
+
+											while (true) {
+												if (var48 >= 4) {
+													break label1308;
+												}
 
-																var21 += var22; // L: 1107
-																var23 = 0; // L: 1108
+												class148.playPcmPlayers(); // L: 1408
+
+												for (var47 = 0; var47 < 13; ++var47) { // L: 1409
+													label1231:
+													for (var5 = 0; var5 < 13; ++var5) { // L: 1410
+														var6 = instanceChunkTemplates[var48][var47][var5]; // L: 1411
+														if (var6 != -1) { // L: 1412
+															var7 = var6 >> 24 & 3; // L: 1413
+															var69 = var6 >> 1 & 3; // L: 1414
+															var53 = var6 >> 14 & 1023; // L: 1415
+															var10 = var6 >> 3 & 2047; // L: 1416
+															var11 = (var53 / 8 << 8) + var10 / 8; // L: 1417
+
+															for (var12 = 0; var12 < class269.regions.length; ++var12) { // L: 1418
+																if (class269.regions[var12] == var11 && VarpDefinition.regionMapArchives[var12] != null) { // L: 1419
+																	byte[] var57 = VarpDefinition.regionMapArchives[var12]; // L: 1420
+																	var14 = var47 * 8; // L: 1421
+																	var15 = var5 * 8; // L: 1422
+																	var16 = (var53 & 7) * 8; // L: 1423
+																	var17 = (var10 & 7) * 8; // L: 1424
+																	Scene var58 = class7.scene; // L: 1425
+																	var55 = collisionMaps; // L: 1426
+																	var73 = new Buffer(var57); // L: 1428
+																	var21 = -1; // L: 1429
+
+																	while (true) {
+																		var22 = var73.method7378(); // L: 1431
+																		if (var22 == 0) { // L: 1432
+																			continue label1231;
+																		}
 
-																while (true) {
-																	var24 = var20.readUShortSmart(); // L: 1110
-																	if (var24 == 0) { // L: 1111
-																		break;
-																	}
+																		var21 += var22; // L: 1433
+																		var56 = 0; // L: 1434
 
-																	var23 += var24 - 1; // L: 1112
-																	var25 = var23 & 63; // L: 1113
-																	var26 = var23 >> 6 & 63; // L: 1114
-																	var27 = var23 >> 12; // L: 1115
-																	var28 = var20.readUnsignedByte(); // L: 1116
-																	var29 = var28 >> 2; // L: 1117
-																	var30 = var28 & 3; // L: 1118
-																	if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1119
-																		ObjectComposition var31 = KitDefinition.getObjectDefinition(var21); // L: 1120
-																		Object var10001 = null; // L: 1121
-																		var32 = var14 + SoundSystem.method780(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30);
-																		var10001 = null; // L: 1122
-																		var33 = var15 + WorldMapRectangle.method3960(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30);
-																		if (var32 > 0 && var33 > 0 && var32 < 103 && var33 < 103) { // L: 1123
-																			var34 = var46; // L: 1124
-																			if ((Tiles.Tiles_renderFlags[1][var32][var33] & 2) == 2) { // L: 1125
-																				var34 = var46 - 1;
+																		while (true) {
+																			var59 = var73.readUShortSmart(); // L: 1436
+																			if (var59 == 0) { // L: 1437
+																				break;
 																			}
 
-																			CollisionMap var35 = null; // L: 1126
-																			if (var34 >= 0) { // L: 1127
-																				var35 = var19[var34];
-																			}
+																			var56 += var59 - 1; // L: 1438
+																			var25 = var56 & 63; // L: 1439
+																			var26 = var56 >> 6 & 63; // L: 1440
+																			var27 = var56 >> 12; // L: 1441
+																			var28 = var73.readUnsignedByte(); // L: 1442
+																			var29 = var28 >> 2; // L: 1443
+																			var30 = var28 & 3; // L: 1444
+																			if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1445
+																				ObjectComposition var31 = class148.getObjectDefinition(var21); // L: 1446
+																				var34 = var26 & 7; // L: 1449
+																				var35 = var25 & 7; // L: 1450
+																				var37 = var31.sizeX; // L: 1452
+																				var38 = var31.sizeY; // L: 1453
+																				if ((var30 & 1) == 1) { // L: 1455
+																					var39 = var37; // L: 1456
+																					var37 = var38; // L: 1457
+																					var38 = var39; // L: 1458
+																				}
+
+																				var36 = var69 & 3; // L: 1460
+																				if (var36 == 0) { // L: 1461
+																					var33 = var34; // L: 1462
+																				} else if (var36 == 1) { // L: 1465
+																					var33 = var35; // L: 1466
+																				} else if (var36 == 2) { // L: 1469
+																					var33 = 7 - var34 - (var37 - 1); // L: 1470
+																				} else {
+																					var33 = 7 - var35 - (var38 - 1); // L: 1473
+																				}
+
+																				var39 = var33 + var14; // L: 1475
+																				Object var10001 = null; // L: 1476
+																				var40 = var15 + Calendar.method5320(var26 & 7, var25 & 7, var69, var31.sizeX, var31.sizeY, var30);
+																				if (var39 > 0 && var40 > 0 && var39 < 103 && var40 < 103) { // L: 1477
+																					var41 = var48; // L: 1478
+																					if ((Tiles.Tiles_renderFlags[1][var39][var40] & 2) == 2) { // L: 1479
+																						var41 = var48 - 1;
+																					}
+
+																					CollisionMap var42 = null; // L: 1480
+																					if (var41 >= 0) { // L: 1481
+																						var42 = var55[var41];
+																					}
 
-																			class92.method2276(var46, var32, var33, var21, var8 + var30 & 3, var29, var18, var35); // L: 1128
+																					ClanChannel.method2996(var48, var39, var40, var21, var69 + var30 & 3, var29, var58, var42); // L: 1482
+																				}
+																			}
 																		}
 																	}
 																}
@@ -2030,1911 +2173,1699 @@ protected final void doCycle() {
 														}
 													}
 												}
+
+												++var48; // L: 1407
 											}
 										}
 
-										++var46; // L: 1081
-									}
-								}
+										class148.playPcmPlayers(); // L: 1303
+
+										for (var47 = 0; var47 < 13; ++var47) { // L: 1304
+											for (var5 = 0; var5 < 13; ++var5) { // L: 1305
+												boolean var67 = false; // L: 1306
+												var7 = instanceChunkTemplates[var48][var47][var5]; // L: 1307
+												if (var7 != -1) { // L: 1308
+													var69 = var7 >> 24 & 3; // L: 1309
+													var53 = var7 >> 1 & 3; // L: 1310
+													var10 = var7 >> 14 & 1023; // L: 1311
+													var11 = var7 >> 3 & 2047; // L: 1312
+													var12 = (var10 / 8 << 8) + var11 / 8; // L: 1313
+
+													for (var72 = 0; var72 < class269.regions.length; ++var72) { // L: 1314
+														if (class269.regions[var72] == var12 && TileItem.regionLandArchives[var72] != null) { // L: 1315
+															byte[] var54 = TileItem.regionLandArchives[var72]; // L: 1316
+															var15 = var47 * 8; // L: 1317
+															var16 = var5 * 8; // L: 1318
+															var17 = (var10 & 7) * 8; // L: 1319
+															var18 = (var11 & 7) * 8; // L: 1320
+															var55 = collisionMaps; // L: 1321
+
+															for (var52 = 0; var52 < 8; ++var52) { // L: 1323
+																for (var21 = 0; var21 < 8; ++var21) { // L: 1324
+																	if (var52 + var15 > 0 && var15 + var52 < 103 && var16 + var21 > 0 && var16 + var21 < 103) { // L: 1325
+																		var10000 = var55[var48].flags[var15 + var52];
+																		var10000[var16 + var21] &= -16777217;
+																	}
+																}
+															}
 
-								class14.playPcmPlayers(); // L: 1031
-
-								for (var4 = 0; var4 < 13; ++var4) { // L: 1032
-									for (var5 = 0; var5 < 13; ++var5) { // L: 1033
-										boolean var71 = false; // L: 1034
-										var7 = instanceChunkTemplates[var46][var4][var5]; // L: 1035
-										if (var7 != -1) { // L: 1036
-											var8 = var7 >> 24 & 3; // L: 1037
-											var9 = var7 >> 1 & 3; // L: 1038
-											var10 = var7 >> 14 & 1023; // L: 1039
-											var11 = var7 >> 3 & 2047; // L: 1040
-											var12 = (var10 / 8 << 8) + var11 / 8; // L: 1041
-
-											for (var13 = 0; var13 < LoginScreenAnimation.regions.length; ++var13) { // L: 1042
-												if (LoginScreenAnimation.regions[var13] == var12 && ModeWhere.regionLandArchives[var13] != null) { // L: 1043
-													FloorOverlayDefinition.method3427(ModeWhere.regionLandArchives[var13], var46, var4 * 8, var5 * 8, var8, (var10 & 7) * 8, (var11 & 7) * 8, var9, collisionMaps); // L: 1044
-													var71 = true; // L: 1045
-													break; // L: 1046
-												}
-											}
-										}
+															var73 = new Buffer(var54); // L: 1328
+
+															for (var21 = 0; var21 < 4; ++var21) { // L: 1329
+																for (var22 = 0; var22 < 64; ++var22) { // L: 1330
+																	for (var56 = 0; var56 < 64; ++var56) { // L: 1331
+																		if (var69 == var21 && var22 >= var17 && var22 < var17 + 8 && var56 >= var18 && var56 < var18 + 8) { // L: 1332
+																			var28 = var22 & 7; // L: 1337
+																			var29 = var56 & 7; // L: 1338
+																			var30 = var53 & 3; // L: 1341
+																			if (var30 == 0) { // L: 1342
+																				var27 = var28; // L: 1343
+																			} else if (var30 == 1) { // L: 1346
+																				var27 = var29; // L: 1347
+																			} else if (var30 == 2) { // L: 1350
+																				var27 = 7 - var28; // L: 1351
+																			} else {
+																				var27 = 7 - var29; // L: 1354
+																			}
 
-										if (!var71) { // L: 1050
-											var8 = var46; // L: 1051
-											var9 = var4 * 8; // L: 1052
-											var10 = var5 * 8; // L: 1053
+																			var33 = var15 + var27; // L: 1358
+																			var36 = var22 & 7; // L: 1361
+																			var37 = var56 & 7; // L: 1362
+																			var38 = var53 & 3; // L: 1365
+																			if (var38 == 0) { // L: 1366
+																				var35 = var37; // L: 1367
+																			} else if (var38 == 1) { // L: 1370
+																				var35 = 7 - var36; // L: 1371
+																			} else if (var38 == 2) { // L: 1374
+																				var35 = 7 - var37; // L: 1375
+																			} else {
+																				var35 = var36; // L: 1378
+																			}
 
-											for (var11 = 0; var11 < 8; ++var11) { // L: 1055
-												for (var12 = 0; var12 < 8; ++var12) { // L: 1056
-													Tiles.Tiles_heights[var8][var11 + var9][var10 + var12] = 0;
-												}
-											}
+																			ScriptFrame.loadTerrain(var73, var48, var33, var16 + var35, 0, 0, var53); // L: 1380
+																		} else {
+																			ScriptFrame.loadTerrain(var73, 0, -1, -1, 0, 0, 0); // L: 1382
+																		}
+																	}
+																}
+															}
 
-											if (var9 > 0) { // L: 1058
-												for (var11 = 1; var11 < 8; ++var11) { // L: 1059
-													Tiles.Tiles_heights[var8][var9][var10 + var11] = Tiles.Tiles_heights[var8][var9 - 1][var11 + var10];
+															var67 = true; // L: 1387
+															break; // L: 1388
+														}
+													}
 												}
-											}
 
-											if (var10 > 0) { // L: 1061
-												for (var11 = 1; var11 < 8; ++var11) { // L: 1062
-													Tiles.Tiles_heights[var8][var9 + var11][var10] = Tiles.Tiles_heights[var8][var9 + var11][var10 - 1];
+												if (!var67) { // L: 1392
+													MenuAction.method1959(var48, var47 * 8, var5 * 8); // L: 1393
 												}
 											}
-
-											if (var9 > 0 && Tiles.Tiles_heights[var8][var9 - 1][var10] != 0) { // L: 1064
-												Tiles.Tiles_heights[var8][var9][var10] = Tiles.Tiles_heights[var8][var9 - 1][var10];
-											} else if (var10 > 0 && Tiles.Tiles_heights[var8][var9][var10 - 1] != 0) { // L: 1065
-												Tiles.Tiles_heights[var8][var9][var10] = Tiles.Tiles_heights[var8][var9][var10 - 1];
-											} else if (var9 > 0 && var10 > 0 && Tiles.Tiles_heights[var8][var9 - 1][var10 - 1] != 0) { // L: 1066
-												Tiles.Tiles_heights[var8][var9][var10] = Tiles.Tiles_heights[var8][var9 - 1][var10 - 1];
-											}
 										}
+
+										++var48; // L: 1302
 									}
 								}
 
-								++var46; // L: 1030
-							}
-						}
-
-						MenuAction.method1912(true); // L: 1142
-						class14.playPcmPlayers(); // L: 1143
-						Scene var60 = GameBuild.scene; // L: 1144
-						CollisionMap[] var69 = collisionMaps; // L: 1145
-
-						for (var5 = 0; var5 < 4; ++var5) { // L: 1147
-							for (var48 = 0; var48 < 104; ++var48) { // L: 1148
-								for (var7 = 0; var7 < 104; ++var7) { // L: 1149
-									if ((Tiles.Tiles_renderFlags[var5][var48][var7] & 1) == 1) { // L: 1150
-										var8 = var5; // L: 1151
-										if ((Tiles.Tiles_renderFlags[1][var48][var7] & 2) == 2) { // L: 1152
-											var8 = var5 - 1;
-										}
+								ClientPacket.method5001(true); // L: 1496
+								class148.playPcmPlayers(); // L: 1497
+								Scene var65 = class7.scene; // L: 1498
+								CollisionMap[] var66 = collisionMaps; // L: 1499
+
+								for (var5 = 0; var5 < 4; ++var5) { // L: 1501
+									for (var6 = 0; var6 < 104; ++var6) { // L: 1502
+										for (var7 = 0; var7 < 104; ++var7) { // L: 1503
+											if ((Tiles.Tiles_renderFlags[var5][var6][var7] & 1) == 1) { // L: 1504
+												var69 = var5; // L: 1505
+												if ((Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 1506
+													var69 = var5 - 1;
+												}
 
-										if (var8 >= 0) { // L: 1153
-											var69[var8].setBlockedByFloor(var48, var7);
+												if (var69 >= 0) { // L: 1507
+													var66[var69].setBlockedByFloor(var6, var7);
+												}
+											}
 										}
 									}
 								}
-							}
-						}
-
-						Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 1158
-						if (Tiles.rndHue < -8) { // L: 1159
-							Tiles.rndHue = -8;
-						}
-
-						if (Tiles.rndHue > 8) { // L: 1160
-							Tiles.rndHue = 8;
-						}
-
-						Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 1161
-						if (Tiles.rndLightness < -16) { // L: 1162
-							Tiles.rndLightness = -16;
-						}
-
-						if (Tiles.rndLightness > 16) { // L: 1163
-							Tiles.rndLightness = 16;
-						}
 
-						int[] var10000;
-						int var50;
-						int var51;
-						int var52;
-						for (var5 = 0; var5 < 4; ++var5) { // L: 1164
-							byte[][] var61 = class54.field419[var5]; // L: 1165
-							var12 = (int)Math.sqrt(5100.0D); // L: 1171
-							var13 = var12 * 768 >> 8; // L: 1172
-
-							for (var14 = 1; var14 < 103; ++var14) { // L: 1173
-								for (var15 = 1; var15 < 103; ++var15) { // L: 1174
-									var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; // L: 1175
-									var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; // L: 1176
-									var50 = (int)Math.sqrt((double)(var16 * var16 + var17 * var17 + 65536)); // L: 1177
-									var51 = (var16 << 8) / var50; // L: 1178
-									var52 = 65536 / var50; // L: 1179
-									var21 = (var17 << 8) / var50; // L: 1180
-									var22 = (var51 * -50 + var21 * -50 + var52 * -10) / var13 + 96; // L: 1181
-									var23 = (var61[var15][var14 + 1] >> 3) + (var61[var15 - 1][var14] >> 2) + (var61[var15][var14 - 1] >> 2) + (var61[var15 + 1][var14] >> 3) + (var61[var15][var14] >> 1); // L: 1182
-									DirectByteArrayCopier.field3212[var15][var14] = var22 - var23; // L: 1183
+								Tiles.rndHue += (int)(Math.random() * 5.0D) - 2; // L: 1512
+								if (Tiles.rndHue < -8) { // L: 1513
+									Tiles.rndHue = -8;
 								}
-							}
 
-							for (var14 = 0; var14 < 104; ++var14) { // L: 1186
-								TileItem.Tiles_hue[var14] = 0; // L: 1187
-								class397.Tiles_saturation[var14] = 0; // L: 1188
-								Tiles.Tiles_lightness[var14] = 0; // L: 1189
-								class1.Tiles_hueMultiplier[var14] = 0; // L: 1190
-								MouseRecorder.field1039[var14] = 0; // L: 1191
-							}
+								if (Tiles.rndHue > 8) { // L: 1514
+									Tiles.rndHue = 8;
+								}
 
-							for (var14 = -5; var14 < 109; ++var14) { // L: 1193
-								for (var15 = 0; var15 < 104; ++var15) { // L: 1194
-									var16 = var14 + 5; // L: 1195
-									int var10002;
-									if (var16 >= 0 && var16 < 104) { // L: 1196
-										var17 = Tiles.Tiles_underlays[var5][var16][var15] & 255; // L: 1197
-										if (var17 > 0) { // L: 1198
-											var51 = var17 - 1; // L: 1200
-											FloorUnderlayDefinition var67 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var51); // L: 1202
-											FloorUnderlayDefinition var64;
-											if (var67 != null) { // L: 1203
-												var64 = var67; // L: 1204
-											} else {
-												byte[] var53 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var51); // L: 1207
-												var67 = new FloorUnderlayDefinition(); // L: 1208
-												if (var53 != null) { // L: 1209
-													var67.decode(new Buffer(var53), var51);
-												}
+								Tiles.rndLightness += (int)(Math.random() * 5.0D) - 2; // L: 1515
+								if (Tiles.rndLightness < -16) { // L: 1516
+									Tiles.rndLightness = -16;
+								}
 
-												var67.postDecode(); // L: 1210
-												FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var67, (long)var51); // L: 1211
-												var64 = var67; // L: 1212
-											}
+								if (Tiles.rndLightness > 16) { // L: 1517
+									Tiles.rndLightness = 16;
+								}
 
-											var10000 = TileItem.Tiles_hue; // L: 1215
-											var10000[var15] += var64.hue;
-											var10000 = class397.Tiles_saturation; // L: 1216
-											var10000[var15] += var64.saturation;
-											var10000 = Tiles.Tiles_lightness; // L: 1217
-											var10000[var15] += var64.lightness;
-											var10000 = class1.Tiles_hueMultiplier; // L: 1218
-											var10000[var15] += var64.hueMultiplier;
-											var10002 = MouseRecorder.field1039[var15]++; // L: 1219
+								for (var5 = 0; var5 < 4; ++var5) { // L: 1518
+									byte[][] var78 = SoundCache.field321[var5]; // L: 1519
+									boolean var68 = true; // L: 1520
+									var8 = true; // L: 1521
+									boolean var81 = true; // L: 1522
+									boolean var70 = true; // L: 1523
+									boolean var71 = true; // L: 1524
+									var12 = (int)Math.sqrt(5100.0D); // L: 1525
+									var72 = var12 * 768 >> 8; // L: 1526
+
+									for (var14 = 1; var14 < 103; ++var14) { // L: 1527
+										for (var15 = 1; var15 < 103; ++var15) { // L: 1528
+											var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; // L: 1529
+											var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; // L: 1530
+											var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536)); // L: 1531
+											var19 = (var16 << 8) / var18; // L: 1532
+											var52 = 65536 / var18; // L: 1533
+											var21 = (var17 << 8) / var18; // L: 1534
+											var22 = (var19 * -50 + var21 * -50 + var52 * -10) / var72 + 96; // L: 1535
+											var56 = (var78[var15 - 1][var14] >> 2) + (var78[var15][var14 - 1] >> 2) + (var78[var15 + 1][var14] >> 3) + (var78[var15][var14 + 1] >> 3) + (var78[var15][var14] >> 1); // L: 1536
+											class194.field2280[var15][var14] = var22 - var56; // L: 1537
 										}
 									}
 
-									var17 = var14 - 5; // L: 1222
-									if (var17 >= 0 && var17 < 104) { // L: 1223
-										var50 = Tiles.Tiles_underlays[var5][var17][var15] & 255; // L: 1224
-										if (var50 > 0) { // L: 1225
-											var52 = var50 - 1; // L: 1227
-											FloorUnderlayDefinition var72 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var52); // L: 1229
-											FloorUnderlayDefinition var65;
-											if (var72 != null) { // L: 1230
-												var65 = var72; // L: 1231
-											} else {
-												byte[] var54 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var52); // L: 1234
-												var72 = new FloorUnderlayDefinition(); // L: 1235
-												if (var54 != null) { // L: 1236
-													var72.decode(new Buffer(var54), var52);
-												}
+									for (var14 = 0; var14 < 104; ++var14) { // L: 1540
+										Tiles.Tiles_hue[var14] = 0; // L: 1541
+										User.Tiles_saturation[var14] = 0; // L: 1542
+										Tiles.Tiles_lightness[var14] = 0; // L: 1543
+										UserComparator5.Tiles_hueMultiplier[var14] = 0; // L: 1544
+										VerticalAlignment.field1874[var14] = 0; // L: 1545
+									}
 
-												var72.postDecode(); // L: 1237
-												FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var72, (long)var52); // L: 1238
-												var65 = var72; // L: 1239
+									for (var14 = -5; var14 < 109; ++var14) { // L: 1547
+										for (var15 = 0; var15 < 104; ++var15) { // L: 1548
+											var16 = var14 + 5; // L: 1549
+											int var10002;
+											if (var16 >= 0 && var16 < 104) { // L: 1550
+												var17 = Tiles.Tiles_underlays[var5][var16][var15] & 255; // L: 1551
+												if (var17 > 0) { // L: 1552
+													FloorUnderlayDefinition var83 = InterfaceParent.method2144(var17 - 1); // L: 1553
+													var10000 = Tiles.Tiles_hue; // L: 1554
+													var10000[var15] += var83.hue;
+													var10000 = User.Tiles_saturation; // L: 1555
+													var10000[var15] += var83.saturation;
+													var10000 = Tiles.Tiles_lightness; // L: 1556
+													var10000[var15] += var83.lightness;
+													var10000 = UserComparator5.Tiles_hueMultiplier; // L: 1557
+													var10000[var15] += var83.hueMultiplier;
+													var10002 = VerticalAlignment.field1874[var15]++; // L: 1558
+												}
 											}
 
-											var10000 = TileItem.Tiles_hue; // L: 1242
-											var10000[var15] -= var65.hue;
-											var10000 = class397.Tiles_saturation; // L: 1243
-											var10000[var15] -= var65.saturation;
-											var10000 = Tiles.Tiles_lightness; // L: 1244
-											var10000[var15] -= var65.lightness;
-											var10000 = class1.Tiles_hueMultiplier; // L: 1245
-											var10000[var15] -= var65.hueMultiplier;
-											var10002 = MouseRecorder.field1039[var15]--; // L: 1246
-										}
-									}
-								}
-
-								if (var14 >= 1 && var14 < 103) { // L: 1250
-									var15 = 0; // L: 1251
-									var16 = 0; // L: 1252
-									var17 = 0; // L: 1253
-									var50 = 0; // L: 1254
-									var51 = 0; // L: 1255
-
-									for (var52 = -5; var52 < 109; ++var52) { // L: 1256
-										var21 = var52 + 5; // L: 1257
-										if (var21 >= 0 && var21 < 104) { // L: 1258
-											var15 += TileItem.Tiles_hue[var21]; // L: 1259
-											var16 += class397.Tiles_saturation[var21]; // L: 1260
-											var17 += Tiles.Tiles_lightness[var21]; // L: 1261
-											var50 += class1.Tiles_hueMultiplier[var21]; // L: 1262
-											var51 += MouseRecorder.field1039[var21]; // L: 1263
+											var17 = var14 - 5; // L: 1561
+											if (var17 >= 0 && var17 < 104) { // L: 1562
+												var18 = Tiles.Tiles_underlays[var5][var17][var15] & 255; // L: 1563
+												if (var18 > 0) { // L: 1564
+													FloorUnderlayDefinition var82 = InterfaceParent.method2144(var18 - 1); // L: 1565
+													var10000 = Tiles.Tiles_hue; // L: 1566
+													var10000[var15] -= var82.hue;
+													var10000 = User.Tiles_saturation; // L: 1567
+													var10000[var15] -= var82.saturation;
+													var10000 = Tiles.Tiles_lightness; // L: 1568
+													var10000[var15] -= var82.lightness;
+													var10000 = UserComparator5.Tiles_hueMultiplier; // L: 1569
+													var10000[var15] -= var82.hueMultiplier;
+													var10002 = VerticalAlignment.field1874[var15]--; // L: 1570
+												}
+											}
 										}
 
-										var22 = var52 - 5; // L: 1265
-										if (var22 >= 0 && var22 < 104) { // L: 1266
-											var15 -= TileItem.Tiles_hue[var22]; // L: 1267
-											var16 -= class397.Tiles_saturation[var22]; // L: 1268
-											var17 -= Tiles.Tiles_lightness[var22]; // L: 1269
-											var50 -= class1.Tiles_hueMultiplier[var22]; // L: 1270
-											var51 -= MouseRecorder.field1039[var22]; // L: 1271
-										}
+										if (var14 >= 1 && var14 < 103) { // L: 1574
+											var15 = 0; // L: 1575
+											var16 = 0; // L: 1576
+											var17 = 0; // L: 1577
+											var18 = 0; // L: 1578
+											var19 = 0; // L: 1579
+
+											for (var52 = -5; var52 < 109; ++var52) { // L: 1580
+												var21 = var52 + 5; // L: 1581
+												if (var21 >= 0 && var21 < 104) { // L: 1582
+													var15 += Tiles.Tiles_hue[var21]; // L: 1583
+													var16 += User.Tiles_saturation[var21]; // L: 1584
+													var17 += Tiles.Tiles_lightness[var21]; // L: 1585
+													var18 += UserComparator5.Tiles_hueMultiplier[var21]; // L: 1586
+													var19 += VerticalAlignment.field1874[var21]; // L: 1587
+												}
 
-										if (var52 >= 1 && var52 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var52] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var52] & 16) == 0)) { // L: 1273 1274 1275 1276
-											if (var5 < Tiles.Tiles_minPlane) { // L: 1279
-												Tiles.Tiles_minPlane = var5;
-											}
+												var22 = var52 - 5; // L: 1589
+												if (var22 >= 0 && var22 < 104) { // L: 1590
+													var15 -= Tiles.Tiles_hue[var22]; // L: 1591
+													var16 -= User.Tiles_saturation[var22]; // L: 1592
+													var17 -= Tiles.Tiles_lightness[var22]; // L: 1593
+													var18 -= UserComparator5.Tiles_hueMultiplier[var22]; // L: 1594
+													var19 -= VerticalAlignment.field1874[var22]; // L: 1595
+												}
 
-											var23 = Tiles.Tiles_underlays[var5][var14][var52] & 255; // L: 1280
-											var24 = Tiles.Tiles_overlays[var5][var14][var52] & 255; // L: 1281
-											if (var23 > 0 || var24 > 0) { // L: 1282
-												var25 = Tiles.Tiles_heights[var5][var14][var52]; // L: 1283
-												var26 = Tiles.Tiles_heights[var5][var14 + 1][var52]; // L: 1284
-												var27 = Tiles.Tiles_heights[var5][var14 + 1][var52 + 1]; // L: 1285
-												var28 = Tiles.Tiles_heights[var5][var14][var52 + 1]; // L: 1286
-												var29 = DirectByteArrayCopier.field3212[var14][var52]; // L: 1287
-												var30 = DirectByteArrayCopier.field3212[var14 + 1][var52]; // L: 1288
-												int var55 = DirectByteArrayCopier.field3212[var14 + 1][var52 + 1]; // L: 1289
-												var32 = DirectByteArrayCopier.field3212[var14][var52 + 1]; // L: 1290
-												var33 = -1; // L: 1291
-												var34 = -1; // L: 1292
-												int var36;
-												int var56;
-												if (var23 > 0) { // L: 1293
-													var56 = var15 * 256 / var50; // L: 1294
-													var36 = var16 / var51; // L: 1295
-													int var37 = var17 / var51; // L: 1296
-													var33 = class17.hslToRgb(var56, var36, var37); // L: 1297
-													var56 = var56 + Tiles.rndHue & 255; // L: 1298
-													var37 += Tiles.rndLightness; // L: 1299
-													if (var37 < 0) { // L: 1300
-														var37 = 0;
-													} else if (var37 > 255) { // L: 1301
-														var37 = 255;
+												if (var52 >= 1 && var52 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var52] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var52] & 16) == 0)) { // L: 1597 1598 1599 1600
+													if (var5 < Tiles.Tiles_minPlane) { // L: 1603
+														Tiles.Tiles_minPlane = var5;
 													}
 
-													var34 = class17.hslToRgb(var56, var36, var37); // L: 1302
-												}
+													var56 = Tiles.Tiles_underlays[var5][var14][var52] & 255; // L: 1604
+													var59 = Tiles.Tiles_overlays[var5][var14][var52] & 255; // L: 1605
+													if (var56 > 0 || var59 > 0) { // L: 1606
+														var25 = Tiles.Tiles_heights[var5][var14][var52]; // L: 1607
+														var26 = Tiles.Tiles_heights[var5][var14 + 1][var52]; // L: 1608
+														var27 = Tiles.Tiles_heights[var5][var14 + 1][var52 + 1]; // L: 1609
+														var28 = Tiles.Tiles_heights[var5][var14][var52 + 1]; // L: 1610
+														var29 = class194.field2280[var14][var52]; // L: 1611
+														var30 = class194.field2280[var14 + 1][var52]; // L: 1612
+														int var60 = class194.field2280[var14 + 1][var52 + 1]; // L: 1613
+														int var32 = class194.field2280[var14][var52 + 1]; // L: 1614
+														var33 = -1; // L: 1615
+														var34 = -1; // L: 1616
+														if (var56 > 0) { // L: 1617
+															var35 = var15 * 256 / var18; // L: 1618
+															var36 = var16 / var19; // L: 1619
+															var37 = var17 / var19; // L: 1620
+															var33 = MusicPatchNode2.hslToRgb(var35, var36, var37); // L: 1621
+															var35 = var35 + Tiles.rndHue & 255; // L: 1622
+															var37 += Tiles.rndLightness; // L: 1623
+															if (var37 < 0) { // L: 1624
+																var37 = 0;
+															} else if (var37 > 255) { // L: 1625
+																var37 = 255;
+															}
 
-												if (var5 > 0) { // L: 1304
-													boolean var73 = true; // L: 1305
-													if (var23 == 0 && Tiles.Tiles_shapes[var5][var14][var52] != 0) { // L: 1306
-														var73 = false;
-													}
+															var34 = MusicPatchNode2.hslToRgb(var35, var36, var37); // L: 1626
+														}
 
-													if (var24 > 0 && !InvDefinition.method2987(var24 - 1).hideUnderlay) { // L: 1307
-														var73 = false;
-													}
+														if (var5 > 0) { // L: 1628
+															boolean var75 = true; // L: 1629
+															if (var56 == 0 && Tiles.Tiles_shapes[var5][var14][var52] != 0) { // L: 1630
+																var75 = false;
+															}
 
-													if (var73 && var26 == var25 && var25 == var27 && var25 == var28) { // L: 1308 1309
-														var10000 = Tiles.field962[var5][var14];
-														var10000[var52] |= 2340;
-													}
-												}
+															if (var59 > 0 && !class18.method302(var59 - 1).hideUnderlay) { // L: 1631
+																var75 = false;
+															}
 
-												var56 = 0; // L: 1312
-												if (var34 != -1) { // L: 1313
-													var56 = Rasterizer3D.Rasterizer3D_colorPalette[UserComparator8.method2456(var34, 96)];
-												}
+															if (var75 && var25 == var26 && var25 == var27 && var25 == var28) { // L: 1632 1633
+																var10000 = ClanChannelMember.field1504[var5][var14];
+																var10000[var52] |= 2340;
+															}
+														}
 
-												if (var24 == 0) { // L: 1314
-													var60.addTile(var5, var14, var52, 0, 0, -1, var25, var26, var27, var28, UserComparator8.method2456(var33, var29), UserComparator8.method2456(var33, var30), UserComparator8.method2456(var33, var55), UserComparator8.method2456(var33, var32), 0, 0, 0, 0, var56, 0); // L: 1315
-												} else {
-													var36 = Tiles.Tiles_shapes[var5][var14][var52] + 1; // L: 1318
-													byte var68 = Tiles.field969[var5][var14][var52]; // L: 1319
-													FloorOverlayDefinition var38 = InvDefinition.method2987(var24 - 1); // L: 1320
-													int var39 = var38.texture; // L: 1321
-													int var40;
-													int var41;
-													int var42;
-													int var43;
-													if (var39 >= 0) { // L: 1324
-														var41 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); // L: 1325
-														var40 = -1; // L: 1326
-													} else if (var38.primaryRgb == 16711935) { // L: 1329
-														var40 = -2; // L: 1330
-														var39 = -1; // L: 1331
-														var41 = -2; // L: 1332
-													} else {
-														var40 = class17.hslToRgb(var38.hue, var38.saturation, var38.lightness); // L: 1335
-														var42 = var38.hue + Tiles.rndHue & 255; // L: 1336
-														var43 = var38.lightness + Tiles.rndLightness; // L: 1337
-														if (var43 < 0) { // L: 1338
-															var43 = 0;
-														} else if (var43 > 255) { // L: 1339
-															var43 = 255;
+														var35 = 0; // L: 1636
+														if (var34 != -1) { // L: 1637
+															var35 = Rasterizer3D.Rasterizer3D_colorPalette[Login.method1995(var34, 96)];
 														}
 
-														var41 = class17.hslToRgb(var42, var38.saturation, var43); // L: 1340
-													}
+														if (var59 == 0) { // L: 1638
+															var65.addTile(var5, var14, var52, 0, 0, -1, var25, var26, var27, var28, Login.method1995(var33, var29), Login.method1995(var33, var30), Login.method1995(var33, var60), Login.method1995(var33, var32), 0, 0, 0, 0, var35, 0); // L: 1639
+														} else {
+															var36 = Tiles.Tiles_shapes[var5][var14][var52] + 1; // L: 1642
+															byte var76 = WorldMapLabelSize.field2580[var5][var14][var52]; // L: 1643
+															FloorOverlayDefinition var61 = class18.method302(var59 - 1); // L: 1644
+															var39 = var61.texture; // L: 1645
+															int var43;
+															int var62;
+															if (var39 >= 0) { // L: 1648
+																var41 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); // L: 1649
+																var40 = -1; // L: 1650
+															} else if (var61.primaryRgb == 16711935) { // L: 1653
+																var40 = -2; // L: 1654
+																var39 = -1; // L: 1655
+																var41 = -2; // L: 1656
+															} else {
+																var40 = MusicPatchNode2.hslToRgb(var61.hue, var61.saturation, var61.lightness); // L: 1659
+																var62 = var61.hue + Tiles.rndHue & 255; // L: 1660
+																var43 = var61.lightness + Tiles.rndLightness; // L: 1661
+																if (var43 < 0) { // L: 1662
+																	var43 = 0;
+																} else if (var43 > 255) { // L: 1663
+																	var43 = 255;
+																}
 
-													var42 = 0; // L: 1343
-													if (var41 != -2) { // L: 1344
-														var42 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapIcon_0.method3885(var41, 96)];
-													}
+																var41 = MusicPatchNode2.hslToRgb(var62, var61.saturation, var43); // L: 1664
+															}
 
-													if (var38.secondaryRgb != -1) { // L: 1345
-														var43 = var38.secondaryHue + Tiles.rndHue & 255; // L: 1346
-														int var44 = var38.secondaryLightness + Tiles.rndLightness; // L: 1347
-														if (var44 < 0) { // L: 1348
-															var44 = 0;
-														} else if (var44 > 255) { // L: 1349
-															var44 = 255;
-														}
+															var62 = 0; // L: 1667
+															if (var41 != -2) { // L: 1668
+																var62 = Rasterizer3D.Rasterizer3D_colorPalette[PendingSpawn.method2223(var41, 96)];
+															}
 
-														var41 = class17.hslToRgb(var43, var38.secondarySaturation, var44); // L: 1350
-														var42 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapIcon_0.method3885(var41, 96)]; // L: 1351
-													}
+															if (var61.secondaryRgb != -1) { // L: 1669
+																var43 = var61.secondaryHue + Tiles.rndHue & 255; // L: 1670
+																int var44 = var61.secondaryLightness + Tiles.rndLightness; // L: 1671
+																if (var44 < 0) { // L: 1672
+																	var44 = 0;
+																} else if (var44 > 255) { // L: 1673
+																	var44 = 255;
+																}
+
+																var41 = MusicPatchNode2.hslToRgb(var43, var61.secondarySaturation, var44); // L: 1674
+																var62 = Rasterizer3D.Rasterizer3D_colorPalette[PendingSpawn.method2223(var41, 96)]; // L: 1675
+															}
 
-													var60.addTile(var5, var14, var52, var36, var68, var39, var25, var26, var27, var28, UserComparator8.method2456(var33, var29), UserComparator8.method2456(var33, var30), UserComparator8.method2456(var33, var55), UserComparator8.method2456(var33, var32), WorldMapIcon_0.method3885(var40, var29), WorldMapIcon_0.method3885(var40, var30), WorldMapIcon_0.method3885(var40, var55), WorldMapIcon_0.method3885(var40, var32), var56, var42); // L: 1353
+															var65.addTile(var5, var14, var52, var36, var76, var39, var25, var26, var27, var28, Login.method1995(var33, var29), Login.method1995(var33, var30), Login.method1995(var33, var60), Login.method1995(var33, var32), PendingSpawn.method2223(var40, var29), PendingSpawn.method2223(var40, var30), PendingSpawn.method2223(var40, var60), PendingSpawn.method2223(var40, var32), var35, var62); // L: 1677
+														}
+													}
 												}
 											}
 										}
 									}
-								}
-							}
 
-							for (var14 = 1; var14 < 103; ++var14) { // L: 1360
-								for (var15 = 1; var15 < 103; ++var15) { // L: 1361
-									if ((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) { // L: 1368
-										var52 = 0; // L: 1369
-									} else if (var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) { // L: 1372
-										var52 = var5 - 1; // L: 1373
-									} else {
-										var52 = var5; // L: 1376
+									for (var14 = 1; var14 < 103; ++var14) { // L: 1684
+										for (var15 = 1; var15 < 103; ++var15) { // L: 1685
+											var65.setTileMinPlane(var5, var15, var14, Login.method1993(var5, var15, var14)); // L: 1686
+										}
 									}
 
-									var60.setTileMinPlane(var5, var15, var14, var52); // L: 1378
+									Tiles.Tiles_underlays[var5] = null; // L: 1689
+									Tiles.Tiles_overlays[var5] = null; // L: 1690
+									Tiles.Tiles_shapes[var5] = null; // L: 1691
+									WorldMapLabelSize.field2580[var5] = null; // L: 1692
+									SoundCache.field321[var5] = null; // L: 1693
 								}
-							}
-
-							Tiles.Tiles_underlays[var5] = null; // L: 1381
-							Tiles.Tiles_overlays[var5] = null; // L: 1382
-							Tiles.Tiles_shapes[var5] = null; // L: 1383
-							Tiles.field969[var5] = null; // L: 1384
-							class54.field419[var5] = null; // L: 1385
-						}
 
-						var60.method4310(-50, -10, -50); // L: 1387
+								var65.method3981(-50, -10, -50); // L: 1695
 
-						for (var5 = 0; var5 < 104; ++var5) { // L: 1388
-							for (var48 = 0; var48 < 104; ++var48) { // L: 1389
-								if ((Tiles.Tiles_renderFlags[1][var5][var48] & 2) == 2) { // L: 1390
-									var60.setLinkBelow(var5, var48);
+								for (var5 = 0; var5 < 104; ++var5) { // L: 1696
+									for (var6 = 0; var6 < 104; ++var6) { // L: 1697
+										if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { // L: 1698
+											var65.setLinkBelow(var5, var6);
+										}
+									}
 								}
-							}
-						}
-
-						var5 = 1; // L: 1393
-						var48 = 2; // L: 1394
-						var7 = 4; // L: 1395
 
-						for (var8 = 0; var8 < 4; ++var8) { // L: 1396
-							if (var8 > 0) { // L: 1397
-								var5 <<= 3; // L: 1398
-								var48 <<= 3; // L: 1399
-								var7 <<= 3; // L: 1400
-							}
+								var5 = 1; // L: 1701
+								var6 = 2; // L: 1702
+								var7 = 4; // L: 1703
 
-							for (var9 = 0; var9 <= var8; ++var9) { // L: 1402
-								for (var10 = 0; var10 <= 104; ++var10) { // L: 1403
-									for (var11 = 0; var11 <= 104; ++var11) { // L: 1404
-										short var66;
-										if ((Tiles.field962[var9][var11][var10] & var5) != 0) { // L: 1405
-											var12 = var10; // L: 1406
-											var13 = var10; // L: 1407
-											var14 = var9; // L: 1408
+								for (var69 = 0; var69 < 4; ++var69) { // L: 1704
+									if (var69 > 0) { // L: 1705
+										var5 <<= 3; // L: 1706
+										var6 <<= 3; // L: 1707
+										var7 <<= 3; // L: 1708
+									}
 
-											for (var15 = var9; var12 > 0 && (Tiles.field962[var9][var11][var12 - 1] & var5) != 0; --var12) { // L: 1409 1410
-											}
+									for (var53 = 0; var53 <= var69; ++var53) { // L: 1710
+										for (var10 = 0; var10 <= 104; ++var10) { // L: 1711
+											for (var11 = 0; var11 <= 104; ++var11) { // L: 1712
+												short var74;
+												if ((ClanChannelMember.field1504[var53][var11][var10] & var5) != 0) { // L: 1713
+													var12 = var10; // L: 1714
+													var72 = var10; // L: 1715
+													var14 = var53; // L: 1716
 
-											while (var13 < 104 && (Tiles.field962[var9][var11][var13 + 1] & var5) != 0) { // L: 1411
-												++var13;
-											}
+													for (var15 = var53; var12 > 0 && (ClanChannelMember.field1504[var53][var11][var12 - 1] & var5) != 0; --var12) { // L: 1717 1718
+													}
 
-											label901:
-											while (var14 > 0) { // L: 1412
-												for (var16 = var12; var16 <= var13; ++var16) { // L: 1413
-													if ((Tiles.field962[var14 - 1][var11][var16] & var5) == 0) {
-														break label901;
+													while (var72 < 104 && (ClanChannelMember.field1504[var53][var11][var72 + 1] & var5) != 0) { // L: 1719
+														++var72;
 													}
-												}
 
-												--var14; // L: 1414
-											}
+													label957:
+													while (var14 > 0) { // L: 1720
+														for (var16 = var12; var16 <= var72; ++var16) { // L: 1721
+															if ((ClanChannelMember.field1504[var14 - 1][var11][var16] & var5) == 0) {
+																break label957;
+															}
+														}
 
-											label890:
-											while (var15 < var8) { // L: 1416
-												for (var16 = var12; var16 <= var13; ++var16) { // L: 1417
-													if ((Tiles.field962[var15 + 1][var11][var16] & var5) == 0) {
-														break label890;
+														--var14; // L: 1722
 													}
-												}
 
-												++var15; // L: 1418
-											}
+													label946:
+													while (var15 < var69) { // L: 1724
+														for (var16 = var12; var16 <= var72; ++var16) { // L: 1725
+															if ((ClanChannelMember.field1504[var15 + 1][var11][var16] & var5) == 0) {
+																break label946;
+															}
+														}
 
-											var16 = (var15 + 1 - var14) * (var13 - var12 + 1); // L: 1420
-											if (var16 >= 8) { // L: 1421
-												var66 = 240; // L: 1422
-												var50 = Tiles.Tiles_heights[var15][var11][var12] - var66; // L: 1423
-												var51 = Tiles.Tiles_heights[var14][var11][var12]; // L: 1424
-												Scene.Scene_addOccluder(var8, 1, var11 * 128, var11 * 128, var12 * 128, var13 * 128 + 128, var50, var51); // L: 1425
-
-												for (var52 = var14; var52 <= var15; ++var52) { // L: 1426
-													for (var21 = var12; var21 <= var13; ++var21) { // L: 1427
-														var10000 = Tiles.field962[var52][var11];
-														var10000[var21] &= ~var5;
+														++var15; // L: 1726
 													}
-												}
-											}
-										}
 
-										if ((Tiles.field962[var9][var11][var10] & var48) != 0) { // L: 1431
-											var12 = var11; // L: 1432
-											var13 = var11; // L: 1433
-											var14 = var9; // L: 1434
+													var16 = (var15 + 1 - var14) * (var72 - var12 + 1); // L: 1728
+													if (var16 >= 8) { // L: 1729
+														var74 = 240; // L: 1730
+														var18 = Tiles.Tiles_heights[var15][var11][var12] - var74; // L: 1731
+														var19 = Tiles.Tiles_heights[var14][var11][var12]; // L: 1732
+														Scene.Scene_addOccluder(var69, 1, var11 * 128, var11 * 128, var12 * 128, var72 * 128 + 128, var18, var19); // L: 1733
+
+														for (var52 = var14; var52 <= var15; ++var52) { // L: 1734
+															for (var21 = var12; var21 <= var72; ++var21) { // L: 1735
+																var10000 = ClanChannelMember.field1504[var52][var11];
+																var10000[var21] &= ~var5;
+															}
+														}
+													}
+												}
 
-											for (var15 = var9; var12 > 0 && (Tiles.field962[var9][var12 - 1][var10] & var48) != 0; --var12) { // L: 1435 1436
-											}
+												if ((ClanChannelMember.field1504[var53][var11][var10] & var6) != 0) { // L: 1739
+													var12 = var11; // L: 1740
+													var72 = var11; // L: 1741
+													var14 = var53; // L: 1742
 
-											while (var13 < 104 && (Tiles.field962[var9][var13 + 1][var10] & var48) != 0) { // L: 1437
-												++var13;
-											}
+													for (var15 = var53; var12 > 0 && (ClanChannelMember.field1504[var53][var12 - 1][var10] & var6) != 0; --var12) { // L: 1743 1744
+													}
 
-											label954:
-											while (var14 > 0) { // L: 1438
-												for (var16 = var12; var16 <= var13; ++var16) { // L: 1439
-													if ((Tiles.field962[var14 - 1][var16][var10] & var48) == 0) {
-														break label954;
+													while (var72 < 104 && (ClanChannelMember.field1504[var53][var72 + 1][var10] & var6) != 0) { // L: 1745
+														++var72;
 													}
-												}
 
-												--var14; // L: 1440
-											}
+													label1010:
+													while (var14 > 0) { // L: 1746
+														for (var16 = var12; var16 <= var72; ++var16) { // L: 1747
+															if ((ClanChannelMember.field1504[var14 - 1][var16][var10] & var6) == 0) {
+																break label1010;
+															}
+														}
 
-											label943:
-											while (var15 < var8) { // L: 1442
-												for (var16 = var12; var16 <= var13; ++var16) { // L: 1443
-													if ((Tiles.field962[var15 + 1][var16][var10] & var48) == 0) {
-														break label943;
+														--var14; // L: 1748
 													}
-												}
 
-												++var15; // L: 1444
-											}
+													label999:
+													while (var15 < var69) { // L: 1750
+														for (var16 = var12; var16 <= var72; ++var16) { // L: 1751
+															if ((ClanChannelMember.field1504[var15 + 1][var16][var10] & var6) == 0) {
+																break label999;
+															}
+														}
 
-											var16 = (var13 - var12 + 1) * (var15 + 1 - var14); // L: 1446
-											if (var16 >= 8) { // L: 1447
-												var66 = 240; // L: 1448
-												var50 = Tiles.Tiles_heights[var15][var12][var10] - var66; // L: 1449
-												var51 = Tiles.Tiles_heights[var14][var12][var10]; // L: 1450
-												Scene.Scene_addOccluder(var8, 2, var12 * 128, var13 * 128 + 128, var10 * 128, var10 * 128, var50, var51); // L: 1451
-
-												for (var52 = var14; var52 <= var15; ++var52) { // L: 1452
-													for (var21 = var12; var21 <= var13; ++var21) { // L: 1453
-														var10000 = Tiles.field962[var52][var21];
-														var10000[var10] &= ~var48;
+														++var15; // L: 1752
 													}
-												}
-											}
-										}
 
-										if ((Tiles.field962[var9][var11][var10] & var7) != 0) { // L: 1457
-											var12 = var11; // L: 1458
-											var13 = var11; // L: 1459
-											var14 = var10; // L: 1460
+													var16 = (var15 + 1 - var14) * (var72 - var12 + 1); // L: 1754
+													if (var16 >= 8) { // L: 1755
+														var74 = 240; // L: 1756
+														var18 = Tiles.Tiles_heights[var15][var12][var10] - var74; // L: 1757
+														var19 = Tiles.Tiles_heights[var14][var12][var10]; // L: 1758
+														Scene.Scene_addOccluder(var69, 2, var12 * 128, var72 * 128 + 128, var10 * 128, var10 * 128, var18, var19); // L: 1759
+
+														for (var52 = var14; var52 <= var15; ++var52) { // L: 1760
+															for (var21 = var12; var21 <= var72; ++var21) { // L: 1761
+																var10000 = ClanChannelMember.field1504[var52][var21];
+																var10000[var10] &= ~var6;
+															}
+														}
+													}
+												}
 
-											for (var15 = var10; var14 > 0 && (Tiles.field962[var9][var11][var14 - 1] & var7) != 0; --var14) { // L: 1461 1462
-											}
+												if ((ClanChannelMember.field1504[var53][var11][var10] & var7) != 0) { // L: 1765
+													var12 = var11; // L: 1766
+													var72 = var11; // L: 1767
+													var14 = var10; // L: 1768
 
-											while (var15 < 104 && (Tiles.field962[var9][var11][var15 + 1] & var7) != 0) { // L: 1463
-												++var15;
-											}
+													for (var15 = var10; var14 > 0 && (ClanChannelMember.field1504[var53][var11][var14 - 1] & var7) != 0; --var14) { // L: 1769 1770
+													}
 
-											label1007:
-											while (var12 > 0) { // L: 1464
-												for (var16 = var14; var16 <= var15; ++var16) { // L: 1465
-													if ((Tiles.field962[var9][var12 - 1][var16] & var7) == 0) {
-														break label1007;
+													while (var15 < 104 && (ClanChannelMember.field1504[var53][var11][var15 + 1] & var7) != 0) { // L: 1771
+														++var15;
 													}
-												}
 
-												--var12; // L: 1466
-											}
+													label1063:
+													while (var12 > 0) { // L: 1772
+														for (var16 = var14; var16 <= var15; ++var16) { // L: 1773
+															if ((ClanChannelMember.field1504[var53][var12 - 1][var16] & var7) == 0) {
+																break label1063;
+															}
+														}
 
-											label996:
-											while (var13 < 104) { // L: 1468
-												for (var16 = var14; var16 <= var15; ++var16) { // L: 1469
-													if ((Tiles.field962[var9][var13 + 1][var16] & var7) == 0) {
-														break label996;
+														--var12; // L: 1774
 													}
-												}
 
-												++var13; // L: 1470
-											}
+													label1052:
+													while (var72 < 104) { // L: 1776
+														for (var16 = var14; var16 <= var15; ++var16) { // L: 1777
+															if ((ClanChannelMember.field1504[var53][var72 + 1][var16] & var7) == 0) {
+																break label1052;
+															}
+														}
+
+														++var72; // L: 1778
+													}
 
-											if ((var13 - var12 + 1) * (var15 - var14 + 1) >= 4) { // L: 1472
-												var16 = Tiles.Tiles_heights[var9][var12][var14]; // L: 1473
-												Scene.Scene_addOccluder(var8, 4, var12 * 128, var13 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); // L: 1474
+													if ((var72 - var12 + 1) * (var15 - var14 + 1) >= 4) { // L: 1780
+														var16 = Tiles.Tiles_heights[var53][var12][var14]; // L: 1781
+														Scene.Scene_addOccluder(var69, 4, var12 * 128, var72 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); // L: 1782
 
-												for (var17 = var12; var17 <= var13; ++var17) { // L: 1475
-													for (var50 = var14; var50 <= var15; ++var50) { // L: 1476
-														var10000 = Tiles.field962[var9][var17];
-														var10000[var50] &= ~var7;
+														for (var17 = var12; var17 <= var72; ++var17) { // L: 1783
+															for (var18 = var14; var18 <= var15; ++var18) { // L: 1784
+																var10000 = ClanChannelMember.field1504[var53][var17];
+																var10000[var18] &= ~var7;
+															}
+														}
 													}
 												}
 											}
 										}
 									}
 								}
-							}
-						}
-
-						MenuAction.method1912(true); // L: 1485
-						var5 = Tiles.Tiles_minPlane; // L: 1486
-						if (var5 > GrandExchangeOfferTotalQuantityComparator.Client_plane) { // L: 1487
-							var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane;
-						}
-
-						if (var5 < GrandExchangeOfferTotalQuantityComparator.Client_plane - 1) { // L: 1488
-							var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane - 1;
-						}
 
-						if (isLowDetail) { // L: 1489
-							GameBuild.scene.init(Tiles.Tiles_minPlane);
-						} else {
-							GameBuild.scene.init(0); // L: 1490
-						}
+								ClientPacket.method5001(true); // L: 1793
+								var5 = Tiles.Tiles_minPlane; // L: 1794
+								if (var5 > class20.Client_plane) { // L: 1795
+									var5 = class20.Client_plane;
+								}
 
-						for (var48 = 0; var48 < 104; ++var48) { // L: 1491
-							for (var7 = 0; var7 < 104; ++var7) { // L: 1492
-								WallDecoration.updateItemPile(var48, var7); // L: 1493
-							}
-						}
+								if (var5 < class20.Client_plane - 1) { // L: 1796
+									var5 = class20.Client_plane - 1;
+								}
 
-						class14.playPcmPlayers(); // L: 1496
+								if (isLowDetail) { // L: 1797
+									class7.scene.init(Tiles.Tiles_minPlane);
+								} else {
+									class7.scene.init(0); // L: 1798
+								}
 
-						for (PendingSpawn var62 = (PendingSpawn)pendingSpawns.last(); var62 != null; var62 = (PendingSpawn)pendingSpawns.previous()) { // L: 1498 1499 1505
-							if (var62.hitpoints == -1) { // L: 1500
-								var62.delay = 0; // L: 1501
-								class14.method180(var62); // L: 1502
-							} else {
-								var62.remove(); // L: 1504
-							}
-						}
+								for (var6 = 0; var6 < 104; ++var6) { // L: 1799
+									for (var7 = 0; var7 < 104; ++var7) { // L: 1800
+										MouseHandler.updateItemPile(var6, var7); // L: 1801
+									}
+								}
 
-						ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 1508
-						PacketBufferNode var63;
-						if (ArchiveLoader.client.hasFrame()) { // L: 1509
-							var63 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2679, packetWriter.isaacCipher); // L: 1511
-							var63.packetBuffer.writeInt(1057001181); // L: 1512
-							packetWriter.addNode(var63); // L: 1513
-						}
+								class148.playPcmPlayers(); // L: 1804
 
-						if (!isInInstance) { // L: 1515
-							var48 = (ItemLayer.field2243 - 6) / 8; // L: 1516
-							var7 = (ItemLayer.field2243 + 6) / 8; // L: 1517
-							var8 = (WallDecoration.field2630 - 6) / 8; // L: 1518
-							var9 = (WallDecoration.field2630 + 6) / 8; // L: 1519
-
-							for (var10 = var48 - 1; var10 <= var7 + 1; ++var10) { // L: 1520
-								for (var11 = var8 - 1; var11 <= var9 + 1; ++var11) { // L: 1521
-									if (var10 < var48 || var10 > var7 || var11 < var8 || var11 > var9) { // L: 1522
-										class11.archive5.loadRegionFromName("m" + var10 + "_" + var11); // L: 1523
-										class11.archive5.loadRegionFromName("l" + var10 + "_" + var11); // L: 1524
+								for (PendingSpawn var79 = (PendingSpawn)pendingSpawns.last(); var79 != null; var79 = (PendingSpawn)pendingSpawns.previous()) { // L: 1806 1807 1813
+									if (var79.hitpoints == -1) { // L: 1808
+										var79.delay = 0; // L: 1809
+										class4.method26(var79); // L: 1810
+									} else {
+										var79.remove(); // L: 1812
 									}
 								}
-							}
-						}
 
-						WorldMapData_1.updateGameState(30); // L: 1528
-						class14.playPcmPlayers(); // L: 1529
-						class113.method2533(); // L: 1530
-						var63 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2713, packetWriter.isaacCipher); // L: 1531
-						packetWriter.addNode(var63); // L: 1532
-						Clock.clock.mark(); // L: 1534
+								ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 1816
+								PacketBufferNode var80;
+								if (class295.client.hasFrame()) { // L: 1817
+									var80 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2879, packetWriter.isaacCipher); // L: 1819
+									var80.packetBuffer.writeInt(1057001181); // L: 1820
+									packetWriter.addNode(var80); // L: 1821
+								}
 
-						for (var7 = 0; var7 < 32; ++var7) { // L: 1535
-							GameEngine.graphicsTickTimes[var7] = 0L;
-						}
+								if (!isInInstance) { // L: 1823
+									var6 = (Messages.field1277 - 6) / 8; // L: 1824
+									var7 = (Messages.field1277 + 6) / 8; // L: 1825
+									var69 = (class4.field9 - 6) / 8; // L: 1826
+									var53 = (class4.field9 + 6) / 8; // L: 1827
+
+									for (var10 = var6 - 1; var10 <= var7 + 1; ++var10) { // L: 1828
+										for (var11 = var69 - 1; var11 <= var53 + 1; ++var11) { // L: 1829
+											if (var10 < var6 || var10 > var7 || var11 < var69 || var11 > var53) { // L: 1830
+												class140.archive5.loadRegionFromName("m" + var10 + "_" + var11); // L: 1831
+												class140.archive5.loadRegionFromName("l" + var10 + "_" + var11); // L: 1832
+											}
+										}
+									}
+								}
 
-						for (var7 = 0; var7 < 32; ++var7) { // L: 1536
-							GameEngine.clientTickTimes[var7] = 0L;
+								VertexNormal.updateGameState(30); // L: 1836
+								class148.playPcmPlayers(); // L: 1837
+								class119.method2689(); // L: 1838
+								var80 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2848, packetWriter.isaacCipher); // L: 1839
+								packetWriter.addNode(var80); // L: 1840
+								class17.method292(); // L: 1841
+							}
 						}
-
-						class1.gameCyclesToDo = 0; // L: 1537
 					}
+				} else {
+					Skeleton.method3947(this, class114.fontPlain12);
+				}
+
+				if (gameState == 30) { // L: 1843
+					this.doCycleLoggedIn();
+				} else if (gameState == 40 || gameState == 45) { // L: 1844
+					this.doCycleLoggedOut();
 				}
+
+				return; // L: 1845
 			}
-		} else {
-			class272.method5197(this, class6.fontPlain12);
-		}
 
-		if (gameState == 30) { // L: 1540
-			this.doCycleLoggedIn();
-		} else if (gameState == 40 || gameState == 45) { // L: 1541
-			this.doCycleLoggedOut();
+			var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 1070
 		}
+	}
 
-	} // L: 1542
-
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)V",
-		garbageValue = "1302395481"
+		garbageValue = "549681271"
 	)
 	@Export("draw")
 	protected final void draw(boolean var1) {
 		boolean var2;
-		label166: {
+		label168: {
 			try {
-				if (class247.musicPlayerStatus == 2) { // L: 1548
-					if (class14.musicTrack == null) { // L: 1549
-						class14.musicTrack = MusicTrack.readTrack(class128.musicTrackArchive, FillMode.musicTrackGroupId, ArchiveDiskActionHandler.musicTrackFileId); // L: 1550
-						if (class14.musicTrack == null) { // L: 1551
-							var2 = false; // L: 1552
-							break label166;
-						}
-					}
-
-					if (class247.soundCache == null) { // L: 1556
-						class247.soundCache = new SoundCache(class408.soundEffectsArchive, class247.musicSamplesArchive);
-					}
-
-					if (class247.midiPcmStream.loadMusicTrack(class14.musicTrack, class247.musicPatchesArchive, class247.soundCache, 22050)) { // L: 1557
-						class247.midiPcmStream.clearAll(); // L: 1558
-						class247.midiPcmStream.setPcmStreamVolume(class247.musicTrackVolume); // L: 1559
-						class247.midiPcmStream.setMusicTrack(class14.musicTrack, SecureRandomCallable.musicTrackBoolean); // L: 1560
-						class247.musicPlayerStatus = 0; // L: 1561
-						class14.musicTrack = null; // L: 1562
-						class247.soundCache = null; // L: 1563
-						class128.musicTrackArchive = null; // L: 1564
-						var2 = true; // L: 1565
-						break label166;
-					}
-				}
-			} catch (Exception var6) { // L: 1570
-				var6.printStackTrace(); // L: 1571
-				class247.midiPcmStream.clear(); // L: 1572
-				class247.musicPlayerStatus = 0; // L: 1573
-				class14.musicTrack = null; // L: 1574
-				class247.soundCache = null; // L: 1575
-				class128.musicTrackArchive = null; // L: 1576
+				if (class260.musicPlayerStatus == 2) { // L: 1852
+					if (class21.musicTrack == null) { // L: 1853
+						class21.musicTrack = MusicTrack.readTrack(class124.musicTrackArchive, VarcInt.musicTrackGroupId, class260.musicTrackFileId); // L: 1854
+						if (class21.musicTrack == null) { // L: 1855
+							var2 = false; // L: 1856
+							break label168;
+						}
+					}
+
+					if (class257.soundCache == null) { // L: 1860
+						class257.soundCache = new SoundCache(class260.soundEffectsArchive, class331.musicSamplesArchive);
+					}
+
+					if (class260.midiPcmStream.loadMusicTrack(class21.musicTrack, class260.musicPatchesArchive, class257.soundCache, 22050)) { // L: 1861
+						class260.midiPcmStream.clearAll(); // L: 1862
+						class260.midiPcmStream.setPcmStreamVolume(ChatChannel.musicTrackVolume); // L: 1863
+						class260.midiPcmStream.setMusicTrack(class21.musicTrack, DynamicObject.musicTrackBoolean); // L: 1864
+						class260.musicPlayerStatus = 0; // L: 1865
+						class21.musicTrack = null; // L: 1866
+						class257.soundCache = null; // L: 1867
+						class124.musicTrackArchive = null; // L: 1868
+						var2 = true; // L: 1869
+						break label168;
+					}
+				}
+			} catch (Exception var6) { // L: 1874
+				var6.printStackTrace(); // L: 1875
+				class260.midiPcmStream.clear(); // L: 1876
+				class260.musicPlayerStatus = 0; // L: 1877
+				class21.musicTrack = null; // L: 1878
+				class257.soundCache = null; // L: 1879
+				class124.musicTrackArchive = null; // L: 1880
 			}
 
-			var2 = false; // L: 1578
+			var2 = false; // L: 1882
 		}
 
-		if (var2 && field710 && HealthBar.pcmPlayer0 != null) { // L: 1581 1582
-			HealthBar.pcmPlayer0.tryDiscard();
+		if (var2 && field743 && JagexCache.pcmPlayer0 != null) { // L: 1885 1886
+			JagexCache.pcmPlayer0.tryDiscard();
 		}
 
-		if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field687 && class111.method2516() > field687) { // L: 1584 1585
-			HorizontalAlignment.setWindowedMode(class134.getWindowedMode()); // L: 1586
+		if ((gameState == 10 || gameState == 20 || gameState == 30) && field514 != 0L && Ignored.method6459() > field514) { // L: 1888 1889
+			Occluder.setWindowedMode(class143.getWindowedMode()); // L: 1890
 		}
 
 		int var4;
-		if (var1) { // L: 1589
-			for (var4 = 0; var4 < 100; ++var4) { // L: 1590
-				field594[var4] = true;
+		if (var1) { // L: 1893
+			for (var4 = 0; var4 < 100; ++var4) { // L: 1894
+				field504[var4] = true;
 			}
 		}
 
-		if (gameState == 0) { // L: 1592
+		if (gameState == 0) { // L: 1896
 			this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1);
-		} else if (gameState == 5) { // L: 1593
-			class12.drawTitle(Login.fontBold12, FriendLoginUpdate.fontPlain11, class6.fontPlain12);
-		} else if (gameState != 10 && gameState != 11) { // L: 1594
-			if (gameState == 20) { // L: 1595
-				class12.drawTitle(Login.fontBold12, FriendLoginUpdate.fontPlain11, class6.fontPlain12);
-			} else if (gameState == 25) { // L: 1596
-				if (field485 == 1) { // L: 1597
-					if (field521 > field522) { // L: 1598
-						field522 = field521;
-					}
-
-					var4 = (field522 * 50 - field521 * 50) / field522; // L: 1599
-					class91.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false); // L: 1600
-				} else if (field485 == 2) { // L: 1602
-					if (field523 > field524) { // L: 1603
-						field524 = field523;
-					}
-
-					var4 = (field524 * 50 - field523 * 50) / field524 + 50; // L: 1604
-					class91.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false); // L: 1605
+		} else if (gameState == 5) { // L: 1897
+			class253.drawTitle(class136.fontBold12, class307.fontPlain11, class114.fontPlain12);
+		} else if (gameState != 10 && gameState != 11) { // L: 1898
+			if (gameState == 20) { // L: 1899
+				class253.drawTitle(class136.fontBold12, class307.fontPlain11, class114.fontPlain12);
+			} else if (gameState == 25) { // L: 1900
+				if (field602 == 1) { // L: 1901
+					if (field529 > field530) { // L: 1902
+						field530 = field529;
+					}
+
+					var4 = (field530 * 50 - field529 * 50) / field530; // L: 1903
+					ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false); // L: 1904
+				} else if (field602 == 2) { // L: 1906
+					if (field617 > field532) { // L: 1907
+						field532 = field617;
+					}
+
+					var4 = (field532 * 50 - field617 * 50) / field532 + 50; // L: 1908
+					ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false); // L: 1909
 				} else {
-					class91.drawLoadingMessage("Loading - please wait.", false); // L: 1607
+					ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); // L: 1911
 				}
-			} else if (gameState == 30) { // L: 1609
+			} else if (gameState == 30) { // L: 1913
 				this.drawLoggedIn();
-			} else if (gameState == 40) { // L: 1610
-				class91.drawLoadingMessage("Connection lost" + "<br>" + "Please wait - attempting to reestablish", false);
-			} else if (gameState == 45) { // L: 1611
-				class91.drawLoadingMessage("Please wait...", false);
+			} else if (gameState == 40) { // L: 1914
+				ArchiveDiskActionHandler.drawLoadingMessage("Connection lost" + "<br>" + "Please wait - attempting to reestablish", false);
+			} else if (gameState == 45) { // L: 1915
+				ArchiveDiskActionHandler.drawLoadingMessage("Please wait...", false);
 			}
 		} else {
-			class12.drawTitle(Login.fontBold12, FriendLoginUpdate.fontPlain11, class6.fontPlain12);
+			class253.drawTitle(class136.fontBold12, class307.fontPlain11, class114.fontPlain12);
 		}
 
-		if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1612
-			for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1613
-				if (field553[var4]) { // L: 1614
-					Canvas.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1615
-					field553[var4] = false; // L: 1616
+		if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1916
+			for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1917
+				if (field686[var4]) { // L: 1918
+					class19.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1919
+					field686[var4] = false; // L: 1920
 				}
 			}
-		} else if (gameState > 0) { // L: 1620
-			Canvas.rasterProvider.drawFull(0, 0); // L: 1621
+		} else if (gameState > 0) { // L: 1924
+			class19.rasterProvider.drawFull(0, 0); // L: 1925
 
-			for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1622
-				field553[var4] = false;
+			for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1926
+				field686[var4] = false;
 			}
 		}
 
-	} // L: 1624
+	} // L: 1928
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "-9054"
+		descriptor = "(I)V",
+		garbageValue = "-1665222357"
 	)
 	@Export("kill0")
 	protected final void kill0() {
-		if (Message.varcs.hasUnwrittenChanges()) { // L: 1627
-			Message.varcs.write();
-		}
-
-		if (Interpreter.mouseRecorder != null) { // L: 1628
-			Interpreter.mouseRecorder.isRunning = false;
-		}
-
-		Interpreter.mouseRecorder = null; // L: 1629
-		packetWriter.close(); // L: 1630
-		if (KeyHandler.KeyHandler_instance != null) { // L: 1632
-			synchronized(KeyHandler.KeyHandler_instance) { // L: 1633
-				KeyHandler.KeyHandler_instance = null; // L: 1634
-			} // L: 1635
+		if (class339.varcs.hasUnwrittenChanges()) { // L: 1931
+			class339.varcs.write();
 		}
 
-		NPC.method2248(); // L: 1638
-		MouseHandler.mouseWheel = null; // L: 1639
-		if (HealthBar.pcmPlayer0 != null) { // L: 1640
-			HealthBar.pcmPlayer0.shutdown();
+		if (mouseRecorder != null) { // L: 1932
+			mouseRecorder.isRunning = false;
 		}
 
-		if (ScriptEvent.pcmPlayer1 != null) { // L: 1641
-			ScriptEvent.pcmPlayer1.shutdown();
+		mouseRecorder = null; // L: 1933
+		packetWriter.close(); // L: 1934
+		GrandExchangeEvents.method5716(); // L: 1935
+		Friend.method6294(); // L: 1936
+		WorldMapDecorationType.mouseWheel = null; // L: 1937
+		if (JagexCache.pcmPlayer0 != null) { // L: 1938
+			JagexCache.pcmPlayer0.shutdown();
 		}
 
-		Script.method1989(); // L: 1642
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1644
-			if (ArchiveDiskActionHandler.field3662 != 0) { // L: 1645
-				ArchiveDiskActionHandler.field3662 = 1; // L: 1646
-
-				try {
-					ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1648
-				} catch (InterruptedException var5) { // L: 1650
-				}
-			}
+		if (PacketWriter.pcmPlayer1 != null) { // L: 1939
+			PacketWriter.pcmPlayer1.shutdown();
 		}
 
-		if (class320.urlRequester != null) { // L: 1654
-			class320.urlRequester.close(); // L: 1655
-			class320.urlRequester = null; // L: 1656
+		GraphicsObject.method1956(); // L: 1940
+		class213.method4356(); // L: 1941
+		if (WorldMapData_1.urlRequester != null) { // L: 1942
+			WorldMapData_1.urlRequester.close(); // L: 1943
+			WorldMapData_1.urlRequester = null; // L: 1944
 		}
 
 		try {
-			JagexCache.JagexCache_dat2File.close(); // L: 1660
+			JagexCache.JagexCache_dat2File.close(); // L: 1948
 
-			for (int var4 = 0; var4 < ItemContainer.idxCount; ++var4) { // L: 1661
-				WorldMapID.JagexCache_idxFiles[var4].close();
+			for (int var1 = 0; var1 < class143.idxCount; ++var1) { // L: 1949
+				JagexCache.JagexCache_idxFiles[var1].close();
 			}
 
-			JagexCache.JagexCache_idx255File.close(); // L: 1662
-			JagexCache.JagexCache_randomDat.close(); // L: 1663
-		} catch (Exception var7) { // L: 1665
+			JagexCache.JagexCache_idx255File.close(); // L: 1950
+			JagexCache.JagexCache_randomDat.close(); // L: 1951
+		} catch (Exception var3) { // L: 1953
 		}
 
-		this.field491.method181(); // L: 1667
-	} // L: 1668
+		this.field510.method206(); // L: 1955
+	} // L: 1956
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "-71"
+		garbageValue = "-3"
 	)
-	protected final void vmethod1164() {
-	} // L: 652
+	protected final void vmethod1151() {
+	} // L: 660
 
-	@ObfuscatedName("eq")
+	@ObfuscatedName("ey")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-863844580"
+		garbageValue = "1448065083"
 	)
-	boolean method1166() {
-		return JagexCache.field1560 != null && !JagexCache.field1560.trim().isEmpty(); // L: 784
+	boolean method1154() {
+		return WorldMapAreaData.field2772 != null && !WorldMapAreaData.field2772.trim().isEmpty(); // L: 975
 	}
 
-	@ObfuscatedName("es")
+	@ObfuscatedName("eq")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1299370997"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "-82"
 	)
-	void method1453(String var1) throws MalformedURLException, IOException {
-		class10 var2 = new class10(new URL(WorldMapSection1.field2203 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"), class9.field27); // L: 788
-		var2.method86("Authorization", "Bearer " + var1); // L: 789
-		this.field537 = this.field491.method187(var2); // L: 790
-	} // L: 791
+	void method1625(String var1) throws MalformedURLException, IOException {
+		class10 var2 = new class10(new URL(class257.field3044 + "public/v1/games/YCfdbvr2pM1zUYMxJRexZY/play"), class9.field36); // L: 979
+		var2.method121("Authorization", "Bearer " + var1); // L: 980
+		this.field613 = this.field510.method213(var2); // L: 981
+	} // L: 982
 
-	@ObfuscatedName("fa")
+	@ObfuscatedName("ff")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "23725"
+		descriptor = "(I)V",
+		garbageValue = "139044598"
 	)
 	@Export("doCycleJs5")
 	void doCycleJs5() {
-		if (gameState != 1000) { // L: 1713
-			long var2 = class111.method2516(); // L: 1716
-			int var4 = (int)(var2 - class423.field4436); // L: 1717
-			class423.field4436 = var2; // L: 1718
-			if (var4 > 200) { // L: 1719
-				var4 = 200;
-			}
-
-			NetCache.NetCache_loadTime += var4; // L: 1720
-			boolean var1;
-			if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1721
-				var1 = true; // L: 1722
-			} else if (NetCache.NetCache_socket == null) { // L: 1725
-				var1 = false; // L: 1726
-			} else {
-				try {
-					label245: {
-						if (NetCache.NetCache_loadTime > 30000) { // L: 1730
-							throw new IOException();
-						}
-
-						NetFileRequest var5;
-						Buffer var6;
-						while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1731
-							var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1732
-							var6 = new Buffer(4); // L: 1733
-							var6.writeByte(1); // L: 1734
-							var6.writeMedium((int)var5.key); // L: 1735
-							NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1736
-							NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1737
-							--NetCache.NetCache_pendingPriorityWritesCount; // L: 1738
-							++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1739
-						}
-
-						while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1741
-							var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1742
-							var6 = new Buffer(4); // L: 1743
-							var6.writeByte(0); // L: 1744
-							var6.writeMedium((int)var5.key); // L: 1745
-							NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1746
-							var5.removeDual(); // L: 1747
-							NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1748
-							--NetCache.NetCache_pendingWritesCount; // L: 1749
-							++NetCache.NetCache_pendingResponsesCount; // L: 1750
-						}
-
-						for (int var17 = 0; var17 < 100; ++var17) { // L: 1752
-							int var18 = NetCache.NetCache_socket.available(); // L: 1753
-							if (var18 < 0) { // L: 1754
-								throw new IOException();
-							}
-
-							if (var18 == 0) { // L: 1755
-								break;
-							}
-
-							NetCache.NetCache_loadTime = 0; // L: 1756
-							byte var7 = 0; // L: 1757
-							if (class131.NetCache_currentResponse == null) { // L: 1758
-								var7 = 8;
-							} else if (NetCache.field3707 == 0) { // L: 1759
-								var7 = 1;
-							}
-
-							int var8;
-							int var9;
-							int var10;
-							int var12;
-							byte[] var10000;
-							int var10001;
-							Buffer var25;
-							if (var7 > 0) { // L: 1760
-								var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1761
-								if (var8 > var18) { // L: 1762
-									var8 = var18;
-								}
-
-								NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1763
-								if (NetCache.field3719 != 0) { // L: 1764
-									for (var9 = 0; var9 < var8; ++var9) { // L: 1765
-										var10000 = NetCache.NetCache_responseHeaderBuffer.array;
-										var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset;
-										var10000[var10001] ^= NetCache.field3719;
-									}
-								}
-
-								var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1767
-								var25.offset += var8;
-								if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1768
-									break;
-								}
-
-								if (class131.NetCache_currentResponse == null) { // L: 1769
-									NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1770
-									var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1771
-									var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1772
-									int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1773
-									var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1774
-									long var13 = (long)(var10 + (var9 << 16)); // L: 1775
-									NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1776
-									class120.field1401 = true; // L: 1777
-									if (var15 == null) { // L: 1778
-										var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1779
-										class120.field1401 = false; // L: 1780
-									}
-
-									if (var15 == null) { // L: 1782
-										throw new IOException(); // L: 1783
-									}
-
-									int var16 = var11 == 0 ? 5 : 9; // L: 1785
-									class131.NetCache_currentResponse = var15; // L: 1786
-									class138.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + class131.NetCache_currentResponse.padding); // L: 1787
-									class138.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1788
-									class138.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1789
-									NetCache.field3707 = 8; // L: 1790
-									NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1791
-								} else if (NetCache.field3707 == 0) { // L: 1794
-									if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1795
-										NetCache.field3707 = 1; // L: 1796
-										NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1797
-									} else {
-										class131.NetCache_currentResponse = null; // L: 1801
-									}
-								}
-							} else {
-								var8 = class138.NetCache_responseArchiveBuffer.array.length - class131.NetCache_currentResponse.padding; // L: 1807
-								var9 = 512 - NetCache.field3707; // L: 1808
-								if (var9 > var8 - class138.NetCache_responseArchiveBuffer.offset) { // L: 1809
-									var9 = var8 - class138.NetCache_responseArchiveBuffer.offset;
-								}
-
-								if (var9 > var18) { // L: 1810
-									var9 = var18;
-								}
-
-								NetCache.NetCache_socket.read(class138.NetCache_responseArchiveBuffer.array, class138.NetCache_responseArchiveBuffer.offset, var9); // L: 1811
-								if (NetCache.field3719 != 0) { // L: 1812
-									for (var10 = 0; var10 < var9; ++var10) { // L: 1813
-										var10000 = class138.NetCache_responseArchiveBuffer.array;
-										var10001 = class138.NetCache_responseArchiveBuffer.offset + var10;
-										var10000[var10001] ^= NetCache.field3719;
-									}
-								}
-
-								var25 = class138.NetCache_responseArchiveBuffer; // L: 1815
-								var25.offset += var9;
-								NetCache.field3707 += var9; // L: 1816
-								if (var8 == class138.NetCache_responseArchiveBuffer.offset) { // L: 1817
-									if (class131.NetCache_currentResponse.key == 16711935L) { // L: 1818
-										class139.NetCache_reference = class138.NetCache_responseArchiveBuffer; // L: 1819
-
-										for (var10 = 0; var10 < 256; ++var10) { // L: 1820
-											Archive var19 = NetCache.NetCache_archives[var10]; // L: 1821
-											if (var19 != null) { // L: 1822
-												class139.NetCache_reference.offset = var10 * 8 + 5; // L: 1823
-												var12 = class139.NetCache_reference.readInt(); // L: 1824
-												int var20 = class139.NetCache_reference.readInt(); // L: 1825
-												var19.loadIndex(var12, var20); // L: 1826
-											}
-										}
-									} else {
-										NetCache.NetCache_crc.reset(); // L: 1831
-										NetCache.NetCache_crc.update(class138.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1832
-										var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1833
-										if (var10 != class131.NetCache_currentResponse.crc) { // L: 1834
-											try {
-												NetCache.NetCache_socket.close(); // L: 1836
-											} catch (Exception var23) { // L: 1838
-											}
-
-											++NetCache.NetCache_crcMismatches; // L: 1839
-											NetCache.NetCache_socket = null; // L: 1840
-											NetCache.field3719 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1841
-											var1 = false; // L: 1842
-											break label245;
-										}
-
-										NetCache.NetCache_crcMismatches = 0; // L: 1845
-										NetCache.NetCache_ioExceptions = 0; // L: 1846
-										class131.NetCache_currentResponse.archive.write((int)(class131.NetCache_currentResponse.key & 65535L), class138.NetCache_responseArchiveBuffer.array, 16711680L == (class131.NetCache_currentResponse.key & 16711680L), class120.field1401); // L: 1847
-									}
-
-									class131.NetCache_currentResponse.remove(); // L: 1849
-									if (class120.field1401) { // L: 1850
-										--NetCache.NetCache_pendingPriorityResponsesCount;
-									} else {
-										--NetCache.NetCache_pendingResponsesCount; // L: 1851
-									}
-
-									NetCache.field3707 = 0; // L: 1852
-									class131.NetCache_currentResponse = null; // L: 1853
-									class138.NetCache_responseArchiveBuffer = null; // L: 1854
-								} else {
-									if (NetCache.field3707 != 512) { // L: 1856
-										break;
-									}
-
-									NetCache.field3707 = 0;
-								}
-							}
-						}
-
-						var1 = true; // L: 1860
-					}
-				} catch (IOException var24) {
-					try {
-						NetCache.NetCache_socket.close(); // L: 1864
-					} catch (Exception var22) { // L: 1866
-					}
-
-					++NetCache.NetCache_ioExceptions; // L: 1867
-					NetCache.NetCache_socket = null; // L: 1868
-					var1 = false; // L: 1869
-				}
-			}
-
-			if (!var1) { // L: 1873
+		if (gameState != 1000) { // L: 1997
+			boolean var1 = class295.method5515(); // L: 1998
+			if (!var1) { // L: 1999
 				this.doCycleJs5Connect();
 			}
 
 		}
-	} // L: 1874
+	} // L: 2000
 
-	@ObfuscatedName("fi")
+	@ObfuscatedName("ft")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1173138453"
+		garbageValue = "-1295917828"
 	)
 	@Export("doCycleJs5Connect")
 	void doCycleJs5Connect() {
-		if (NetCache.NetCache_crcMismatches >= 4) { // L: 1877
-			this.error("js5crc"); // L: 1878
-			WorldMapData_1.updateGameState(1000); // L: 1879
+		if (NetCache.NetCache_crcMismatches >= 4) { // L: 2003
+			this.error("js5crc"); // L: 2004
+			VertexNormal.updateGameState(1000); // L: 2005
 		} else {
-			if (NetCache.NetCache_ioExceptions >= 4) { // L: 1882
-				if (gameState <= 5) { // L: 1883
-					this.error("js5io"); // L: 1884
-					WorldMapData_1.updateGameState(1000); // L: 1885
-					return; // L: 1886
+			if (NetCache.NetCache_ioExceptions >= 4) { // L: 2008
+				if (gameState <= 5) { // L: 2009
+					this.error("js5io"); // L: 2010
+					VertexNormal.updateGameState(1000); // L: 2011
+					return; // L: 2012
 				}
 
-				field572 = 3000; // L: 1889
-				NetCache.NetCache_ioExceptions = 3; // L: 1890
+				field517 = 3000; // L: 2015
+				NetCache.NetCache_ioExceptions = 3; // L: 2016
 			}
 
-			if (--field572 + 1 <= 0) { // L: 1893
+			if (--field517 + 1 <= 0) { // L: 2019
 				try {
-					if (js5ConnectState == 0) { // L: 1895
-						class114.js5SocketTask = GameEngine.taskHandler.newSocketTask(WorldMapIcon_0.worldHost, ScriptEvent.currentPort); // L: 1896
-						++js5ConnectState; // L: 1897
+					if (js5ConnectState == 0) { // L: 2021
+						ScriptEvent.js5SocketTask = GameEngine.taskHandler.newSocketTask(class185.worldHost, class129.currentPort); // L: 2022
+						++js5ConnectState; // L: 2023
 					}
 
-					if (js5ConnectState == 1) { // L: 1899
-						if (class114.js5SocketTask.status == 2) { // L: 1900
-							this.js5Error(-1); // L: 1901
-							return; // L: 1902
+					if (js5ConnectState == 1) { // L: 2025
+						if (ScriptEvent.js5SocketTask.status == 2) { // L: 2026
+							this.js5Error(-1); // L: 2027
+							return; // L: 2028
 						}
 
-						if (class114.js5SocketTask.status == 1) { // L: 1904
+						if (ScriptEvent.js5SocketTask.status == 1) { // L: 2030
 							++js5ConnectState;
 						}
 					}
 
-					if (js5ConnectState == 2) { // L: 1906
-						if (useBufferedSocket) { // L: 1907
-							ItemLayer.js5Socket = class132.method2767((Socket)class114.js5SocketTask.result, 40000, 5000); // L: 1908
+					if (js5ConnectState == 2) { // L: 2032
+						if (useBufferedSocket) { // L: 2033
+							FontName.js5Socket = Login.method1965((Socket)ScriptEvent.js5SocketTask.result, 40000, 5000); // L: 2034
 						} else {
-							ItemLayer.js5Socket = new NetSocket((Socket)class114.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1911
+							FontName.js5Socket = new NetSocket((Socket)ScriptEvent.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 2037
 						}
 
-						Buffer var1 = new Buffer(5); // L: 1913
-						var1.writeByte(15); // L: 1914
-						var1.writeInt(201); // L: 1915
-						ItemLayer.js5Socket.write(var1.array, 0, 5); // L: 1916
-						++js5ConnectState; // L: 1917
-						Login.field889 = class111.method2516(); // L: 1918
+						Buffer var1 = new Buffer(5); // L: 2039
+						var1.writeByte(15); // L: 2040
+						var1.writeInt(202); // L: 2041
+						FontName.js5Socket.write(var1.array, 0, 5); // L: 2042
+						++js5ConnectState; // L: 2043
+						class120.field1450 = Ignored.method6459(); // L: 2044
 					}
 
-					if (js5ConnectState == 3) { // L: 1920
-						if (ItemLayer.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1921
-							int var2 = ItemLayer.js5Socket.readUnsignedByte(); // L: 1922
-							if (var2 != 0) { // L: 1923
-								this.js5Error(var2); // L: 1924
-								return; // L: 1925
+					if (js5ConnectState == 3) { // L: 2046
+						if (FontName.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 2047
+							int var5 = FontName.js5Socket.readUnsignedByte(); // L: 2048
+							if (var5 != 0) { // L: 2049
+								this.js5Error(var5); // L: 2050
+								return; // L: 2051
 							}
 
-							++js5ConnectState; // L: 1927
-						} else if (class111.method2516() - Login.field889 > 30000L) { // L: 1930
-							this.js5Error(-2); // L: 1931
-							return; // L: 1932
+							++js5ConnectState; // L: 2053
+						} else if (Ignored.method6459() - class120.field1450 > 30000L) { // L: 2056
+							this.js5Error(-2); // L: 2057
+							return; // L: 2058
 						}
 					}
 
-					if (js5ConnectState == 4) { // L: 1936
-						GameObject.method4647(ItemLayer.js5Socket, gameState > 20); // L: 1937
-						class114.js5SocketTask = null; // L: 1938
-						ItemLayer.js5Socket = null; // L: 1939
-						js5ConnectState = 0; // L: 1940
-						js5Errors = 0; // L: 1941
+					if (js5ConnectState == 4) { // L: 2062
+						AbstractSocket var10 = FontName.js5Socket; // L: 2063
+						boolean var2 = gameState > 20; // L: 2064
+						if (NetCache.NetCache_socket != null) { // L: 2066
+							try {
+								NetCache.NetCache_socket.close(); // L: 2068
+							} catch (Exception var8) { // L: 2070
+							}
+
+							NetCache.NetCache_socket = null; // L: 2071
+						}
+
+						NetCache.NetCache_socket = var10; // L: 2073
+						ClientPreferences.method2297(var2); // L: 2074
+						NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 2075
+						class279.NetCache_currentResponse = null; // L: 2076
+						class149.NetCache_responseArchiveBuffer = null; // L: 2077
+						NetCache.field3863 = 0; // L: 2078
+
+						while (true) {
+							NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 2080
+							if (var3 == null) { // L: 2081
+								while (true) {
+									var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 2087
+									if (var3 == null) { // L: 2088
+										if (NetCache.field3866 != 0) { // L: 2094
+											try {
+												Buffer var11 = new Buffer(4); // L: 2096
+												var11.writeByte(4); // L: 2097
+												var11.writeByte(NetCache.field3866); // L: 2098
+												var11.writeShort(0); // L: 2099
+												NetCache.NetCache_socket.write(var11.array, 0, 4); // L: 2100
+											} catch (IOException var7) {
+												try {
+													NetCache.NetCache_socket.close(); // L: 2104
+												} catch (Exception var6) { // L: 2106
+												}
+
+												++NetCache.NetCache_ioExceptions; // L: 2107
+												NetCache.NetCache_socket = null; // L: 2108
+											}
+										}
+
+										NetCache.NetCache_loadTime = 0; // L: 2111
+										UserComparator7.field1319 = Ignored.method6459(); // L: 2112
+										ScriptEvent.js5SocketTask = null; // L: 2114
+										FontName.js5Socket = null; // L: 2115
+										js5ConnectState = 0; // L: 2116
+										js5Errors = 0; // L: 2117
+										return; // L: 2123
+									}
+
+									NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 2089
+									NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 2090
+									++NetCache.NetCache_pendingWritesCount; // L: 2091
+									--NetCache.NetCache_pendingResponsesCount; // L: 2092
+								}
+							}
+
+							NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 2082
+							++NetCache.NetCache_pendingPriorityWritesCount; // L: 2083
+							--NetCache.NetCache_pendingPriorityResponsesCount; // L: 2084
+						}
 					}
-				} catch (IOException var3) { // L: 1944
-					this.js5Error(-3); // L: 1945
+				} catch (IOException var9) { // L: 2120
+					this.js5Error(-3); // L: 2121
 				}
 
 			}
 		}
-	} // L: 1880 1947
+	} // L: 2006
 
-	@ObfuscatedName("fj")
+	@ObfuscatedName("fk")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "-88"
+		garbageValue = "99"
 	)
 	@Export("js5Error")
 	void js5Error(int var1) {
-		class114.js5SocketTask = null; // L: 1950
-		ItemLayer.js5Socket = null; // L: 1951
-		js5ConnectState = 0; // L: 1952
-		if (ApproximateRouteStrategy.worldPort == ScriptEvent.currentPort) { // L: 1953
-			ScriptEvent.currentPort = ParamComposition.js5Port;
+		ScriptEvent.js5SocketTask = null; // L: 2126
+		FontName.js5Socket = null; // L: 2127
+		js5ConnectState = 0; // L: 2128
+		if (GameObject.worldPort == class129.currentPort) { // L: 2129
+			class129.currentPort = class133.js5Port;
 		} else {
-			ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 1954
+			class129.currentPort = GameObject.worldPort; // L: 2130
 		}
 
-		++js5Errors; // L: 1955
-		if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 1956
-			if (js5Errors >= 2 && var1 == 6) { // L: 1963
-				this.error("js5connect_outofdate"); // L: 1964
-				WorldMapData_1.updateGameState(1000); // L: 1965
-			} else if (js5Errors >= 4) { // L: 1967
-				if (gameState <= 5) { // L: 1968
-					this.error("js5connect"); // L: 1969
-					WorldMapData_1.updateGameState(1000); // L: 1970
+		++js5Errors; // L: 2131
+		if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 2132
+			if (js5Errors >= 2 && var1 == 6) { // L: 2139
+				this.error("js5connect_outofdate"); // L: 2140
+				VertexNormal.updateGameState(1000); // L: 2141
+			} else if (js5Errors >= 4) { // L: 2143
+				if (gameState <= 5) { // L: 2144
+					this.error("js5connect"); // L: 2145
+					VertexNormal.updateGameState(1000); // L: 2146
 				} else {
-					field572 = 3000; // L: 1972
+					field517 = 3000; // L: 2148
 				}
 			}
-		} else if (gameState <= 5) { // L: 1957
-			this.error("js5connect_full"); // L: 1958
-			WorldMapData_1.updateGameState(1000); // L: 1959
+		} else if (gameState <= 5) { // L: 2133
+			this.error("js5connect_full"); // L: 2134
+			VertexNormal.updateGameState(1000); // L: 2135
 		} else {
-			field572 = 3000; // L: 1961
+			field517 = 3000; // L: 2137
 		}
 
-	} // L: 1974
+	} // L: 2150
 
-	@ObfuscatedName("fn")
+	@ObfuscatedName("fg")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1167591664"
+		descriptor = "(B)V",
+		garbageValue = "0"
 	)
 	@Export("doCycleLoggedOut")
 	final void doCycleLoggedOut() {
-		Object var1 = packetWriter.getSocket(); // L: 2424
-		PacketBuffer var2 = packetWriter.packetBuffer; // L: 2425
+		Object var1 = packetWriter.getSocket(); // L: 2832
+		PacketBuffer var2 = packetWriter.packetBuffer; // L: 2833
 
 		try {
-			if (loginState == 0) { // L: 2427
-				if (UserComparator4.secureRandom == null && (secureRandomFuture.isDone() || field496 > 250)) { // L: 2428
-					UserComparator4.secureRandom = secureRandomFuture.get(); // L: 2429
-					secureRandomFuture.shutdown(); // L: 2430
-					secureRandomFuture = null; // L: 2431
+			if (loginState == 0) { // L: 2835
+				if (class19.secureRandom == null && (secureRandomFuture.isDone() || field545 > 250)) { // L: 2836
+					class19.secureRandom = secureRandomFuture.get(); // L: 2837
+					secureRandomFuture.shutdown(); // L: 2838
+					secureRandomFuture = null; // L: 2839
 				}
 
-				if (UserComparator4.secureRandom != null) { // L: 2433
-					if (var1 != null) { // L: 2434
-						((AbstractSocket)var1).close(); // L: 2435
-						var1 = null; // L: 2436
+				if (class19.secureRandom != null) { // L: 2841
+					if (var1 != null) { // L: 2842
+						((AbstractSocket)var1).close(); // L: 2843
+						var1 = null; // L: 2844
 					}
 
-					PcmPlayer.socketTask = null; // L: 2438
-					hadNetworkError = false; // L: 2439
-					field496 = 0; // L: 2440
-					if (field500.method7220()) { // L: 2441
+					class334.socketTask = null; // L: 2846
+					hadNetworkError = false; // L: 2847
+					field545 = 0; // L: 2848
+					if (field508.method7605()) { // L: 2849
 						try {
-							this.method1453(JagexCache.field1560); // L: 2443
-							UserComparator6.method2503(20); // L: 2444
-						} catch (Throwable var20) { // L: 2446
-							MilliClock.RunException_sendStackTrace((String)null, var20); // L: 2447
-							SecureRandomFuture.getLoginError(65); // L: 2448
-							return; // L: 2449
+							this.method1625(WorldMapAreaData.field2772); // L: 2851
+							PacketBufferNode.method5016(20); // L: 2852
+						} catch (Throwable var21) { // L: 2854
+							AccessFile.RunException_sendStackTrace((String)null, var21); // L: 2855
+							class29.getLoginError(65); // L: 2856
+							return; // L: 2857
 						}
 					} else {
-						UserComparator6.method2503(1); // L: 2453
+						PacketBufferNode.method5016(1); // L: 2861
 					}
 				}
 			}
 
-			if (loginState == 20) { // L: 2457
-				if (!this.field537.method280()) { // L: 2458
-					return; // L: 2459
+			if (loginState == 20) { // L: 2865
+				if (!this.field613.method309()) { // L: 2866
+					return; // L: 2867
 				}
 
-				if (this.field537.method276()) { // L: 2461
-					MilliClock.RunException_sendStackTrace(this.field537.method293(), (Throwable)null); // L: 2462
-					SecureRandomFuture.getLoginError(65); // L: 2463
-					return; // L: 2464
+				if (this.field613.method331()) { // L: 2869
+					AccessFile.RunException_sendStackTrace(this.field613.method307(), (Throwable)null); // L: 2870
+					class29.getLoginError(65); // L: 2871
+					return; // L: 2872
 				}
 
-				class21 var3 = this.field537.method281(); // L: 2466
-				if (var3.method310() != 200) { // L: 2467
-					MilliClock.RunException_sendStackTrace("Response code: " + var3.method310() + "Response body: " + var3.method303(), (Throwable)null); // L: 2468
-					SecureRandomFuture.getLoginError(65); // L: 2469
-					return; // L: 2470
+				class21 var3 = this.field613.method310(); // L: 2874
+				if (var3.method338() != 200) { // L: 2875
+					AccessFile.RunException_sendStackTrace("Response code: " + var3.method338() + "Response body: " + var3.method339(), (Throwable)null); // L: 2876
+					class29.getLoginError(65); // L: 2877
+					return; // L: 2878
 				}
 
-				field496 = 0; // L: 2472
-				this.field501 = var3.method303(); // L: 2473
-				UserComparator6.method2503(1); // L: 2474
+				field545 = 0; // L: 2880
+				this.field576 = var3.method339(); // L: 2881
+				PacketBufferNode.method5016(1); // L: 2882
 			}
 
-			if (loginState == 1) { // L: 2476
-				if (PcmPlayer.socketTask == null) { // L: 2477
-					PcmPlayer.socketTask = GameEngine.taskHandler.newSocketTask(WorldMapIcon_0.worldHost, ScriptEvent.currentPort); // L: 2478
+			if (loginState == 1) { // L: 2884
+				if (class334.socketTask == null) { // L: 2885
+					class334.socketTask = GameEngine.taskHandler.newSocketTask(class185.worldHost, class129.currentPort); // L: 2886
 				}
 
-				if (PcmPlayer.socketTask.status == 2) { // L: 2480
+				if (class334.socketTask.status == 2) { // L: 2888
 					throw new IOException();
 				}
 
-				if (PcmPlayer.socketTask.status == 1) { // L: 2481
-					if (useBufferedSocket) { // L: 2482
-						var1 = class132.method2767((Socket)PcmPlayer.socketTask.result, 40000, 5000); // L: 2483
+				if (class334.socketTask.status == 1) { // L: 2889
+					if (useBufferedSocket) { // L: 2890
+						var1 = Login.method1965((Socket)class334.socketTask.result, 40000, 5000); // L: 2891
 					} else {
-						var1 = new NetSocket((Socket)PcmPlayer.socketTask.result, GameEngine.taskHandler, 5000); // L: 2486
+						var1 = new NetSocket((Socket)class334.socketTask.result, GameEngine.taskHandler, 5000); // L: 2894
 					}
 
-					packetWriter.setSocket((AbstractSocket)var1); // L: 2488
-					PcmPlayer.socketTask = null; // L: 2489
-					UserComparator6.method2503(2); // L: 2490
+					packetWriter.setSocket((AbstractSocket)var1); // L: 2896
+					class334.socketTask = null; // L: 2897
+					PacketBufferNode.method5016(2); // L: 2898
 				}
 			}
 
-			PacketBufferNode var4;
-			if (loginState == 2) { // L: 2493
-				packetWriter.clearBuffer(); // L: 2494
-				var4 = class92.method2296(); // L: 2497
-				var4.clientPacket = null; // L: 2498
-				var4.clientPacketLength = 0; // L: 2499
-				var4.packetBuffer = new PacketBuffer(5000); // L: 2500
-				var4.packetBuffer.writeByte(LoginPacket.field2901.id); // L: 2504
-				packetWriter.addNode(var4); // L: 2505
-				packetWriter.flush(); // L: 2506
-				var2.offset = 0; // L: 2507
-				UserComparator6.method2503(3); // L: 2508
+			PacketBufferNode var23;
+			if (loginState == 2) { // L: 2901
+				packetWriter.clearBuffer(); // L: 2902
+				var23 = class231.method4802(); // L: 2903
+				var23.packetBuffer.writeByte(LoginPacket.field3032.id); // L: 2904
+				packetWriter.addNode(var23); // L: 2905
+				packetWriter.flush(); // L: 2906
+				var2.offset = 0; // L: 2907
+				PacketBufferNode.method5016(3); // L: 2908
 			}
 
-			boolean var13;
-			int var14;
-			if (loginState == 3) { // L: 2510
-				if (HealthBar.pcmPlayer0 != null) { // L: 2511
-					HealthBar.pcmPlayer0.method750();
+			int var4;
+			boolean var12;
+			if (loginState == 3) { // L: 2910
+				if (JagexCache.pcmPlayer0 != null) { // L: 2911
+					JagexCache.pcmPlayer0.method747();
 				}
 
-				if (ScriptEvent.pcmPlayer1 != null) { // L: 2512
-					ScriptEvent.pcmPlayer1.method750();
+				if (PacketWriter.pcmPlayer1 != null) { // L: 2912
+					PacketWriter.pcmPlayer1.method747();
 				}
 
-				var13 = true; // L: 2513
-				if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2514 2515
-					var13 = false;
+				var12 = true; // L: 2913
+				if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2914 2915
+					var12 = false;
 				}
 
-				if (var13) { // L: 2517
-					var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2518
-					if (HealthBar.pcmPlayer0 != null) { // L: 2519
-						HealthBar.pcmPlayer0.method750();
+				if (var12) { // L: 2917
+					var4 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2918
+					if (JagexCache.pcmPlayer0 != null) { // L: 2919
+						JagexCache.pcmPlayer0.method747();
 					}
 
-					if (ScriptEvent.pcmPlayer1 != null) { // L: 2520
-						ScriptEvent.pcmPlayer1.method750();
+					if (PacketWriter.pcmPlayer1 != null) { // L: 2920
+						PacketWriter.pcmPlayer1.method747();
 					}
 
-					if (var14 != 0) { // L: 2521
-						SecureRandomFuture.getLoginError(var14); // L: 2522
-						return; // L: 2523
+					if (var4 != 0) { // L: 2921
+						class29.getLoginError(var4); // L: 2922
+						return; // L: 2923
 					}
 
-					var2.offset = 0; // L: 2525
-					UserComparator6.method2503(4); // L: 2526
+					var2.offset = 0; // L: 2925
+					PacketBufferNode.method5016(4); // L: 2926
 				}
 			}
 
-			int var33;
-			if (loginState == 4) { // L: 2529
-				if (var2.offset < 8) { // L: 2530
-					var33 = ((AbstractSocket)var1).available(); // L: 2531
-					if (var33 > 8 - var2.offset) { // L: 2532
-						var33 = 8 - var2.offset;
+			int var34;
+			if (loginState == 4) { // L: 2929
+				if (var2.offset < 8) { // L: 2930
+					var34 = ((AbstractSocket)var1).available(); // L: 2931
+					if (var34 > 8 - var2.offset) { // L: 2932
+						var34 = 8 - var2.offset;
 					}
 
-					if (var33 > 0) { // L: 2533
-						((AbstractSocket)var1).read(var2.array, var2.offset, var33); // L: 2534
-						var2.offset += var33; // L: 2535
+					if (var34 > 0) { // L: 2933
+						((AbstractSocket)var1).read(var2.array, var2.offset, var34); // L: 2934
+						var2.offset += var34; // L: 2935
 					}
 				}
 
-				if (var2.offset == 8) { // L: 2538
-					var2.offset = 0; // L: 2539
-					ItemLayer.field2244 = var2.readLong(); // L: 2540
-					UserComparator6.method2503(5); // L: 2541
+				if (var2.offset == 8) { // L: 2938
+					var2.offset = 0; // L: 2939
+					Messages.field1272 = var2.readLong(); // L: 2940
+					PacketBufferNode.method5016(5); // L: 2941
 				}
 			}
 
-			if (loginState == 5) { // L: 2544
-				packetWriter.packetBuffer.offset = 0; // L: 2545
-				packetWriter.clearBuffer(); // L: 2546
-				PacketBuffer var22 = new PacketBuffer(500); // L: 2547
-				int[] var25 = new int[]{UserComparator4.secureRandom.nextInt(), UserComparator4.secureRandom.nextInt(), UserComparator4.secureRandom.nextInt(), UserComparator4.secureRandom.nextInt()}; // L: 2548 2549 2550 2551 2552
-				var22.offset = 0; // L: 2553
-				var22.writeByte(1); // L: 2554
-				var22.writeInt(var25[0]); // L: 2555
-				var22.writeInt(var25[1]); // L: 2556
-				var22.writeInt(var25[2]); // L: 2557
-				var22.writeInt(var25[3]); // L: 2558
-				var22.writeLong(ItemLayer.field2244); // L: 2559
-				if (gameState == 40) { // L: 2560
-					var22.writeInt(ServerPacket.field2893[0]); // L: 2561
-					var22.writeInt(ServerPacket.field2893[1]); // L: 2562
-					var22.writeInt(ServerPacket.field2893[2]); // L: 2563
-					var22.writeInt(ServerPacket.field2893[3]); // L: 2564
+			int var7;
+			int var9;
+			int var14;
+			if (loginState == 5) { // L: 2944
+				packetWriter.packetBuffer.offset = 0; // L: 2945
+				packetWriter.clearBuffer(); // L: 2946
+				PacketBuffer var24 = new PacketBuffer(500); // L: 2947
+				int[] var13 = new int[]{class19.secureRandom.nextInt(), class19.secureRandom.nextInt(), class19.secureRandom.nextInt(), class19.secureRandom.nextInt()}; // L: 2948 2949 2950 2951 2952
+				var24.offset = 0; // L: 2953
+				var24.writeByte(1); // L: 2954
+				var24.writeInt(var13[0]); // L: 2955
+				var24.writeInt(var13[1]); // L: 2956
+				var24.writeInt(var13[2]); // L: 2957
+				var24.writeInt(var13[3]); // L: 2958
+				var24.writeLong(Messages.field1272); // L: 2959
+				int var10;
+				if (gameState == 40) { // L: 2960
+					var24.writeInt(ArchiveLoader.field984[0]); // L: 2961
+					var24.writeInt(ArchiveLoader.field984[1]); // L: 2962
+					var24.writeInt(ArchiveLoader.field984[2]); // L: 2963
+					var24.writeInt(ArchiveLoader.field984[3]); // L: 2964
 				} else {
-					var22.writeByte(field693.rsOrdinal()); // L: 2567
-					switch(field693.field1344) { // L: 2568
+					var24.writeByte(field507.rsOrdinal()); // L: 2967
+					switch(field507.field1475) { // L: 2968
 					case 0:
 					case 3:
-						var22.writeMedium(ReflectionCheck.field429); // L: 2577
-						++var22.offset; // L: 2578
-						break; // L: 2579
+						var24.writeMedium(class148.field1651); // L: 2972
+						++var24.offset; // L: 2973
+						break; // L: 2974
 					case 1:
-						var22.writeInt((Integer)class408.clientPreferences.parameters.get(ClanChannel.method2824(Login.Login_username))); // L: 2583
+						LinkedHashMap var6 = SecureRandomFuture.clientPreferences.parameters; // L: 2984
+						String var8 = Login.Login_username; // L: 2986
+						var9 = var8.length(); // L: 2988
+						var10 = 0; // L: 2989
+
+						for (int var11 = 0; var11 < var9; ++var11) { // L: 2990
+							var10 = (var10 << 5) - var10 + var8.charAt(var11);
+						}
+
+						var24.writeInt((Integer)var6.get(var10)); // L: 2993
 						break;
 					case 2:
-						var22.offset += 4; // L: 2571
+						var24.offset += 4; // L: 2978
 					}
 
-					if (field500.method7220()) { // L: 2587
-						var22.writeByte(class404.field4352.rsOrdinal()); // L: 2588
-						var22.writeStringCp1252NullTerminated(this.field501); // L: 2589
+					if (field508.method7605()) { // L: 2997
+						var24.writeByte(class422.field4524.rsOrdinal()); // L: 2998
+						var24.writeStringCp1252NullTerminated(this.field576); // L: 2999
 					} else {
-						var22.writeByte(class404.field4351.rsOrdinal()); // L: 2592
-						var22.writeStringCp1252NullTerminated(Login.Login_password); // L: 2593
+						var24.writeByte(class422.field4523.rsOrdinal()); // L: 3002
+						var24.writeStringCp1252NullTerminated(Login.Login_password); // L: 3003
 					}
 				}
 
-				var22.encryptRsa(class67.field840, class67.field843); // L: 2596
-				ServerPacket.field2893 = var25; // L: 2597
-				PacketBufferNode var6 = class92.method2296(); // L: 2600
-				var6.clientPacket = null; // L: 2601
-				var6.clientPacketLength = 0; // L: 2602
-				var6.packetBuffer = new PacketBuffer(5000); // L: 2603
-				var6.packetBuffer.offset = 0; // L: 2607
-				if (gameState == 40) { // L: 2608
-					var6.packetBuffer.writeByte(LoginPacket.field2894.id); // L: 2609
+				var24.encryptRsa(class67.field856, class67.field857); // L: 3006
+				ArchiveLoader.field984 = var13; // L: 3007
+				PacketBufferNode var5 = class231.method4802(); // L: 3008
+				var5.packetBuffer.offset = 0; // L: 3009
+				if (gameState == 40) { // L: 3010
+					var5.packetBuffer.writeByte(LoginPacket.field3037.id); // L: 3011
 				} else {
-					var6.packetBuffer.writeByte(LoginPacket.field2896.id); // L: 2612
-				}
-
-				var6.packetBuffer.writeShort(0); // L: 2614
-				int var7 = var6.packetBuffer.offset; // L: 2615
-				var6.packetBuffer.writeInt(201); // L: 2616
-				var6.packetBuffer.writeInt(1); // L: 2617
-				var6.packetBuffer.writeByte(clientType); // L: 2618
-				var6.packetBuffer.writeByte(field469); // L: 2619
-				var6.packetBuffer.writeBytes(var22.array, 0, var22.offset); // L: 2620
-				int var8 = var6.packetBuffer.offset; // L: 2621
-				var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2622
-				var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2623
-				var6.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 2624
-				var6.packetBuffer.writeShort(KeyHandler.canvasHeight); // L: 2625
-				PacketBuffer var9 = var6.packetBuffer; // L: 2626
-				if (randomDatData != null) { // L: 2628
-					var9.writeBytes(randomDatData, 0, randomDatData.length); // L: 2629
-				} else {
-					byte[] var10 = ObjectSound.method1771(); // L: 2632
-					var9.writeBytes(var10, 0, var10.length); // L: 2633
-				}
-
-				var6.packetBuffer.writeStringCp1252NullTerminated(UserComparator3.field1316); // L: 2635
-				var6.packetBuffer.writeInt(TextureProvider.field2483); // L: 2636
-				Buffer var32 = new Buffer(class54.platformInfo.size()); // L: 2637
-				class54.platformInfo.write(var32); // L: 2638
-				var6.packetBuffer.writeBytes(var32.array, 0, var32.array.length); // L: 2639
-				var6.packetBuffer.writeByte(clientType); // L: 2640
-				var6.packetBuffer.writeInt(0); // L: 2641
-				var6.packetBuffer.method7010(Messages.archive6.hash); // L: 2642
-				var6.packetBuffer.writeInt(Archive.archive15.hash); // L: 2643
-				var6.packetBuffer.writeIntME(SecureRandomCallable.archive14.hash); // L: 2644
-				var6.packetBuffer.method7126(HorizontalAlignment.archive7.hash); // L: 2645
-				var6.packetBuffer.method7010(GrandExchangeOfferOwnWorldComparator.archive20.hash); // L: 2646
-				var6.packetBuffer.writeIntME(Message.archive17.hash); // L: 2647
-				var6.packetBuffer.writeIntME(GrandExchangeOfferOwnWorldComparator.archive8.hash); // L: 2648
-				var6.packetBuffer.method7010(Messages.archive18.hash); // L: 2649
-				var6.packetBuffer.method7126(class1.archive2.hash); // L: 2650
-				var6.packetBuffer.method7010(0); // L: 2651
-				var6.packetBuffer.method7010(class14.archive12.hash); // L: 2652
-				var6.packetBuffer.method7010(SecureRandomFuture.archive9.hash); // L: 2653
-				var6.packetBuffer.writeInt(ApproximateRouteStrategy.archive1.hash); // L: 2654
-				var6.packetBuffer.writeInt(InvDefinition.archive0.hash); // L: 2655
-				var6.packetBuffer.method7010(ChatChannel.archive10.hash); // L: 2656
-				var6.packetBuffer.writeInt(class11.archive5.hash); // L: 2657
-				var6.packetBuffer.writeIntME(class111.archive19.hash); // L: 2658
-				var6.packetBuffer.writeIntME(class12.archive4.hash); // L: 2659
-				var6.packetBuffer.writeIntME(ParamComposition.archive3.hash); // L: 2660
-				var6.packetBuffer.writeInt(LoginScreenAnimation.archive13.hash); // L: 2661
-				var6.packetBuffer.writeInt(AbstractWorldMapIcon.archive11.hash); // L: 2662
-				var6.packetBuffer.xteaEncrypt(var25, var8, var6.packetBuffer.offset); // L: 2663
-				var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var7); // L: 2664
-				packetWriter.addNode(var6); // L: 2665
-				packetWriter.flush(); // L: 2666
-				packetWriter.isaacCipher = new IsaacCipher(var25); // L: 2667
-				int[] var11 = new int[4]; // L: 2668
-
-				for (int var12 = 0; var12 < 4; ++var12) { // L: 2669
-					var11[var12] = var25[var12] + 50;
-				}
-
-				var2.newIsaacCipher(var11); // L: 2670
-				UserComparator6.method2503(6); // L: 2671
+					var5.packetBuffer.writeByte(LoginPacket.field3038.id); // L: 3014
+				}
+
+				var5.packetBuffer.writeShort(0); // L: 3016
+				var14 = var5.packetBuffer.offset; // L: 3017
+				var5.packetBuffer.writeInt(202); // L: 3018
+				var5.packetBuffer.writeInt(1); // L: 3019
+				var5.packetBuffer.writeByte(clientType); // L: 3020
+				var5.packetBuffer.writeByte(field499); // L: 3021
+				var5.packetBuffer.writeBytes(var24.array, 0, var24.offset); // L: 3022
+				var7 = var5.packetBuffer.offset; // L: 3023
+				var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 3024
+				var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 3025
+				var5.packetBuffer.writeShort(class186.canvasWidth); // L: 3026
+				var5.packetBuffer.writeShort(BoundaryObject.canvasHeight); // L: 3027
+				Decimator.method1082(var5.packetBuffer); // L: 3028
+				var5.packetBuffer.writeStringCp1252NullTerminated(class1.field3); // L: 3029
+				var5.packetBuffer.writeInt(FriendLoginUpdate.field4096); // L: 3030
+				Buffer var32 = new Buffer(Interpreter.platformInfo.size()); // L: 3031
+				Interpreter.platformInfo.write(var32); // L: 3032
+				var5.packetBuffer.writeBytes(var32.array, 0, var32.array.length); // L: 3033
+				var5.packetBuffer.writeByte(clientType); // L: 3034
+				var5.packetBuffer.writeInt(0); // L: 3035
+				var5.packetBuffer.writeInt(0); // L: 3036
+				var5.packetBuffer.method7407(WorldMapScaleHandler.archive6.hash); // L: 3037
+				var5.packetBuffer.writeIntME(class9.archive3.hash); // L: 3038
+				var5.packetBuffer.method7407(ChatChannel.archive14.hash); // L: 3039
+				var5.packetBuffer.method7527(class1.archive13.hash); // L: 3040
+				var5.packetBuffer.writeInt(TaskHandler.archive12.hash); // L: 3041
+				var5.packetBuffer.writeInt(class148.archive19.hash); // L: 3042
+				var5.packetBuffer.method7407(class133.archive15.hash); // L: 3043
+				var5.packetBuffer.writeIntME(class19.archive4.hash); // L: 3044
+				var5.packetBuffer.writeIntME(UserComparator6.archive8.hash); // L: 3045
+				var5.packetBuffer.method7527(class126.archive17.hash); // L: 3046
+				var5.packetBuffer.writeIntME(class115.archive7.hash); // L: 3047
+				var5.packetBuffer.writeInt(Players.archive11.hash); // L: 3048
+				var5.packetBuffer.method7407(VertexNormal.archive18.hash); // L: 3049
+				var5.packetBuffer.writeInt(class140.archive5.hash); // L: 3050
+				var5.packetBuffer.writeIntME(class131.archive2.hash); // L: 3051
+				var5.packetBuffer.method7407(KeyHandler.field151.hash); // L: 3052
+				var5.packetBuffer.writeIntME(NetSocket.archive9.hash); // L: 3053
+				var5.packetBuffer.writeInt(class257.archive10.hash); // L: 3054
+				var5.packetBuffer.method7407(HealthBarUpdate.archive20.hash); // L: 3055
+				var5.packetBuffer.method7407(class115.archive1.hash); // L: 3056
+				var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset); // L: 3057
+				var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 3058
+				packetWriter.addNode(var5); // L: 3059
+				packetWriter.flush(); // L: 3060
+				packetWriter.isaacCipher = new IsaacCipher(var13); // L: 3061
+				int[] var15 = new int[4]; // L: 3062
+
+				for (var10 = 0; var10 < 4; ++var10) { // L: 3063
+					var15[var10] = var13[var10] + 50;
+				}
+
+				var2.newIsaacCipher(var15); // L: 3064
+				PacketBufferNode.method5016(6); // L: 3065
 			}
 
-			if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2673 2674
-				var33 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2675
-				if (var33 == 21 && gameState == 20) { // L: 2676
-					UserComparator6.method2503(12); // L: 2677
-				} else if (var33 == 2) { // L: 2679
-					UserComparator6.method2503(14); // L: 2680
-				} else if (var33 == 15 && gameState == 40) { // L: 2682
-					packetWriter.serverPacketLength = -1; // L: 2683
-					UserComparator6.method2503(19); // L: 2684
-				} else if (var33 == 64) { // L: 2686
-					UserComparator6.method2503(10); // L: 2687
-				} else if (var33 == 23 && field685 < 1) { // L: 2689
-					++field685; // L: 2690
-					UserComparator6.method2503(0); // L: 2691
-				} else if (var33 == 29) { // L: 2693
-					UserComparator6.method2503(17); // L: 2694
+			if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 3067 3068
+				var34 = ((AbstractSocket)var1).readUnsignedByte(); // L: 3069
+				if (var34 == 21 && gameState == 20) { // L: 3070
+					PacketBufferNode.method5016(12); // L: 3071
+				} else if (var34 == 2) { // L: 3073
+					PacketBufferNode.method5016(14); // L: 3074
+				} else if (var34 == 15 && gameState == 40) { // L: 3076
+					packetWriter.serverPacketLength = -1; // L: 3077
+					PacketBufferNode.method5016(19); // L: 3078
+				} else if (var34 == 64) { // L: 3080
+					PacketBufferNode.method5016(10); // L: 3081
+				} else if (var34 == 23 && field541 < 1) { // L: 3083
+					++field541; // L: 3084
+					PacketBufferNode.method5016(0); // L: 3085
+				} else if (var34 == 29) { // L: 3087
+					PacketBufferNode.method5016(17); // L: 3088
 				} else {
-					if (var33 != 69) { // L: 2696
-						SecureRandomFuture.getLoginError(var33); // L: 2700
-						return; // L: 2701
+					if (var34 != 69) { // L: 3090
+						class29.getLoginError(var34); // L: 3094
+						return; // L: 3095
 					}
 
-					UserComparator6.method2503(7); // L: 2697
+					PacketBufferNode.method5016(7); // L: 3091
 				}
 			}
 
-			if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2705 2706
-				((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2707
-				var2.offset = 0; // L: 2708
-				class320.field3868 = var2.readUnsignedShort(); // L: 2709
-				UserComparator6.method2503(8); // L: 2710
+			if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 3099 3100
+				((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3101
+				var2.offset = 0; // L: 3102
+				WorldMapSection2.field2601 = var2.readUnsignedShort(); // L: 3103
+				PacketBufferNode.method5016(8); // L: 3104
 			}
 
-			if (loginState == 8 && ((AbstractSocket)var1).available() >= class320.field3868) { // L: 2713 2714
-				var2.offset = 0; // L: 2715
-				((AbstractSocket)var1).read(var2.array, var2.offset, class320.field3868); // L: 2716
-				class6 var23 = class135.method2797()[var2.readUnsignedByte()]; // L: 2717
+			if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field2601) { // L: 3107 3108
+				var2.offset = 0; // L: 3109
+				((AbstractSocket)var1).read(var2.array, var2.offset, WorldMapSection2.field2601); // L: 3110
+				class6 var25 = FontName.method7075()[var2.readUnsignedByte()]; // L: 3111
 
 				try {
-					switch(var23.field12) { // L: 2721
-					case 0:
-						class0 var26 = new class0(); // L: 2728
-						this.field507 = new class7(var2, var26); // L: 2734
-						UserComparator6.method2503(9); // L: 2735
-						break;
-					default:
-						throw new IllegalArgumentException(); // L: 2724
-					}
-				} catch (Exception var19) { // L: 2737
-					SecureRandomFuture.getLoginError(22); // L: 2738
-					return; // L: 2739
+					class3 var35 = KitDefinition.method3238(var25); // L: 3113
+					this.field515 = new class7(var2, var35); // L: 3114
+					PacketBufferNode.method5016(9); // L: 3115
+				} catch (Exception var20) { // L: 3117
+					class29.getLoginError(22); // L: 3118
+					return; // L: 3119
 				}
 			}
 
-			if (loginState == 9 && this.field507.method46()) { // L: 2743 2744
-				this.field579 = this.field507.method48(); // L: 2745
-				this.field507.method47(); // L: 2746
-				this.field507 = null; // L: 2747
-				if (this.field579 == null) { // L: 2748
-					SecureRandomFuture.getLoginError(22); // L: 2749
-					return; // L: 2750
-				}
-
-				packetWriter.clearBuffer(); // L: 2752
-				var4 = class92.method2296(); // L: 2755
-				var4.clientPacket = null; // L: 2756
-				var4.clientPacketLength = 0; // L: 2757
-				var4.packetBuffer = new PacketBuffer(5000); // L: 2758
-				var4.packetBuffer.writeByte(LoginPacket.field2900.id); // L: 2762
-				var4.packetBuffer.writeShort(this.field579.offset); // L: 2763
-				var4.packetBuffer.method6960(this.field579); // L: 2764
-				packetWriter.addNode(var4); // L: 2765
-				packetWriter.flush(); // L: 2766
-				this.field579 = null; // L: 2767
-				UserComparator6.method2503(6); // L: 2768
+			if (loginState == 9 && this.field515.method61()) { // L: 3123 3124
+				this.field710 = this.field515.method75(); // L: 3125
+				this.field515.method65(); // L: 3126
+				this.field515 = null; // L: 3127
+				if (this.field710 == null) { // L: 3128
+					class29.getLoginError(22); // L: 3129
+					return; // L: 3130
+				}
+
+				packetWriter.clearBuffer(); // L: 3132
+				var23 = class231.method4802(); // L: 3133
+				var23.packetBuffer.writeByte(LoginPacket.field3034.id); // L: 3134
+				var23.packetBuffer.writeShort(this.field710.offset); // L: 3135
+				var23.packetBuffer.method7356(this.field710); // L: 3136
+				packetWriter.addNode(var23); // L: 3137
+				packetWriter.flush(); // L: 3138
+				this.field710 = null; // L: 3139
+				PacketBufferNode.method5016(6); // L: 3140
 			}
 
-			if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2771 2772
-				VarbitComposition.field1775 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2773
-				UserComparator6.method2503(11); // L: 2774
+			if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 3143 3144
+				class10.field59 = ((AbstractSocket)var1).readUnsignedByte(); // L: 3145
+				PacketBufferNode.method5016(11); // L: 3146
 			}
 
-			if (loginState == 11 && ((AbstractSocket)var1).available() >= VarbitComposition.field1775) { // L: 2777 2778
-				((AbstractSocket)var1).read(var2.array, 0, VarbitComposition.field1775); // L: 2779
-				var2.offset = 0; // L: 2780
-				UserComparator6.method2503(6); // L: 2781
+			if (loginState == 11 && ((AbstractSocket)var1).available() >= class10.field59) { // L: 3149 3150
+				((AbstractSocket)var1).read(var2.array, 0, class10.field59); // L: 3151
+				var2.offset = 0; // L: 3152
+				PacketBufferNode.method5016(6); // L: 3153
 			}
 
-			if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2784 2785
-				field498 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2786
-				UserComparator6.method2503(13); // L: 2787
+			if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 3156 3157
+				field506 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 3158
+				PacketBufferNode.method5016(13); // L: 3159
 			}
 
-			if (loginState == 13) { // L: 2790
-				field496 = 0; // L: 2791
-				class1.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field498 / 60 + " seconds."); // L: 2792
-				if (--field498 <= 0) { // L: 2793
-					UserComparator6.method2503(0);
+			if (loginState == 13) { // L: 3162
+				field545 = 0; // L: 3163
+				class19.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field506 / 60 + " seconds."); // L: 3164
+				if (--field506 <= 0) { // L: 3165
+					PacketBufferNode.method5016(0);
 				}
 
 			} else {
-				if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2796 2797
-					TextureProvider.field2485 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2798
-					UserComparator6.method2503(15); // L: 2799
-				}
+				if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 3168 3169
+					Canvas.field163 = ((AbstractSocket)var1).readUnsignedByte(); // L: 3170
+					PacketBufferNode.method5016(15); // L: 3171
+				}
+
+				if (loginState == 15 && ((AbstractSocket)var1).available() >= Canvas.field163) { // L: 3174 3175
+					var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 3176
+					((AbstractSocket)var1).read(var2.array, 0, 4); // L: 3177
+					var2.offset = 0; // L: 3178
+					boolean var26 = false; // L: 3179
+					if (var12) { // L: 3180
+						var4 = var2.readByteIsaac() << 24; // L: 3181
+						var4 |= var2.readByteIsaac() << 16; // L: 3182
+						var4 |= var2.readByteIsaac() << 8; // L: 3183
+						var4 |= var2.readByteIsaac(); // L: 3184
+						String var31 = Login.Login_username; // L: 3186
+						var7 = var31.length(); // L: 3188
+						int var16 = 0; // L: 3189
+						var9 = 0; // L: 3190
 
-				int var15;
-				boolean var34;
-				if (loginState == 15 && ((AbstractSocket)var1).available() >= TextureProvider.field2485) { // L: 2802 2803
-					var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2804
-					((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2805
-					var2.offset = 0; // L: 2806
-					var34 = false; // L: 2807
-					if (var13) { // L: 2808
-						var14 = var2.readByteIsaac() << 24; // L: 2809
-						var14 |= var2.readByteIsaac() << 16; // L: 2810
-						var14 |= var2.readByteIsaac() << 8; // L: 2811
-						var14 |= var2.readByteIsaac(); // L: 2812
-						var15 = ClanChannel.method2824(Login.Login_username); // L: 2813
-						if (class408.clientPreferences.parameters.size() >= 10 && !class408.clientPreferences.parameters.containsKey(var15)) { // L: 2814 2815
-							Iterator var31 = class408.clientPreferences.parameters.entrySet().iterator(); // L: 2816
-							var31.next(); // L: 2817
-							var31.remove(); // L: 2818
-						}
+						while (true) {
+							if (var9 >= var7) {
+								if (SecureRandomFuture.clientPreferences.parameters.size() >= 10 && !SecureRandomFuture.clientPreferences.parameters.containsKey(var16)) { // L: 3194 3195
+									Iterator var33 = SecureRandomFuture.clientPreferences.parameters.entrySet().iterator(); // L: 3196
+									var33.next(); // L: 3197
+									var33.remove(); // L: 3198
+								}
+
+								SecureRandomFuture.clientPreferences.parameters.put(var16, var4); // L: 3201
+								break;
+							}
 
-						class408.clientPreferences.parameters.put(var15, var14); // L: 2821
+							var16 = (var16 << 5) - var16 + var31.charAt(var9);
+							++var9;
+						}
 					}
 
-					if (Login_isUsernameRemembered) { // L: 2823
-						class408.clientPreferences.rememberedUsername = Login.Login_username; // L: 2824
+					if (Login_isUsernameRemembered) { // L: 3203
+						SecureRandomFuture.clientPreferences.rememberedUsername = Login.Login_username; // L: 3204
 					} else {
-						class408.clientPreferences.rememberedUsername = null; // L: 2827
-					}
-
-					Login.savePreferences(); // L: 2829
-					staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2830
-					playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2831
-					localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2832
-					localPlayerIndex <<= 8; // L: 2833
-					localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2834
-					field588 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2835
-					((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2836
-					var2.offset = 0; // L: 2837
-					ServerPacket[] var5 = class128.ServerPacket_values(); // L: 2838
-					int var16 = var2.readSmartByteShortIsaac(); // L: 2839
-					if (var16 < 0 || var16 >= var5.length) { // L: 2840
-						throw new IOException(var16 + " " + var2.offset);
-					}
-
-					packetWriter.serverPacket = var5[var16]; // L: 2841
-					packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2842
-					((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2843
-					var2.offset = 0; // L: 2844
-					packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2845
+						SecureRandomFuture.clientPreferences.rememberedUsername = null; // L: 3207
+					}
+
+					class127.savePreferences(); // L: 3209
+					staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 3210
+					playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 3211
+					localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 3212
+					localPlayerIndex <<= 8; // L: 3213
+					localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 3214
+					field594 = ((AbstractSocket)var1).readUnsignedByte(); // L: 3215
+					((AbstractSocket)var1).read(var2.array, 0, 1); // L: 3216
+					var2.offset = 0; // L: 3217
+					ServerPacket[] var28 = class129.ServerPacket_values(); // L: 3218
+					var14 = var2.readSmartByteShortIsaac(); // L: 3219
+					if (var14 < 0 || var14 >= var28.length) { // L: 3220
+						throw new IOException(var14 + " " + var2.offset);
+					}
+
+					packetWriter.serverPacket = var28[var14]; // L: 3221
+					packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 3222
+					((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3223
+					var2.offset = 0; // L: 3224
+					packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 3225
 
 					try {
-						Client var17 = ArchiveLoader.client; // L: 2847
-						JSObject.getWindow(var17).call("zap", (Object[])null); // L: 2850
-					} catch (Throwable var18) { // L: 2853
+						Client var18 = class295.client; // L: 3227
+						JSObject.getWindow(var18).call("zap", (Object[])null); // L: 3230
+					} catch (Throwable var19) { // L: 3233
 					}
 
-					UserComparator6.method2503(16); // L: 2854
+					PacketBufferNode.method5016(16); // L: 3234
 				}
 
-				if (loginState != 16) { // L: 2857
-					if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2976 2977
-						var2.offset = 0; // L: 2978
-						((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2979
-						var2.offset = 0; // L: 2980
-						class122.field1420 = var2.readUnsignedShort(); // L: 2981
-						UserComparator6.method2503(18); // L: 2982
+				if (loginState != 16) { // L: 3237
+					if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 3350 3351
+						var2.offset = 0; // L: 3352
+						((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3353
+						var2.offset = 0; // L: 3354
+						class126.field1497 = var2.readUnsignedShort(); // L: 3355
+						PacketBufferNode.method5016(18); // L: 3356
 					}
 
-					if (loginState == 18 && ((AbstractSocket)var1).available() >= class122.field1420) { // L: 2985 2986
-						var2.offset = 0; // L: 2987
-						((AbstractSocket)var1).read(var2.array, 0, class122.field1420); // L: 2988
-						var2.offset = 0; // L: 2989
-						String var27 = var2.readStringCp1252NullTerminated(); // L: 2990
-						String var30 = var2.readStringCp1252NullTerminated(); // L: 2991
-						String var28 = var2.readStringCp1252NullTerminated(); // L: 2992
-						class1.setLoginResponseString(var27, var30, var28); // L: 2993
-						WorldMapData_1.updateGameState(10); // L: 2994
+					if (loginState == 18 && ((AbstractSocket)var1).available() >= class126.field1497) { // L: 3359 3360
+						var2.offset = 0; // L: 3361
+						((AbstractSocket)var1).read(var2.array, 0, class126.field1497); // L: 3362
+						var2.offset = 0; // L: 3363
+						String var29 = var2.readStringCp1252NullTerminated(); // L: 3364
+						String var37 = var2.readStringCp1252NullTerminated(); // L: 3365
+						String var30 = var2.readStringCp1252NullTerminated(); // L: 3366
+						class19.setLoginResponseString(var29, var37, var30); // L: 3367
+						VertexNormal.updateGameState(10); // L: 3368
 					}
 
-					if (loginState == 19) { // L: 2997
-						if (packetWriter.serverPacketLength == -1) { // L: 2998
-							if (((AbstractSocket)var1).available() < 2) { // L: 2999
+					if (loginState == 19) { // L: 3371
+						if (packetWriter.serverPacketLength == -1) { // L: 3372
+							if (((AbstractSocket)var1).available() < 2) { // L: 3373
 								return;
 							}
 
-							((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3000
-							var2.offset = 0; // L: 3001
-							packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 3002
+							((AbstractSocket)var1).read(var2.array, 0, 2); // L: 3374
+							var2.offset = 0; // L: 3375
+							packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 3376
 						}
 
-						if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 3004
-							((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 3005
-							var2.offset = 0; // L: 3006
-							var33 = packetWriter.serverPacketLength; // L: 3007
-							timer.method5970(); // L: 3008
-							Bounds.method6370(); // L: 3009
-							LoginScreenAnimation.updatePlayer(var2); // L: 3010
-							if (var33 != var2.offset) { // L: 3011
-								throw new RuntimeException(); // L: 3012
+						if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 3378
+							((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 3379
+							var2.offset = 0; // L: 3380
+							var34 = packetWriter.serverPacketLength; // L: 3381
+							timer.method6244(); // L: 3382
+							class116.method2662(); // L: 3383
+							HorizontalAlignment.updatePlayer(var2); // L: 3384
+							if (var34 != var2.offset) { // L: 3385
+								throw new RuntimeException(); // L: 3386
 							}
 						}
 					} else {
-						++field496; // L: 3016
-						if (field496 > 2000) { // L: 3017
-							if (field685 < 1) { // L: 3018
-								if (ScriptEvent.currentPort == ApproximateRouteStrategy.worldPort) { // L: 3019
-									ScriptEvent.currentPort = ParamComposition.js5Port;
+						++field545; // L: 3390
+						if (field545 > 2000) { // L: 3391
+							if (field541 < 1) { // L: 3392
+								if (GameObject.worldPort == class129.currentPort) { // L: 3393
+									class129.currentPort = class133.js5Port;
 								} else {
-									ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 3020
+									class129.currentPort = GameObject.worldPort; // L: 3394
 								}
 
-								++field685; // L: 3021
-								UserComparator6.method2503(0); // L: 3022
+								++field541; // L: 3395
+								PacketBufferNode.method5016(0); // L: 3396
 							} else {
-								SecureRandomFuture.getLoginError(-3); // L: 3025
+								class29.getLoginError(-3); // L: 3399
 							}
 						}
 					}
 				} else {
-					if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2858
-						var2.offset = 0; // L: 2859
-						((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2860
-						timer.method5974(); // L: 2861
-						mouseLastLastPressedTimeMillis = -1L; // L: 2864
-						Interpreter.mouseRecorder.index = 0; // L: 2865
-						WorldMapSectionType.hasFocus = true; // L: 2866
-						hadFocus = true; // L: 2867
-						field565 = -1L; // L: 2868
-						class125.method2637(); // L: 2869
-						packetWriter.clearBuffer(); // L: 2870
-						packetWriter.packetBuffer.offset = 0; // L: 2871
-						packetWriter.serverPacket = null; // L: 2872
-						packetWriter.field1277 = null; // L: 2873
-						packetWriter.field1284 = null; // L: 2874
-						packetWriter.field1285 = null; // L: 2875
-						packetWriter.serverPacketLength = 0; // L: 2876
-						packetWriter.field1275 = 0; // L: 2877
-						rebootTimer = 0; // L: 2878
-						logoutTimer = 0; // L: 2879
-						hintArrowType = 0; // L: 2880
-						KeyHandler.method343(); // L: 2881
-						ClanSettings.method2703(0); // L: 2882
-						Strings.method5220(); // L: 2883
-						isItemSelected = 0; // L: 2884
-						isSpellSelected = false; // L: 2885
-						soundEffectCount = 0; // L: 2886
-						camAngleY = 0; // L: 2887
-						oculusOrbState = 0; // L: 2888
-						ClanSettings.field1440 = null; // L: 2889
-						minimapState = 0; // L: 2890
-						field701 = -1; // L: 2891
-						destinationX = 0; // L: 2892
-						destinationY = 0; // L: 2893
-						playerAttackOption = AttackOption.AttackOption_hidden; // L: 2894
-						npcAttackOption = AttackOption.AttackOption_hidden; // L: 2895
-						npcCount = 0; // L: 2896
-						Players.Players_count = 0; // L: 2898
-
-						for (var33 = 0; var33 < 2048; ++var33) { // L: 2899
-							Players.field1242[var33] = null; // L: 2900
-							Players.field1241[var33] = 1; // L: 2901
-						}
-
-						for (var33 = 0; var33 < 2048; ++var33) { // L: 2904
-							players[var33] = null;
-						}
-
-						for (var33 = 0; var33 < 32768; ++var33) { // L: 2905
-							npcs[var33] = null;
-						}
-
-						combatTargetPlayerIndex = -1; // L: 2906
-						projectiles.clear(); // L: 2907
-						graphicsObjects.clear(); // L: 2908
-
-						for (var33 = 0; var33 < 4; ++var33) { // L: 2909
-							for (var14 = 0; var14 < 104; ++var14) { // L: 2910
-								for (var15 = 0; var15 < 104; ++var15) { // L: 2911
-									groundItems[var33][var14][var15] = null; // L: 2912
+					if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 3238
+						var2.offset = 0; // L: 3239
+						((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 3240
+						timer.method6234(); // L: 3241
+						mouseLastLastPressedTimeMillis = -1L; // L: 3244
+						mouseRecorder.index = 0; // L: 3245
+						World.hasFocus = true; // L: 3246
+						hadFocus = true; // L: 3247
+						field676 = -1L; // L: 3248
+						class33.reflectionChecks = new IterableNodeDeque(); // L: 3250
+						packetWriter.clearBuffer(); // L: 3252
+						packetWriter.packetBuffer.offset = 0; // L: 3253
+						packetWriter.serverPacket = null; // L: 3254
+						packetWriter.field1289 = null; // L: 3255
+						packetWriter.field1290 = null; // L: 3256
+						packetWriter.field1291 = null; // L: 3257
+						packetWriter.serverPacketLength = 0; // L: 3258
+						packetWriter.field1287 = 0; // L: 3259
+						rebootTimer = 0; // L: 3260
+						logoutTimer = 0; // L: 3261
+						hintArrowType = 0; // L: 3262
+						UrlRequest.method2489(); // L: 3263
+						class123.method2746(0); // L: 3264
+						class123.method2745(); // L: 3265
+						isItemSelected = 0; // L: 3266
+						isSpellSelected = false; // L: 3267
+						soundEffectCount = 0; // L: 3268
+						camAngleY = 0; // L: 3269
+						oculusOrbState = 0; // L: 3270
+						Messages.field1273 = null; // L: 3271
+						minimapState = 0; // L: 3272
+						field570 = -1; // L: 3273
+						destinationX = 0; // L: 3274
+						destinationY = 0; // L: 3275
+						playerAttackOption = AttackOption.AttackOption_hidden; // L: 3276
+						npcAttackOption = AttackOption.AttackOption_hidden; // L: 3277
+						npcCount = 0; // L: 3278
+						Players.Players_count = 0; // L: 3280
+
+						for (var34 = 0; var34 < 2048; ++var34) { // L: 3281
+							Players.field1248[var34] = null; // L: 3282
+							Players.field1246[var34] = class185.field2123; // L: 3283
+						}
+
+						for (var34 = 0; var34 < 2048; ++var34) { // L: 3286
+							players[var34] = null;
+						}
+
+						for (var34 = 0; var34 < 32768; ++var34) { // L: 3287
+							npcs[var34] = null;
+						}
+
+						combatTargetPlayerIndex = -1; // L: 3288
+						projectiles.clear(); // L: 3289
+						graphicsObjects.clear(); // L: 3290
+
+						for (var34 = 0; var34 < 4; ++var34) { // L: 3291
+							for (var4 = 0; var4 < 104; ++var4) { // L: 3292
+								for (int var17 = 0; var17 < 104; ++var17) { // L: 3293
+									groundItems[var34][var4][var17] = null; // L: 3294
 								}
 							}
 						}
 
-						pendingSpawns = new NodeDeque(); // L: 2916
-						class112.friendSystem.clear(); // L: 2917
+						pendingSpawns = new NodeDeque(); // L: 3298
+						GameEngine.friendSystem.clear(); // L: 3299
 
-						for (var33 = 0; var33 < VarpDefinition.VarpDefinition_fileCount; ++var33) { // L: 2918
-							VarpDefinition var29 = ArchiveLoader.VarpDefinition_get(var33); // L: 2919
-							if (var29 != null) { // L: 2920
-								Varps.Varps_temp[var33] = 0; // L: 2921
-								Varps.Varps_main[var33] = 0; // L: 2922
+						for (var34 = 0; var34 < class433.VarpDefinition_fileCount; ++var34) { // L: 3300
+							VarpDefinition var36 = SecureRandomCallable.VarpDefinition_get(var34); // L: 3301
+							if (var36 != null) { // L: 3302
+								Varps.Varps_temp[var34] = 0; // L: 3303
+								Varps.Varps_main[var34] = 0; // L: 3304
 							}
 						}
 
-						Message.varcs.clearTransient(); // L: 2925
-						followerIndex = -1; // L: 2926
-						if (rootInterface != -1) { // L: 2927
-							var33 = rootInterface; // L: 2928
-							if (var33 != -1 && class132.Widget_loadedInterfaces[var33]) { // L: 2930 2931
-								class283.Widget_archive.clearFilesGroup(var33); // L: 2932
-								if (WorldMapSection1.Widget_interfaceComponents[var33] != null) { // L: 2933
-									var34 = true; // L: 2934
-
-									for (var15 = 0; var15 < WorldMapSection1.Widget_interfaceComponents[var33].length; ++var15) { // L: 2935
-										if (WorldMapSection1.Widget_interfaceComponents[var33][var15] != null) { // L: 2936
-											if (WorldMapSection1.Widget_interfaceComponents[var33][var15].type != 2) { // L: 2937
-												WorldMapSection1.Widget_interfaceComponents[var33][var15] = null;
-											} else {
-												var34 = false; // L: 2938
-											}
-										}
-									}
-
-									if (var34) { // L: 2941
-										WorldMapSection1.Widget_interfaceComponents[var33] = null;
-									}
-
-									class132.Widget_loadedInterfaces[var33] = false; // L: 2942
-								}
-							}
+						class339.varcs.clearTransient(); // L: 3307
+						followerIndex = -1; // L: 3308
+						if (rootInterface != -1) { // L: 3309
+							class273.method5333(rootInterface);
 						}
 
-						for (InterfaceParent var24 = (InterfaceParent)interfaceParents.first(); var24 != null; var24 = (InterfaceParent)interfaceParents.next()) { // L: 2945
-							Players.closeInterface(var24, true); // L: 2946
+						for (InterfaceParent var27 = (InterfaceParent)interfaceParents.first(); var27 != null; var27 = (InterfaceParent)interfaceParents.next()) { // L: 3310
+							class10.closeInterface(var27, true); // L: 3311
 						}
 
-						rootInterface = -1; // L: 2948
-						interfaceParents = new NodeHashTable(8); // L: 2949
-						meslayerContinueWidget = null; // L: 2950
-						KeyHandler.method343(); // L: 2951
-						playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2952
+						rootInterface = -1; // L: 3313
+						interfaceParents = new NodeHashTable(8); // L: 3314
+						meslayerContinueWidget = null; // L: 3315
+						UrlRequest.method2489(); // L: 3316
+						playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 3317
 
-						for (var33 = 0; var33 < 8; ++var33) { // L: 2953
-							playerMenuActions[var33] = null; // L: 2954
-							playerOptionsPriorities[var33] = false; // L: 2955
+						for (var34 = 0; var34 < 8; ++var34) { // L: 3318
+							playerMenuActions[var34] = null; // L: 3319
+							playerOptionsPriorities[var34] = false; // L: 3320
 						}
 
-						GrandExchangeOfferUnitPriceComparator.method5485(); // L: 2957
-						isLoading = true; // L: 2958
+						ItemContainer.itemContainers = new NodeHashTable(32); // L: 3323
+						isLoading = true; // L: 3325
 
-						for (var33 = 0; var33 < 100; ++var33) { // L: 2959
-							field594[var33] = true;
+						for (var34 = 0; var34 < 100; ++var34) { // L: 3326
+							field504[var34] = true;
 						}
 
-						Frames.method4481(); // L: 2960
-						AbstractArchive.friendsChat = null; // L: 2961
-						class67.guestClanSettings = null; // L: 2962
-						Arrays.fill(currentClanSettings, (Object)null); // L: 2963
-						class115.guestClanChannel = null; // L: 2964
-						Arrays.fill(currentClanChannels, (Object)null); // L: 2965
+						var23 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, packetWriter.isaacCipher); // L: 3329
+						var23.packetBuffer.writeByte(class143.getWindowedMode()); // L: 3330
+						var23.packetBuffer.writeShort(class186.canvasWidth); // L: 3331
+						var23.packetBuffer.writeShort(BoundaryObject.canvasHeight); // L: 3332
+						packetWriter.addNode(var23); // L: 3333
+						Players.friendsChat = null; // L: 3335
+						class222.guestClanSettings = null; // L: 3336
+						Arrays.fill(currentClanSettings, (Object)null); // L: 3337
+						UserComparator5.guestClanChannel = null; // L: 3338
+						Arrays.fill(currentClanChannels, (Object)null); // L: 3339
 
-						for (var33 = 0; var33 < 8; ++var33) { // L: 2966
-							grandExchangeOffers[var33] = new GrandExchangeOffer();
+						for (var34 = 0; var34 < 8; ++var34) { // L: 3340
+							grandExchangeOffers[var34] = new GrandExchangeOffer();
 						}
 
-						JagexCache.grandExchangeEvents = null; // L: 2967
-						LoginScreenAnimation.updatePlayer(var2); // L: 2969
-						ItemLayer.field2243 = -1; // L: 2970
-						Canvas.loadRegions(false, var2); // L: 2971
-						packetWriter.serverPacket = null; // L: 2972
+						grandExchangeEvents = null; // L: 3341
+						HorizontalAlignment.updatePlayer(var2); // L: 3343
+						Messages.field1277 = -1; // L: 3344
+						DevicePcmPlayerProvider.loadRegions(false, var2); // L: 3345
+						packetWriter.serverPacket = null; // L: 3346
 					}
 
 				}
 			}
-		} catch (IOException var21) { // L: 3029
-			if (field685 < 1) { // L: 3030
-				if (ApproximateRouteStrategy.worldPort == ScriptEvent.currentPort) { // L: 3031
-					ScriptEvent.currentPort = ParamComposition.js5Port;
+		} catch (IOException var22) { // L: 3403
+			if (field541 < 1) { // L: 3404
+				if (class129.currentPort == GameObject.worldPort) { // L: 3405
+					class129.currentPort = class133.js5Port;
 				} else {
-					ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 3032
+					class129.currentPort = GameObject.worldPort; // L: 3406
 				}
 
-				++field685; // L: 3033
-				UserComparator6.method2503(0); // L: 3034
+				++field541; // L: 3407
+				PacketBufferNode.method5016(0); // L: 3408
 			} else {
-				SecureRandomFuture.getLoginError(-2); // L: 3037
+				class29.getLoginError(-2); // L: 3411
 			}
 		}
-	} // L: 2794 2974 3014 3023 3026 3035 3038 3040
+	} // L: 3166 3348 3388 3397 3400 3409 3412 3414
 
-	@ObfuscatedName("fc")
+	@ObfuscatedName("fo")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-681213511"
+		garbageValue = "1374404947"
 	)
 	@Export("doCycleLoggedIn")
 	final void doCycleLoggedIn() {
-		if (rebootTimer > 1) { // L: 3295
+		if (rebootTimer > 1) { // L: 3676
 			--rebootTimer;
 		}
 
-		if (logoutTimer > 0) { // L: 3296
+		if (logoutTimer > 0) { // L: 3677
 			--logoutTimer;
 		}
 
-		if (hadNetworkError) { // L: 3297
-			hadNetworkError = false; // L: 3298
-			Clock.method2960(); // L: 3299
+		if (hadNetworkError) { // L: 3678
+			hadNetworkError = false; // L: 3679
+			Varcs.method2411(); // L: 3680
 		} else {
-			if (!isMenuOpen) { // L: 3302
-				FriendSystem.addCancelMenuEntry();
+			if (!isMenuOpen) { // L: 3683
+				WorldMapElement.addCancelMenuEntry();
 			}
 
 			int var1;
-			for (var1 = 0; var1 < 100 && this.method1180(packetWriter); ++var1) { // L: 3303 3304
+			for (var1 = 0; var1 < 100 && this.method1394(packetWriter); ++var1) { // L: 3684 3685
 			}
 
-			if (gameState == 30) { // L: 3306
+			if (gameState == 30) { // L: 3687
 				while (true) {
-					ReflectionCheck var2 = (ReflectionCheck)class54.reflectionChecks.last(); // L: 3310
-					boolean var32;
-					if (var2 == null) { // L: 3311
-						var32 = false; // L: 3312
+					ReflectionCheck var2 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 3691
+					boolean var30;
+					if (var2 == null) { // L: 3692
+						var30 = false; // L: 3693
 					} else {
-						var32 = true; // L: 3315
+						var30 = true; // L: 3696
 					}
 
 					int var3;
-					PacketBufferNode var33;
-					if (!var32) { // L: 3317
+					PacketBufferNode var31;
+					if (!var30) { // L: 3698
 						PacketBufferNode var14;
 						int var15;
-						if (timer.field3900) { // L: 3325
-							var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2666, packetWriter.isaacCipher); // L: 3327
-							var14.packetBuffer.writeByte(0); // L: 3328
-							var15 = var14.packetBuffer.offset; // L: 3329
-							timer.write(var14.packetBuffer); // L: 3330
-							var14.packetBuffer.method6963(var14.packetBuffer.offset - var15); // L: 3331
-							packetWriter.addNode(var14); // L: 3332
-							timer.method5975(); // L: 3333
+						if (timer.field4043) { // L: 3706
+							var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2907, packetWriter.isaacCipher); // L: 3708
+							var14.packetBuffer.writeByte(0); // L: 3709
+							var15 = var14.packetBuffer.offset; // L: 3710
+							timer.write(var14.packetBuffer); // L: 3711
+							var14.packetBuffer.method7357(var14.packetBuffer.offset - var15); // L: 3712
+							packetWriter.addNode(var14); // L: 3713
+							timer.method6238(); // L: 3714
 						}
 
 						int var4;
@@ -3947,2855 +3878,2810 @@ final void doCycleLoggedIn() {
 						int var11;
 						int var12;
 						PacketBuffer var10000;
-						synchronized(Interpreter.mouseRecorder.lock) { // L: 3336
-							if (!field497) { // L: 3337
-								Interpreter.mouseRecorder.index = 0; // L: 3423
-							} else if (MouseHandler.MouseHandler_lastButton != 0 || Interpreter.mouseRecorder.index >= 40) { // L: 3338
-								var33 = null; // L: 3340
-								var3 = 0; // L: 3341
-								var4 = 0; // L: 3342
-								var5 = 0; // L: 3343
-								var6 = 0; // L: 3344
-
-								for (var7 = 0; var7 < Interpreter.mouseRecorder.index && (var33 == null || var33.packetBuffer.offset - var3 < 246); ++var7) { // L: 3345 3346
-									var4 = var7; // L: 3347
-									var8 = Interpreter.mouseRecorder.ys[var7]; // L: 3348
-									if (var8 < -1) { // L: 3349
+						synchronized(mouseRecorder.lock) { // L: 3717
+							if (!field713) { // L: 3718
+								mouseRecorder.index = 0; // L: 3804
+							} else if (MouseHandler.MouseHandler_lastButton != 0 || mouseRecorder.index >= 40) { // L: 3719
+								var31 = null; // L: 3721
+								var3 = 0; // L: 3722
+								var4 = 0; // L: 3723
+								var5 = 0; // L: 3724
+								var6 = 0; // L: 3725
+
+								for (var7 = 0; var7 < mouseRecorder.index && (var31 == null || var31.packetBuffer.offset - var3 < 246); ++var7) { // L: 3726 3727
+									var4 = var7; // L: 3728
+									var8 = mouseRecorder.ys[var7]; // L: 3729
+									if (var8 < -1) { // L: 3730
 										var8 = -1;
-									} else if (var8 > 65534) { // L: 3350
+									} else if (var8 > 65534) { // L: 3731
 										var8 = 65534;
 									}
 
-									var9 = Interpreter.mouseRecorder.xs[var7]; // L: 3351
-									if (var9 < -1) { // L: 3352
+									var9 = mouseRecorder.xs[var7]; // L: 3732
+									if (var9 < -1) { // L: 3733
 										var9 = -1;
-									} else if (var9 > 65534) { // L: 3353
+									} else if (var9 > 65534) { // L: 3734
 										var9 = 65534;
 									}
 
-									if (var9 != field475 || var8 != field476) { // L: 3354
-										if (var33 == null) { // L: 3357
-											var33 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2704, packetWriter.isaacCipher); // L: 3358
-											var33.packetBuffer.writeByte(0); // L: 3359
-											var3 = var33.packetBuffer.offset; // L: 3360
-											var10000 = var33.packetBuffer; // L: 3361
+									if (var9 != field483 || var8 != field746) { // L: 3735
+										if (var31 == null) { // L: 3738
+											var31 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2889, packetWriter.isaacCipher); // L: 3739
+											var31.packetBuffer.writeByte(0); // L: 3740
+											var3 = var31.packetBuffer.offset; // L: 3741
+											var10000 = var31.packetBuffer; // L: 3742
 											var10000.offset += 2;
-											var5 = 0; // L: 3362
-											var6 = 0; // L: 3363
+											var5 = 0; // L: 3743
+											var6 = 0; // L: 3744
 										}
 
-										if (field477 != -1L) { // L: 3368
-											var10 = var9 - field475; // L: 3369
-											var11 = var8 - field476; // L: 3370
-											var12 = (int)((Interpreter.mouseRecorder.millis[var7] - field477) / 20L); // L: 3371
-											var5 = (int)((long)var5 + (Interpreter.mouseRecorder.millis[var7] - field477) % 20L); // L: 3372
+										if (field485 != -1L) { // L: 3749
+											var10 = var9 - field483; // L: 3750
+											var11 = var8 - field746; // L: 3751
+											var12 = (int)((mouseRecorder.millis[var7] - field485) / 20L); // L: 3752
+											var5 = (int)((long)var5 + (mouseRecorder.millis[var7] - field485) % 20L); // L: 3753
 										} else {
-											var10 = var9; // L: 3375
-											var11 = var8; // L: 3376
-											var12 = Integer.MAX_VALUE; // L: 3377
+											var10 = var9; // L: 3756
+											var11 = var8; // L: 3757
+											var12 = Integer.MAX_VALUE; // L: 3758
 										}
 
-										field475 = var9; // L: 3379
-										field476 = var8; // L: 3380
-										if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3381
-											var10 += 32; // L: 3382
-											var11 += 32; // L: 3383
-											var33.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3384
-										} else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3386
-											var10 += 128; // L: 3387
-											var11 += 128; // L: 3388
-											var33.packetBuffer.writeByte(var12 + 128); // L: 3389
-											var33.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3390
-										} else if (var12 < 32) { // L: 3392
-											var33.packetBuffer.writeByte(var12 + 192); // L: 3393
-											if (var9 != -1 && var8 != -1) { // L: 3394
-												var33.packetBuffer.writeInt(var9 | var8 << 16); // L: 3395
+										field483 = var9; // L: 3760
+										field746 = var8; // L: 3761
+										if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3762
+											var10 += 32; // L: 3763
+											var11 += 32; // L: 3764
+											var31.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3765
+										} else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3767
+											var10 += 128; // L: 3768
+											var11 += 128; // L: 3769
+											var31.packetBuffer.writeByte(var12 + 128); // L: 3770
+											var31.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3771
+										} else if (var12 < 32) { // L: 3773
+											var31.packetBuffer.writeByte(var12 + 192); // L: 3774
+											if (var9 != -1 && var8 != -1) { // L: 3775
+												var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 3776
 											} else {
-												var33.packetBuffer.writeInt(Integer.MIN_VALUE);
+												var31.packetBuffer.writeInt(Integer.MIN_VALUE);
 											}
 										} else {
-											var33.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3398
-											if (var9 != -1 && var8 != -1) { // L: 3399
-												var33.packetBuffer.writeInt(var9 | var8 << 16); // L: 3400
+											var31.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3779
+											if (var9 != -1 && var8 != -1) { // L: 3780
+												var31.packetBuffer.writeInt(var9 | var8 << 16); // L: 3781
 											} else {
-												var33.packetBuffer.writeInt(Integer.MIN_VALUE);
+												var31.packetBuffer.writeInt(Integer.MIN_VALUE);
 											}
 										}
 
-										++var6; // L: 3402
-										field477 = Interpreter.mouseRecorder.millis[var7]; // L: 3403
+										++var6; // L: 3783
+										field485 = mouseRecorder.millis[var7]; // L: 3784
 									}
 								}
 
-								if (var33 != null) { // L: 3405
-									var33.packetBuffer.method6963(var33.packetBuffer.offset - var3); // L: 3406
-									var7 = var33.packetBuffer.offset; // L: 3407
-									var33.packetBuffer.offset = var3; // L: 3408
-									var33.packetBuffer.writeByte(var5 / var6); // L: 3409
-									var33.packetBuffer.writeByte(var5 % var6); // L: 3410
-									var33.packetBuffer.offset = var7; // L: 3411
-									packetWriter.addNode(var33); // L: 3412
+								if (var31 != null) { // L: 3786
+									var31.packetBuffer.method7357(var31.packetBuffer.offset - var3); // L: 3787
+									var7 = var31.packetBuffer.offset; // L: 3788
+									var31.packetBuffer.offset = var3; // L: 3789
+									var31.packetBuffer.writeByte(var5 / var6); // L: 3790
+									var31.packetBuffer.writeByte(var5 % var6); // L: 3791
+									var31.packetBuffer.offset = var7; // L: 3792
+									packetWriter.addNode(var31); // L: 3793
 								}
 
-								if (var4 >= Interpreter.mouseRecorder.index) { // L: 3414
-									Interpreter.mouseRecorder.index = 0;
+								if (var4 >= mouseRecorder.index) { // L: 3795
+									mouseRecorder.index = 0;
 								} else {
-									MouseRecorder var55 = Interpreter.mouseRecorder; // L: 3416
-									var55.index -= var4;
-									System.arraycopy(Interpreter.mouseRecorder.xs, var4, Interpreter.mouseRecorder.xs, 0, Interpreter.mouseRecorder.index); // L: 3417
-									System.arraycopy(Interpreter.mouseRecorder.ys, var4, Interpreter.mouseRecorder.ys, 0, Interpreter.mouseRecorder.index); // L: 3418
-									System.arraycopy(Interpreter.mouseRecorder.millis, var4, Interpreter.mouseRecorder.millis, 0, Interpreter.mouseRecorder.index); // L: 3419
+									MouseRecorder var43 = mouseRecorder; // L: 3797
+									var43.index -= var4;
+									System.arraycopy(mouseRecorder.xs, var4, mouseRecorder.xs, 0, mouseRecorder.index); // L: 3798
+									System.arraycopy(mouseRecorder.ys, var4, mouseRecorder.ys, 0, mouseRecorder.index); // L: 3799
+									System.arraycopy(mouseRecorder.millis, var4, mouseRecorder.millis, 0, mouseRecorder.index); // L: 3800
 								}
 							}
 						}
 
 						PacketBufferNode var18;
-						if (MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3425
-							long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3426
-							if (var16 > 32767L) { // L: 3427
+						if (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3806
+							long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3807
+							if (var16 > 32767L) { // L: 3808
 								var16 = 32767L;
 							}
 
-							mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3428
-							var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3429
-							if (var3 < 0) { // L: 3430
+							mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3809
+							var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3810
+							if (var3 < 0) { // L: 3811
 								var3 = 0;
-							} else if (var3 > KeyHandler.canvasHeight) { // L: 3431
-								var3 = KeyHandler.canvasHeight;
+							} else if (var3 > BoundaryObject.canvasHeight) { // L: 3812
+								var3 = BoundaryObject.canvasHeight;
 							}
 
-							var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3432
-							if (var4 < 0) { // L: 3433
+							var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3813
+							if (var4 < 0) { // L: 3814
 								var4 = 0;
-							} else if (var4 > GameEngine.canvasWidth) { // L: 3434
-								var4 = GameEngine.canvasWidth;
+							} else if (var4 > class186.canvasWidth) { // L: 3815
+								var4 = class186.canvasWidth;
 							}
 
-							var5 = (int)var16; // L: 3435
-							var18 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2725, packetWriter.isaacCipher); // L: 3436
-							var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 3437
-							var18.packetBuffer.writeShort(var4); // L: 3438
-							var18.packetBuffer.writeShort(var3); // L: 3439
-							packetWriter.addNode(var18); // L: 3440
+							var5 = (int)var16; // L: 3816
+							var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2894, packetWriter.isaacCipher); // L: 3817
+							var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 3818
+							var18.packetBuffer.writeShort(var4); // L: 3819
+							var18.packetBuffer.writeShort(var3); // L: 3820
+							packetWriter.addNode(var18); // L: 3821
 						}
 
-						if (KeyHandler.field110 > 0) { // L: 3442
-							var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2716, packetWriter.isaacCipher); // L: 3443
-							var14.packetBuffer.writeShort(0); // L: 3444
-							var15 = var14.packetBuffer.offset; // L: 3445
-							long var19 = class111.method2516(); // L: 3446
+						if (KeyHandler.field140 > 0) { // L: 3823
+							var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2899, packetWriter.isaacCipher); // L: 3824
+							var14.packetBuffer.writeShort(0); // L: 3825
+							var15 = var14.packetBuffer.offset; // L: 3826
+							long var19 = Ignored.method6459(); // L: 3827
 
-							for (var5 = 0; var5 < KeyHandler.field110; ++var5) { // L: 3447
-								long var21 = var19 - field565; // L: 3448
-								if (var21 > 16777215L) { // L: 3449
+							for (var5 = 0; var5 < KeyHandler.field140; ++var5) { // L: 3828
+								long var21 = var19 - field676; // L: 3829
+								if (var21 > 16777215L) { // L: 3830
 									var21 = 16777215L;
 								}
 
-								field565 = var19; // L: 3450
-								var14.packetBuffer.method7009((int)var21); // L: 3451
-								var14.packetBuffer.method6947(KeyHandler.field125[var5]); // L: 3452
+								field676 = var19; // L: 3831
+								var14.packetBuffer.writeMedium((int)var21); // L: 3832
+								var14.packetBuffer.method7362(KeyHandler.field139[var5]); // L: 3833
 							}
 
-							var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 3454
-							packetWriter.addNode(var14); // L: 3455
-						}
-
-						if (field620 > 0) { // L: 3457
-							--field620;
-						}
-
-						if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3458
-							field555 = true;
-						}
-
-						if (field555 && field620 <= 0) { // L: 3459
-							field620 = 20; // L: 3460
-							field555 = false; // L: 3461
-							var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2699, packetWriter.isaacCipher); // L: 3463
-							var14.packetBuffer.method7001(camAngleX); // L: 3464
-							var14.packetBuffer.method7003(camAngleY); // L: 3465
-							packetWriter.addNode(var14); // L: 3466
+							var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 3835
+							packetWriter.addNode(var14); // L: 3836
 						}
 
-						if (WorldMapSectionType.hasFocus && !hadFocus) { // L: 3468
-							hadFocus = true; // L: 3469
-							var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2743, packetWriter.isaacCipher); // L: 3471
-							var14.packetBuffer.writeByte(1); // L: 3472
-							packetWriter.addNode(var14); // L: 3473
+						if (field560 > 0) { // L: 3838
+							--field560;
 						}
 
-						if (!WorldMapSectionType.hasFocus && hadFocus) { // L: 3475
-							hadFocus = false; // L: 3476
-							var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2743, packetWriter.isaacCipher); // L: 3478
-							var14.packetBuffer.writeByte(0); // L: 3479
-							packetWriter.addNode(var14); // L: 3480
+						if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3839
+							field561 = true;
 						}
 
-						if (class133.worldMap != null) { // L: 3483
-							class133.worldMap.method6487();
+						if (field561 && field560 <= 0) { // L: 3840
+							field560 = 20; // L: 3841
+							field561 = false; // L: 3842
+							var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2869, packetWriter.isaacCipher); // L: 3844
+							var14.packetBuffer.method7493(camAngleX); // L: 3845
+							var14.packetBuffer.method7398(camAngleY); // L: 3846
+							packetWriter.addNode(var14); // L: 3847
 						}
 
-						if (class6.ClanChat_inClanChat) { // L: 3485
-							if (AbstractArchive.friendsChat != null) { // L: 3486
-								AbstractArchive.friendsChat.sort(); // L: 3487
-							}
-
-							TileItem.method2315(); // L: 3489
-							class6.ClanChat_inClanChat = false; // L: 3490
+						if (World.hasFocus && !hadFocus) { // L: 3849
+							hadFocus = true; // L: 3850
+							var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2861, packetWriter.isaacCipher); // L: 3852
+							var14.packetBuffer.writeByte(1); // L: 3853
+							packetWriter.addNode(var14); // L: 3854
 						}
 
-						if (class29.field162) { // L: 3494
-							UserComparator10.method2494(); // L: 3495
-							class29.field162 = false; // L: 3496
+						if (!World.hasFocus && hadFocus) { // L: 3856
+							hadFocus = false; // L: 3857
+							var14 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2861, packetWriter.isaacCipher); // L: 3859
+							var14.packetBuffer.writeByte(0); // L: 3860
+							packetWriter.addNode(var14); // L: 3861
 						}
 
-						if (GrandExchangeOfferTotalQuantityComparator.Client_plane != field701) { // L: 3500
-							field701 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 3501
-							var1 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 3502
-							int[] var34 = class10.sceneMinimapSprite.pixels; // L: 3504
-							var3 = var34.length; // L: 3505
-
-							for (var4 = 0; var4 < var3; ++var4) { // L: 3506
-								var34[var4] = 0;
-							}
-
-							for (var4 = 1; var4 < 103; ++var4) { // L: 3507
-								var5 = (103 - var4) * 2048 + 24628; // L: 3508
-
-								for (var6 = 1; var6 < 103; ++var6) { // L: 3509
-									if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { // L: 3510
-										GameBuild.scene.drawTileMinimap(var34, var5, 512, var1, var6, var4);
-									}
-
-									if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { // L: 3511
-										GameBuild.scene.drawTileMinimap(var34, var5, 512, var1 + 1, var6, var4);
-									}
-
-									var5 += 4; // L: 3512
-								}
-							}
-
-							var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 3515
-							var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3516
-							class10.sceneMinimapSprite.setRaster(); // L: 3517
-
-							for (var6 = 1; var6 < 103; ++var6) { // L: 3518
-								for (var7 = 1; var7 < 103; ++var7) { // L: 3519
-									if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { // L: 3520
-										class111.drawObject(var1, var7, var6, var4, var5);
-									}
-
-									if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { // L: 3521
-										class111.drawObject(var1 + 1, var7, var6, var4, var5);
-									}
-								}
-							}
-
-							mapIconCount = 0; // L: 3524
-
-							for (var6 = 0; var6 < 104; ++var6) { // L: 3525
-								for (var7 = 0; var7 < 104; ++var7) { // L: 3526
-									long var23 = GameBuild.scene.getFloorDecorationTag(GrandExchangeOfferTotalQuantityComparator.Client_plane, var6, var7); // L: 3527
-									if (var23 != 0L) { // L: 3528
-										var10 = class21.Entity_unpackID(var23); // L: 3529
-										var11 = KitDefinition.getObjectDefinition(var10).mapIconId; // L: 3530
-										if (var11 >= 0 && ItemComposition.WorldMapElement_get(var11).field1629) { // L: 3531 3532
-											mapIcons[mapIconCount] = ItemComposition.WorldMapElement_get(var11).getSpriteBool(false); // L: 3535
-											mapIconXs[mapIconCount] = var6; // L: 3536
-											mapIconYs[mapIconCount] = var7; // L: 3537
-											++mapIconCount; // L: 3538
-										}
-									}
-								}
-							}
-
-							Canvas.rasterProvider.apply(); // L: 3543
+						if (Varcs.worldMap != null) { // L: 3864
+							Varcs.worldMap.method6902();
 						}
 
-						if (gameState != 30) { // L: 3547
+						class65.method1958(); // L: 3865
+						class117.method2682(); // L: 3866
+						class145.method2985(); // L: 3867
+						if (gameState != 30) { // L: 3868
 							return;
 						}
 
-						for (PendingSpawn var42 = (PendingSpawn)pendingSpawns.last(); var42 != null; var42 = (PendingSpawn)pendingSpawns.previous()) { // L: 3549 3550 3569
-							if (var42.hitpoints > 0) { // L: 3551
-								--var42.hitpoints;
-							}
-
-							if (var42.hitpoints == 0) { // L: 3552
-								if (var42.objectId < 0 || NPC.method2265(var42.objectId, var42.field1076)) { // L: 3553
-									MusicPatchNode2.addPendingSpawnToScene(var42.plane, var42.type, var42.x, var42.y, var42.objectId, var42.field1075, var42.field1076); // L: 3554
-									var42.remove(); // L: 3555
-								}
-							} else {
-								if (var42.delay > 0) { // L: 3559
-									--var42.delay;
-								}
-
-								if (var42.delay == 0 && var42.x >= 1 && var42.y >= 1 && var42.x <= 102 && var42.y <= 102 && (var42.id < 0 || NPC.method2265(var42.id, var42.field1082))) { // L: 3560 3561
-									MusicPatchNode2.addPendingSpawnToScene(var42.plane, var42.type, var42.x, var42.y, var42.id, var42.orientation, var42.field1082); // L: 3562
-									var42.delay = -1; // L: 3563
-									if (var42.id == var42.objectId && var42.objectId == -1) { // L: 3564
-										var42.remove();
-									} else if (var42.objectId == var42.id && var42.field1075 == var42.orientation && var42.field1076 == var42.field1082) { // L: 3565
-										var42.remove();
-									}
-								}
-							}
-						}
+						AbstractArchive.method5693(); // L: 3869
 
 						int var10002;
-						for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 3573
-							var10002 = queuedSoundEffectDelays[var1]--; // L: 3574
-							if (queuedSoundEffectDelays[var1] >= -10) { // L: 3575
-								SoundEffect var35 = soundEffects[var1]; // L: 3587
-								if (var35 == null) { // L: 3588
-									var10000 = null; // L: 3589
-									var35 = SoundEffect.readSoundEffect(class12.archive4, soundEffectIds[var1], 0);
-									if (var35 == null) { // L: 3590
+						for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 3871
+							var10002 = queuedSoundEffectDelays[var1]--; // L: 3872
+							if (queuedSoundEffectDelays[var1] >= -10) { // L: 3873
+								SoundEffect var32 = soundEffects[var1]; // L: 3885
+								if (var32 == null) { // L: 3886
+									var10000 = null; // L: 3887
+									var32 = SoundEffect.readSoundEffect(KeyHandler.field151, soundEffectIds[var1], 0);
+									if (var32 == null) { // L: 3888
 										continue;
 									}
 
-									int[] var56 = queuedSoundEffectDelays; // L: 3591
-									var56[var1] += var35.calculateDelay();
-									soundEffects[var1] = var35; // L: 3592
+									int[] var44 = queuedSoundEffectDelays; // L: 3889
+									var44[var1] += var32.calculateDelay();
+									soundEffects[var1] = var32; // L: 3890
 								}
 
-								if (queuedSoundEffectDelays[var1] < 0) { // L: 3598
-									if (soundLocations[var1] != 0) { // L: 3600
-										var4 = (soundLocations[var1] & 255) * 128; // L: 3601
-										var5 = soundLocations[var1] >> 16 & 255; // L: 3602
-										var6 = var5 * 128 + 64 - HealthBarDefinition.localPlayer.x; // L: 3603
-										if (var6 < 0) { // L: 3604
+								if (queuedSoundEffectDelays[var1] < 0) { // L: 3896
+									if (soundLocations[var1] != 0) { // L: 3898
+										var4 = (soundLocations[var1] & 255) * 128; // L: 3899
+										var5 = soundLocations[var1] >> 16 & 255; // L: 3900
+										var6 = var5 * 128 + 64 - class340.localPlayer.x; // L: 3901
+										if (var6 < 0) { // L: 3902
 											var6 = -var6;
 										}
 
-										var7 = soundLocations[var1] >> 8 & 255; // L: 3605
-										var8 = var7 * 128 + 64 - HealthBarDefinition.localPlayer.y; // L: 3606
-										if (var8 < 0) { // L: 3607
+										var7 = soundLocations[var1] >> 8 & 255; // L: 3903
+										var8 = var7 * 128 + 64 - class340.localPlayer.y; // L: 3904
+										if (var8 < 0) { // L: 3905
 											var8 = -var8;
 										}
 
-										var9 = var8 + var6 - 128; // L: 3608
-										if (var9 > var4) { // L: 3609
-											queuedSoundEffectDelays[var1] = -100; // L: 3610
-											continue; // L: 3611
+										var9 = var8 + var6 - 128; // L: 3906
+										if (var9 > var4) { // L: 3907
+											queuedSoundEffectDelays[var1] = -100; // L: 3908
+											continue; // L: 3909
 										}
 
-										if (var9 < 0) { // L: 3613
+										if (var9 < 0) { // L: 3911
 											var9 = 0;
 										}
 
-										var3 = (var4 - var9) * class408.clientPreferences.areaSoundEffectsVolume / var4; // L: 3614
+										var3 = (var4 - var9) * SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / var4; // L: 3912
 									} else {
-										var3 = class408.clientPreferences.soundEffectsVolume; // L: 3616
+										var3 = SecureRandomFuture.clientPreferences.soundEffectsVolume; // L: 3914
 									}
 
-									if (var3 > 0) { // L: 3617
-										RawSound var25 = var35.toRawSound().resample(FontName.decimator); // L: 3618
-										RawPcmStream var26 = RawPcmStream.createRawPcmStream(var25, 100, var3); // L: 3619
-										var26.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3620
-										BuddyRankComparator.pcmStreamMixer.addSubStream(var26); // L: 3621
+									if (var3 > 0) { // L: 3915
+										RawSound var23 = var32.toRawSound().resample(BoundaryObject.decimator); // L: 3916
+										RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); // L: 3917
+										var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3918
+										class281.pcmStreamMixer.addSubStream(var24); // L: 3919
 									}
 
-									queuedSoundEffectDelays[var1] = -100; // L: 3623
+									queuedSoundEffectDelays[var1] = -100; // L: 3921
 								}
 							} else {
-								--soundEffectCount; // L: 3576
-
-								for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 3577
-									soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 3578
-									soundEffects[var15] = soundEffects[var15 + 1]; // L: 3579
-									queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 3580
-									queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 3581
-									soundLocations[var15] = soundLocations[var15 + 1]; // L: 3582
+								--soundEffectCount; // L: 3874
+
+								for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 3875
+									soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 3876
+									soundEffects[var15] = soundEffects[var15 + 1]; // L: 3877
+									queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 3878
+									queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 3879
+									soundLocations[var15] = soundLocations[var15 + 1]; // L: 3880
 								}
 
-								--var1; // L: 3584
+								--var1; // L: 3882
 							}
 						}
 
-						if (field710) { // L: 3626
-							if (class247.musicPlayerStatus != 0) { // L: 3629
-								var32 = true; // L: 3630
-							} else {
-								var32 = class247.midiPcmStream.isReady(); // L: 3633
+						if (field743 && !Projectile.method2008()) { // L: 3924
+							if (SecureRandomFuture.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 3925
+								NetSocket.method3118(WorldMapScaleHandler.archive6, currentTrackGroupId, 0, SecureRandomFuture.clientPreferences.musicVolume, false);
 							}
 
-							if (!var32) { // L: 3635
-								if (class408.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 3636
-									Archive var36 = Messages.archive6; // L: 3637
-									var3 = currentTrackGroupId; // L: 3638
-									var4 = class408.clientPreferences.musicVolume; // L: 3639
-									class247.musicPlayerStatus = 1; // L: 3641
-									class128.musicTrackArchive = var36; // L: 3642
-									FillMode.musicTrackGroupId = var3; // L: 3643
-									ArchiveDiskActionHandler.musicTrackFileId = 0; // L: 3644
-									class247.musicTrackVolume = var4; // L: 3645
-									SecureRandomCallable.musicTrackBoolean = false; // L: 3646
-									class247.pcmSampleLength = 10000; // L: 3647
-								}
-
-								field710 = false; // L: 3650
-							}
+							field743 = false; // L: 3926
 						}
 
-						++packetWriter.field1275; // L: 3654
-						if (packetWriter.field1275 > 750) { // L: 3655
-							Clock.method2960(); // L: 3656
-							return; // L: 3657
+						++packetWriter.field1287; // L: 3929
+						if (packetWriter.field1287 > 750) { // L: 3930
+							Varcs.method2411(); // L: 3931
+							return; // L: 3932
 						}
 
-						VerticalAlignment.method3159(); // L: 3659
-
-						for (var1 = 0; var1 < npcCount; ++var1) { // L: 3661
-							var15 = npcIndices[var1]; // L: 3662
-							NPC var27 = npcs[var15]; // L: 3663
-							if (var27 != null) { // L: 3664
-								class135.updateActorSequence(var27, var27.definition.size); // L: 3665
-							}
-						}
-
-						int[] var43 = Players.Players_indices; // L: 3670
-
-						for (var15 = 0; var15 < Players.Players_count; ++var15) { // L: 3671
-							Player var53 = players[var43[var15]]; // L: 3672
-							if (var53 != null && var53.overheadTextCyclesRemaining > 0) { // L: 3673
-								--var53.overheadTextCyclesRemaining; // L: 3674
-								if (var53.overheadTextCyclesRemaining == 0) { // L: 3675
-									var53.overheadText = null;
-								}
-							}
-						}
-
-						for (var15 = 0; var15 < npcCount; ++var15) { // L: 3678
-							var3 = npcIndices[var15]; // L: 3679
-							NPC var48 = npcs[var3]; // L: 3680
-							if (var48 != null && var48.overheadTextCyclesRemaining > 0) { // L: 3681
-								--var48.overheadTextCyclesRemaining; // L: 3682
-								if (var48.overheadTextCyclesRemaining == 0) { // L: 3683
-									var48.overheadText = null;
-								}
-							}
-						}
-
-						++field531; // L: 3687
-						if (mouseCrossColor != 0) { // L: 3688
-							mouseCrossState += 20; // L: 3689
-							if (mouseCrossState >= 400) { // L: 3690
+						class341.method6257(); // L: 3934
+						Canvas.method406(); // L: 3935
+						class91.method2337(); // L: 3936
+						++field538; // L: 3937
+						if (mouseCrossColor != 0) { // L: 3938
+							mouseCrossState += 20; // L: 3939
+							if (mouseCrossState >= 400) { // L: 3940
 								mouseCrossColor = 0;
 							}
 						}
 
-						if (WorldMapSection2.field2037 != null) { // L: 3692
-							++field576; // L: 3693
-							if (field576 >= 15) { // L: 3694
-								class184.invalidateWidget(WorldMapSection2.field2037); // L: 3695
-								WorldMapSection2.field2037 = null; // L: 3696
+						if (WorldMapDecoration.field2722 != null) { // L: 3942
+							++field582; // L: 3943
+							if (field582 >= 15) { // L: 3944
+								SecureRandomCallable.invalidateWidget(WorldMapDecoration.field2722); // L: 3945
+								WorldMapDecoration.field2722 = null; // L: 3946
 							}
 						}
 
-						Widget var44 = WorldMapData_0.mousedOverWidgetIf1; // L: 3699
-						Widget var37 = Skills.field3247; // L: 3700
-						WorldMapData_0.mousedOverWidgetIf1 = null; // L: 3701
-						Skills.field3247 = null; // L: 3702
-						draggedOnWidget = null; // L: 3703
-						field680 = false; // L: 3704
-						field648 = false; // L: 3705
-						field695 = 0; // L: 3706
-
-						while (WorldMapElement.isKeyDown() && field695 < 128) { // L: 3707
-							if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class12.field55 == 66) { // L: 3708
-								String var49 = ""; // L: 3711
-
-								Message var45;
-								for (Iterator var50 = Messages.Messages_hashTable.iterator(); var50.hasNext(); var49 = var49 + var45.sender + ':' + var45.text + '\n') { // L: 3712 3715
-									var45 = (Message)var50.next(); // L: 3713
-								}
-
-								ArchiveLoader.client.method484(var49); // L: 3721
-							} else if (oculusOrbState != 1 || class319.field3858 <= 0) { // L: 3724
-								field697[field695] = class12.field55; // L: 3727
-								field696[field695] = class319.field3858; // L: 3728
-								++field695; // L: 3729
+						Widget var38 = class4.mousedOverWidgetIf1; // L: 3949
+						Widget var33 = class281.field3375; // L: 3950
+						class4.mousedOverWidgetIf1 = null; // L: 3951
+						class281.field3375 = null; // L: 3952
+						draggedOnWidget = null; // L: 3953
+						field657 = false; // L: 3954
+						field531 = false; // L: 3955
+						field701 = 0; // L: 3956
+
+						while (NPCComposition.isKeyDown() && field701 < 128) { // L: 3957
+							if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && Players.field1247 == 66) { // L: 3958
+								String var25 = method1668(); // L: 3959
+								class295.client.method492(var25); // L: 3960
+							} else if (oculusOrbState != 1 || ModeWhere.field3954 <= 0) { // L: 3963
+								field522[field701] = Players.field1247; // L: 3966
+								field758[field701] = ModeWhere.field3954; // L: 3967
+								++field701; // L: 3968
 							}
 						}
 
-						boolean var38 = staffModLevel >= 2; // L: 3733
-						if (var38 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3735
-							var4 = HealthBarDefinition.localPlayer.plane - mouseWheelRotation; // L: 3736
-							if (var4 < 0) { // L: 3737
+						boolean var34 = staffModLevel >= 2; // L: 3972
+						if (var34 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3974
+							var4 = class340.localPlayer.plane - mouseWheelRotation; // L: 3975
+							if (var4 < 0) { // L: 3976
 								var4 = 0;
-							} else if (var4 > 3) { // L: 3738
+							} else if (var4 > 3) { // L: 3977
 								var4 = 3;
 							}
 
-							if (var4 != HealthBarDefinition.localPlayer.plane) { // L: 3739
-								InvDefinition.method2986(HealthBarDefinition.localPlayer.pathX[0] + class19.baseX, HealthBarDefinition.localPlayer.pathY[0] + DefaultsGroup.baseY, var4, false); // L: 3740
+							if (var4 != class340.localPlayer.plane) { // L: 3978
+								BuddyRankComparator.method2547(class340.localPlayer.pathX[0] + class131.baseX, class340.localPlayer.pathY[0] + TileItem.baseY, var4, false); // L: 3979
 							}
 
-							mouseWheelRotation = 0; // L: 3742
+							mouseWheelRotation = 0; // L: 3981
 						}
 
-						if (rootInterface != -1) { // L: 3744
-							Messages.updateRootInterface(rootInterface, 0, 0, GameEngine.canvasWidth, KeyHandler.canvasHeight, 0, 0);
+						if (rootInterface != -1) { // L: 3983
+							class13.updateRootInterface(rootInterface, 0, 0, class186.canvasWidth, BoundaryObject.canvasHeight, 0, 0);
 						}
 
-						++cycleCntr; // L: 3745
+						++cycleCntr; // L: 3984
 
 						while (true) {
-							Widget var46;
-							ScriptEvent var51;
-							Widget var52;
+							Widget var39;
+							ScriptEvent var40;
+							Widget var41;
 							do {
-								var51 = (ScriptEvent)field674.removeLast(); // L: 3747
-								if (var51 == null) { // L: 3748
+								var40 = (ScriptEvent)field680.removeLast(); // L: 3986
+								if (var40 == null) { // L: 3987
 									while (true) {
 										do {
-											var51 = (ScriptEvent)field675.removeLast(); // L: 3759
-											if (var51 == null) { // L: 3760
+											var40 = (ScriptEvent)field579.removeLast(); // L: 3998
+											if (var40 == null) { // L: 3999
 												while (true) {
 													do {
-														var51 = (ScriptEvent)scriptEvents.removeLast(); // L: 3771
-														if (var51 == null) { // L: 3772
-															this.menu(); // L: 3782
-															if (class133.worldMap != null) { // L: 3784
-																class133.worldMap.method6497(GrandExchangeOfferTotalQuantityComparator.Client_plane, (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX, (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY, false); // L: 3785
-																class133.worldMap.loadCache(); // L: 3786
-															}
-
-															if (clickedWidget != null) { // L: 3789
-																this.method1186();
+														var40 = (ScriptEvent)scriptEvents.removeLast(); // L: 4010
+														if (var40 == null) { // L: 4011
+															this.menu(); // L: 4021
+															WorldMapLabelSize.method4358(); // L: 4022
+															if (clickedWidget != null) { // L: 4023
+																this.method1174();
 															}
 
-															if (class247.dragInventoryWidget != null) { // L: 3790
-																class184.invalidateWidget(class247.dragInventoryWidget); // L: 3791
-																++itemDragDuration; // L: 3792
-																if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3793
-																	if (field667) { // L: 3794
-																		if (class274.hoveredItemContainer == class247.dragInventoryWidget && dragItemSlotDestination != dragItemSlotSource) { // L: 3795
-																			Widget var54 = class247.dragInventoryWidget; // L: 3796
-																			byte var39 = 0; // L: 3797
-																			if (field656 == 1 && var54.contentType == 206) { // L: 3798
-																				var39 = 1;
+															if (class143.dragInventoryWidget != null) { // L: 4024
+																SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); // L: 4025
+																++itemDragDuration; // L: 4026
+																if (MouseHandler.MouseHandler_currentButton == 0) { // L: 4027
+																	if (field572) { // L: 4028
+																		if (class143.dragInventoryWidget == FloorOverlayDefinition.hoveredItemContainer && dragItemSlotDestination != dragItemSlotSource) { // L: 4029
+																			Widget var42 = class143.dragInventoryWidget; // L: 4030
+																			byte var35 = 0; // L: 4031
+																			if (field641 == 1 && var42.contentType == 206) { // L: 4032
+																				var35 = 1;
 																			}
 
-																			if (var54.itemIds[dragItemSlotDestination] <= 0) { // L: 3799
-																				var39 = 0;
+																			if (var42.itemIds[dragItemSlotDestination] <= 0) { // L: 4033
+																				var35 = 0;
 																			}
 
-																			if (TileItem.method2316(PendingSpawn.getWidgetFlags(var54))) { // L: 3800
-																				var6 = dragItemSlotSource; // L: 3801
-																				var7 = dragItemSlotDestination; // L: 3802
-																				var54.itemIds[var7] = var54.itemIds[var6]; // L: 3803
-																				var54.itemQuantities[var7] = var54.itemQuantities[var6]; // L: 3804
-																				var54.itemIds[var6] = -1; // L: 3805
-																				var54.itemQuantities[var6] = 0; // L: 3806
-																			} else if (var39 == 1) { // L: 3808
-																				var6 = dragItemSlotSource; // L: 3809
-																				var7 = dragItemSlotDestination; // L: 3810
-
-																				while (var7 != var6) { // L: 3811
-																					if (var6 > var7) { // L: 3812
-																						var54.swapItems(var6 - 1, var6); // L: 3813
-																						--var6; // L: 3814
-																					} else if (var6 < var7) { // L: 3816
-																						var54.swapItems(var6 + 1, var6); // L: 3817
-																						++var6; // L: 3818
+																			if (MouseHandler.method649(class363.getWidgetFlags(var42))) { // L: 4034
+																				var6 = dragItemSlotSource; // L: 4035
+																				var7 = dragItemSlotDestination; // L: 4036
+																				var42.itemIds[var7] = var42.itemIds[var6]; // L: 4037
+																				var42.itemQuantities[var7] = var42.itemQuantities[var6]; // L: 4038
+																				var42.itemIds[var6] = -1; // L: 4039
+																				var42.itemQuantities[var6] = 0; // L: 4040
+																			} else if (var35 == 1) { // L: 4042
+																				var6 = dragItemSlotSource; // L: 4043
+																				var7 = dragItemSlotDestination; // L: 4044
+
+																				while (var6 != var7) { // L: 4045
+																					if (var6 > var7) { // L: 4046
+																						var42.swapItems(var6 - 1, var6); // L: 4047
+																						--var6; // L: 4048
+																					} else if (var6 < var7) { // L: 4050
+																						var42.swapItems(var6 + 1, var6); // L: 4051
+																						++var6; // L: 4052
 																					}
 																				}
 																			} else {
-																				var54.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3823
+																				var42.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 4057
 																			}
 
-																			var18 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2669, packetWriter.isaacCipher); // L: 3826
-																			var18.packetBuffer.method7001(dragItemSlotDestination); // L: 3827
-																			var18.packetBuffer.method7003(dragItemSlotSource); // L: 3828
-																			var18.packetBuffer.method6993(var39); // L: 3829
-																			var18.packetBuffer.method7010(class247.dragInventoryWidget.id); // L: 3830
-																			packetWriter.addNode(var18); // L: 3831
+																			var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2811, packetWriter.isaacCipher); // L: 4060
+																			var18.packetBuffer.method7398(dragItemSlotDestination); // L: 4061
+																			var18.packetBuffer.method7362(var35); // L: 4062
+																			var18.packetBuffer.method7407(class143.dragInventoryWidget.id); // L: 4063
+																			var18.packetBuffer.method7493(dragItemSlotSource); // L: 4064
+																			packetWriter.addNode(var18); // L: 4065
 																		}
-																	} else if (this.shouldLeftClickOpenMenu()) { // L: 3835
-																		this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3836
-																	} else if (menuOptionsCount > 0) { // L: 3838
-																		var4 = draggedWidgetX; // L: 3839
-																		var5 = draggedWidgetY; // L: 3840
-																		MenuAction var47 = class274.tempMenuAction; // L: 3842
-																		class14.menuAction(var47.param0, var47.param1, var47.opcode, var47.identifier, var47.action, var47.action, var4, var5); // L: 3844
-																		class274.tempMenuAction = null; // L: 3846
+																	} else if (this.shouldLeftClickOpenMenu()) { // L: 4069
+																		this.openMenu(draggedWidgetX, draggedWidgetY); // L: 4070
+																	} else if (menuOptionsCount > 0) { // L: 4072
+																		var4 = draggedWidgetX; // L: 4073
+																		var5 = draggedWidgetY; // L: 4074
+																		WorldMapIcon_1.method4385(class87.tempMenuAction, var4, var5); // L: 4076
+																		class87.tempMenuAction = null; // L: 4077
 																	}
 
-																	field576 = 10; // L: 3850
-																	MouseHandler.MouseHandler_lastButton = 0; // L: 3851
-																	class247.dragInventoryWidget = null; // L: 3852
-																} else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3855 3856
-																	field667 = true; // L: 3857
+																	field582 = 10; // L: 4081
+																	MouseHandler.MouseHandler_lastButton = 0; // L: 4082
+																	class143.dragInventoryWidget = null; // L: 4083
+																} else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 4086 4087
+																	field572 = true; // L: 4088
 																}
 															}
 
-															if (Scene.shouldSendWalk()) { // L: 3862
-																var4 = Scene.Scene_selectedX; // L: 3863
-																var5 = Scene.Scene_selectedY; // L: 3864
-																var18 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2703, packetWriter.isaacCipher); // L: 3866
-																var18.packetBuffer.writeByte(5); // L: 3867
-																var18.packetBuffer.method6962(var4 + class19.baseX); // L: 3868
-																var18.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3869
-																var18.packetBuffer.method7003(var5 + DefaultsGroup.baseY); // L: 3870
-																packetWriter.addNode(var18); // L: 3871
-																Scene.method4451(); // L: 3872
-																mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3873
-																mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3874
-																mouseCrossColor = 1; // L: 3875
-																mouseCrossState = 0; // L: 3876
-																destinationX = var4; // L: 3877
-																destinationY = var5; // L: 3878
+															if (Scene.shouldSendWalk()) { // L: 4093
+																var4 = Scene.Scene_selectedX; // L: 4094
+																var5 = Scene.Scene_selectedY; // L: 4095
+																var18 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2859, packetWriter.isaacCipher); // L: 4097
+																var18.packetBuffer.writeByte(5); // L: 4098
+																var18.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 4099
+																var18.packetBuffer.method7493(var5 + TileItem.baseY); // L: 4100
+																var18.packetBuffer.method7349(var4 + class131.baseX); // L: 4101
+																packetWriter.addNode(var18); // L: 4102
+																Scene.method3990(); // L: 4103
+																mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 4104
+																mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 4105
+																mouseCrossColor = 1; // L: 4106
+																mouseCrossState = 0; // L: 4107
+																destinationX = var4; // L: 4108
+																destinationY = var5; // L: 4109
 															}
 
-															if (var44 != WorldMapData_0.mousedOverWidgetIf1) { // L: 3880
-																if (var44 != null) { // L: 3881
-																	class184.invalidateWidget(var44);
+															if (var38 != class4.mousedOverWidgetIf1) { // L: 4111
+																if (var38 != null) { // L: 4112
+																	SecureRandomCallable.invalidateWidget(var38);
 																}
 
-																if (WorldMapData_0.mousedOverWidgetIf1 != null) { // L: 3882
-																	class184.invalidateWidget(WorldMapData_0.mousedOverWidgetIf1);
+																if (class4.mousedOverWidgetIf1 != null) { // L: 4113
+																	SecureRandomCallable.invalidateWidget(class4.mousedOverWidgetIf1);
 																}
 															}
 
-															if (var37 != Skills.field3247 && field714 == field621) { // L: 3884
-																if (var37 != null) { // L: 3885
-																	class184.invalidateWidget(var37);
+															if (var33 != class281.field3375 && field628 == field714) { // L: 4115
+																if (var33 != null) { // L: 4116
+																	SecureRandomCallable.invalidateWidget(var33);
 																}
 
-																if (Skills.field3247 != null) { // L: 3886
-																	class184.invalidateWidget(Skills.field3247);
+																if (class281.field3375 != null) { // L: 4117
+																	SecureRandomCallable.invalidateWidget(class281.field3375);
 																}
 															}
 
-															if (Skills.field3247 != null) { // L: 3888
-																if (field621 < field714) { // L: 3889
-																	++field621; // L: 3890
-																	if (field621 == field714) { // L: 3891
-																		class184.invalidateWidget(Skills.field3247);
+															if (class281.field3375 != null) { // L: 4119
+																if (field714 < field628) { // L: 4120
+																	++field714; // L: 4121
+																	if (field714 == field628) { // L: 4122
+																		SecureRandomCallable.invalidateWidget(class281.field3375);
 																	}
 																}
-															} else if (field621 > 0) { // L: 3894
-																--field621;
+															} else if (field714 > 0) { // L: 4125
+																--field714;
 															}
 
-															if (oculusOrbState == 0) { // L: 3896
-																var4 = HealthBarDefinition.localPlayer.x; // L: 3897
-																var5 = HealthBarDefinition.localPlayer.y; // L: 3898
-																if (class320.oculusOrbFocalPointX - var4 < -500 || class320.oculusOrbFocalPointX - var4 > 500 || class18.oculusOrbFocalPointY - var5 < -500 || class18.oculusOrbFocalPointY - var5 > 500) { // L: 3899
-																	class320.oculusOrbFocalPointX = var4; // L: 3900
-																	class18.oculusOrbFocalPointY = var5; // L: 3901
+															if (oculusOrbState == 0) { // L: 4127
+																var4 = class340.localPlayer.x; // L: 4128
+																var5 = class340.localPlayer.y; // L: 4129
+																if (class7.oculusOrbFocalPointX - var4 < -500 || class7.oculusOrbFocalPointX - var4 > 500 || Actor.oculusOrbFocalPointY - var5 < -500 || Actor.oculusOrbFocalPointY - var5 > 500) { // L: 4130
+																	class7.oculusOrbFocalPointX = var4; // L: 4131
+																	Actor.oculusOrbFocalPointY = var5; // L: 4132
 																}
 
-																if (var4 != class320.oculusOrbFocalPointX) { // L: 3903
-																	class320.oculusOrbFocalPointX += (var4 - class320.oculusOrbFocalPointX) / 16;
+																if (var4 != class7.oculusOrbFocalPointX) { // L: 4134
+																	class7.oculusOrbFocalPointX += (var4 - class7.oculusOrbFocalPointX) / 16;
 																}
 
-																if (var5 != class18.oculusOrbFocalPointY) { // L: 3904
-																	class18.oculusOrbFocalPointY += (var5 - class18.oculusOrbFocalPointY) / 16;
+																if (var5 != Actor.oculusOrbFocalPointY) { // L: 4135
+																	Actor.oculusOrbFocalPointY += (var5 - Actor.oculusOrbFocalPointY) / 16;
 																}
 
-																var6 = class320.oculusOrbFocalPointX >> 7; // L: 3905
-																var7 = class18.oculusOrbFocalPointY >> 7; // L: 3906
-																var8 = class392.getTileHeight(class320.oculusOrbFocalPointX, class18.oculusOrbFocalPointY, GrandExchangeOfferTotalQuantityComparator.Client_plane); // L: 3907
-																var9 = 0; // L: 3908
-																if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { // L: 3909
-																	for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 3910
-																		for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { // L: 3911
-																			var12 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 3912
-																			if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { // L: 3913
+																var6 = class7.oculusOrbFocalPointX >> 7; // L: 4136
+																var7 = Actor.oculusOrbFocalPointY >> 7; // L: 4137
+																var8 = FaceNormal.getTileHeight(class7.oculusOrbFocalPointX, Actor.oculusOrbFocalPointY, class20.Client_plane); // L: 4138
+																var9 = 0; // L: 4139
+																if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { // L: 4140
+																	for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 4141
+																		for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { // L: 4142
+																			var12 = class20.Client_plane; // L: 4143
+																			if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { // L: 4144
 																				++var12;
 																			}
 
-																			int var28 = var8 - Tiles.Tiles_heights[var12][var10][var11]; // L: 3914
-																			if (var28 > var9) { // L: 3915
-																				var9 = var28;
+																			int var26 = var8 - Tiles.Tiles_heights[var12][var10][var11]; // L: 4145
+																			if (var26 > var9) { // L: 4146
+																				var9 = var26;
 																			}
 																		}
 																	}
 																}
 
-																var10 = var9 * 192; // L: 3919
-																if (var10 > 98048) { // L: 3920
+																var10 = var9 * 192; // L: 4150
+																if (var10 > 98048) { // L: 4151
 																	var10 = 98048;
 																}
 
-																if (var10 < 32768) { // L: 3921
+																if (var10 < 32768) { // L: 4152
 																	var10 = 32768;
 																}
 
-																if (var10 > field556) { // L: 3922
-																	field556 += (var10 - field556) / 24;
-																} else if (var10 < field556) { // L: 3923
-																	field556 += (var10 - field556) / 80;
+																if (var10 > field562) { // L: 4153
+																	field562 += (var10 - field562) / 24;
+																} else if (var10 < field562) { // L: 4154
+																	field562 += (var10 - field562) / 80;
 																}
 
-																DynamicObject.field942 = class392.getTileHeight(HealthBarDefinition.localPlayer.x, HealthBarDefinition.localPlayer.y, GrandExchangeOfferTotalQuantityComparator.Client_plane) - camFollowHeight; // L: 3924
-															} else if (oculusOrbState == 1) { // L: 3926
-																if (field511 && HealthBarDefinition.localPlayer != null) { // L: 3928
-																	var4 = HealthBarDefinition.localPlayer.pathX[0]; // L: 3929
-																	var5 = HealthBarDefinition.localPlayer.pathY[0]; // L: 3930
-																	if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 3931
-																		class320.oculusOrbFocalPointX = HealthBarDefinition.localPlayer.x; // L: 3932
-																		var6 = class392.getTileHeight(HealthBarDefinition.localPlayer.x, HealthBarDefinition.localPlayer.y, GrandExchangeOfferTotalQuantityComparator.Client_plane) - camFollowHeight; // L: 3933
-																		if (var6 < DynamicObject.field942) { // L: 3934
-																			DynamicObject.field942 = var6;
+																MouseHandler.field231 = FaceNormal.getTileHeight(class340.localPlayer.x, class340.localPlayer.y, class20.Client_plane) - camFollowHeight; // L: 4155
+															} else if (oculusOrbState == 1) { // L: 4157
+																if (field612 && class340.localPlayer != null) { // L: 4159
+																	var4 = class340.localPlayer.pathX[0]; // L: 4160
+																	var5 = class340.localPlayer.pathY[0]; // L: 4161
+																	if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 4162
+																		class7.oculusOrbFocalPointX = class340.localPlayer.x; // L: 4163
+																		var6 = FaceNormal.getTileHeight(class340.localPlayer.x, class340.localPlayer.y, class20.Client_plane) - camFollowHeight; // L: 4164
+																		if (var6 < MouseHandler.field231) { // L: 4165
+																			MouseHandler.field231 = var6;
 																		}
 
-																		class18.oculusOrbFocalPointY = HealthBarDefinition.localPlayer.y; // L: 3935
-																		field511 = false; // L: 3936
+																		Actor.oculusOrbFocalPointY = class340.localPlayer.y; // L: 4166
+																		field612 = false; // L: 4167
 																	}
 																}
 
-																short var40 = -1; // L: 3939
-																if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3940
-																	var40 = 0;
-																} else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3941
-																	var40 = 1024;
+																short var36 = -1; // L: 4170
+																if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 4171
+																	var36 = 0;
+																} else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 4172
+																	var36 = 1024;
 																}
 
-																if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3942
-																	if (var40 == 0) { // L: 3943
-																		var40 = 1792;
-																	} else if (var40 == 1024) { // L: 3944
-																		var40 = 1280;
+																if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 4173
+																	if (var36 == 0) { // L: 4174
+																		var36 = 1792;
+																	} else if (var36 == 1024) { // L: 4175
+																		var36 = 1280;
 																	} else {
-																		var40 = 1536; // L: 3945
+																		var36 = 1536; // L: 4176
 																	}
-																} else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3947
-																	if (var40 == 0) { // L: 3948
-																		var40 = 256;
-																	} else if (var40 == 1024) { // L: 3949
-																		var40 = 768;
+																} else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 4178
+																	if (var36 == 0) { // L: 4179
+																		var36 = 256;
+																	} else if (var36 == 1024) { // L: 4180
+																		var36 = 768;
 																	} else {
-																		var40 = 512; // L: 3950
+																		var36 = 512; // L: 4181
 																	}
 																}
 
-																byte var41 = 0; // L: 3952
-																if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3953
-																	var41 = -1;
-																} else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3954
-																	var41 = 1;
+																byte var37 = 0; // L: 4183
+																if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 4184
+																	var37 = -1;
+																} else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 4185
+																	var37 = 1;
 																}
 
-																var6 = 0; // L: 3955
-																if (var40 >= 0 || var41 != 0) { // L: 3956
-																	var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * -1748111485 * 2001475371 : oculusOrbNormalSpeed * -347452533 * -567507933; // L: 3957
-																	var6 *= 16; // L: 3958
-																	field520 = var40; // L: 3959
-																	field549 = var41; // L: 3960
+																var6 = 0; // L: 4186
+																if (var36 >= 0 || var37 != 0) { // L: 4187
+																	var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * 1403293651 * 97493083 : oculusOrbNormalSpeed * -535945653 * -682804381; // L: 4188
+																	var6 *= 16; // L: 4189
+																	field584 = var36; // L: 4190
+																	field555 = var37; // L: 4191
 																}
 
-																if (field547 < var6) { // L: 3962
-																	field547 += var6 / 8; // L: 3963
-																	if (field547 > var6) { // L: 3964
-																		field547 = var6;
+																if (field542 < var6) { // L: 4193
+																	field542 += var6 / 8; // L: 4194
+																	if (field542 > var6) { // L: 4195
+																		field542 = var6;
 																	}
-																} else if (field547 > var6) { // L: 3966
-																	field547 = field547 * 9 / 10;
+																} else if (field542 > var6) { // L: 4197
+																	field542 = field542 * 9 / 10;
 																}
 
-																if (field547 > 0) { // L: 3967
-																	var7 = field547 / 16; // L: 3968
-																	if (field520 >= 0) { // L: 3969
-																		var4 = field520 - WorldMapRegion.cameraYaw & 2047; // L: 3970
-																		var8 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 3971
-																		var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 3972
-																		class320.oculusOrbFocalPointX += var8 * var7 / 65536; // L: 3973
-																		class18.oculusOrbFocalPointY += var7 * var9 / 65536; // L: 3974
+																if (field542 > 0) { // L: 4198
+																	var7 = field542 / 16; // L: 4199
+																	if (field584 >= 0) { // L: 4200
+																		var4 = field584 - class379.cameraYaw & 2047; // L: 4201
+																		var8 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 4202
+																		var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 4203
+																		class7.oculusOrbFocalPointX += var8 * var7 / 65536; // L: 4204
+																		Actor.oculusOrbFocalPointY += var7 * var9 / 65536; // L: 4205
 																	}
 
-																	if (field549 != 0) { // L: 3976
-																		DynamicObject.field942 += var7 * field549; // L: 3977
-																		if (DynamicObject.field942 > 0) { // L: 3978
-																			DynamicObject.field942 = 0;
+																	if (field555 != 0) { // L: 4207
+																		MouseHandler.field231 += var7 * field555; // L: 4208
+																		if (MouseHandler.field231 > 0) { // L: 4209
+																			MouseHandler.field231 = 0;
 																		}
 																	}
 																} else {
-																	field520 = -1; // L: 3982
-																	field549 = -1; // L: 3983
+																	field584 = -1; // L: 4213
+																	field555 = -1; // L: 4214
 																}
 
-																if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3985
-																	class29.method413(); // L: 3986
+																if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 4216
+																	packetWriter.addNode(HitSplatDefinition.getPacketBufferNode(ClientPacket.field2867, packetWriter.isaacCipher)); // L: 4218
+																	oculusOrbState = 0; // L: 4219
 																}
 															}
 
-															if (MouseHandler.MouseHandler_currentButton == 4 && ApproximateRouteStrategy.mouseCam) { // L: 3989
-																var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 3990
-																camAngleDX = var4 * 2; // L: 3991
-																mouseCamClickedY = var4 != -1 && var4 != 1 ? (mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 111270843 * -1137004173; // L: 3992
-																var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3993
-																camAngleDY = var5 * 2; // L: 3994
-																mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -1783686409 * 1769064135; // L: 3995
+															if (MouseHandler.MouseHandler_currentButton == 4 && class150.mouseCam) { // L: 4223
+																var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 4224
+																camAngleDX = var4 * 2; // L: 4225
+																mouseCamClickedY = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 84217699 * -688068021; // L: 4226
+																var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 4227
+																camAngleDY = var5 * 2; // L: 4228
+																mouseCamClickedX = var5 != -1 && var5 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 635129293 * -971872507; // L: 4229
 															} else {
-																if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3998
+																if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 4232
 																	camAngleDY += (-24 - camAngleDY) / 2;
-																} else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3999
+																} else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 4233
 																	camAngleDY += (24 - camAngleDY) / 2;
 																} else {
-																	camAngleDY /= 2; // L: 4000
+																	camAngleDY /= 2; // L: 4234
 																}
 
-																if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 4001
+																if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 4235
 																	camAngleDX += (12 - camAngleDX) / 2;
-																} else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 4002
+																} else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 4236
 																	camAngleDX += (-12 - camAngleDX) / 2;
 																} else {
-																	camAngleDX /= 2; // L: 4003
+																	camAngleDX /= 2; // L: 4237
 																}
 
-																mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 4004
-																mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 4005
+																mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 4238
+																mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 4239
 															}
 
-															camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 4007
-															camAngleX += camAngleDX / 2; // L: 4008
-															if (camAngleX < 128) { // L: 4009
+															camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 4241
+															camAngleX += camAngleDX / 2; // L: 4242
+															if (camAngleX < 128) { // L: 4243
 																camAngleX = 128;
 															}
 
-															if (camAngleX > 383) { // L: 4010
+															if (camAngleX > 383) { // L: 4244
 																camAngleX = 383;
 															}
 
-															if (isCameraLocked) { // L: 4012
-																class123.method2621();
+															if (field724) { // L: 4246
+																GrandExchangeOfferOwnWorldComparator.method1148();
+															} else if (isCameraLocked) { // L: 4247
+																var4 = class167.field1811 * 128 + 64; // L: 4248
+																var5 = VarpDefinition.field1748 * 128 + 64; // L: 4249
+																var6 = FaceNormal.getTileHeight(var4, var5, class20.Client_plane) - UserComparator9.field1335; // L: 4250
+																class1.method12(var4, var6, var5); // L: 4251
+																var4 = PlayerComposition.field3193 * 128 + 64; // L: 4252
+																var5 = MusicPatchNode.field3150 * 128 + 64; // L: 4253
+																var6 = FaceNormal.getTileHeight(var4, var5, class20.Client_plane) - ModeWhere.field3951; // L: 4254
+																var7 = var4 - UserComparator7.cameraX; // L: 4255
+																var8 = var6 - AbstractByteArrayCopier.cameraY; // L: 4256
+																var9 = var5 - UserComparator10.cameraZ; // L: 4257
+																var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 4258
+																var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.9490051269531D) & 2047; // L: 4259
+																var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; // L: 4260
+																SecureRandomFuture.method2025(var11, var12); // L: 4261
 															}
 
-															for (var4 = 0; var4 < 5; ++var4) { // L: 4013
-																var10002 = field722[var4]++;
+															for (var4 = 0; var4 < 5; ++var4) { // L: 4263
+																var10002 = field729[var4]++;
 															}
 
-															Message.varcs.tryWrite(); // L: 4014
-															var4 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 4017
-															var6 = GameEngine.method584(); // L: 4020
-															PacketBufferNode var29;
-															if (var4 > 15000 && var6 > 15000) { // L: 4021
-																logoutTimer = 250; // L: 4022
-																ClanSettings.method2703(14500); // L: 4023
-																var29 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2719, packetWriter.isaacCipher); // L: 4025
-																packetWriter.addNode(var29); // L: 4026
+															class339.varcs.tryWrite(); // L: 4264
+															var4 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 4267
+															var6 = KeyHandler.KeyHandler_idleCycles; // L: 4272
+															PacketBufferNode var27;
+															if (var4 > 15000 && var6 > 15000) { // L: 4275
+																logoutTimer = 250; // L: 4276
+																class123.method2746(14500); // L: 4277
+																var27 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2837, packetWriter.isaacCipher); // L: 4279
+																packetWriter.addNode(var27); // L: 4280
 															}
 
-															class112.friendSystem.processFriendUpdates(); // L: 4028
-															++packetWriter.pendingWrites; // L: 4029
-															if (packetWriter.pendingWrites > 50) { // L: 4030
-																var29 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2726, packetWriter.isaacCipher); // L: 4032
-																packetWriter.addNode(var29); // L: 4033
+															GameEngine.friendSystem.processFriendUpdates(); // L: 4282
+															++packetWriter.pendingWrites; // L: 4283
+															if (packetWriter.pendingWrites > 50) { // L: 4284
+																var27 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2814, packetWriter.isaacCipher); // L: 4286
+																packetWriter.addNode(var27); // L: 4287
 															}
 
 															try {
-																packetWriter.flush(); // L: 4036
-															} catch (IOException var30) { // L: 4038
-																Clock.method2960(); // L: 4039
+																packetWriter.flush(); // L: 4290
+															} catch (IOException var28) { // L: 4292
+																Varcs.method2411(); // L: 4293
 															}
 
-															return; // L: 4041
+															return; // L: 4295
 														}
 
-														var52 = var51.widget; // L: 3773
-														if (var52.childIndex < 0) { // L: 3774
+														var41 = var40.widget; // L: 4012
+														if (var41.childIndex < 0) { // L: 4013
 															break;
 														}
 
-														var46 = UserComparator9.getWidget(var52.parentId); // L: 3775
-													} while(var46 == null || var46.children == null || var52.childIndex >= var46.children.length || var52 != var46.children[var52.childIndex]); // L: 3776
+														var39 = ChatChannel.getWidget(var41.parentId); // L: 4014
+													} while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); // L: 4015
 
-													Tile.runScriptEvent(var51); // L: 3780
+													class285.runScriptEvent(var40); // L: 4019
 												}
 											}
 
-											var52 = var51.widget; // L: 3761
-											if (var52.childIndex < 0) { // L: 3762
+											var41 = var40.widget; // L: 4000
+											if (var41.childIndex < 0) { // L: 4001
 												break;
 											}
 
-											var46 = UserComparator9.getWidget(var52.parentId); // L: 3763
-										} while(var46 == null || var46.children == null || var52.childIndex >= var46.children.length || var52 != var46.children[var52.childIndex]); // L: 3764
+											var39 = ChatChannel.getWidget(var41.parentId); // L: 4002
+										} while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); // L: 4003
 
-										Tile.runScriptEvent(var51); // L: 3768
+										class285.runScriptEvent(var40); // L: 4007
 									}
 								}
 
-								var52 = var51.widget; // L: 3749
-								if (var52.childIndex < 0) { // L: 3750
+								var41 = var40.widget; // L: 3988
+								if (var41.childIndex < 0) { // L: 3989
 									break;
 								}
 
-								var46 = UserComparator9.getWidget(var52.parentId); // L: 3751
-							} while(var46 == null || var46.children == null || var52.childIndex >= var46.children.length || var52 != var46.children[var52.childIndex]); // L: 3752
+								var39 = ChatChannel.getWidget(var41.parentId); // L: 3990
+							} while(var39 == null || var39.children == null || var41.childIndex >= var39.children.length || var41 != var39.children[var41.childIndex]); // L: 3991
 
-							Tile.runScriptEvent(var51); // L: 3756
+							class285.runScriptEvent(var40); // L: 3995
 						}
 					}
 
-					var33 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2676, packetWriter.isaacCipher); // L: 3318
-					var33.packetBuffer.writeByte(0); // L: 3319
-					var3 = var33.packetBuffer.offset; // L: 3320
-					class16.performReflectionCheck(var33.packetBuffer); // L: 3321
-					var33.packetBuffer.method6963(var33.packetBuffer.offset - var3); // L: 3322
-					packetWriter.addNode(var33); // L: 3323
+					var31 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2852, packetWriter.isaacCipher); // L: 3699
+					var31.packetBuffer.writeByte(0); // L: 3700
+					var3 = var31.packetBuffer.offset; // L: 3701
+					UserComparator3.performReflectionCheck(var31.packetBuffer); // L: 3702
+					var31.packetBuffer.method7357(var31.packetBuffer.offset - var3); // L: 3703
+					packetWriter.addNode(var31); // L: 3704
 				}
 			}
 		}
-	} // L: 3300
+	} // L: 3681
 
-	@ObfuscatedName("gp")
+	@ObfuscatedName("gh")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "43"
+		garbageValue = "-5"
 	)
 	@Export("resizeJS")
 	void resizeJS() {
-		int var1 = GameEngine.canvasWidth; // L: 4584
-		int var2 = KeyHandler.canvasHeight; // L: 4585
-		if (super.contentWidth < var1) { // L: 4586
+		int var1 = class186.canvasWidth; // L: 5000
+		int var2 = BoundaryObject.canvasHeight; // L: 5001
+		if (super.contentWidth < var1) { // L: 5002
 			var1 = super.contentWidth;
 		}
 
-		if (super.contentHeight < var2) {
-			var2 = super.contentHeight; // L: 4587
+		if (super.contentHeight < var2) { // L: 5003
+			var2 = super.contentHeight;
 		}
 
-		if (class408.clientPreferences != null) { // L: 4588
+		if (SecureRandomFuture.clientPreferences != null) { // L: 5004
 			try {
-				class27.method394(ArchiveLoader.client, "resize", new Object[]{class134.getWindowedMode()}); // L: 4590
-			} catch (Throwable var4) { // L: 4592
+				Client var3 = class295.client; // L: 5006
+				Object[] var4 = new Object[]{class143.getWindowedMode()}; // L: 5007
+				JSObject.getWindow(var3).call("resize", var4); // L: 5010
+			} catch (Throwable var5) { // L: 5013
 			}
 		}
 
-	} // L: 4594
+	} // L: 5015
 
 	@ObfuscatedName("gg")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-693987024"
+		garbageValue = "-2013418749"
 	)
 	@Export("drawLoggedIn")
 	final void drawLoggedIn() {
-		if (rootInterface != -1) { // L: 4597
-			DirectByteArrayCopier.method5179(rootInterface);
+		if (rootInterface != -1) { // L: 5018
+			GraphicsObject.method1955(rootInterface);
 		}
 
 		int var1;
-		for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4598
-			if (field594[var1]) { // L: 4599
-				field553[var1] = true;
+		for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 5019
+			if (field504[var1]) { // L: 5020
+				field686[var1] = true;
 			}
 
-			field651[var1] = field594[var1]; // L: 4600
-			field594[var1] = false; // L: 4601
+			field687[var1] = field504[var1]; // L: 5021
+			field504[var1] = false; // L: 5022
 		}
 
-		field678 = cycle; // L: 4603
-		viewportX = -1; // L: 4604
-		viewportY = -1; // L: 4605
-		class274.hoveredItemContainer = null; // L: 4606
-		if (rootInterface != -1) { // L: 4607
-			rootWidgetCount = 0; // L: 4608
-			HorizontalAlignment.drawWidgets(rootInterface, 0, 0, GameEngine.canvasWidth, KeyHandler.canvasHeight, 0, 0, -1); // L: 4609
+		field684 = cycle; // L: 5024
+		viewportX = -1; // L: 5025
+		viewportY = -1; // L: 5026
+		FloorOverlayDefinition.hoveredItemContainer = null; // L: 5027
+		if (rootInterface != -1) { // L: 5028
+			rootWidgetCount = 0; // L: 5029
+			class12.drawWidgets(rootInterface, 0, 0, class186.canvasWidth, BoundaryObject.canvasHeight, 0, 0, -1); // L: 5030
 		}
 
-		Rasterizer2D.Rasterizer2D_resetClip(); // L: 4611
-		if (showMouseCross) { // L: 4612
-			if (mouseCrossColor == 1) { // L: 4613
-				UserComparator10.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4614
+		Rasterizer2D.Rasterizer2D_resetClip(); // L: 5032
+		if (showMouseCross) { // L: 5033
+			if (mouseCrossColor == 1) { // L: 5034
+				UserComparator5.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 5035
 			}
 
-			if (mouseCrossColor == 2) { // L: 4616
-				UserComparator10.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4617
+			if (mouseCrossColor == 2) { // L: 5037
+				UserComparator5.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 5038
 			}
 		}
 
-		if (!isMenuOpen) { // L: 4620
-			if (viewportX != -1) { // L: 4621
-				SecureRandomFuture.method1979(viewportX, viewportY);
+		if (!isMenuOpen) { // L: 5041
+			if (viewportX != -1) { // L: 5042
+				Friend.method6288(viewportX, viewportY);
 			}
 		} else {
-			Message.method1146(); // L: 4623
+			class4.method25(); // L: 5044
+		}
+
+		if (gameDrawingMode == 3) { // L: 5045
+			for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 5046
+				if (field687[var1]) { // L: 5047
+					Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 5048
+				} else if (field686[var1]) { // L: 5050
+					Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 5051
+				}
+			}
 		}
 
-		if (gameDrawingMode == 3) { // L: 4624
-			for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4625
-				if (field651[var1]) { // L: 4626
-					Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4627
-				} else if (field553[var1]) { // L: 4629
-					Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4630
+		var1 = class20.Client_plane; // L: 5055
+		int var2 = class340.localPlayer.x; // L: 5056
+		int var3 = class340.localPlayer.y; // L: 5057
+		int var4 = field538; // L: 5058
+
+		for (ObjectSound var5 = (ObjectSound)ObjectSound.objectSounds.last(); var5 != null; var5 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 5060
+			if (var5.soundEffectId != -1 || var5.soundEffectIds != null) { // L: 5061
+				int var6 = 0; // L: 5062
+				if (var2 > var5.maxX) { // L: 5063
+					var6 += var2 - var5.maxX;
+				} else if (var2 < var5.x) { // L: 5064
+					var6 += var5.x - var2;
+				}
+
+				if (var3 > var5.maxY) { // L: 5065
+					var6 += var3 - var5.maxY;
+				} else if (var3 < var5.y) { // L: 5066
+					var6 += var5.y - var3;
+				}
+
+				if (var6 - 64 <= var5.field793 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0 && var1 == var5.plane) { // L: 5067
+					var6 -= 64; // L: 5078
+					if (var6 < 0) { // L: 5079
+						var6 = 0;
+					}
+
+					int var7 = (var5.field793 - var6) * SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / var5.field793; // L: 5080
+					Object var10000;
+					if (var5.stream1 == null) { // L: 5081
+						if (var5.soundEffectId >= 0) { // L: 5082
+							var10000 = null; // L: 5083
+							SoundEffect var8 = SoundEffect.readSoundEffect(KeyHandler.field151, var5.soundEffectId, 0);
+							if (var8 != null) { // L: 5084
+								RawSound var9 = var8.toRawSound().resample(BoundaryObject.decimator); // L: 5085
+								RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7); // L: 5086
+								var10.setNumLoops(-1); // L: 5087
+								class281.pcmStreamMixer.addSubStream(var10); // L: 5088
+								var5.stream1 = var10; // L: 5089
+							}
+						}
+					} else {
+						var5.stream1.method843(var7); // L: 5093
+					}
+
+					if (var5.stream2 == null) { // L: 5094
+						if (var5.soundEffectIds != null && (var5.field789 -= var4) <= 0) { // L: 5095
+							int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length); // L: 5096
+							var10000 = null; // L: 5097
+							SoundEffect var13 = SoundEffect.readSoundEffect(KeyHandler.field151, var5.soundEffectIds[var12], 0);
+							if (var13 != null) { // L: 5098
+								RawSound var14 = var13.toRawSound().resample(BoundaryObject.decimator); // L: 5099
+								RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7); // L: 5100
+								var11.setNumLoops(0); // L: 5101
+								class281.pcmStreamMixer.addSubStream(var11); // L: 5102
+								var5.stream2 = var11; // L: 5103
+								var5.field789 = var5.field796 + (int)(Math.random() * (double)(var5.field797 - var5.field796)); // L: 5104
+							}
+						}
+					} else {
+						var5.stream2.method843(var7); // L: 5109
+						if (!var5.stream2.hasNext()) { // L: 5110
+							var5.stream2 = null; // L: 5111
+						}
+					}
+				} else {
+					if (var5.stream1 != null) { // L: 5068
+						class281.pcmStreamMixer.removeSubStream(var5.stream1); // L: 5069
+						var5.stream1 = null; // L: 5070
+					}
+
+					if (var5.stream2 != null) { // L: 5072
+						class281.pcmStreamMixer.removeSubStream(var5.stream2); // L: 5073
+						var5.stream2 = null; // L: 5074
+					}
 				}
 			}
 		}
 
-		class130.method2746(GrandExchangeOfferTotalQuantityComparator.Client_plane, HealthBarDefinition.localPlayer.x, HealthBarDefinition.localPlayer.y, field531); // L: 4634
-		field531 = 0; // L: 4635
-	} // L: 4636
+		field538 = 0; // L: 5116
+	} // L: 5117
 
-	@ObfuscatedName("ho")
+	@ObfuscatedName("hf")
 	@ObfuscatedSignature(
-		descriptor = "(Lcv;I)Z",
-		garbageValue = "-1849354153"
+		descriptor = "(Lch;I)Z",
+		garbageValue = "-1371711107"
 	)
-	final boolean method1180(PacketWriter var1) {
-		AbstractSocket var2 = var1.getSocket(); // L: 6027
-		PacketBuffer var3 = var1.packetBuffer; // L: 6028
-		if (var2 == null) { // L: 6029
+	final boolean method1394(PacketWriter var1) {
+		AbstractSocket var2 = var1.getSocket(); // L: 6472
+		PacketBuffer var3 = var1.packetBuffer; // L: 6473
+		if (var2 == null) { // L: 6474
 			return false;
 		} else {
-			int var18;
+			int var6;
 			String var19;
 			try {
 				int var5;
-				if (var1.serverPacket == null) { // L: 6031
-					if (var1.field1280) { // L: 6032
-						if (!var2.isAvailable(1)) { // L: 6033
+				if (var1.serverPacket == null) { // L: 6476
+					if (var1.field1278) { // L: 6477
+						if (!var2.isAvailable(1)) { // L: 6478
 							return false;
 						}
 
-						var2.read(var1.packetBuffer.array, 0, 1); // L: 6034
-						var1.field1275 = 0; // L: 6035
-						var1.field1280 = false; // L: 6036
+						var2.read(var1.packetBuffer.array, 0, 1); // L: 6479
+						var1.field1287 = 0; // L: 6480
+						var1.field1278 = false; // L: 6481
 					}
 
-					var3.offset = 0; // L: 6038
-					if (var3.method6912()) { // L: 6039
-						if (!var2.isAvailable(1)) { // L: 6040
+					var3.offset = 0; // L: 6483
+					if (var3.method7311()) { // L: 6484
+						if (!var2.isAvailable(1)) { // L: 6485
 							return false;
 						}
 
-						var2.read(var1.packetBuffer.array, 1, 1); // L: 6041
-						var1.field1275 = 0; // L: 6042
+						var2.read(var1.packetBuffer.array, 1, 1); // L: 6486
+						var1.field1287 = 0; // L: 6487
 					}
 
-					var1.field1280 = true; // L: 6044
-					ServerPacket[] var4 = class128.ServerPacket_values(); // L: 6045
-					var5 = var3.readSmartByteShortIsaac(); // L: 6046
-					if (var5 < 0 || var5 >= var4.length) { // L: 6047
+					var1.field1278 = true; // L: 6489
+					ServerPacket[] var4 = class129.ServerPacket_values(); // L: 6490
+					var5 = var3.readSmartByteShortIsaac(); // L: 6491
+					if (var5 < 0 || var5 >= var4.length) { // L: 6492
 						throw new IOException(var5 + " " + var3.offset);
 					}
 
-					var1.serverPacket = var4[var5]; // L: 6048
-					var1.serverPacketLength = var1.serverPacket.length; // L: 6049
+					var1.serverPacket = var4[var5]; // L: 6493
+					var1.serverPacketLength = var1.serverPacket.length; // L: 6494
 				}
 
-				if (var1.serverPacketLength == -1) { // L: 6051
-					if (!var2.isAvailable(1)) { // L: 6052
+				if (var1.serverPacketLength == -1) { // L: 6496
+					if (!var2.isAvailable(1)) { // L: 6497
 						return false;
 					}
 
-					var1.getSocket().read(var3.array, 0, 1); // L: 6053
-					var1.serverPacketLength = var3.array[0] & 255; // L: 6054
+					var1.getSocket().read(var3.array, 0, 1); // L: 6498
+					var1.serverPacketLength = var3.array[0] & 255; // L: 6499
 				}
 
-				if (var1.serverPacketLength == -2) { // L: 6056
-					if (!var2.isAvailable(2)) { // L: 6057
+				if (var1.serverPacketLength == -2) { // L: 6501
+					if (!var2.isAvailable(2)) { // L: 6502
 						return false;
 					}
 
-					var1.getSocket().read(var3.array, 0, 2); // L: 6058
-					var3.offset = 0; // L: 6059
-					var1.serverPacketLength = var3.readUnsignedShort(); // L: 6060
+					var1.getSocket().read(var3.array, 0, 2); // L: 6503
+					var3.offset = 0; // L: 6504
+					var1.serverPacketLength = var3.readUnsignedShort(); // L: 6505
 				}
 
-				if (!var2.isAvailable(var1.serverPacketLength)) { // L: 6062
+				if (!var2.isAvailable(var1.serverPacketLength)) { // L: 6507
 					return false;
 				}
 
-				var3.offset = 0; // L: 6063
-				var2.read(var3.array, 0, var1.serverPacketLength); // L: 6064
-				var1.field1275 = 0; // L: 6065
-				timer.method5972(); // L: 6066
-				var1.field1285 = var1.field1284; // L: 6067
-				var1.field1284 = var1.field1277; // L: 6068
-				var1.field1277 = var1.serverPacket; // L: 6069
-				int var17;
-				String var53;
-				if (ServerPacket.field2865 == var1.serverPacket) { // L: 6070
-					var17 = var3.method6997(); // L: 6071
-					var5 = var3.method6996(); // L: 6072
-					var53 = var3.readStringCp1252NullTerminated(); // L: 6073
-					if (var17 >= 1 && var17 <= 8) { // L: 6074
-						if (var53.equalsIgnoreCase("null")) { // L: 6075
-							var53 = null;
-						}
-
-						playerMenuActions[var17 - 1] = var53; // L: 6076
-						playerOptionsPriorities[var17 - 1] = var5 == 0; // L: 6077
-					}
-
-					var1.serverPacket = null; // L: 6079
-					return true; // L: 6080
-				}
-
+				var3.offset = 0; // L: 6508
+				var2.read(var3.array, 0, var1.serverPacketLength); // L: 6509
+				var1.field1287 = 0; // L: 6510
+				timer.method6253(); // L: 6511
+				var1.field1291 = var1.field1290; // L: 6512
+				var1.field1290 = var1.field1289; // L: 6513
+				var1.field1289 = var1.serverPacket; // L: 6514
 				int var7;
-				int var8;
-				int var9;
-				int var10;
-				if (ServerPacket.field2806 == var1.serverPacket) { // L: 6082
-					isCameraLocked = true; // L: 6083
-					UrlRequest.field1298 = var3.readUnsignedByte(); // L: 6084
-					SoundSystem.field288 = var3.readUnsignedByte(); // L: 6085
-					ArchiveLoader.field985 = var3.readUnsignedShort(); // L: 6086
-					class269.field3221 = var3.readUnsignedByte(); // L: 6087
-					TextureProvider.field2484 = var3.readUnsignedByte(); // L: 6088
-					if (TextureProvider.field2484 >= 100) { // L: 6089
-						var17 = UrlRequest.field1298 * 128 + 64; // L: 6090
-						var5 = SoundSystem.field288 * 128 + 64; // L: 6091
-						var18 = class392.getTileHeight(var17, var5, GrandExchangeOfferTotalQuantityComparator.Client_plane) - ArchiveLoader.field985; // L: 6092
-						var7 = var17 - WorldMapSectionType.cameraX; // L: 6093
-						var8 = var18 - class174.cameraY; // L: 6094
-						var9 = var5 - class65.cameraZ; // L: 6095
-						var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); // L: 6096
-						class121.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; // L: 6097
-						WorldMapRegion.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 6098
-						if (class121.cameraPitch < 128) { // L: 6099
-							class121.cameraPitch = 128;
-						}
-
-						if (class121.cameraPitch > 383) { // L: 6100
-							class121.cameraPitch = 383;
-						}
+				int var17;
+				Widget var52;
+				if (ServerPacket.field2978 == var1.serverPacket) { // L: 6515
+					var17 = var3.method7403(); // L: 6516
+					var5 = var3.method7411(); // L: 6517
+					var6 = var3.readUnsignedShort(); // L: 6518
+					var7 = var3.method7403(); // L: 6519
+					var52 = ChatChannel.getWidget(var5); // L: 6520
+					if (var17 != var52.modelAngleX || var6 != var52.modelAngleY || var7 != var52.modelZoom) { // L: 6521
+						var52.modelAngleX = var17; // L: 6522
+						var52.modelAngleY = var6; // L: 6523
+						var52.modelZoom = var7; // L: 6524
+						SecureRandomCallable.invalidateWidget(var52); // L: 6525
 					}
 
-					var1.serverPacket = null; // L: 6102
-					return true; // L: 6103
+					var1.serverPacket = null; // L: 6527
+					return true; // L: 6528
 				}
 
-				if (ServerPacket.field2805 == var1.serverPacket) { // L: 6105
-					ItemComposition.method3406(); // L: 6106
-					weight = var3.readShort(); // L: 6107
-					field494 = cycleCntr; // L: 6108
-					var1.serverPacket = null; // L: 6109
-					return true; // L: 6110
+				if (ServerPacket.field3011 == var1.serverPacket) { // L: 6530
+					var17 = var3.readUnsignedShort(); // L: 6531
+					var5 = var3.readUnsignedByte(); // L: 6532
+					var6 = var3.readUnsignedShort(); // L: 6533
+					LoginScreenAnimation.queueSoundEffect(var17, var5, var6); // L: 6534
+					var1.serverPacket = null; // L: 6535
+					return true; // L: 6536
 				}
 
-				if (ServerPacket.field2890 == var1.serverPacket) { // L: 6112
-					var17 = var3.readUnsignedByte(); // L: 6113
-					if (var3.readUnsignedByte() == 0) { // L: 6114
-						grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 6115
-						var3.offset += 18; // L: 6116
-					} else {
-						--var3.offset; // L: 6119
-						grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 6120
+				Widget var18;
+				if (ServerPacket.field2952 == var1.serverPacket) { // L: 6538
+					var17 = var3.method7411(); // L: 6539
+					var5 = var3.readShort(); // L: 6540
+					var18 = ChatChannel.getWidget(var17); // L: 6541
+					if (var5 != var18.sequenceId || var5 == -1) { // L: 6542
+						var18.sequenceId = var5; // L: 6543
+						var18.modelFrame = 0; // L: 6544
+						var18.modelFrameCycle = 0; // L: 6545
+						SecureRandomCallable.invalidateWidget(var18); // L: 6546
 					}
 
-					field536 = cycleCntr; // L: 6122
-					var1.serverPacket = null; // L: 6123
-					return true; // L: 6124
+					var1.serverPacket = null; // L: 6548
+					return true; // L: 6549
 				}
 
-				if (ServerPacket.field2804 == var1.serverPacket) { // L: 6126
-					class21.method309(class240.field2772); // L: 6127
-					var1.serverPacket = null; // L: 6128
-					return true; // L: 6129
+				if (ServerPacket.field2972 == var1.serverPacket) { // L: 6551
+					DirectByteArrayCopier.method5328(class253.field2915); // L: 6552
+					var1.serverPacket = null; // L: 6553
+					return true; // L: 6554
 				}
 
-				byte var61;
-				if (ServerPacket.field2802 == var1.serverPacket) { // L: 6131
-					var61 = var3.readByte(); // L: 6132
-					var5 = var3.method7120(); // L: 6133
-					Varps.Varps_temp[var5] = var61; // L: 6134
-					if (Varps.Varps_main[var5] != var61) { // L: 6135
-						Varps.Varps_main[var5] = var61; // L: 6136
+				if (ServerPacket.field3002 == var1.serverPacket) { // L: 6556
+					if (BuddyRankComparator.field1342 == null) { // L: 6557
+						BuddyRankComparator.field1342 = new class370(Ignored.HitSplatDefinition_cached);
 					}
 
-					WorldMapLabelSize.changeGameOptions(var5); // L: 6138
-					changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6139
-					var1.serverPacket = null; // L: 6140
-					return true; // L: 6141
-				}
-
-				if (ServerPacket.field2824 == var1.serverPacket) { // L: 6143
-					class21.method309(class240.field2780); // L: 6144
-					var1.serverPacket = null; // L: 6145
-					return true; // L: 6146
-				}
-
-				if (ServerPacket.field2858 == var1.serverPacket) { // L: 6148
-					var17 = var3.readUnsignedByte(); // L: 6149
-					var5 = var3.readUnsignedByte(); // L: 6150
-					var18 = var3.readUnsignedByte(); // L: 6151
-					var7 = var3.readUnsignedByte(); // L: 6152
-					field718[var17] = true; // L: 6153
-					field719[var17] = var5; // L: 6154
-					field598[var17] = var18; // L: 6155
-					field721[var17] = var7; // L: 6156
-					field722[var17] = 0; // L: 6157
-					var1.serverPacket = null; // L: 6158
-					return true; // L: 6159
+					class426 var49 = Ignored.HitSplatDefinition_cached.method6761(var3); // L: 6558
+					BuddyRankComparator.field1342.field4221.vmethod7129(var49.field4539, var49.field4537); // L: 6559
+					field695[++field734 - 1 & 31] = var49.field4539; // L: 6560
+					var1.serverPacket = null; // L: 6561
+					return true; // L: 6562
 				}
 
 				int var15;
-				String var25;
-				if (ServerPacket.field2878 == var1.serverPacket) { // L: 6161
-					var61 = var3.readByte(); // L: 6162
-					var19 = var3.readStringCp1252NullTerminated(); // L: 6163
-					long var20 = (long)var3.readUnsignedShort(); // L: 6164
-					long var22 = (long)var3.readMedium(); // L: 6165
-					PlayerType var70 = (PlayerType)UserComparator4.findEnumerated(VarbitComposition.PlayerType_values(), var3.readUnsignedByte()); // L: 6166
-					long var11 = var22 + (var20 << 32); // L: 6167
-					boolean var58 = false; // L: 6168
-					ClanChannel var14 = null; // L: 6169
-					var14 = var61 >= 0 ? currentClanChannels[var61] : class115.guestClanChannel; // L: 6171
-					if (var14 == null) { // L: 6172
-						var58 = true; // L: 6173
+				String var24;
+				byte var68;
+				if (ServerPacket.field3005 == var1.serverPacket) { // L: 6564
+					var68 = var3.readByte(); // L: 6565
+					var19 = var3.readStringCp1252NullTerminated(); // L: 6566
+					long var20 = (long)var3.readUnsignedShort(); // L: 6567
+					long var22 = (long)var3.readMedium(); // L: 6568
+					PlayerType var55 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 6569
+					long var11 = (var20 << 32) + var22; // L: 6570
+					boolean var56 = false; // L: 6571
+					ClanChannel var14 = null; // L: 6572
+					var14 = var68 >= 0 ? currentClanChannels[var68] : UserComparator5.guestClanChannel; // L: 6574
+					if (var14 == null) { // L: 6575
+						var56 = true; // L: 6576
 					} else {
 						var15 = 0;
 
 						while (true) {
 							if (var15 >= 100) {
-								if (var70.isUser && class112.friendSystem.isIgnored(new Username(var19, GrandExchangeOfferUnitPriceComparator.loginType))) { // L: 6182 6183
-									var58 = true;
+								if (var55.isUser && GameEngine.friendSystem.isIgnored(new Username(var19, class194.loginType))) { // L: 6585 6586
+									var56 = true;
 								}
 								break;
 							}
 
-							if (var11 == crossWorldMessageIds[var15]) { // L: 6177
-								var58 = true; // L: 6178
-								break; // L: 6179
+							if (crossWorldMessageIds[var15] == var11) { // L: 6580
+								var56 = true; // L: 6581
+								break; // L: 6582
 							}
 
-							++var15; // L: 6176
+							++var15; // L: 6579
 						}
 					}
 
-					if (!var58) { // L: 6186
-						crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; // L: 6187
-						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6188
-						var25 = AbstractFont.escapeBrackets(MilliClock.method2955(var3)); // L: 6189
-						int var16 = var61 >= 0 ? 41 : 44; // L: 6190
-						if (var70.modIcon != -1) { // L: 6191
-							class269.addChatMessage(var16, SpriteMask.method4998(var70.modIcon) + var19, var25, var14.name);
+					if (!var56) { // L: 6589
+						crossWorldMessageIds[crossWorldMessageIdsIndex] = var11; // L: 6590
+						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6591
+						var24 = AbstractFont.escapeBrackets(SequenceDefinition.method3689(var3)); // L: 6592
+						int var16 = var68 >= 0 ? 41 : 44; // L: 6593
+						if (var55.modIcon != -1) { // L: 6594
+							DevicePcmPlayerProvider.addChatMessage(var16, class221.method4705(var55.modIcon) + var19, var24, var14.name);
 						} else {
-							class269.addChatMessage(var16, var19, var25, var14.name); // L: 6192
+							DevicePcmPlayerProvider.addChatMessage(var16, var19, var24, var14.name); // L: 6595
 						}
 					}
 
-					var1.serverPacket = null; // L: 6194
-					return true; // L: 6195
+					var1.serverPacket = null; // L: 6597
+					return true; // L: 6598
 				}
 
-				if (ServerPacket.field2864 == var1.serverPacket) { // L: 6197
-					if (rootInterface != -1) { // L: 6198
-						ItemComposition.runIntfCloseListeners(rootInterface, 0);
-					}
+				String var45;
+				if (ServerPacket.field3001 == var1.serverPacket) { // L: 6600
+					var45 = var3.readStringCp1252NullTerminated(); // L: 6601
+					Object[] var67 = new Object[var45.length() + 1]; // L: 6602
 
-					var1.serverPacket = null; // L: 6199
-					return true; // L: 6200
-				}
+					for (var6 = var45.length() - 1; var6 >= 0; --var6) { // L: 6603
+						if (var45.charAt(var6) == 's') { // L: 6604
+							var67[var6 + 1] = var3.readStringCp1252NullTerminated();
+						} else {
+							var67[var6 + 1] = new Integer(var3.readInt()); // L: 6605
+						}
+					}
 
-				if (ServerPacket.field2849 == var1.serverPacket) { // L: 6202
-					class21.method309(class240.field2773); // L: 6203
-					var1.serverPacket = null; // L: 6204
-					return true; // L: 6205
+					var67[0] = new Integer(var3.readInt()); // L: 6607
+					ScriptEvent var72 = new ScriptEvent(); // L: 6608
+					var72.args = var67; // L: 6609
+					class285.runScriptEvent(var72); // L: 6610
+					var1.serverPacket = null; // L: 6611
+					return true; // L: 6612
 				}
 
-				if (ServerPacket.field2883 == var1.serverPacket) { // L: 6207
-					var17 = var3.method7004(); // L: 6208
-					ClanSettings.method2714(var17); // L: 6209
-					changedItemContainers[++field659 - 1 & 31] = var17 & 32767; // L: 6210
-					var1.serverPacket = null; // L: 6211
-					return true; // L: 6212
+				if (ServerPacket.field2980 == var1.serverPacket) { // L: 6614
+					UserComparator6.method2551(); // L: 6615
+					weight = var3.readShort(); // L: 6616
+					field471 = cycleCntr; // L: 6617
+					var1.serverPacket = null; // L: 6618
+					return true; // L: 6619
 				}
 
-				int var13;
-				long var26;
-				long var28;
-				String var33;
-				String var47;
-				if (ServerPacket.field2838 == var1.serverPacket) { // L: 6214
-					var47 = var3.readStringCp1252NullTerminated(); // L: 6215
-					var26 = (long)var3.readUnsignedShort(); // L: 6216
-					var28 = (long)var3.readMedium(); // L: 6217
-					PlayerType var30 = (PlayerType)UserComparator4.findEnumerated(VarbitComposition.PlayerType_values(), var3.readUnsignedByte()); // L: 6218
-					long var31 = (var26 << 32) + var28; // L: 6219
-					boolean var12 = false; // L: 6220
-
-					for (var13 = 0; var13 < 100; ++var13) { // L: 6221
-						if (crossWorldMessageIds[var13] == var31) { // L: 6222
-							var12 = true; // L: 6223
-							break; // L: 6224
-						}
+				if (ServerPacket.field3023 == var1.serverPacket) { // L: 6621
+					destinationX = var3.readUnsignedByte(); // L: 6622
+					if (destinationX == 255) { // L: 6623
+						destinationX = 0;
 					}
 
-					if (class112.friendSystem.isIgnored(new Username(var47, GrandExchangeOfferUnitPriceComparator.loginType))) { // L: 6227
-						var12 = true;
+					destinationY = var3.readUnsignedByte(); // L: 6624
+					if (destinationY == 255) { // L: 6625
+						destinationY = 0;
 					}
 
-					if (!var12 && field539 == 0) { // L: 6228
-						crossWorldMessageIds[crossWorldMessageIdsIndex] = var31; // L: 6229
-						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6230
-						var33 = AbstractFont.escapeBrackets(class19.method277(MilliClock.method2955(var3))); // L: 6231
-						byte var72;
-						if (var30.isPrivileged) { // L: 6233
-							var72 = 7;
-						} else {
-							var72 = 3; // L: 6234
-						}
+					var1.serverPacket = null; // L: 6626
+					return true; // L: 6627
+				}
 
-						if (var30.modIcon != -1) { // L: 6235
-							class397.addGameMessage(var72, SpriteMask.method4998(var30.modIcon) + var47, var33);
-						} else {
-							class397.addGameMessage(var72, var47, var33); // L: 6236
-						}
+				if (ServerPacket.field2930 == var1.serverPacket) { // L: 6629
+					var17 = var3.readInt(); // L: 6630
+					var5 = var3.readInt(); // L: 6631
+					var6 = class143.getGcDuration(); // L: 6632
+					PacketBufferNode var73 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2890, packetWriter.isaacCipher); // L: 6634
+					var73.packetBuffer.writeByte(GameEngine.fps); // L: 6635
+					var73.packetBuffer.method7343(var6); // L: 6636
+					var73.packetBuffer.method7407(var17); // L: 6637
+					var73.packetBuffer.writeIntME(var5); // L: 6638
+					packetWriter.addNode(var73); // L: 6639
+					var1.serverPacket = null; // L: 6640
+					return true; // L: 6641
+				}
+
+				if (ServerPacket.field2955 == var1.serverPacket) { // L: 6643
+					if (Players.friendsChat != null) { // L: 6644
+						Players.friendsChat.method6305(var3); // L: 6645
 					}
 
-					var1.serverPacket = null; // L: 6238
-					return true; // L: 6239
+					class334.method6216(); // L: 6647
+					var1.serverPacket = null; // L: 6648
+					return true; // L: 6649
 				}
 
-				if (ServerPacket.field2884 == var1.serverPacket) { // L: 6241
-					field724 = cycleCntr; // L: 6242
-					var61 = var3.readByte(); // L: 6243
-					class133 var67 = new class133(var3); // L: 6244
-					ClanChannel var57;
-					if (var61 >= 0) { // L: 6246
-						var57 = currentClanChannels[var61];
-					} else {
-						var57 = class115.guestClanChannel; // L: 6247
+				Widget var25;
+				if (ServerPacket.field2960 == var1.serverPacket) { // L: 6651
+					var17 = var3.readShort(); // L: 6652
+					var5 = var3.readInt(); // L: 6653
+					var6 = var3.method7405(); // L: 6654
+					var25 = ChatChannel.getWidget(var5); // L: 6655
+					if (var17 != var25.rawX || var6 != var25.rawY || var25.xAlignment != 0 || var25.yAlignment != 0) { // L: 6656
+						var25.rawX = var17; // L: 6657
+						var25.rawY = var6; // L: 6658
+						var25.xAlignment = 0; // L: 6659
+						var25.yAlignment = 0; // L: 6660
+						SecureRandomCallable.invalidateWidget(var25); // L: 6661
+						this.alignWidget(var25); // L: 6662
+						if (var25.type == 0) { // L: 6663
+							class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var5 >> 16], var25, false);
+						}
 					}
 
-					var67.method2777(var57); // L: 6248
-					var1.serverPacket = null; // L: 6249
-					return true; // L: 6250
+					var1.serverPacket = null; // L: 6665
+					return true; // L: 6666
 				}
 
-				if (ServerPacket.field2888 == var1.serverPacket) { // L: 6252
-					Players.field1254 = true; // L: 6253
-					class16.updateNpcs(true, var3); // L: 6254
-					var1.serverPacket = null; // L: 6255
-					return true; // L: 6256
+				if (ServerPacket.field2996 == var1.serverPacket) { // L: 6668
+					DirectByteArrayCopier.method5328(class253.field2918); // L: 6669
+					var1.serverPacket = null; // L: 6670
+					return true; // L: 6671
 				}
 
-				if (ServerPacket.field2811 == var1.serverPacket) { // L: 6258
-					class16.updateNpcs(false, var3); // L: 6259
-					var1.serverPacket = null; // L: 6260
-					return true; // L: 6261
+				if (ServerPacket.field2998 == var1.serverPacket) { // L: 6673
+					BuddyRankComparator.field1342 = null; // L: 6674
+					var1.serverPacket = null; // L: 6675
+					return true; // L: 6676
 				}
 
-				Widget var52;
-				if (ServerPacket.field2818 == var1.serverPacket) { // L: 6263
-					var17 = var3.readInt(); // L: 6264
-					var5 = var3.readUnsignedShort(); // L: 6265
-					var52 = UserComparator9.getWidget(var17); // L: 6266
-					if (var52.modelType != 2 || var5 != var52.modelId) { // L: 6267
-						var52.modelType = 2; // L: 6268
-						var52.modelId = var5; // L: 6269
-						class184.invalidateWidget(var52); // L: 6270
+				int var9;
+				long var12;
+				int var26;
+				int var27;
+				InterfaceParent var71;
+				if (ServerPacket.field3021 == var1.serverPacket) { // L: 6678
+					var17 = var3.offset + var1.serverPacketLength; // L: 6679
+					var5 = var3.readUnsignedShort(); // L: 6680
+					var6 = var3.readUnsignedShort(); // L: 6681
+					if (var5 != rootInterface) { // L: 6682
+						rootInterface = var5; // L: 6683
+						this.resizeRoot(false); // L: 6684
+						class140.Widget_resetModelFrames(rootInterface); // L: 6685
+						class33.runWidgetOnLoadListener(rootInterface); // L: 6686
+
+						for (var7 = 0; var7 < 100; ++var7) { // L: 6687
+							field504[var7] = true;
+						}
+					}
+
+					InterfaceParent var54;
+					for (; var6-- > 0; var54.field1014 = true) { // L: 6689 6699
+						var7 = var3.readInt(); // L: 6690
+						var26 = var3.readUnsignedShort(); // L: 6691
+						var9 = var3.readUnsignedByte(); // L: 6692
+						var54 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6693
+						if (var54 != null && var26 != var54.group) { // L: 6694
+							class10.closeInterface(var54, true); // L: 6695
+							var54 = null; // L: 6696
+						}
+
+						if (var54 == null) { // L: 6698
+							var54 = ChatChannel.method2058(var7, var26, var9);
+						}
+					}
+
+					for (var71 = (InterfaceParent)interfaceParents.first(); var71 != null; var71 = (InterfaceParent)interfaceParents.next()) { // L: 6701
+						if (var71.field1014) { // L: 6702
+							var71.field1014 = false;
+						} else {
+							class10.closeInterface(var71, true); // L: 6704
+						}
+					}
+
+					widgetFlags = new NodeHashTable(512); // L: 6707
+
+					while (var3.offset < var17) { // L: 6708
+						var7 = var3.readInt(); // L: 6709
+						var26 = var3.readUnsignedShort(); // L: 6710
+						var9 = var3.readUnsignedShort(); // L: 6711
+						var27 = var3.readInt(); // L: 6712
+
+						for (int var74 = var26; var74 <= var9; ++var74) { // L: 6713
+							var12 = (long)var74 + ((long)var7 << 32); // L: 6714
+							widgetFlags.put(new IntegerNode(var27), var12); // L: 6715
+						}
 					}
 
-					var1.serverPacket = null; // L: 6272
-					return true; // L: 6273
+					var1.serverPacket = null; // L: 6718
+					return true; // L: 6719
 				}
 
-				if (ServerPacket.field2803 == var1.serverPacket) { // L: 6275
-					var17 = var3.readInt(); // L: 6276
-					var5 = var3.readUnsignedShort(); // L: 6277
-					if (var17 < -70000) { // L: 6278
+				if (ServerPacket.field3018 == var1.serverPacket) { // L: 6721
+					var17 = var3.readInt(); // L: 6722
+					var5 = var3.readUnsignedShort(); // L: 6723
+					if (var17 < -70000) { // L: 6724
 						var5 += 32768;
 					}
 
-					if (var17 >= 0) { // L: 6280
-						var52 = UserComparator9.getWidget(var17);
+					if (var17 >= 0) { // L: 6726
+						var18 = ChatChannel.getWidget(var17);
 					} else {
-						var52 = null; // L: 6281
+						var18 = null; // L: 6727
 					}
 
-					for (; var3.offset < var1.serverPacketLength; DynamicObject.itemContainerSetItem(var5, var7, var8 - 1, var9)) { // L: 6282 6296
-						var7 = var3.readUShortSmart(); // L: 6283
-						var8 = var3.readUnsignedShort(); // L: 6284
-						var9 = 0; // L: 6285
-						if (var8 != 0) { // L: 6286
-							var9 = var3.readUnsignedByte(); // L: 6287
-							if (var9 == 255) { // L: 6288
-								var9 = var3.readInt();
-							}
+					if (var18 != null) { // L: 6728
+						for (var7 = 0; var7 < var18.itemIds.length; ++var7) { // L: 6729
+							var18.itemIds[var7] = 0; // L: 6730
+							var18.itemQuantities[var7] = 0; // L: 6731
+						}
+					}
+
+					class141.clearItemContainer(var5); // L: 6734
+					var7 = var3.readUnsignedShort(); // L: 6735
+
+					for (var26 = 0; var26 < var7; ++var26) { // L: 6736
+						var9 = var3.method7392(); // L: 6737
+						if (var9 == 255) { // L: 6738
+							var9 = var3.readInt();
 						}
 
-						if (var52 != null && var7 >= 0 && var7 < var52.itemIds.length) { // L: 6290 6291
-							var52.itemIds[var7] = var8; // L: 6292
-							var52.itemQuantities[var7] = var9; // L: 6293
+						var27 = var3.method7401(); // L: 6739
+						if (var18 != null && var26 < var18.itemIds.length) { // L: 6740 6741
+							var18.itemIds[var26] = var27; // L: 6742
+							var18.itemQuantities[var26] = var9; // L: 6743
 						}
+
+						GraphicsObject.itemContainerSetItem(var5, var26, var27 - 1, var9); // L: 6746
 					}
 
-					if (var52 != null) { // L: 6298
-						class184.invalidateWidget(var52);
+					if (var18 != null) { // L: 6748
+						SecureRandomCallable.invalidateWidget(var18);
 					}
 
-					ItemComposition.method3406(); // L: 6299
-					changedItemContainers[++field659 - 1 & 31] = var5 & 32767; // L: 6300
-					var1.serverPacket = null; // L: 6301
-					return true; // L: 6302
+					UserComparator6.method2551(); // L: 6749
+					changedItemContainers[++field665 - 1 & 31] = var5 & 32767; // L: 6750
+					var1.serverPacket = null; // L: 6751
+					return true; // L: 6752
+				}
+
+				if (ServerPacket.field2944 == var1.serverPacket) { // L: 6754
+					var17 = var3.readUnsignedByte(); // L: 6755
+					VarpDefinition.method3168(var17); // L: 6756
+					var1.serverPacket = null; // L: 6757
+					return true; // L: 6758
 				}
 
-				if (ServerPacket.field2843 == var1.serverPacket) { // L: 6304
-					var17 = var3.method7044(); // L: 6305
-					var5 = var3.method7006(); // L: 6306
-					var18 = var5 >> 10 & 31; // L: 6307
-					var7 = var5 >> 5 & 31; // L: 6308
-					var8 = var5 & 31; // L: 6309
-					var9 = (var7 << 11) + (var18 << 19) + (var8 << 3); // L: 6310
-					Widget var69 = UserComparator9.getWidget(var17); // L: 6311
-					if (var9 != var69.color) { // L: 6312
-						var69.color = var9; // L: 6313
-						class184.invalidateWidget(var69); // L: 6314
+				if (ServerPacket.field3027 == var1.serverPacket && isCameraLocked) { // L: 6760 6761
+					field724 = true; // L: 6762
+					Renderable.field2358 = var3.readUnsignedByte(); // L: 6763
+					ItemComposition.field2012 = var3.readUnsignedByte(); // L: 6764
+					WorldMapSection1.field2755 = var3.readUnsignedByte(); // L: 6765
+					ChatChannel.field956 = var3.readUnsignedByte(); // L: 6766
+
+					for (var17 = 0; var17 < 5; ++var17) { // L: 6767
+						field725[var17] = false;
 					}
 
-					var1.serverPacket = null; // L: 6316
-					return true; // L: 6317
+					var1.serverPacket = null; // L: 6768
+					return true; // L: 6769
 				}
 
-				if (ServerPacket.field2892 == var1.serverPacket) { // L: 6319
-					Players.field1254 = true; // L: 6320
-					class16.updateNpcs(false, var3); // L: 6321
-					var1.serverPacket = null; // L: 6322
-					return true; // L: 6323
+				if (ServerPacket.field2949 == var1.serverPacket) { // L: 6772
+					World var48 = new World(); // L: 6773
+					var48.host = var3.readStringCp1252NullTerminated(); // L: 6774
+					var48.id = var3.readUnsignedShort(); // L: 6775
+					var5 = var3.readInt(); // L: 6776
+					var48.properties = var5; // L: 6777
+					VertexNormal.updateGameState(45); // L: 6778
+					var2.close(); // L: 6779
+					var2 = null; // L: 6780
+					BoundaryObject.changeWorld(var48); // L: 6781
+					var1.serverPacket = null; // L: 6782
+					return false; // L: 6783
 				}
 
-				if (ServerPacket.field2859 == var1.serverPacket) { // L: 6325
-					byte[] var50 = new byte[var1.serverPacketLength]; // L: 6326
-					var3.method6939(var50, 0, var50.length); // L: 6327
-					Buffer var66 = new Buffer(var50); // L: 6328
-					var53 = var66.readStringCp1252NullTerminated(); // L: 6329
-					class91.openURL(var53, true, false); // L: 6330
-					var1.serverPacket = null; // L: 6331
-					return true; // L: 6332
+				if (ServerPacket.field2984 == var1.serverPacket) { // L: 6785
+					DevicePcmPlayerProvider.loadRegions(false, var1.packetBuffer); // L: 6786
+					var1.serverPacket = null; // L: 6787
+					return true; // L: 6788
 				}
 
-				if (ServerPacket.field2833 == var1.serverPacket) { // L: 6334
-					isCameraLocked = true; // L: 6335
-					SpotAnimationDefinition.field1761 = var3.readUnsignedByte(); // L: 6336
-					BuddyRankComparator.field1333 = var3.readUnsignedByte(); // L: 6337
-					Renderable.field2442 = var3.readUnsignedShort(); // L: 6338
-					UserComparator8.field1305 = var3.readUnsignedByte(); // L: 6339
-					Login.field888 = var3.readUnsignedByte(); // L: 6340
-					if (Login.field888 >= 100) { // L: 6341
-						WorldMapSectionType.cameraX = SpotAnimationDefinition.field1761 * 128 + 64; // L: 6342
-						class65.cameraZ = BuddyRankComparator.field1333 * 128 + 64; // L: 6343
-						class174.cameraY = class392.getTileHeight(WorldMapSectionType.cameraX, class65.cameraZ, GrandExchangeOfferTotalQuantityComparator.Client_plane) - Renderable.field2442; // L: 6344
+				if (ServerPacket.field2940 == var1.serverPacket) { // L: 6790
+					field583 = cycleCntr; // L: 6791
+					var68 = var3.readByte(); // L: 6792
+					class143 var65 = new class143(var3); // L: 6793
+					ClanChannel var70;
+					if (var68 >= 0) { // L: 6795
+						var70 = currentClanChannels[var68];
+					} else {
+						var70 = UserComparator5.guestClanChannel; // L: 6796
 					}
 
-					var1.serverPacket = null; // L: 6346
-					return true; // L: 6347
+					var65.method2960(var70); // L: 6797
+					var1.serverPacket = null; // L: 6798
+					return true; // L: 6799
 				}
 
-				if (ServerPacket.field2826 == var1.serverPacket) { // L: 6349
-					var17 = var3.method7015(); // L: 6350
-					var5 = var3.method7004(); // L: 6351
-					var52 = UserComparator9.getWidget(var17); // L: 6352
-					if (var52 != null && var52.type == 0) { // L: 6353
-						if (var5 > var52.scrollHeight - var52.height) { // L: 6354
-							var5 = var52.scrollHeight - var52.height;
-						}
+				if (ServerPacket.field2938 == var1.serverPacket) { // L: 6801
+					var17 = var3.readUnsignedShort(); // L: 6802
+					rootInterface = var17; // L: 6803
+					this.resizeRoot(false); // L: 6804
+					class140.Widget_resetModelFrames(var17); // L: 6805
+					class33.runWidgetOnLoadListener(rootInterface); // L: 6806
 
-						if (var5 < 0) { // L: 6355
-							var5 = 0;
-						}
+					for (var5 = 0; var5 < 100; ++var5) { // L: 6807
+						field504[var5] = true;
+					}
 
-						if (var5 != var52.scrollY) { // L: 6356
-							var52.scrollY = var5; // L: 6357
-							class184.invalidateWidget(var52); // L: 6358
-						}
+					var1.serverPacket = null; // L: 6808
+					return true; // L: 6809
+				}
+
+				if (ServerPacket.field3029 == var1.serverPacket) { // L: 6811
+					var17 = var3.readInt(); // L: 6812
+					var5 = var3.readInt(); // L: 6813
+					InterfaceParent var69 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6814
+					var71 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6815
+					if (var71 != null) { // L: 6816
+						class10.closeInterface(var71, var69 == null || var71.group != var69.group);
+					}
+
+					if (var69 != null) { // L: 6817
+						var69.remove(); // L: 6818
+						interfaceParents.put(var69, (long)var5); // L: 6819
+					}
+
+					var52 = ChatChannel.getWidget(var17); // L: 6821
+					if (var52 != null) { // L: 6822
+						SecureRandomCallable.invalidateWidget(var52);
+					}
+
+					var52 = ChatChannel.getWidget(var5); // L: 6823
+					if (var52 != null) { // L: 6824
+						SecureRandomCallable.invalidateWidget(var52); // L: 6825
+						class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var52.id >>> 16], var52, true); // L: 6826
+					}
+
+					if (rootInterface != -1) { // L: 6828
+						Message.runIntfCloseListeners(rootInterface, 1);
 					}
 
-					var1.serverPacket = null; // L: 6361
-					return true; // L: 6362
+					var1.serverPacket = null; // L: 6829
+					return true; // L: 6830
 				}
 
-				if (ServerPacket.field2797 == var1.serverPacket) { // L: 6364
-					var17 = var3.readUnsignedByte(); // L: 6365
-					CollisionMap.forceDisconnect(var17); // L: 6366
-					var1.serverPacket = null; // L: 6367
-					return false; // L: 6368
+				if (ServerPacket.field2937 == var1.serverPacket) { // L: 6832
+					DirectByteArrayCopier.method5328(class253.field2919); // L: 6833
+					var1.serverPacket = null; // L: 6834
+					return true; // L: 6835
 				}
 
-				if (ServerPacket.field2841 == var1.serverPacket) { // L: 6370
-					ItemComposition.method3406(); // L: 6371
-					runEnergy = var3.readUnsignedByte(); // L: 6372
-					field494 = cycleCntr; // L: 6373
-					var1.serverPacket = null; // L: 6374
-					return true; // L: 6375
+				if (ServerPacket.field2934 == var1.serverPacket) { // L: 6837
+					if (var1.serverPacketLength == 0) { // L: 6838
+						Players.friendsChat = null; // L: 6839
+					} else {
+						if (Players.friendsChat == null) { // L: 6842
+							Players.friendsChat = new FriendsChat(class194.loginType, class295.client); // L: 6843
+						}
+
+						Players.friendsChat.readUpdate(var3); // L: 6845
+					}
+
+					class334.method6216(); // L: 6847
+					var1.serverPacket = null; // L: 6848
+					return true; // L: 6849
 				}
 
-				if (ServerPacket.field2875 == var1.serverPacket) { // L: 6377
-					ApproximateRouteStrategy.privateChatMode = FloorDecoration.method4189(var3.readUnsignedByte()); // L: 6378
-					var1.serverPacket = null; // L: 6379
-					return true; // L: 6380
+				if (ServerPacket.field2989 == var1.serverPacket) { // L: 6851
+					UserComparator6.method2551(); // L: 6852
+					runEnergy = var3.readUnsignedByte(); // L: 6853
+					field471 = cycleCntr; // L: 6854
+					var1.serverPacket = null; // L: 6855
+					return true; // L: 6856
 				}
 
-				if (ServerPacket.field2845 == var1.serverPacket) { // L: 6382
-					var47 = var3.readStringCp1252NullTerminated(); // L: 6383
-					var5 = var3.method7021(); // L: 6384
-					var52 = UserComparator9.getWidget(var5); // L: 6385
-					if (!var47.equals(var52.text)) { // L: 6386
-						var52.text = var47; // L: 6387
-						class184.invalidateWidget(var52); // L: 6388
+				if (ServerPacket.field2961 == var1.serverPacket) { // L: 6858
+					for (var17 = 0; var17 < class433.VarpDefinition_fileCount; ++var17) { // L: 6859
+						VarpDefinition var64 = SecureRandomCallable.VarpDefinition_get(var17); // L: 6860
+						if (var64 != null) { // L: 6861
+							Varps.Varps_temp[var17] = 0; // L: 6862
+							Varps.Varps_main[var17] = 0; // L: 6863
+						}
 					}
 
-					var1.serverPacket = null; // L: 6390
-					return true; // L: 6391
+					UserComparator6.method2551(); // L: 6866
+					changedVarpCount += 32; // L: 6867
+					var1.serverPacket = null; // L: 6868
+					return true; // L: 6869
 				}
 
-				if (ServerPacket.field2874 == var1.serverPacket) { // L: 6393
-					Canvas.loadRegions(true, var1.packetBuffer); // L: 6394
-					var1.serverPacket = null; // L: 6395
-					return true; // L: 6396
+				if (ServerPacket.field2982 == var1.serverPacket) { // L: 6871
+					DirectByteArrayCopier.method5328(class253.field2913); // L: 6872
+					var1.serverPacket = null; // L: 6873
+					return true; // L: 6874
 				}
 
-				if (ServerPacket.field2861 == var1.serverPacket) { // L: 6398
-					rebootTimer = var3.method7120() * 30; // L: 6399
-					field494 = cycleCntr; // L: 6400
-					var1.serverPacket = null; // L: 6401
-					return true; // L: 6402
-				}
+				if (ServerPacket.field3016 == var1.serverPacket) { // L: 6876
+					class167.field1813 = var3.method7520(); // L: 6877
+					class17.field90 = var3.readUnsignedByte(); // L: 6878
 
-				if (ServerPacket.field2813 == var1.serverPacket) { // L: 6404
-					var3.offset += 28; // L: 6405
-					if (var3.checkCrc()) { // L: 6406
-						class274.method5198(var3, var3.offset - 28);
+					while (var3.offset < var1.serverPacketLength) { // L: 6879
+						var17 = var3.readUnsignedByte(); // L: 6880
+						class253 var63 = Timer.method6230()[var17]; // L: 6881
+						DirectByteArrayCopier.method5328(var63); // L: 6882
 					}
 
-					var1.serverPacket = null; // L: 6407
-					return true; // L: 6408
+					var1.serverPacket = null; // L: 6884
+					return true; // L: 6885
 				}
 
-				if (ServerPacket.field2853 == var1.serverPacket) { // L: 6410
-					CollisionMap.readReflectionCheck(var3, var1.serverPacketLength); // L: 6411
-					var1.serverPacket = null; // L: 6412
-					return true; // L: 6413
+				if (ServerPacket.field2991 == var1.serverPacket) { // L: 6887
+					DirectByteArrayCopier.method5328(class253.field2914); // L: 6888
+					var1.serverPacket = null; // L: 6889
+					return true; // L: 6890
 				}
 
-				if (ServerPacket.field2820 == var1.serverPacket) { // L: 6415
-					var47 = var3.readStringCp1252NullTerminated(); // L: 6416
-					Object[] var65 = new Object[var47.length() + 1]; // L: 6417
+				long var29;
+				long var31;
+				long var33;
+				if (ServerPacket.field2931 == var1.serverPacket) { // L: 6892
+					var45 = var3.readStringCp1252NullTerminated(); // L: 6893
+					var29 = var3.readLong(); // L: 6894
+					var31 = (long)var3.readUnsignedShort(); // L: 6895
+					var33 = (long)var3.readMedium(); // L: 6896
+					PlayerType var75 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 6897
+					var12 = var33 + (var31 << 32); // L: 6898
+					boolean var77 = false; // L: 6899
 
-					for (var18 = var47.length() - 1; var18 >= 0; --var18) { // L: 6418
-						if (var47.charAt(var18) == 's') { // L: 6419
-							var65[var18 + 1] = var3.readStringCp1252NullTerminated();
-						} else {
-							var65[var18 + 1] = new Integer(var3.readInt()); // L: 6420
+					for (var15 = 0; var15 < 100; ++var15) { // L: 6900
+						if (var12 == crossWorldMessageIds[var15]) { // L: 6901
+							var77 = true; // L: 6902
+							break; // L: 6903
 						}
 					}
 
-					var65[0] = new Integer(var3.readInt()); // L: 6422
-					ScriptEvent var54 = new ScriptEvent(); // L: 6423
-					var54.args = var65; // L: 6424
-					Tile.runScriptEvent(var54); // L: 6425
-					var1.serverPacket = null; // L: 6426
-					return true; // L: 6427
-				}
+					if (var75.isUser && GameEngine.friendSystem.isIgnored(new Username(var45, class194.loginType))) { // L: 6906 6907
+						var77 = true;
+					}
 
-				boolean var56;
-				if (ServerPacket.field2854 == var1.serverPacket) { // L: 6429
-					var17 = var3.method7044(); // L: 6430
-					var56 = var3.readUnsignedByte() == 1; // L: 6431
-					var52 = UserComparator9.getWidget(var17); // L: 6432
-					if (var56 != var52.isHidden) { // L: 6433
-						var52.isHidden = var56; // L: 6434
-						class184.invalidateWidget(var52); // L: 6435
+					if (!var77 && field590 == 0) { // L: 6909
+						crossWorldMessageIds[crossWorldMessageIdsIndex] = var12; // L: 6910
+						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6911
+						var24 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); // L: 6912
+						if (var75.modIcon != -1) { // L: 6913
+							DevicePcmPlayerProvider.addChatMessage(9, class221.method4705(var75.modIcon) + var45, var24, GraphicsDefaults.base37DecodeLong(var29));
+						} else {
+							DevicePcmPlayerProvider.addChatMessage(9, var45, var24, GraphicsDefaults.base37DecodeLong(var29)); // L: 6914
+						}
 					}
 
-					var1.serverPacket = null; // L: 6437
-					return true; // L: 6438
+					var1.serverPacket = null; // L: 6916
+					return true; // L: 6917
 				}
 
-				if (ServerPacket.field2852 == var1.serverPacket) { // L: 6440
-					var17 = var3.readInt(); // L: 6441
-					var5 = var3.method7004(); // L: 6442
-					var52 = UserComparator9.getWidget(var17); // L: 6443
-					if (var52.modelType != 1 || var5 != var52.modelId) { // L: 6444
-						var52.modelType = 1; // L: 6445
-						var52.modelId = var5; // L: 6446
-						class184.invalidateWidget(var52); // L: 6447
+				boolean var66;
+				if (ServerPacket.field3017 == var1.serverPacket) { // L: 6919
+					var66 = var3.readUnsignedByte() == 1; // L: 6920
+					var5 = var3.method7411(); // L: 6921
+					var18 = ChatChannel.getWidget(var5); // L: 6922
+					if (var66 != var18.isHidden) { // L: 6923
+						var18.isHidden = var66; // L: 6924
+						SecureRandomCallable.invalidateWidget(var18); // L: 6925
 					}
 
-					var1.serverPacket = null; // L: 6449
-					return true; // L: 6450
+					var1.serverPacket = null; // L: 6927
+					return true; // L: 6928
 				}
 
-				if (ServerPacket.field2836 == var1.serverPacket) { // L: 6452
-					Actor.field1146 = var3.method6995(); // L: 6453
-					ItemComposition.field1931 = var3.readUnsignedByte(); // L: 6454
+				if (ServerPacket.field2965 == var1.serverPacket) { // L: 6930
+					isCameraLocked = false; // L: 6931
 
-					for (var17 = ItemComposition.field1931; var17 < ItemComposition.field1931 + 8; ++var17) { // L: 6455
-						for (var5 = Actor.field1146; var5 < Actor.field1146 + 8; ++var5) { // L: 6456
-							if (groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var17][var5] != null) { // L: 6457
-								groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var17][var5] = null; // L: 6458
-								WallDecoration.updateItemPile(var17, var5); // L: 6459
-							}
-						}
+					for (var17 = 0; var17 < 5; ++var17) { // L: 6932
+						field725[var17] = false;
 					}
 
-					for (PendingSpawn var49 = (PendingSpawn)pendingSpawns.last(); var49 != null; var49 = (PendingSpawn)pendingSpawns.previous()) { // L: 6463 6464 6466
-						if (var49.x >= ItemComposition.field1931 && var49.x < ItemComposition.field1931 + 8 && var49.y >= Actor.field1146 && var49.y < Actor.field1146 + 8 && var49.plane == GrandExchangeOfferTotalQuantityComparator.Client_plane) { // L: 6465
-							var49.hitpoints = 0;
-						}
+					var1.serverPacket = null; // L: 6933
+					return true; // L: 6934
+				}
+
+				if (ServerPacket.field2986 == var1.serverPacket) { // L: 6936
+					if (rootInterface != -1) { // L: 6937
+						Message.runIntfCloseListeners(rootInterface, 0);
 					}
 
-					var1.serverPacket = null; // L: 6468
-					return true; // L: 6469
+					var1.serverPacket = null; // L: 6938
+					return true; // L: 6939
 				}
 
-				if (ServerPacket.field2870 == var1.serverPacket) { // L: 6471
-					SequenceDefinition.logOut(); // L: 6472
-					var1.serverPacket = null; // L: 6473
-					return false; // L: 6474
+				if (ServerPacket.field3000 == var1.serverPacket) { // L: 6941
+					DirectByteArrayCopier.method5328(class253.field2912); // L: 6942
+					var1.serverPacket = null; // L: 6943
+					return true; // L: 6944
 				}
 
-				if (ServerPacket.field2856 == var1.serverPacket) { // L: 6476
-					class112.friendSystem.method1746(); // L: 6477
-					field679 = cycleCntr; // L: 6478
-					var1.serverPacket = null; // L: 6479
-					return true; // L: 6480
+				if (ServerPacket.field2948 == var1.serverPacket) { // L: 6946
+					DirectByteArrayCopier.method5328(class253.field2916); // L: 6947
+					var1.serverPacket = null; // L: 6948
+					return true; // L: 6949
 				}
 
-				if (ServerPacket.field2871 == var1.serverPacket) { // L: 6482
-					var17 = var3.readUnsignedShort(); // L: 6483
-					var5 = var3.readUnsignedByte(); // L: 6484
-					var18 = var3.readUnsignedShort(); // L: 6485
-					class128.queueSoundEffect(var17, var5, var18); // L: 6486
-					var1.serverPacket = null; // L: 6487
-					return true; // L: 6488
+				if (ServerPacket.field3004 == var1.serverPacket) { // L: 6951
+					GrandExchangeOfferOwnWorldComparator.updateNpcs(false, var3); // L: 6952
+					var1.serverPacket = null; // L: 6953
+					return true; // L: 6954
 				}
 
-				if (ServerPacket.field2793 == var1.serverPacket) { // L: 6490
-					isCameraLocked = false; // L: 6491
+				if (ServerPacket.field2968 == var1.serverPacket) { // L: 6956
+					GameEngine.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6957
+					field671 = cycleCntr; // L: 6958
+					var1.serverPacket = null; // L: 6959
+					return true; // L: 6960
+				}
 
-					for (var17 = 0; var17 < 5; ++var17) { // L: 6492
-						field718[var17] = false;
-					}
+				if (ServerPacket.field2957 == var1.serverPacket) { // L: 6962
+					var17 = var3.method7401(); // L: 6963
+					var5 = var3.method7411(); // L: 6964
+					var18 = ChatChannel.getWidget(var5); // L: 6965
+					if (var18 != null && var18.type == 0) { // L: 6966
+						if (var17 > var18.scrollHeight - var18.height) { // L: 6967
+							var17 = var18.scrollHeight - var18.height;
+						}
 
-					var1.serverPacket = null; // L: 6493
-					return true; // L: 6494
-				}
+						if (var17 < 0) { // L: 6968
+							var17 = 0;
+						}
 
-				if (ServerPacket.field2844 == var1.serverPacket) { // L: 6496
-					for (var17 = 0; var17 < VarpDefinition.VarpDefinition_fileCount; ++var17) { // L: 6497
-						VarpDefinition var64 = ArchiveLoader.VarpDefinition_get(var17); // L: 6498
-						if (var64 != null) { // L: 6499
-							Varps.Varps_temp[var17] = 0; // L: 6500
-							Varps.Varps_main[var17] = 0; // L: 6501
+						if (var17 != var18.scrollY) { // L: 6969
+							var18.scrollY = var17; // L: 6970
+							SecureRandomCallable.invalidateWidget(var18); // L: 6971
 						}
 					}
 
-					ItemComposition.method3406(); // L: 6504
-					changedVarpCount += 32; // L: 6505
-					var1.serverPacket = null; // L: 6506
-					return true; // L: 6507
+					var1.serverPacket = null; // L: 6974
+					return true; // L: 6975
 				}
 
-				InterfaceParent var35;
-				if (ServerPacket.field2809 == var1.serverPacket) { // L: 6509
-					var17 = var3.method7006(); // L: 6510
-					var5 = var3.method7015(); // L: 6511
-					var18 = var3.method6995(); // L: 6512
-					var35 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6513
-					if (var35 != null) { // L: 6514
-						Players.closeInterface(var35, var17 != var35.group);
-					}
-
-					DynamicObject.method1997(var5, var17, var18); // L: 6515
-					var1.serverPacket = null; // L: 6516
-					return true; // L: 6517
+				if (ServerPacket.field2994 == var1.serverPacket) { // L: 6977
+					DirectByteArrayCopier.method5328(class253.field2920); // L: 6978
+					var1.serverPacket = null; // L: 6979
+					return true; // L: 6980
 				}
 
-				if (ServerPacket.field2847 == var1.serverPacket) { // L: 6519
-					class21.method309(class240.field2781); // L: 6520
-					var1.serverPacket = null; // L: 6521
-					return true; // L: 6522
+				if (ServerPacket.field3026 == var1.serverPacket) { // L: 6982
+					GameEngine.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6983
+					Skeleton.FriendSystem_invalidateIgnoreds(); // L: 6984
+					field671 = cycleCntr; // L: 6985
+					var1.serverPacket = null; // L: 6986
+					return true; // L: 6987
 				}
 
-				if (ServerPacket.field2846 == var1.serverPacket) { // L: 6524
-					var17 = var3.readInt(); // L: 6525
-					var5 = var3.readUnsignedShort(); // L: 6526
-					if (var17 < -70000) { // L: 6527
+				if (ServerPacket.field2970 == var1.serverPacket) { // L: 6989
+					var17 = var3.readInt(); // L: 6990
+					var5 = var3.readUnsignedShort(); // L: 6991
+					if (var17 < -70000) { // L: 6992
 						var5 += 32768;
 					}
 
-					if (var17 >= 0) { // L: 6529
-						var52 = UserComparator9.getWidget(var17);
+					if (var17 >= 0) { // L: 6994
+						var18 = ChatChannel.getWidget(var17);
 					} else {
-						var52 = null; // L: 6530
+						var18 = null; // L: 6995
 					}
 
-					if (var52 != null) { // L: 6531
-						for (var7 = 0; var7 < var52.itemIds.length; ++var7) { // L: 6532
-							var52.itemIds[var7] = 0; // L: 6533
-							var52.itemQuantities[var7] = 0; // L: 6534
-						}
-					}
-
-					class20.clearItemContainer(var5); // L: 6537
-					var7 = var3.readUnsignedShort(); // L: 6538
-
-					for (var8 = 0; var8 < var7; ++var8) { // L: 6539
-						var9 = var3.method6996(); // L: 6540
-						if (var9 == 255) { // L: 6541
-							var9 = var3.method7015();
+					for (; var3.offset < var1.serverPacketLength; GraphicsObject.itemContainerSetItem(var5, var7, var26 - 1, var9)) { // L: 6996 7010
+						var7 = var3.readUShortSmart(); // L: 6997
+						var26 = var3.readUnsignedShort(); // L: 6998
+						var9 = 0; // L: 6999
+						if (var26 != 0) { // L: 7000
+							var9 = var3.readUnsignedByte(); // L: 7001
+							if (var9 == 255) { // L: 7002
+								var9 = var3.readInt();
+							}
 						}
 
-						var10 = var3.method7004(); // L: 6542
-						if (var52 != null && var8 < var52.itemIds.length) { // L: 6543 6544
-							var52.itemIds[var8] = var10; // L: 6545
-							var52.itemQuantities[var8] = var9; // L: 6546
+						if (var18 != null && var7 >= 0 && var7 < var18.itemIds.length) { // L: 7004 7005
+							var18.itemIds[var7] = var26; // L: 7006
+							var18.itemQuantities[var7] = var9; // L: 7007
 						}
-
-						DynamicObject.itemContainerSetItem(var5, var8, var10 - 1, var9); // L: 6549
 					}
 
-					if (var52 != null) { // L: 6551
-						class184.invalidateWidget(var52);
+					if (var18 != null) { // L: 7012
+						SecureRandomCallable.invalidateWidget(var18);
 					}
 
-					ItemComposition.method3406(); // L: 6552
-					changedItemContainers[++field659 - 1 & 31] = var5 & 32767; // L: 6553
-					var1.serverPacket = null; // L: 6554
-					return true; // L: 6555
+					UserComparator6.method2551(); // L: 7013
+					changedItemContainers[++field665 - 1 & 31] = var5 & 32767; // L: 7014
+					var1.serverPacket = null; // L: 7015
+					return true; // L: 7016
 				}
 
-				if (ServerPacket.field2860 == var1.serverPacket) { // L: 6557
-					var17 = var3.readUShortSmart(); // L: 6558
-					var56 = var3.readUnsignedByte() == 1; // L: 6559
-					var53 = ""; // L: 6560
-					boolean var55 = false; // L: 6561
-					if (var56) { // L: 6562
-						var53 = var3.readStringCp1252NullTerminated(); // L: 6563
-						if (class112.friendSystem.isIgnored(new Username(var53, GrandExchangeOfferUnitPriceComparator.loginType))) { // L: 6564
-							var55 = true;
+				if (ServerPacket.field2942 == var1.serverPacket) { // L: 7018
+					isCameraLocked = true; // L: 7019
+					field724 = false; // L: 7020
+					PlayerComposition.field3193 = var3.readUnsignedByte(); // L: 7021
+					MusicPatchNode.field3150 = var3.readUnsignedByte(); // L: 7022
+					ModeWhere.field3951 = var3.readUnsignedShort(); // L: 7023
+					WorldMapSection1.field2755 = var3.readUnsignedByte(); // L: 7024
+					ChatChannel.field956 = var3.readUnsignedByte(); // L: 7025
+					if (ChatChannel.field956 >= 100) { // L: 7026
+						var17 = PlayerComposition.field3193 * 128 + 64; // L: 7027
+						var5 = MusicPatchNode.field3150 * 128 + 64; // L: 7028
+						var6 = FaceNormal.getTileHeight(var17, var5, class20.Client_plane) - ModeWhere.field3951; // L: 7029
+						var7 = var17 - UserComparator7.cameraX; // L: 7030
+						var26 = var6 - AbstractByteArrayCopier.cameraY; // L: 7031
+						var9 = var5 - UserComparator10.cameraZ; // L: 7032
+						var27 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 7033
+						UserComparator7.cameraPitch = (int)(Math.atan2((double)var26, (double)var27) * 325.9490051269531D) & 2047; // L: 7034
+						class379.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.9490051269531D) & 2047; // L: 7035
+						if (UserComparator7.cameraPitch < 128) { // L: 7036
+							UserComparator7.cameraPitch = 128;
 						}
-					}
 
-					String var76 = var3.readStringCp1252NullTerminated(); // L: 6566
-					if (!var55) { // L: 6567
-						class397.addGameMessage(var17, var53, var76);
+						if (UserComparator7.cameraPitch > 383) { // L: 7037
+							UserComparator7.cameraPitch = 383;
+						}
 					}
 
-					var1.serverPacket = null; // L: 6568
-					return true; // L: 6569
-				}
-
-				if (ServerPacket.field2839 == var1.serverPacket) { // L: 6571
-					Canvas.loadRegions(false, var1.packetBuffer); // L: 6572
-					var1.serverPacket = null; // L: 6573
-					return true; // L: 6574
+					var1.serverPacket = null; // L: 7039
+					return true; // L: 7040
 				}
 
-				if (ServerPacket.field2885 == var1.serverPacket) { // L: 6576
-					ItemComposition.field1931 = var3.method6995(); // L: 6577
-					Actor.field1146 = var3.readUnsignedByte(); // L: 6578
-
-					while (var3.offset < var1.serverPacketLength) { // L: 6579
-						var17 = var3.readUnsignedByte(); // L: 6580
-						class240 var63 = class130.method2748()[var17]; // L: 6581
-						class21.method309(var63); // L: 6582
+				if (ServerPacket.field3007 == var1.serverPacket) { // L: 7042
+					isCameraLocked = true; // L: 7043
+					field724 = false; // L: 7044
+					class167.field1811 = var3.readUnsignedByte(); // L: 7045
+					VarpDefinition.field1748 = var3.readUnsignedByte(); // L: 7046
+					UserComparator9.field1335 = var3.readUnsignedShort(); // L: 7047
+					Renderable.field2358 = var3.readUnsignedByte(); // L: 7048
+					ItemComposition.field2012 = var3.readUnsignedByte(); // L: 7049
+					if (ItemComposition.field2012 >= 100) { // L: 7050
+						UserComparator7.cameraX = class167.field1811 * 128 + 64; // L: 7051
+						UserComparator10.cameraZ = VarpDefinition.field1748 * 128 + 64; // L: 7052
+						AbstractByteArrayCopier.cameraY = FaceNormal.getTileHeight(UserComparator7.cameraX, UserComparator10.cameraZ, class20.Client_plane) - UserComparator9.field1335; // L: 7053
 					}
 
-					var1.serverPacket = null; // L: 6584
-					return true; // L: 6585
+					var1.serverPacket = null; // L: 7055
+					return true; // L: 7056
 				}
 
-				if (ServerPacket.field2796 == var1.serverPacket) { // L: 6587
-					class128.method2728(var3.readStringCp1252NullTerminated()); // L: 6588
-					var1.serverPacket = null; // L: 6589
-					return true; // L: 6590
-				}
-
-				if (ServerPacket.field2812 == var1.serverPacket) { // L: 6592
-					class21.method309(class240.field2782); // L: 6593
-					var1.serverPacket = null; // L: 6594
-					return true; // L: 6595
-				}
+				if (ServerPacket.field2983 == var1.serverPacket) { // L: 7058
+					var17 = var3.method7401(); // L: 7059
+					var5 = var3.method7394(); // L: 7060
+					var6 = var3.readInt(); // L: 7061
+					var71 = (InterfaceParent)interfaceParents.get((long)var6); // L: 7062
+					if (var71 != null) { // L: 7063
+						class10.closeInterface(var71, var17 != var71.group);
+					}
 
-				Widget var73;
-				if (ServerPacket.field2842 == var1.serverPacket) { // L: 6597
-					var17 = var3.method7120(); // L: 6598
-					var5 = var3.method7004(); // L: 6599
-					var18 = var3.method7021(); // L: 6600
-					var73 = UserComparator9.getWidget(var18); // L: 6601
-					var73.field3165 = var5 + (var17 << 16); // L: 6602
-					var1.serverPacket = null; // L: 6603
-					return true; // L: 6604
+					ChatChannel.method2058(var6, var17, var5); // L: 7064
+					var1.serverPacket = null; // L: 7065
+					return true; // L: 7066
 				}
 
-				if (ServerPacket.field2834 == var1.serverPacket) { // L: 6606
-					var17 = var3.readInt(); // L: 6607
-					var5 = var3.readInt(); // L: 6608
-					var18 = Occluder.getGcDuration(); // L: 6609
-					PacketBufferNode var75 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2680, packetWriter.isaacCipher); // L: 6611
-					var75.packetBuffer.writeByte(GameEngine.fps); // L: 6612
-					var75.packetBuffer.method7126(var17); // L: 6613
-					var75.packetBuffer.method7126(var5); // L: 6614
-					var75.packetBuffer.method6947(var18); // L: 6615
-					packetWriter.addNode(var75); // L: 6616
-					var1.serverPacket = null; // L: 6617
-					return true; // L: 6618
+				if (ServerPacket.field3020 == var1.serverPacket) { // L: 7068
+					class12.field72 = true; // L: 7069
+					GrandExchangeOfferOwnWorldComparator.updateNpcs(true, var3); // L: 7070
+					var1.serverPacket = null; // L: 7071
+					return true; // L: 7072
 				}
 
-				boolean var68;
-				if (ServerPacket.field2821 == var1.serverPacket) { // L: 6620
-					var68 = var3.readUnsignedByte() == 1; // L: 6621
-					if (var68) { // L: 6622
-						GrandExchangeOfferUnitPriceComparator.field3758 = class111.method2516() - var3.readLong(); // L: 6623
-						JagexCache.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6624
+				if (ServerPacket.field2990 == var1.serverPacket) { // L: 7074
+					var17 = var3.readUnsignedByte(); // L: 7075
+					if (var3.readUnsignedByte() == 0) { // L: 7076
+						grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 7077
+						var3.offset += 18; // L: 7078
 					} else {
-						JagexCache.grandExchangeEvents = null; // L: 6626
-					}
-
-					field670 = cycleCntr; // L: 6627
-					var1.serverPacket = null; // L: 6628
-					return true; // L: 6629
-				}
-
-				if (ServerPacket.field2850 == var1.serverPacket) { // L: 6631
-					var17 = var3.method7008(); // L: 6632
-					var5 = var3.method7044(); // L: 6633
-					var52 = UserComparator9.getWidget(var5); // L: 6634
-					if (var17 != var52.sequenceId || var17 == -1) { // L: 6635
-						var52.sequenceId = var17; // L: 6636
-						var52.modelFrame = 0; // L: 6637
-						var52.modelFrameCycle = 0; // L: 6638
-						class184.invalidateWidget(var52); // L: 6639
+						--var3.offset; // L: 7081
+						grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 7082
 					}
 
-					var1.serverPacket = null; // L: 6641
-					return true; // L: 6642
+					field675 = cycleCntr; // L: 7084
+					var1.serverPacket = null; // L: 7085
+					return true; // L: 7086
 				}
 
-				long var37;
-				if (ServerPacket.field2827 == var1.serverPacket) { // L: 6644
-					var61 = var3.readByte(); // L: 6645
-					var26 = (long)var3.readUnsignedShort(); // L: 6646
-					var28 = (long)var3.readMedium(); // L: 6647
-					var37 = var28 + (var26 << 32); // L: 6648
-					boolean var77 = false; // L: 6649
-					ClanChannel var40 = var61 >= 0 ? currentClanChannels[var61] : class115.guestClanChannel; // L: 6650
-					if (var40 == null) { // L: 6651
-						var77 = true;
-					} else {
-						for (var13 = 0; var13 < 100; ++var13) { // L: 6653
-							if (crossWorldMessageIds[var13] == var37) { // L: 6654
-								var77 = true; // L: 6655
-								break; // L: 6656
-							}
+				if (ServerPacket.field2951 == var1.serverPacket) { // L: 7088
+					Strings.method5509(); // L: 7089
+					var68 = var3.readByte(); // L: 7090
+					if (var1.serverPacketLength == 1) { // L: 7091
+						if (var68 >= 0) { // L: 7092
+							currentClanSettings[var68] = null;
+						} else {
+							class222.guestClanSettings = null; // L: 7093
 						}
+
+						var1.serverPacket = null; // L: 7094
+						return true; // L: 7095
 					}
 
-					if (!var77) { // L: 6660
-						crossWorldMessageIds[crossWorldMessageIdsIndex] = var37; // L: 6661
-						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6662
-						var33 = MilliClock.method2955(var3); // L: 6663
-						int var71 = var61 >= 0 ? 43 : 46; // L: 6664
-						class269.addChatMessage(var71, "", var33, var40.name); // L: 6665
+					if (var68 >= 0) { // L: 7097
+						currentClanSettings[var68] = new ClanSettings(var3); // L: 7098
+					} else {
+						class222.guestClanSettings = new ClanSettings(var3); // L: 7101
 					}
 
-					var1.serverPacket = null; // L: 6667
-					return true; // L: 6668
+					var1.serverPacket = null; // L: 7103
+					return true; // L: 7104
 				}
 
-				if (ServerPacket.field2868 == var1.serverPacket) { // L: 6670
-					for (var17 = 0; var17 < players.length; ++var17) { // L: 6671
-						if (players[var17] != null) { // L: 6672
-							players[var17].sequence = -1;
-						}
+				if (ServerPacket.field2993 == var1.serverPacket) { // L: 7106
+					Strings.method5509(); // L: 7107
+					var68 = var3.readByte(); // L: 7108
+					class129 var61 = new class129(var3); // L: 7109
+					ClanSettings var62;
+					if (var68 >= 0) { // L: 7111
+						var62 = currentClanSettings[var68];
+					} else {
+						var62 = class222.guestClanSettings; // L: 7112
 					}
 
-					for (var17 = 0; var17 < npcs.length; ++var17) { // L: 6674
-						if (npcs[var17] != null) { // L: 6675
-							npcs[var17].sequence = -1;
-						}
-					}
+					var61.method2781(var62); // L: 7113
+					var1.serverPacket = null; // L: 7114
+					return true; // L: 7115
+				}
 
-					var1.serverPacket = null; // L: 6677
-					return true; // L: 6678
+				if (ServerPacket.field2939 == var1.serverPacket) { // L: 7117
+					class167.field1813 = var3.readUnsignedByte(); // L: 7118
+					class17.field90 = var3.method7394(); // L: 7119
+					var1.serverPacket = null; // L: 7120
+					return true; // L: 7121
 				}
 
-				Widget var36;
-				if (ServerPacket.field2828 == var1.serverPacket) { // L: 6680
-					var17 = var3.method7044(); // L: 6681
-					var5 = var3.method7044(); // L: 6682
-					InterfaceParent var51 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6683
-					var35 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6684
-					if (var35 != null) { // L: 6685
-						Players.closeInterface(var35, var51 == null || var51.group != var35.group);
-					}
+				if (ServerPacket.field2973 == var1.serverPacket) { // L: 7123
+					DevicePcmPlayerProvider.loadRegions(true, var1.packetBuffer); // L: 7124
+					var1.serverPacket = null; // L: 7125
+					return true; // L: 7126
+				}
 
-					if (var51 != null) { // L: 6686
-						var51.remove(); // L: 6687
-						interfaceParents.put(var51, (long)var5); // L: 6688
+				if (ServerPacket.field2932 == var1.serverPacket) { // L: 7128
+					hintArrowType = var3.readUnsignedByte(); // L: 7129
+					if (hintArrowType == 1) { // L: 7130
+						hintArrowNpcIndex = var3.readUnsignedShort();
 					}
 
-					var36 = UserComparator9.getWidget(var17); // L: 6690
-					if (var36 != null) { // L: 6691
-						class184.invalidateWidget(var36);
-					}
+					if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 7131
+						if (hintArrowType == 2) { // L: 7132
+							hintArrowSubX = 64; // L: 7133
+							hintArrowSubY = 64; // L: 7134
+						}
 
-					var36 = UserComparator9.getWidget(var5); // L: 6692
-					if (var36 != null) { // L: 6693
-						class184.invalidateWidget(var36); // L: 6694
-						MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var36.id >>> 16], var36, true); // L: 6695
-					}
+						if (hintArrowType == 3) { // L: 7136
+							hintArrowSubX = 0; // L: 7137
+							hintArrowSubY = 64; // L: 7138
+						}
 
-					if (rootInterface != -1) { // L: 6697
-						ItemComposition.runIntfCloseListeners(rootInterface, 1);
-					}
+						if (hintArrowType == 4) { // L: 7140
+							hintArrowSubX = 128; // L: 7141
+							hintArrowSubY = 64; // L: 7142
+						}
 
-					var1.serverPacket = null; // L: 6698
-					return true; // L: 6699
-				}
+						if (hintArrowType == 5) { // L: 7144
+							hintArrowSubX = 64; // L: 7145
+							hintArrowSubY = 0; // L: 7146
+						}
 
-				if (ServerPacket.field2822 == var1.serverPacket) { // L: 6701
-					publicChatMode = var3.method6996(); // L: 6702
-					tradeChatMode = var3.method6997(); // L: 6703
-					var1.serverPacket = null; // L: 6704
-					return true; // L: 6705
-				}
+						if (hintArrowType == 6) { // L: 7148
+							hintArrowSubX = 64; // L: 7149
+							hintArrowSubY = 128; // L: 7150
+						}
 
-				if (ServerPacket.field2887 == var1.serverPacket) { // L: 6707
-					destinationX = var3.readUnsignedByte(); // L: 6708
-					if (destinationX == 255) { // L: 6709
-						destinationX = 0;
+						hintArrowType = 2; // L: 7152
+						hintArrowX = var3.readUnsignedShort(); // L: 7153
+						hintArrowY = var3.readUnsignedShort(); // L: 7154
+						hintArrowHeight = var3.readUnsignedByte(); // L: 7155
 					}
 
-					destinationY = var3.readUnsignedByte(); // L: 6710
-					if (destinationY == 255) { // L: 6711
-						destinationY = 0;
+					if (hintArrowType == 10) { // L: 7157
+						hintArrowPlayerIndex = var3.readUnsignedShort();
 					}
 
-					var1.serverPacket = null; // L: 6712
-					return true; // L: 6713
+					var1.serverPacket = null; // L: 7158
+					return true; // L: 7159
 				}
 
-				if (ServerPacket.field2815 == var1.serverPacket) { // L: 6715
-					ItemComposition.method3406(); // L: 6716
-					var17 = var3.method6997(); // L: 6717
-					var5 = var3.method7015(); // L: 6718
-					var18 = var3.method6995(); // L: 6719
-					experience[var17] = var5; // L: 6720
-					currentLevels[var17] = var18; // L: 6721
-					levels[var17] = 1; // L: 6722
-
-					for (var7 = 0; var7 < 98; ++var7) { // L: 6723
-						if (var5 >= Skills.Skills_experienceTable[var7]) {
-							levels[var17] = var7 + 2;
-						}
+				if (ServerPacket.field2935 == var1.serverPacket) { // L: 7161
+					var17 = var3.method7412(); // L: 7162
+					var5 = var3.method7411(); // L: 7163
+					var6 = var3.method7401(); // L: 7164
+					if (var6 == 65535) { // L: 7165
+						var6 = -1;
 					}
 
-					changedSkills[++changedSkillsCount - 1 & 31] = var17; // L: 6724
-					var1.serverPacket = null; // L: 6725
-					return true; // L: 6726
-				}
+					var25 = ChatChannel.getWidget(var5); // L: 7166
+					ItemComposition var51;
+					if (!var25.isIf3) { // L: 7167
+						if (var6 == -1) { // L: 7168
+							var25.modelType = 0; // L: 7169
+							var1.serverPacket = null; // L: 7170
+							return true; // L: 7171
+						}
 
-				if (ServerPacket.field2807 == var1.serverPacket) { // L: 6728
-					UserComparator6.method2509(); // L: 6729
-					var61 = var3.readByte(); // L: 6730
-					class119 var62 = new class119(var3); // L: 6731
-					ClanSettings var6;
-					if (var61 >= 0) { // L: 6733
-						var6 = currentClanSettings[var61];
+						var51 = UserComparator6.ItemDefinition_get(var6); // L: 7173
+						var25.modelType = 4; // L: 7174
+						var25.modelId = var6; // L: 7175
+						var25.modelAngleX = var51.xan2d; // L: 7176
+						var25.modelAngleY = var51.yan2d; // L: 7177
+						var25.modelZoom = var51.zoom2d * 100 / var17; // L: 7178
+						SecureRandomCallable.invalidateWidget(var25); // L: 7179
 					} else {
-						var6 = class67.guestClanSettings; // L: 6734
+						var25.itemId = var6; // L: 7182
+						var25.itemQuantity = var17; // L: 7183
+						var51 = UserComparator6.ItemDefinition_get(var6); // L: 7184
+						var25.modelAngleX = var51.xan2d; // L: 7185
+						var25.modelAngleY = var51.yan2d; // L: 7186
+						var25.modelAngleZ = var51.zan2d; // L: 7187
+						var25.modelOffsetX = var51.offsetX2d; // L: 7188
+						var25.modelOffsetY = var51.offsetY2d; // L: 7189
+						var25.modelZoom = var51.zoom2d; // L: 7190
+						if (var51.isStackable == 1) { // L: 7191
+							var25.itemQuantityMode = 1;
+						} else {
+							var25.itemQuantityMode = 2; // L: 7192
+						}
+
+						if (var25.field3280 > 0) { // L: 7193
+							var25.modelZoom = var25.modelZoom * 32 / var25.field3280;
+						} else if (var25.rawWidth > 0) { // L: 7194
+							var25.modelZoom = var25.modelZoom * 32 / var25.rawWidth;
+						}
+
+						SecureRandomCallable.invalidateWidget(var25); // L: 7195
 					}
 
-					var62.method2577(var6); // L: 6735
-					var1.serverPacket = null; // L: 6736
-					return true; // L: 6737
+					var1.serverPacket = null; // L: 7197
+					return true; // L: 7198
 				}
 
-				if (ServerPacket.field2877 == var1.serverPacket) { // L: 6739
-					var17 = var3.method7021(); // L: 6740
-					var5 = var3.readInt(); // L: 6741
-					var18 = var3.readUnsignedShort(); // L: 6742
-					if (var18 == 65535) { // L: 6743
-						var18 = -1;
+				if (ServerPacket.field2988 == var1.serverPacket) { // L: 7200
+					var17 = var3.method7412(); // L: 7201
+					var5 = var3.method7401(); // L: 7202
+					if (var5 == 65535) { // L: 7203
+						var5 = -1;
 					}
 
-					var7 = var3.method7120(); // L: 6744
-					if (var7 == 65535) { // L: 6745
-						var7 = -1;
+					var6 = var3.method7401(); // L: 7204
+					if (var6 == 65535) { // L: 7205
+						var6 = -1;
 					}
 
-					for (var8 = var7; var8 <= var18; ++var8) { // L: 6746
-						var37 = (long)var8 + ((long)var5 << 32); // L: 6747
-						Node var78 = widgetFlags.get(var37); // L: 6748
-						if (var78 != null) { // L: 6749
-							var78.remove();
+					var7 = var3.readInt(); // L: 7206
+
+					for (var26 = var5; var26 <= var6; ++var26) { // L: 7207
+						var33 = ((long)var7 << 32) + (long)var26; // L: 7208
+						Node var35 = widgetFlags.get(var33); // L: 7209
+						if (var35 != null) { // L: 7210
+							var35.remove();
 						}
 
-						widgetFlags.put(new IntegerNode(var17), var37); // L: 6750
+						widgetFlags.put(new IntegerNode(var17), var33); // L: 7211
 					}
 
-					var1.serverPacket = null; // L: 6752
-					return true; // L: 6753
+					var1.serverPacket = null; // L: 7213
+					return true; // L: 7214
 				}
 
-				if (ServerPacket.field2800 == var1.serverPacket) { // L: 6755
-					UserComparator6.method2509(); // L: 6756
-					var61 = var3.readByte(); // L: 6757
-					if (var1.serverPacketLength == 1) { // L: 6758
-						if (var61 >= 0) { // L: 6759
-							currentClanSettings[var61] = null;
-						} else {
-							class67.guestClanSettings = null; // L: 6760
-						}
+				if (ServerPacket.field2967 == var1.serverPacket) { // L: 7216
+					class12.field72 = true; // L: 7217
+					GrandExchangeOfferOwnWorldComparator.updateNpcs(false, var3); // L: 7218
+					var1.serverPacket = null; // L: 7219
+					return true; // L: 7220
+				}
 
-						var1.serverPacket = null; // L: 6761
-						return true; // L: 6762
-					}
+				if (ServerPacket.field2943 == var1.serverPacket) { // L: 7222
+					GameEngine.friendSystem.method1764(); // L: 7223
+					field671 = cycleCntr; // L: 7224
+					var1.serverPacket = null; // L: 7225
+					return true; // L: 7226
+				}
 
-					if (var61 >= 0) { // L: 6764
-						currentClanSettings[var61] = new ClanSettings(var3); // L: 6765
-					} else {
-						class67.guestClanSettings = new ClanSettings(var3); // L: 6768
-					}
+				if (ServerPacket.field2981 == var1.serverPacket) { // L: 7228
+					BuddyRankComparator.field1342 = new class370(Ignored.HitSplatDefinition_cached); // L: 7229
+					var1.serverPacket = null; // L: 7230
+					return true; // L: 7231
+				}
 
-					var1.serverPacket = null; // L: 6770
-					return true; // L: 6771
+				if (ServerPacket.field2945 == var1.serverPacket) { // L: 7233
+					rebootTimer = var3.readUnsignedShort() * 30; // L: 7234
+					field471 = cycleCntr; // L: 7235
+					var1.serverPacket = null; // L: 7236
+					return true; // L: 7237
 				}
 
-				if (ServerPacket.field2798 == var1.serverPacket) { // L: 6773
-					var17 = var3.method7006(); // L: 6774
-					rootInterface = var17; // L: 6775
-					this.resizeRoot(false); // L: 6776
-					Player.Widget_resetModelFrames(var17); // L: 6777
-					class54.runWidgetOnLoadListener(rootInterface); // L: 6778
+				Widget var58;
+				if (ServerPacket.field2985 == var1.serverPacket) { // L: 7239
+					var17 = var3.method7412(); // L: 7240
+					var58 = ChatChannel.getWidget(var17); // L: 7241
 
-					for (var5 = 0; var5 < 100; ++var5) { // L: 6779
-						field594[var5] = true;
+					for (var6 = 0; var6 < var58.itemIds.length; ++var6) { // L: 7242
+						var58.itemIds[var6] = -1; // L: 7243
+						var58.itemIds[var6] = 0; // L: 7244
 					}
 
-					var1.serverPacket = null; // L: 6780
-					return true; // L: 6781
+					SecureRandomCallable.invalidateWidget(var58); // L: 7246
+					var1.serverPacket = null; // L: 7247
+					return true; // L: 7248
 				}
 
-				Widget var59;
-				if (ServerPacket.field2794 == var1.serverPacket) { // L: 6783
-					var17 = var3.method7021(); // L: 6784
-					var59 = UserComparator9.getWidget(var17); // L: 6785
-					var59.modelType = 3; // L: 6786
-					var59.modelId = HealthBarDefinition.localPlayer.appearance.getChatHeadId(); // L: 6787
-					class184.invalidateWidget(var59); // L: 6788
-					var1.serverPacket = null; // L: 6789
-					return true; // L: 6790
+				if (ServerPacket.field3008 == var1.serverPacket) { // L: 7250
+					var45 = var3.readStringCp1252NullTerminated(); // L: 7251
+					var5 = var3.method7568(); // L: 7252
+					var18 = ChatChannel.getWidget(var5); // L: 7253
+					if (!var45.equals(var18.text)) { // L: 7254
+						var18.text = var45; // L: 7255
+						SecureRandomCallable.invalidateWidget(var18); // L: 7256
+					}
+
+					var1.serverPacket = null; // L: 7258
+					return true; // L: 7259
+				}
+
+				if (ServerPacket.field2963 == var1.serverPacket) { // L: 7261
+					var17 = var3.readUnsignedByte(); // L: 7262
+					var5 = var3.readUnsignedByte(); // L: 7263
+					var6 = var3.readUnsignedByte(); // L: 7264
+					var7 = var3.readUnsignedByte(); // L: 7265
+					field725[var17] = true; // L: 7266
+					field726[var17] = var5; // L: 7267
+					field679[var17] = var6; // L: 7268
+					field618[var17] = var7; // L: 7269
+					field729[var17] = 0; // L: 7270
+					var1.serverPacket = null; // L: 7271
+					return true; // L: 7272
 				}
 
-				if (ServerPacket.field2808 == var1.serverPacket) { // L: 6792
-					var17 = var3.readInt(); // L: 6793
-					InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6794
-					if (var60 != null) { // L: 6795
-						Players.closeInterface(var60, true);
+				if (ServerPacket.field2958 == var1.serverPacket) { // L: 7274
+					for (var17 = 0; var17 < players.length; ++var17) { // L: 7275
+						if (players[var17] != null) { // L: 7276
+							players[var17].sequence = -1;
+						}
 					}
 
-					if (meslayerContinueWidget != null) { // L: 6796
-						class184.invalidateWidget(meslayerContinueWidget); // L: 6797
-						meslayerContinueWidget = null; // L: 6798
+					for (var17 = 0; var17 < npcs.length; ++var17) { // L: 7278
+						if (npcs[var17] != null) { // L: 7279
+							npcs[var17].sequence = -1;
+						}
 					}
 
-					var1.serverPacket = null; // L: 6800
-					return true; // L: 6801
+					var1.serverPacket = null; // L: 7281
+					return true; // L: 7282
 				}
 
-				if (ServerPacket.field2873 == var1.serverPacket) { // L: 6803
-					class21.method309(class240.field2778); // L: 6804
-					var1.serverPacket = null; // L: 6805
-					return true; // L: 6806
+				if (ServerPacket.field3015 == var1.serverPacket) { // L: 7284
+					Projectile.privateChatMode = WorldMapData_0.method4353(var3.readUnsignedByte()); // L: 7285
+					var1.serverPacket = null; // L: 7286
+					return true; // L: 7287
 				}
 
-				if (ServerPacket.field2857 == var1.serverPacket) { // L: 6808
-					class112.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6809
-					field679 = cycleCntr; // L: 6810
-					var1.serverPacket = null; // L: 6811
-					return true; // L: 6812
-				}
+				if (ServerPacket.field2976 == var1.serverPacket) { // L: 7289
+					var17 = var3.readInt(); // L: 7290
+					if (var17 != field607) { // L: 7291
+						field607 = var17; // L: 7292
+						class291.method5502(); // L: 7293
+					}
 
-				if (ServerPacket.field2832 == var1.serverPacket) { // L: 6814
-					minimapState = var3.readUnsignedByte(); // L: 6815
-					var1.serverPacket = null; // L: 6816
-					return true; // L: 6817
+					var1.serverPacket = null; // L: 7295
+					return true; // L: 7296
 				}
 
-				if (ServerPacket.field2863 == var1.serverPacket) { // L: 6819
-					var47 = var3.readStringCp1252NullTerminated(); // L: 6820
-					var19 = AbstractFont.escapeBrackets(class19.method277(MilliClock.method2955(var3))); // L: 6821
-					class397.addGameMessage(6, var47, var19); // L: 6822
-					var1.serverPacket = null; // L: 6823
-					return true; // L: 6824
+				if (ServerPacket.field2969 == var1.serverPacket) { // L: 7298
+					UserComparator4.method2499(var3.readStringCp1252NullTerminated()); // L: 7299
+					var1.serverPacket = null; // L: 7300
+					return true; // L: 7301
 				}
 
-				if (ServerPacket.field2855 == var1.serverPacket) { // L: 6826
-					class21.method309(class240.field2774); // L: 6827
-					var1.serverPacket = null; // L: 6828
-					return true; // L: 6829
+				if (ServerPacket.field2962 == var1.serverPacket) { // L: 7303
+					publicChatMode = var3.readUnsignedByte(); // L: 7304
+					tradeChatMode = var3.method7520(); // L: 7305
+					var1.serverPacket = null; // L: 7306
+					return true; // L: 7307
 				}
 
-				if (ServerPacket.field2816 == var1.serverPacket) { // L: 6831
-					World var48 = new World(); // L: 6832
-					var48.host = var3.readStringCp1252NullTerminated(); // L: 6833
-					var48.id = var3.readUnsignedShort(); // L: 6834
-					var5 = var3.readInt(); // L: 6835
-					var48.properties = var5; // L: 6836
-					WorldMapData_1.updateGameState(45); // L: 6837
-					var2.close(); // L: 6838
-					var2 = null; // L: 6839
-					MidiPcmStream.changeWorld(var48); // L: 6840
-					var1.serverPacket = null; // L: 6841
-					return false; // L: 6842
+				String var57;
+				if (ServerPacket.field2999 == var1.serverPacket) { // L: 7309
+					var17 = var3.readUShortSmart(); // L: 7310
+					boolean var53 = var3.readUnsignedByte() == 1; // L: 7311
+					var57 = ""; // L: 7312
+					boolean var50 = false; // L: 7313
+					if (var53) { // L: 7314
+						var57 = var3.readStringCp1252NullTerminated(); // L: 7315
+						if (GameEngine.friendSystem.isIgnored(new Username(var57, class194.loginType))) { // L: 7316
+							var50 = true;
+						}
+					}
+
+					String var8 = var3.readStringCp1252NullTerminated(); // L: 7318
+					if (!var50) { // L: 7319
+						class194.addGameMessage(var17, var57, var8);
+					}
+
+					var1.serverPacket = null; // L: 7320
+					return true; // L: 7321
 				}
 
-				if (ServerPacket.field2814 == var1.serverPacket) { // L: 6844
-					var68 = var3.readBoolean(); // L: 6845
-					if (var68) { // L: 6846
-						if (ClanSettings.field1440 == null) { // L: 6847
-							ClanSettings.field1440 = new class300();
+				if (ServerPacket.field3009 == var1.serverPacket) { // L: 7323
+					var66 = var3.readBoolean(); // L: 7324
+					if (var66) { // L: 7325
+						if (Messages.field1273 == null) { // L: 7326
+							Messages.field1273 = new class312();
 						}
 					} else {
-						ClanSettings.field1440 = null; // L: 6849
+						Messages.field1273 = null; // L: 7328
 					}
 
-					var1.serverPacket = null; // L: 6850
-					return true; // L: 6851
+					var1.serverPacket = null; // L: 7329
+					return true; // L: 7330
 				}
 
-				if (ServerPacket.field2823 == var1.serverPacket) { // L: 6853
-					class21.method309(class240.field2775); // L: 6854
-					var1.serverPacket = null; // L: 6855
-					return true; // L: 6856
+				if (ServerPacket.field2953 == var1.serverPacket) { // L: 7332
+					var17 = var3.method7411(); // L: 7333
+					var5 = var3.method7403(); // L: 7334
+					var6 = var3.readUnsignedShort(); // L: 7335
+					var25 = ChatChannel.getWidget(var17); // L: 7336
+					var25.field3260 = var6 + (var5 << 16); // L: 7337
+					var1.serverPacket = null; // L: 7338
+					return true; // L: 7339
 				}
 
-				if (ServerPacket.field2869 == var1.serverPacket) { // L: 6858
-					class21.method309(class240.field2777); // L: 6859
-					var1.serverPacket = null; // L: 6860
-					return true; // L: 6861
-				}
+				int var13;
+				String var41;
+				if (ServerPacket.field3012 == var1.serverPacket) { // L: 7341
+					var45 = var3.readStringCp1252NullTerminated(); // L: 7342
+					var29 = (long)var3.readUnsignedShort(); // L: 7343
+					var31 = (long)var3.readMedium(); // L: 7344
+					PlayerType var37 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var3.readUnsignedByte()); // L: 7345
+					long var38 = (var29 << 32) + var31; // L: 7346
+					boolean var40 = false; // L: 7347
 
-				if (ServerPacket.field2825 == var1.serverPacket) { // L: 6863
-					var17 = var3.method7006(); // L: 6864
-					if (var17 == 65535) { // L: 6865
-						var17 = -1;
+					for (var13 = 0; var13 < 100; ++var13) { // L: 7348
+						if (crossWorldMessageIds[var13] == var38) { // L: 7349
+							var40 = true; // L: 7350
+							break; // L: 7351
+						}
 					}
 
-					var5 = var3.readInt(); // L: 6866
-					var18 = var3.method7015(); // L: 6867
-					var73 = UserComparator9.getWidget(var5); // L: 6868
-					ItemComposition var74;
-					if (!var73.isIf3) { // L: 6869
-						if (var17 == -1) { // L: 6870
-							var73.modelType = 0; // L: 6871
-							var1.serverPacket = null; // L: 6872
-							return true; // L: 6873
-						}
+					if (GameEngine.friendSystem.isIgnored(new Username(var45, class194.loginType))) { // L: 7354
+						var40 = true;
+					}
 
-						var74 = TaskHandler.ItemDefinition_get(var17); // L: 6875
-						var73.modelType = 4; // L: 6876
-						var73.modelId = var17; // L: 6877
-						var73.modelAngleX = var74.xan2d; // L: 6878
-						var73.modelAngleY = var74.yan2d; // L: 6879
-						var73.modelZoom = var74.zoom2d * 100 / var18; // L: 6880
-						class184.invalidateWidget(var73); // L: 6881
-					} else {
-						var73.itemId = var17; // L: 6884
-						var73.itemQuantity = var18; // L: 6885
-						var74 = TaskHandler.ItemDefinition_get(var17); // L: 6886
-						var73.modelAngleX = var74.xan2d; // L: 6887
-						var73.modelAngleY = var74.yan2d; // L: 6888
-						var73.modelAngleZ = var74.zan2d; // L: 6889
-						var73.modelOffsetX = var74.offsetX2d; // L: 6890
-						var73.modelOffsetY = var74.offsetY2d; // L: 6891
-						var73.modelZoom = var74.zoom2d; // L: 6892
-						if (var74.isStackable == 1) { // L: 6893
-							var73.itemQuantityMode = 1;
+					if (!var40 && field590 == 0) { // L: 7355
+						crossWorldMessageIds[crossWorldMessageIdsIndex] = var38; // L: 7356
+						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7357
+						var41 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); // L: 7358
+						byte var76;
+						if (var37.isPrivileged) { // L: 7360
+							var76 = 7;
 						} else {
-							var73.itemQuantityMode = 2; // L: 6894
+							var76 = 3; // L: 7361
 						}
 
-						if (var73.field3106 > 0) { // L: 6895
-							var73.modelZoom = var73.modelZoom * 32 / var73.field3106;
-						} else if (var73.rawWidth > 0) { // L: 6896
-							var73.modelZoom = var73.modelZoom * 32 / var73.rawWidth;
+						if (var37.modIcon != -1) { // L: 7362
+							class194.addGameMessage(var76, class221.method4705(var37.modIcon) + var45, var41);
+						} else {
+							class194.addGameMessage(var76, var45, var41); // L: 7363
 						}
-
-						class184.invalidateWidget(var73); // L: 6897
-					}
-
-					var1.serverPacket = null; // L: 6899
-					return true; // L: 6900
-				}
-
-				if (ServerPacket.field2880 == var1.serverPacket) { // L: 6902
-					var17 = var3.method7044(); // L: 6903
-					var5 = var3.readUnsignedShort(); // L: 6904
-					Varps.Varps_temp[var5] = var17; // L: 6905
-					if (Varps.Varps_main[var5] != var17) { // L: 6906
-						Varps.Varps_main[var5] = var17; // L: 6907
 					}
 
-					WorldMapLabelSize.changeGameOptions(var5); // L: 6909
-					changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6910
-					var1.serverPacket = null; // L: 6911
-					return true; // L: 6912
+					var1.serverPacket = null; // L: 7365
+					return true; // L: 7366
 				}
 
-				if (ServerPacket.field2876 == var1.serverPacket) { // L: 6914
-					class21.method309(class240.field2779); // L: 6915
-					var1.serverPacket = null; // L: 6916
-					return true; // L: 6917
+				if (ServerPacket.field3025 == var1.serverPacket) { // L: 7368
+					LoginScreenAnimation.logOut(); // L: 7369
+					var1.serverPacket = null; // L: 7370
+					return false; // L: 7371
 				}
 
-				if (ServerPacket.field2872 == var1.serverPacket) { // L: 6919
-					var17 = var3.readInt(); // L: 6920
-					if (var17 != field552) { // L: 6921
-						field552 = var17; // L: 6922
-						class126.method2646(); // L: 6923
+				if (ServerPacket.field3024 == var1.serverPacket) { // L: 7373
+					var68 = var3.method7465(); // L: 7374
+					var5 = var3.readUnsignedShort(); // L: 7375
+					Varps.Varps_temp[var5] = var68; // L: 7376
+					if (Varps.Varps_main[var5] != var68) { // L: 7377
+						Varps.Varps_main[var5] = var68; // L: 7378
 					}
 
-					var1.serverPacket = null; // L: 6925
-					return true; // L: 6926
+					class281.changeGameOptions(var5); // L: 7380
+					changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 7381
+					var1.serverPacket = null; // L: 7382
+					return true; // L: 7383
 				}
 
-				if (ServerPacket.field2837 == var1.serverPacket) { // L: 6928
-					field724 = cycleCntr; // L: 6929
-					var61 = var3.readByte(); // L: 6930
-					if (var1.serverPacketLength == 1) { // L: 6931
-						if (var61 >= 0) { // L: 6932
-							currentClanChannels[var61] = null;
-						} else {
-							class115.guestClanChannel = null; // L: 6933
+				if (ServerPacket.field2971 == var1.serverPacket) { // L: 7385
+					var17 = var3.method7392(); // L: 7386
+					var5 = var3.method7392(); // L: 7387
+					var57 = var3.readStringCp1252NullTerminated(); // L: 7388
+					if (var5 >= 1 && var5 <= 8) { // L: 7389
+						if (var57.equalsIgnoreCase("null")) { // L: 7390
+							var57 = null;
 						}
 
-						var1.serverPacket = null; // L: 6934
-						return true; // L: 6935
-					}
-
-					if (var61 >= 0) { // L: 6937
-						currentClanChannels[var61] = new ClanChannel(var3); // L: 6938
-					} else {
-						class115.guestClanChannel = new ClanChannel(var3); // L: 6941
+						playerMenuActions[var5 - 1] = var57; // L: 7391
+						playerOptionsPriorities[var5 - 1] = var17 == 0; // L: 7392
 					}
 
-					var1.serverPacket = null; // L: 6943
-					return true; // L: 6944
+					var1.serverPacket = null; // L: 7394
+					return true; // L: 7395
 				}
 
-				long var42;
-				if (ServerPacket.field2829 == var1.serverPacket) { // L: 6946
-					var47 = var3.readStringCp1252NullTerminated(); // L: 6947
-					var26 = var3.readLong(); // L: 6948
-					var28 = (long)var3.readUnsignedShort(); // L: 6949
-					var37 = (long)var3.readMedium(); // L: 6950
-					PlayerType var41 = (PlayerType)UserComparator4.findEnumerated(VarbitComposition.PlayerType_values(), var3.readUnsignedByte()); // L: 6951
-					var42 = var37 + (var28 << 32); // L: 6952
-					boolean var34 = false; // L: 6953
-
-					for (var15 = 0; var15 < 100; ++var15) { // L: 6954
-						if (var42 == crossWorldMessageIds[var15]) { // L: 6955
-							var34 = true; // L: 6956
-							break; // L: 6957
+				if (ServerPacket.field2979 == var1.serverPacket) { // L: 7397
+					var68 = var3.readByte(); // L: 7398
+					var29 = (long)var3.readUnsignedShort(); // L: 7399
+					var31 = (long)var3.readMedium(); // L: 7400
+					var33 = (var29 << 32) + var31; // L: 7401
+					boolean var28 = false; // L: 7402
+					ClanChannel var42 = var68 >= 0 ? currentClanChannels[var68] : UserComparator5.guestClanChannel; // L: 7403
+					if (var42 == null) { // L: 7404
+						var28 = true;
+					} else {
+						for (var13 = 0; var13 < 100; ++var13) { // L: 7406
+							if (var33 == crossWorldMessageIds[var13]) { // L: 7407
+								var28 = true; // L: 7408
+								break; // L: 7409
+							}
 						}
 					}
 
-					if (var41.isUser && class112.friendSystem.isIgnored(new Username(var47, GrandExchangeOfferUnitPriceComparator.loginType))) { // L: 6960 6961
-						var34 = true;
+					if (!var28) { // L: 7413
+						crossWorldMessageIds[crossWorldMessageIdsIndex] = var33; // L: 7414
+						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 7415
+						var41 = SequenceDefinition.method3689(var3); // L: 7416
+						int var36 = var68 >= 0 ? 43 : 46; // L: 7417
+						DevicePcmPlayerProvider.addChatMessage(var36, "", var41, var42.name); // L: 7418
 					}
 
-					if (!var34 && field539 == 0) { // L: 6963
-						crossWorldMessageIds[crossWorldMessageIdsIndex] = var42; // L: 6964
-						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6965
-						var25 = AbstractFont.escapeBrackets(class19.method277(MilliClock.method2955(var3))); // L: 6966
-						if (var41.modIcon != -1) { // L: 6967
-							class269.addChatMessage(9, SpriteMask.method4998(var41.modIcon) + var47, var25, FontName.base37DecodeLong(var26));
+					var1.serverPacket = null; // L: 7420
+					return true; // L: 7421
+				}
+
+				if (ServerPacket.field3014 == var1.serverPacket) { // L: 7423
+					minimapState = var3.readUnsignedByte(); // L: 7424
+					var1.serverPacket = null; // L: 7425
+					return true; // L: 7426
+				}
+
+				if (ServerPacket.field2997 == var1.serverPacket) { // L: 7428
+					GrandExchangeOfferOwnWorldComparator.updateNpcs(true, var3); // L: 7429
+					var1.serverPacket = null; // L: 7430
+					return true; // L: 7431
+				}
+
+				if (ServerPacket.field3022 == var1.serverPacket) { // L: 7433
+					field583 = cycleCntr; // L: 7434
+					var68 = var3.readByte(); // L: 7435
+					if (var1.serverPacketLength == 1) { // L: 7436
+						if (var68 >= 0) { // L: 7437
+							currentClanChannels[var68] = null;
 						} else {
-							class269.addChatMessage(9, var47, var25, FontName.base37DecodeLong(var26)); // L: 6968
+							UserComparator5.guestClanChannel = null; // L: 7438
 						}
-					}
 
-					var1.serverPacket = null; // L: 6970
-					return true; // L: 6971
-				}
+						var1.serverPacket = null; // L: 7439
+						return true; // L: 7440
+					}
 
-				if (ServerPacket.field2801 == var1.serverPacket) { // L: 6973
-					if (NPC.field1210 == null) { // L: 6974
-						NPC.field1210 = new class353(class240.HitSplatDefinition_cachedSprites);
+					if (var68 >= 0) { // L: 7442
+						currentClanChannels[var68] = new ClanChannel(var3); // L: 7443
+					} else {
+						UserComparator5.guestClanChannel = new ClanChannel(var3); // L: 7446
 					}
 
-					class408 var46 = class240.HitSplatDefinition_cachedSprites.method6391(var3); // L: 6975
-					NPC.field1210.field4033.vmethod6736(var46.field4363, var46.field4361); // L: 6976
-					field662[++field663 - 1 & 31] = var46.field4363; // L: 6977
-					var1.serverPacket = null; // L: 6978
-					return true; // L: 6979
+					var1.serverPacket = null; // L: 7448
+					return true; // L: 7449
 				}
 
-				if (ServerPacket.field2886 == var1.serverPacket) { // L: 6981
-					var17 = var3.method7015(); // L: 6982
-					var5 = var3.method7007(); // L: 6983
-					var18 = var3.method7007(); // L: 6984
-					var73 = UserComparator9.getWidget(var17); // L: 6985
-					if (var5 != var73.rawX || var18 != var73.rawY || var73.xAlignment != 0 || var73.yAlignment != 0) { // L: 6986
-						var73.rawX = var5; // L: 6987
-						var73.rawY = var18; // L: 6988
-						var73.xAlignment = 0; // L: 6989
-						var73.yAlignment = 0; // L: 6990
-						class184.invalidateWidget(var73); // L: 6991
-						this.alignWidget(var73); // L: 6992
-						if (var73.type == 0) { // L: 6993
-							MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var17 >> 16], var73, false);
-						}
+				if (ServerPacket.field3013 == var1.serverPacket) { // L: 7451
+					var17 = var3.method7411(); // L: 7452
+					var5 = var3.method7403(); // L: 7453
+					Varps.Varps_temp[var5] = var17; // L: 7454
+					if (Varps.Varps_main[var5] != var17) { // L: 7455
+						Varps.Varps_main[var5] = var17; // L: 7456
 					}
 
-					var1.serverPacket = null; // L: 6995
-					return true; // L: 6996
+					class281.changeGameOptions(var5); // L: 7458
+					changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 7459
+					var1.serverPacket = null; // L: 7460
+					return true; // L: 7461
 				}
 
-				if (ServerPacket.field2851 == var1.serverPacket) { // L: 6998
-					var17 = var3.offset + var1.serverPacketLength; // L: 6999
-					var5 = var3.readUnsignedShort(); // L: 7000
-					var18 = var3.readUnsignedShort(); // L: 7001
-					if (var5 != rootInterface) { // L: 7002
-						rootInterface = var5; // L: 7003
-						this.resizeRoot(false); // L: 7004
-						Player.Widget_resetModelFrames(rootInterface); // L: 7005
-						class54.runWidgetOnLoadListener(rootInterface); // L: 7006
-
-						for (var7 = 0; var7 < 100; ++var7) { // L: 7007
-							field594[var7] = true;
-						}
+				if (ServerPacket.field2933 == var1.serverPacket) { // L: 7463
+					var66 = var3.readUnsignedByte() == 1; // L: 7464
+					if (var66) { // L: 7465
+						WorldMapSprite.field2727 = Ignored.method6459() - var3.readLong(); // L: 7466
+						grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 7467
+					} else {
+						grandExchangeEvents = null; // L: 7469
 					}
 
-					InterfaceParent var24;
-					for (; var18-- > 0; var24.field1011 = true) { // L: 7009 7019
-						var7 = var3.readInt(); // L: 7010
-						var8 = var3.readUnsignedShort(); // L: 7011
-						var9 = var3.readUnsignedByte(); // L: 7012
-						var24 = (InterfaceParent)interfaceParents.get((long)var7); // L: 7013
-						if (var24 != null && var8 != var24.group) { // L: 7014
-							Players.closeInterface(var24, true); // L: 7015
-							var24 = null; // L: 7016
-						}
+					field669 = cycleCntr; // L: 7470
+					var1.serverPacket = null; // L: 7471
+					return true; // L: 7472
+				}
 
-						if (var24 == null) { // L: 7018
-							var24 = DynamicObject.method1997(var7, var8, var9);
-						}
-					}
+				if (ServerPacket.field2946 == var1.serverPacket) { // L: 7474
+					class17.field90 = var3.method7392(); // L: 7475
+					class167.field1813 = var3.readUnsignedByte(); // L: 7476
 
-					for (var35 = (InterfaceParent)interfaceParents.first(); var35 != null; var35 = (InterfaceParent)interfaceParents.next()) { // L: 7021
-						if (var35.field1011) { // L: 7022
-							var35.field1011 = false;
-						} else {
-							Players.closeInterface(var35, true); // L: 7024
+					for (var17 = class17.field90; var17 < class17.field90 + 8; ++var17) { // L: 7477
+						for (var5 = class167.field1813; var5 < class167.field1813 + 8; ++var5) { // L: 7478
+							if (groundItems[class20.Client_plane][var17][var5] != null) { // L: 7479
+								groundItems[class20.Client_plane][var17][var5] = null; // L: 7480
+								MouseHandler.updateItemPile(var17, var5); // L: 7481
+							}
 						}
 					}
 
-					widgetFlags = new NodeHashTable(512); // L: 7027
-
-					while (var3.offset < var17) { // L: 7028
-						var7 = var3.readInt(); // L: 7029
-						var8 = var3.readUnsignedShort(); // L: 7030
-						var9 = var3.readUnsignedShort(); // L: 7031
-						var10 = var3.readInt(); // L: 7032
-
-						for (int var39 = var8; var39 <= var9; ++var39) { // L: 7033
-							var42 = (long)var39 + ((long)var7 << 32); // L: 7034
-							widgetFlags.put(new IntegerNode(var10), var42); // L: 7035
+					for (PendingSpawn var47 = (PendingSpawn)pendingSpawns.last(); var47 != null; var47 = (PendingSpawn)pendingSpawns.previous()) { // L: 7485 7486 7488
+						if (var47.x >= class17.field90 && var47.x < class17.field90 + 8 && var47.y >= class167.field1813 && var47.y < class167.field1813 + 8 && var47.plane == class20.Client_plane) { // L: 7487
+							var47.hitpoints = 0;
 						}
 					}
 
-					var1.serverPacket = null; // L: 7038
-					return true; // L: 7039
+					var1.serverPacket = null; // L: 7490
+					return true; // L: 7491
 				}
 
-				if (ServerPacket.field2792 == var1.serverPacket) { // L: 7041
-					class16.updateNpcs(true, var3); // L: 7042
-					var1.serverPacket = null; // L: 7043
-					return true; // L: 7044
+				if (ServerPacket.field3019 == var1.serverPacket) { // L: 7493
+					DirectByteArrayCopier.method5328(class253.field2911); // L: 7494
+					var1.serverPacket = null; // L: 7495
+					return true; // L: 7496
 				}
 
-				if (ServerPacket.field2810 == var1.serverPacket) { // L: 7046
-					var17 = var3.method7120(); // L: 7047
-					if (var17 == 65535) { // L: 7048
-						var17 = -1;
+				if (ServerPacket.field3006 == var1.serverPacket) { // L: 7498
+					var17 = var3.readInt(); // L: 7499
+					InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var17); // L: 7500
+					if (var60 != null) { // L: 7501
+						class10.closeInterface(var60, true);
 					}
 
-					ModeWhere.playSong(var17); // L: 7049
-					var1.serverPacket = null; // L: 7050
-					return true; // L: 7051
-				}
-
-				if (ServerPacket.field2862 == var1.serverPacket) { // L: 7053
-					var17 = var3.readMedium(); // L: 7054
-					var5 = var3.readUnsignedShort(); // L: 7055
-					if (var5 == 65535) { // L: 7056
-						var5 = -1;
+					if (meslayerContinueWidget != null) { // L: 7502
+						SecureRandomCallable.invalidateWidget(meslayerContinueWidget); // L: 7503
+						meslayerContinueWidget = null; // L: 7504
 					}
 
-					Friend.method6057(var5, var17); // L: 7057
-					var1.serverPacket = null; // L: 7058
-					return true; // L: 7059
+					var1.serverPacket = null; // L: 7506
+					return true; // L: 7507
 				}
 
-				if (ServerPacket.field2881 == var1.serverPacket) { // L: 7061
-					if (var1.serverPacketLength == 0) { // L: 7062
-						AbstractArchive.friendsChat = null; // L: 7063
-					} else {
-						if (AbstractArchive.friendsChat == null) { // L: 7066
-							AbstractArchive.friendsChat = new FriendsChat(GrandExchangeOfferUnitPriceComparator.loginType, ArchiveLoader.client); // L: 7067
-						}
+				if (ServerPacket.field2947 == var1.serverPacket) { // L: 7509
+					byte[] var46 = new byte[var1.serverPacketLength]; // L: 7510
+					var3.method7312(var46, 0, var46.length); // L: 7511
+					Buffer var59 = new Buffer(var46); // L: 7512
+					var57 = var59.readStringCp1252NullTerminated(); // L: 7513
+					WorldMapSprite.openURL(var57, true, false); // L: 7514
+					var1.serverPacket = null; // L: 7515
+					return true; // L: 7516
+				}
 
-						AbstractArchive.friendsChat.readUpdate(var3); // L: 7069
+				if (ServerPacket.field2959 == var1.serverPacket) { // L: 7518
+					var17 = var3.method7411(); // L: 7519
+					var5 = var3.method7499(); // L: 7520
+					var18 = ChatChannel.getWidget(var17); // L: 7521
+					if (var18.modelType != 2 || var5 != var18.modelId) { // L: 7522
+						var18.modelType = 2; // L: 7523
+						var18.modelId = var5; // L: 7524
+						SecureRandomCallable.invalidateWidget(var18); // L: 7525
 					}
 
-					ReflectionCheck.method1114(); // L: 7071
-					var1.serverPacket = null; // L: 7072
-					return true; // L: 7073
-				}
-
-				if (ServerPacket.field2867 == var1.serverPacket) { // L: 7075
-					var17 = var3.readUnsignedByte(); // L: 7076
-					ArchiveLoader.method2056(var17); // L: 7077
-					var1.serverPacket = null; // L: 7078
-					return true; // L: 7079
+					var1.serverPacket = null; // L: 7527
+					return true; // L: 7528
 				}
 
-				if (ServerPacket.field2819 == var1.serverPacket) { // L: 7081
-					for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 7082
-						if (Varps.Varps_temp[var17] != Varps.Varps_main[var17]) { // L: 7083
-							Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 7084
-							WorldMapLabelSize.changeGameOptions(var17); // L: 7085
-							changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 7086
+				if (ServerPacket.field2936 == var1.serverPacket) { // L: 7530
+					for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 7531
+						if (Varps.Varps_temp[var17] != Varps.Varps_main[var17]) { // L: 7532
+							Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 7533
+							class281.changeGameOptions(var17); // L: 7534
+							changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 7535
 						}
 					}
 
-					var1.serverPacket = null; // L: 7089
-					return true; // L: 7090
+					var1.serverPacket = null; // L: 7538
+					return true; // L: 7539
 				}
 
-				if (ServerPacket.field2817 == var1.serverPacket) { // L: 7092
-					class112.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 7093
-					TextureProvider.FriendSystem_invalidateIgnoreds(); // L: 7094
-					field679 = cycleCntr; // L: 7095
-					var1.serverPacket = null; // L: 7096
-					return true; // L: 7097
+				if (ServerPacket.field2974 == var1.serverPacket) { // L: 7541
+					var17 = var3.method7412(); // L: 7542
+					var58 = ChatChannel.getWidget(var17); // L: 7543
+					var58.modelType = 3; // L: 7544
+					var58.modelId = class340.localPlayer.appearance.getChatHeadId(); // L: 7545
+					SecureRandomCallable.invalidateWidget(var58); // L: 7546
+					var1.serverPacket = null; // L: 7547
+					return true; // L: 7548
 				}
 
-				if (ServerPacket.field2882 == var1.serverPacket) { // L: 7099
-					NPC.field1210 = null; // L: 7100
-					var1.serverPacket = null; // L: 7101
-					return true; // L: 7102
+				if (ServerPacket.field3010 == var1.serverPacket) { // L: 7550
+					updatePlayers(var3, var1.serverPacketLength); // L: 7551
+					WorldMapLabelSize.method4373(); // L: 7552
+					var1.serverPacket = null; // L: 7553
+					return true; // L: 7554
 				}
 
-				if (ServerPacket.field2835 == var1.serverPacket) { // L: 7104
-					var17 = var3.method7015(); // L: 7105
-					var59 = UserComparator9.getWidget(var17); // L: 7106
+				if (ServerPacket.field2966 == var1.serverPacket) { // L: 7556
+					ObjectSound.readReflectionCheck(var3, var1.serverPacketLength); // L: 7557
+					var1.serverPacket = null; // L: 7558
+					return true; // L: 7559
+				}
 
-					for (var18 = 0; var18 < var59.itemIds.length; ++var18) { // L: 7107
-						var59.itemIds[var18] = -1; // L: 7108
-						var59.itemIds[var18] = 0; // L: 7109
-					}
+				if (ServerPacket.field2964 == var1.serverPacket) { // L: 7561
+					UserComparator6.method2551(); // L: 7562
+					var17 = var3.readUnsignedByte(); // L: 7563
+					var5 = var3.method7394(); // L: 7564
+					var6 = var3.method7411(); // L: 7565
+					experience[var5] = var6; // L: 7566
+					currentLevels[var5] = var17; // L: 7567
+					levels[var5] = 1; // L: 7568
 
-					class184.invalidateWidget(var59); // L: 7111
-					var1.serverPacket = null; // L: 7112
-					return true; // L: 7113
-				}
+					for (var7 = 0; var7 < 98; ++var7) { // L: 7569
+						if (var6 >= Skills.Skills_experienceTable[var7]) {
+							levels[var5] = var7 + 2;
+						}
+					}
 
-				if (ServerPacket.field2840 == var1.serverPacket) { // L: 7115
-					ItemComposition.field1931 = var3.readUnsignedByte(); // L: 7116
-					Actor.field1146 = var3.method6996(); // L: 7117
-					var1.serverPacket = null; // L: 7118
-					return true; // L: 7119
+					changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 7570
+					var1.serverPacket = null; // L: 7571
+					return true; // L: 7572
 				}
 
-				if (ServerPacket.field2830 == var1.serverPacket) { // L: 7121
-					GameBuild.updatePlayers(var3, var1.serverPacketLength); // L: 7122
-					class279.method5216(); // L: 7123
-					var1.serverPacket = null; // L: 7124
-					return true; // L: 7125
-				}
+				if (ServerPacket.field2995 == var1.serverPacket) { // L: 7574
+					var3.offset += 28; // L: 7575
+					if (var3.checkCrc()) { // L: 7576
+						ObjectComposition.method3541(var3, var3.offset - 28);
+					}
 
-				if (ServerPacket.field2879 == var1.serverPacket) { // L: 7127
-					NPC.field1210 = new class353(class240.HitSplatDefinition_cachedSprites); // L: 7128
-					var1.serverPacket = null; // L: 7129
-					return true; // L: 7130
+					var1.serverPacket = null; // L: 7577
+					return true; // L: 7578
 				}
 
-				if (ServerPacket.field2795 == var1.serverPacket) { // L: 7132
-					var17 = var3.readUnsignedShort(); // L: 7133
-					var5 = var3.readUnsignedShort(); // L: 7134
-					var18 = var3.readUnsignedShort(); // L: 7135
-					var7 = var3.method7015(); // L: 7136
-					var36 = UserComparator9.getWidget(var7); // L: 7137
-					if (var17 != var36.modelAngleX || var5 != var36.modelAngleY || var18 != var36.modelZoom) { // L: 7138
-						var36.modelAngleX = var17; // L: 7139
-						var36.modelAngleY = var5; // L: 7140
-						var36.modelZoom = var18; // L: 7141
-						class184.invalidateWidget(var36); // L: 7142
+				if (ServerPacket.field2975 == var1.serverPacket) { // L: 7580
+					var17 = var3.readUnsignedShort(); // L: 7581
+					if (var17 == 65535) { // L: 7582
+						var17 = -1;
 					}
 
-					var1.serverPacket = null; // L: 7144
-					return true; // L: 7145
+					class18.playSong(var17); // L: 7583
+					var1.serverPacket = null; // L: 7584
+					return true; // L: 7585
 				}
 
-				if (ServerPacket.field2831 == var1.serverPacket) { // L: 7147
-					hintArrowType = var3.readUnsignedByte(); // L: 7148
-					if (hintArrowType == 1) { // L: 7149
-						hintArrowNpcIndex = var3.readUnsignedShort();
+				if (ServerPacket.field3003 == var1.serverPacket) { // L: 7587
+					var17 = var3.method7508(); // L: 7588
+					var5 = var3.method7401(); // L: 7589
+					if (var5 == 65535) { // L: 7590
+						var5 = -1;
 					}
 
-					if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 7150
-						if (hintArrowType == 2) { // L: 7151
-							hintArrowSubX = 64; // L: 7152
-							hintArrowSubY = 64; // L: 7153
-						}
-
-						if (hintArrowType == 3) { // L: 7155
-							hintArrowSubX = 0; // L: 7156
-							hintArrowSubY = 64; // L: 7157
-						}
+					class315.method5822(var5, var17); // L: 7591
+					var1.serverPacket = null; // L: 7592
+					return true; // L: 7593
+				}
 
-						if (hintArrowType == 4) { // L: 7159
-							hintArrowSubX = 128; // L: 7160
-							hintArrowSubY = 64; // L: 7161
-						}
+				if (ServerPacket.field2987 == var1.serverPacket) { // L: 7595
+					var17 = var3.readUnsignedShort(); // L: 7596
+					var5 = var3.method7411(); // L: 7597
+					var18 = ChatChannel.getWidget(var5); // L: 7598
+					if (var18.modelType != 1 || var17 != var18.modelId) { // L: 7599
+						var18.modelType = 1; // L: 7600
+						var18.modelId = var17; // L: 7601
+						SecureRandomCallable.invalidateWidget(var18); // L: 7602
+					}
 
-						if (hintArrowType == 5) { // L: 7163
-							hintArrowSubX = 64; // L: 7164
-							hintArrowSubY = 0; // L: 7165
-						}
+					var1.serverPacket = null; // L: 7604
+					return true; // L: 7605
+				}
 
-						if (hintArrowType == 6) { // L: 7167
-							hintArrowSubX = 64; // L: 7168
-							hintArrowSubY = 128; // L: 7169
-						}
+				if (ServerPacket.field2941 == var1.serverPacket) { // L: 7607
+					var17 = var3.method7401(); // L: 7608
+					ReflectionCheck.method662(var17); // L: 7609
+					changedItemContainers[++field665 - 1 & 31] = var17 & 32767; // L: 7610
+					var1.serverPacket = null; // L: 7611
+					return true; // L: 7612
+				}
 
-						hintArrowType = 2; // L: 7171
-						hintArrowX = var3.readUnsignedShort(); // L: 7172
-						hintArrowY = var3.readUnsignedShort(); // L: 7173
-						hintArrowHeight = var3.readUnsignedByte(); // L: 7174
-					}
+				if (ServerPacket.field2950 == var1.serverPacket) { // L: 7614
+					var17 = var3.readUnsignedByte(); // L: 7615
+					SecureRandomFuture.forceDisconnect(var17); // L: 7616
+					var1.serverPacket = null; // L: 7617
+					return false; // L: 7618
+				}
 
-					if (hintArrowType == 10) { // L: 7176
-						hintArrowPlayerIndex = var3.readUnsignedShort();
+				if (ServerPacket.field2992 == var1.serverPacket) { // L: 7620
+					var17 = var3.method7412(); // L: 7621
+					var5 = var3.method7401(); // L: 7622
+					var6 = var5 >> 10 & 31; // L: 7623
+					var7 = var5 >> 5 & 31; // L: 7624
+					var26 = var5 & 31; // L: 7625
+					var9 = (var7 << 11) + (var6 << 19) + (var26 << 3); // L: 7626
+					Widget var10 = ChatChannel.getWidget(var17); // L: 7627
+					if (var9 != var10.color) { // L: 7628
+						var10.color = var9; // L: 7629
+						SecureRandomCallable.invalidateWidget(var10); // L: 7630
 					}
 
-					var1.serverPacket = null; // L: 7177
-					return true; // L: 7178
+					var1.serverPacket = null; // L: 7632
+					return true; // L: 7633
 				}
 
-				if (ServerPacket.field2799 == var1.serverPacket) { // L: 7180
-					if (AbstractArchive.friendsChat != null) { // L: 7181
-						AbstractArchive.friendsChat.method6040(var3); // L: 7182
-					}
+				if (ServerPacket.field2954 == var1.serverPacket) { // L: 7635
+					var45 = var3.readStringCp1252NullTerminated(); // L: 7636
+					var19 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(var3))); // L: 7637
+					class194.addGameMessage(6, var45, var19); // L: 7638
+					var1.serverPacket = null; // L: 7639
+					return true; // L: 7640
+				}
 
-					ReflectionCheck.method1114(); // L: 7184
-					var1.serverPacket = null; // L: 7185
-					return true; // L: 7186
+				if (ServerPacket.field2956 == var1.serverPacket) { // L: 7642
+					DirectByteArrayCopier.method5328(class253.field2917); // L: 7643
+					var1.serverPacket = null; // L: 7644
+					return true; // L: 7645
 				}
 
-				MilliClock.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1996281945 * -662376471 : -1) + "," + (var1.field1284 != null ? var1.field1284.id * 1996281945 * -662376471 : -1) + "," + (var1.field1285 != null ? var1.field1285.id * 1996281945 * -662376471 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7188
-				SequenceDefinition.logOut(); // L: 7189
-			} catch (IOException var44) { // L: 7191
-				Clock.method2960(); // L: 7192
-			} catch (Exception var45) {
-				var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1996281945 * -662376471 : -1) + "," + (var1.field1284 != null ? var1.field1284.id * 1996281945 * -662376471 : -1) + "," + (var1.field1285 != null ? var1.field1285.id * 1996281945 * -662376471 : -1) + "," + var1.serverPacketLength + "," + (HealthBarDefinition.localPlayer.pathX[0] + class19.baseX) + "," + (HealthBarDefinition.localPlayer.pathY[0] + DefaultsGroup.baseY) + ","; // L: 7195
+				AccessFile.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -836596687 * 884821201 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -836596687 * 884821201 : -1) + "," + (var1.field1291 != null ? var1.field1291.id * -836596687 * 884821201 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7647
+				LoginScreenAnimation.logOut(); // L: 7648
+			} catch (IOException var43) { // L: 7650
+				Varcs.method2411(); // L: 7651
+			} catch (Exception var44) {
+				var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -836596687 * 884821201 : -1) + "," + (var1.field1290 != null ? var1.field1290.id * -836596687 * 884821201 : -1) + "," + (var1.field1291 != null ? var1.field1291.id * -836596687 * 884821201 : -1) + "," + var1.serverPacketLength + "," + (class340.localPlayer.pathX[0] + class131.baseX) + "," + (class340.localPlayer.pathY[0] + TileItem.baseY) + ","; // L: 7654
 
-				for (var18 = 0; var18 < var1.serverPacketLength && var18 < 50; ++var18) { // L: 7196
-					var19 = var19 + var3.array[var18] + ",";
+				for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7655
+					var19 = var19 + var3.array[var6] + ",";
 				}
 
-				MilliClock.RunException_sendStackTrace(var19, var45); // L: 7197
-				SequenceDefinition.logOut(); // L: 7198
+				AccessFile.RunException_sendStackTrace(var19, var44); // L: 7656
+				LoginScreenAnimation.logOut(); // L: 7657
 			}
 
-			return true; // L: 7200
+			return true; // L: 7659
 		}
 	}
 
-	@ObfuscatedName("hh")
+	@ObfuscatedName("ip")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "46102630"
+		descriptor = "(B)V",
+		garbageValue = "49"
 	)
 	@Export("menu")
 	final void menu() {
-		class29.method414(); // L: 8115
-		if (class247.dragInventoryWidget == null) { // L: 8116
-			if (clickedWidget == null) { // L: 8117
-				int var1 = MouseHandler.MouseHandler_lastButton; // L: 8118
+		Message.method1115(); // L: 8867
+		if (class143.dragInventoryWidget == null) { // L: 8868
+			if (clickedWidget == null) { // L: 8869
+				int var1 = MouseHandler.MouseHandler_lastButton; // L: 8870
 				int var2;
+				int var3;
 				int var4;
 				int var5;
-				int var6;
+				int var7;
 				int var8;
-				int var9;
-				if (isMenuOpen) { // L: 8119
-					int var3;
-					int var13;
-					if (var1 != 1 && (ApproximateRouteStrategy.mouseCam || var1 != 4)) { // L: 8120
-						var2 = MouseHandler.MouseHandler_x; // L: 8121
-						var3 = MouseHandler.MouseHandler_y; // L: 8122
-						if (var2 < SecureRandomCallable.menuX - 10 || var2 > SecureRandomCallable.menuX + ObjectComposition.menuWidth + 10 || var3 < Frames.menuY - 10 || var3 > StudioGame.menuHeight + Frames.menuY + 10) { // L: 8123
-							isMenuOpen = false; // L: 8124
-							var4 = SecureRandomCallable.menuX; // L: 8125
-							var5 = Frames.menuY; // L: 8126
-							var6 = ObjectComposition.menuWidth; // L: 8127
-							var13 = StudioGame.menuHeight; // L: 8128
-
-							for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 8130
-								if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var6 + var4 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var5 + var13) { // L: 8131
-									field594[var8] = true;
-								}
-							}
-						}
-					}
-
-					if (var1 == 1 || !ApproximateRouteStrategy.mouseCam && var1 == 4) { // L: 8136
-						var2 = SecureRandomCallable.menuX; // L: 8137
-						var3 = Frames.menuY; // L: 8138
-						var4 = ObjectComposition.menuWidth; // L: 8139
-						var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8140
-						var6 = MouseHandler.MouseHandler_lastPressedY; // L: 8141
-						var13 = -1; // L: 8142
-
-						for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 8143
-							var9 = (menuOptionsCount - 1 - var8) * 15 + var3 + 31; // L: 8144
-							if (var5 > var2 && var5 < var2 + var4 && var6 > var9 - 13 && var6 < var9 + 3) { // L: 8145
-								var13 = var8;
+				if (isMenuOpen) { // L: 8871
+					if (var1 != 1 && (class150.mouseCam || var1 != 4)) { // L: 8872
+						var2 = MouseHandler.MouseHandler_x; // L: 8873
+						var3 = MouseHandler.MouseHandler_y; // L: 8874
+						if (var2 < ModeWhere.menuX - 10 || var2 > GameObject.menuWidth + ModeWhere.menuX + 10 || var3 < BufferedSink.menuY - 10 || var3 > BufferedSink.menuY + UserComparator3.menuHeight + 10) { // L: 8875
+							isMenuOpen = false; // L: 8876
+							class10.method124(ModeWhere.menuX, BufferedSink.menuY, GameObject.menuWidth, UserComparator3.menuHeight); // L: 8877
+						}
+					}
+
+					if (var1 == 1 || !class150.mouseCam && var1 == 4) { // L: 8880
+						var2 = ModeWhere.menuX; // L: 8881
+						var3 = BufferedSink.menuY; // L: 8882
+						var4 = GameObject.menuWidth; // L: 8883
+						var5 = MouseHandler.MouseHandler_lastPressedX; // L: 8884
+						int var10 = MouseHandler.MouseHandler_lastPressedY; // L: 8885
+						var7 = -1; // L: 8886
+
+						for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 8887
+							int var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 8888
+							if (var5 > var2 && var5 < var4 + var2 && var10 > var9 - 13 && var10 < var9 + 3) { // L: 8889
+								var7 = var8;
 							}
 						}
 
-						if (var13 != -1) { // L: 8147
-							class67.method1913(var13);
+						if (var7 != -1) { // L: 8891
+							class17.method291(var7);
 						}
 
-						isMenuOpen = false; // L: 8148
-						var8 = SecureRandomCallable.menuX; // L: 8149
-						var9 = Frames.menuY; // L: 8150
-						int var14 = ObjectComposition.menuWidth; // L: 8151
-						int var11 = StudioGame.menuHeight; // L: 8152
-
-						for (int var12 = 0; var12 < rootWidgetCount; ++var12) { // L: 8154
-							if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var8 && rootWidgetXs[var12] < var14 + var8 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var11 + var9) { // L: 8155
-								field594[var12] = true;
-							}
-						}
+						isMenuOpen = false; // L: 8892
+						class10.method124(ModeWhere.menuX, BufferedSink.menuY, GameObject.menuWidth, UserComparator3.menuHeight); // L: 8893
 					}
 				} else {
-					var2 = menuOptionsCount - 1; // L: 8163
-					if ((var1 == 1 || !ApproximateRouteStrategy.mouseCam && var1 == 4) && var2 >= 0) { // L: 8166
-						var4 = menuOpcodes[var2]; // L: 8167
-						if (var4 == 39 || var4 == 40 || var4 == 41 || var4 == 42 || var4 == 43 || var4 == 33 || var4 == 34 || var4 == 35 || var4 == 36 || var4 == 37 || var4 == 38 || var4 == 1005) { // L: 8168
-							var5 = menuArguments1[var2]; // L: 8169
-							var6 = menuArguments2[var2]; // L: 8170
-							Widget var7 = UserComparator9.getWidget(var6); // L: 8171
-							if (HorizontalAlignment.method3114(PendingSpawn.getWidgetFlags(var7)) || TileItem.method2316(PendingSpawn.getWidgetFlags(var7))) { // L: 8172
-								if (class247.dragInventoryWidget != null && !field667 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8173 8174
-									var8 = draggedWidgetX; // L: 8175
-									var9 = draggedWidgetY; // L: 8176
-									MenuAction var10 = class274.tempMenuAction; // L: 8178
-									class14.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var8, var9); // L: 8180
-									class274.tempMenuAction = null; // L: 8182
+					var2 = UserComparator10.method2543(); // L: 8897
+					if ((var1 == 1 || !class150.mouseCam && var1 == 4) && var2 >= 0) { // L: 8898
+						var3 = menuOpcodes[var2]; // L: 8899
+						if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 8900
+							var4 = menuArguments1[var2]; // L: 8901
+							var5 = menuArguments2[var2]; // L: 8902
+							Widget var6 = ChatChannel.getWidget(var5); // L: 8903
+							if (class257.method5020(class363.getWidgetFlags(var6)) || MouseHandler.method649(class363.getWidgetFlags(var6))) { // L: 8904
+								if (class143.dragInventoryWidget != null && !field572 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 8905 8906
+									var7 = draggedWidgetX; // L: 8907
+									var8 = draggedWidgetY; // L: 8908
+									WorldMapIcon_1.method4385(class87.tempMenuAction, var7, var8); // L: 8910
+									class87.tempMenuAction = null; // L: 8911
 								}
 
-								field667 = false; // L: 8186
-								itemDragDuration = 0; // L: 8187
-								if (class247.dragInventoryWidget != null) { // L: 8188
-									class184.invalidateWidget(class247.dragInventoryWidget);
+								field572 = false; // L: 8915
+								itemDragDuration = 0; // L: 8916
+								if (class143.dragInventoryWidget != null) { // L: 8917
+									SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget);
 								}
 
-								class247.dragInventoryWidget = UserComparator9.getWidget(var6); // L: 8189
-								dragItemSlotSource = var5; // L: 8190
-								draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8191
-								draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8192
-								if (var2 >= 0) { // L: 8193
-									class12.method170(var2);
+								class143.dragInventoryWidget = ChatChannel.getWidget(var5); // L: 8918
+								dragItemSlotSource = var4; // L: 8919
+								draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 8920
+								draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 8921
+								if (var2 >= 0) { // L: 8922
+									class16.method239(var2);
 								}
 
-								class184.invalidateWidget(class247.dragInventoryWidget); // L: 8194
-								return; // L: 8195
+								SecureRandomCallable.invalidateWidget(class143.dragInventoryWidget); // L: 8923
+								return; // L: 8924
 							}
 						}
 					}
 
-					if ((var1 == 1 || !ApproximateRouteStrategy.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8199 8200
-						var1 = 2; // L: 8201
+					if ((var1 == 1 || !class150.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 8928 8929
+						var1 = 2; // L: 8930
 					}
 
-					if ((var1 == 1 || !ApproximateRouteStrategy.mouseCam && var1 == 4) && menuOptionsCount > 0) { // L: 8204
-						class67.method1913(var2); // L: 8205
+					if ((var1 == 1 || !class150.mouseCam && var1 == 4) && menuOptionsCount > 0) { // L: 8933
+						class17.method291(var2); // L: 8934
 					}
 
-					if (var1 == 2 && menuOptionsCount > 0) { // L: 8207
+					if (var1 == 2 && menuOptionsCount > 0) { // L: 8936
 						this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
 					}
 				}
 
 			}
 		}
-	} // L: 8209
+	} // L: 8938
 
-	@ObfuscatedName("hz")
+	@ObfuscatedName("ig")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-296322242"
+		garbageValue = "-2019357274"
 	)
 	@Export("shouldLeftClickOpenMenu")
 	final boolean shouldLeftClickOpenMenu() {
-		int var1 = menuOptionsCount - 1; // L: 8214
-		return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || UrlRequest.method2446(var1)) && !menuShiftClick[var1]; // L: 8217
+		int var1 = UserComparator10.method2543(); // L: 8941
+		boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; // L: 8942
+		if (!var2) { // L: 8943
+			boolean var3;
+			if (var1 < 0) { // L: 8946
+				var3 = false; // L: 8947
+			} else {
+				int var4 = menuOpcodes[var1]; // L: 8950
+				if (var4 >= 2000) { // L: 8951
+					var4 -= 2000;
+				}
+
+				if (var4 == 1007) { // L: 8952
+					var3 = true; // L: 8953
+				} else {
+					var3 = false; // L: 8956
+				}
+			}
+
+			var2 = var3; // L: 8958
+		}
+
+		return var2 && !menuShiftClick[var1]; // L: 8960
 	}
 
-	@ObfuscatedName("hy")
+	@ObfuscatedName("im")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "8"
+		descriptor = "(III)V",
+		garbageValue = "-193534652"
 	)
 	@Export("openMenu")
 	final void openMenu(int var1, int var2) {
-		class392.method6871(var1, var2); // L: 8221
-		GameBuild.scene.menuOpen(GrandExchangeOfferTotalQuantityComparator.Client_plane, var1, var2, false); // L: 8222
-		isMenuOpen = true; // L: 8223
-	} // L: 8224
+		MouseHandler.method646(var1, var2); // L: 8964
+		class7.scene.menuOpen(class20.Client_plane, var1, var2, false); // L: 8965
+		isMenuOpen = true; // L: 8966
+	} // L: 8967
 
-	@ObfuscatedName("iw")
+	@ObfuscatedName("jq")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "-586334153"
+		descriptor = "(ZB)V",
+		garbageValue = "-48"
 	)
 	@Export("resizeRoot")
 	final void resizeRoot(boolean var1) {
-		SecureRandomCallable.method2051(rootInterface, GameEngine.canvasWidth, KeyHandler.canvasHeight, var1); // L: 10209
-	} // L: 10210
+		class18.method297(rootInterface, class186.canvasWidth, BoundaryObject.canvasHeight, var1); // L: 10905
+	} // L: 10906
 
-	@ObfuscatedName("iq")
+	@ObfuscatedName("jc")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;I)V",
-		garbageValue = "925917033"
+		descriptor = "(Ljm;I)V",
+		garbageValue = "-1768383258"
 	)
 	@Export("alignWidget")
 	void alignWidget(Widget var1) {
-		Widget var2 = var1.parentId == -1 ? null : UserComparator9.getWidget(var1.parentId); // L: 10213
+		Widget var2 = var1.parentId == -1 ? null : ChatChannel.getWidget(var1.parentId); // L: 10909
 		int var3;
 		int var4;
-		if (var2 == null) { // L: 10216
-			var3 = GameEngine.canvasWidth; // L: 10217
-			var4 = KeyHandler.canvasHeight; // L: 10218
+		if (var2 == null) { // L: 10912
+			var3 = class186.canvasWidth; // L: 10913
+			var4 = BoundaryObject.canvasHeight; // L: 10914
 		} else {
-			var3 = var2.width; // L: 10221
-			var4 = var2.height; // L: 10222
+			var3 = var2.width; // L: 10917
+			var4 = var2.height; // L: 10918
 		}
 
-		WorldMapScaleHandler.alignWidgetSize(var1, var3, var4, false); // L: 10224
-		LoginPacket.alignWidgetPosition(var1, var3, var4); // L: 10225
-	} // L: 10226
+		class29.alignWidgetSize(var1, var3, var4, false); // L: 10920
+		MouseHandler.alignWidgetPosition(var1, var3, var4); // L: 10921
+	} // L: 10922
 
-	@ObfuscatedName("jd")
+	@ObfuscatedName("kd")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "407876174"
-	)
-	final void method1186() {
-		class184.invalidateWidget(clickedWidget); // L: 11190
-		++class134.widgetDragDuration; // L: 11191
-		if (field680 && field648) { // L: 11192
-			int var1 = MouseHandler.MouseHandler_x; // L: 11198
-			int var2 = MouseHandler.MouseHandler_y; // L: 11199
-			var1 -= widgetClickX; // L: 11200
-			var2 -= widgetClickY; // L: 11201
-			if (var1 < field649) { // L: 11202
-				var1 = field649;
+		garbageValue = "1117157787"
+	)
+	final void method1174() {
+		SecureRandomCallable.invalidateWidget(clickedWidget); // L: 11948
+		++class87.widgetDragDuration; // L: 11949
+		if (field657 && field531) { // L: 11950
+			int var1 = MouseHandler.MouseHandler_x; // L: 11956
+			int var2 = MouseHandler.MouseHandler_y; // L: 11957
+			var1 -= widgetClickX; // L: 11958
+			var2 -= widgetClickY; // L: 11959
+			if (var1 < field681) { // L: 11960
+				var1 = field681;
 			}
 
-			if (var1 + clickedWidget.width > field649 + clickedWidgetParent.width) { // L: 11203
-				var1 = field649 + clickedWidgetParent.width - clickedWidget.width;
+			if (var1 + clickedWidget.width > field681 + clickedWidgetParent.width) { // L: 11961
+				var1 = field681 + clickedWidgetParent.width - clickedWidget.width;
 			}
 
-			if (var2 < field650) { // L: 11204
-				var2 = field650;
+			if (var2 < field659) { // L: 11962
+				var2 = field659;
 			}
 
-			if (var2 + clickedWidget.height > field650 + clickedWidgetParent.height) { // L: 11205
-				var2 = field650 + clickedWidgetParent.height - clickedWidget.height;
+			if (var2 + clickedWidget.height > field659 + clickedWidgetParent.height) { // L: 11963
+				var2 = field659 + clickedWidgetParent.height - clickedWidget.height;
 			}
 
-			int var3 = var1 - field652; // L: 11206
-			int var4 = var2 - field468; // L: 11207
-			int var5 = clickedWidget.dragZoneSize; // L: 11208
-			if (class134.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11209 11210
-				isDraggingWidget = true; // L: 11211
+			int var3 = var1 - field658; // L: 11964
+			int var4 = var2 - field660; // L: 11965
+			int var5 = clickedWidget.dragZoneSize; // L: 11966
+			if (class87.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 11967 11968
+				isDraggingWidget = true; // L: 11969
 			}
 
-			int var6 = var1 - field649 + clickedWidgetParent.scrollX; // L: 11214
-			int var7 = var2 - field650 + clickedWidgetParent.scrollY; // L: 11215
+			int var6 = var1 - field681 + clickedWidgetParent.scrollX; // L: 11972
+			int var7 = var2 - field659 + clickedWidgetParent.scrollY; // L: 11973
 			ScriptEvent var8;
-			if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11216
-				var8 = new ScriptEvent(); // L: 11217
-				var8.widget = clickedWidget; // L: 11218
-				var8.mouseX = var6; // L: 11219
-				var8.mouseY = var7; // L: 11220
-				var8.args = clickedWidget.onDrag; // L: 11221
-				Tile.runScriptEvent(var8); // L: 11222
+			if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 11974
+				var8 = new ScriptEvent(); // L: 11975
+				var8.widget = clickedWidget; // L: 11976
+				var8.mouseX = var6; // L: 11977
+				var8.mouseY = var7; // L: 11978
+				var8.args = clickedWidget.onDrag; // L: 11979
+				class285.runScriptEvent(var8); // L: 11980
 			}
 
-			if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11224
-				if (isDraggingWidget) { // L: 11225
-					if (clickedWidget.onDragComplete != null) { // L: 11226
-						var8 = new ScriptEvent(); // L: 11227
-						var8.widget = clickedWidget; // L: 11228
-						var8.mouseX = var6; // L: 11229
-						var8.mouseY = var7; // L: 11230
-						var8.dragTarget = draggedOnWidget; // L: 11231
-						var8.args = clickedWidget.onDragComplete; // L: 11232
-						Tile.runScriptEvent(var8); // L: 11233
-					}
-
-					if (draggedOnWidget != null && BuddyRankComparator.method2501(clickedWidget) != null) { // L: 11235
-						PacketBufferNode var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2727, packetWriter.isaacCipher); // L: 11237
-						var12.packetBuffer.method7001(draggedOnWidget.itemId); // L: 11238
-						var12.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11239
-						var12.packetBuffer.method7001(clickedWidget.childIndex); // L: 11240
-						var12.packetBuffer.method7126(draggedOnWidget.id); // L: 11241
-						var12.packetBuffer.method7001(clickedWidget.itemId); // L: 11242
-						var12.packetBuffer.writeIntME(clickedWidget.id); // L: 11243
-						packetWriter.addNode(var12); // L: 11244
-					}
-				} else if (this.shouldLeftClickOpenMenu()) { // L: 11248
-					this.openMenu(field652 + widgetClickX, widgetClickY + field468); // L: 11249
-				} else if (menuOptionsCount > 0) { // L: 11251
-					int var11 = widgetClickX + field652; // L: 11252
-					int var9 = widgetClickY + field468; // L: 11253
-					MenuAction var10 = class274.tempMenuAction; // L: 11255
-					class14.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var11, var9); // L: 11257
-					class274.tempMenuAction = null; // L: 11259
-				}
-
-				clickedWidget = null; // L: 11263
+			if (MouseHandler.MouseHandler_currentButton == 0) { // L: 11982
+				if (isDraggingWidget) { // L: 11983
+					if (clickedWidget.onDragComplete != null) { // L: 11984
+						var8 = new ScriptEvent(); // L: 11985
+						var8.widget = clickedWidget; // L: 11986
+						var8.mouseX = var6; // L: 11987
+						var8.mouseY = var7; // L: 11988
+						var8.dragTarget = draggedOnWidget; // L: 11989
+						var8.args = clickedWidget.onDragComplete; // L: 11990
+						class285.runScriptEvent(var8); // L: 11991
+					}
+
+					if (draggedOnWidget != null && SpotAnimationDefinition.method3340(clickedWidget) != null) { // L: 11993
+						PacketBufferNode var11 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2816, packetWriter.isaacCipher); // L: 11995
+						var11.packetBuffer.method7407(draggedOnWidget.id); // L: 11996
+						var11.packetBuffer.method7398(clickedWidget.childIndex); // L: 11997
+						var11.packetBuffer.method7493(draggedOnWidget.itemId); // L: 11998
+						var11.packetBuffer.method7493(draggedOnWidget.childIndex); // L: 11999
+						var11.packetBuffer.writeShort(clickedWidget.itemId); // L: 12000
+						var11.packetBuffer.writeInt(clickedWidget.id); // L: 12001
+						packetWriter.addNode(var11); // L: 12002
+					}
+				} else if (this.shouldLeftClickOpenMenu()) { // L: 12006
+					this.openMenu(field658 + widgetClickX, widgetClickY + field660); // L: 12007
+				} else if (menuOptionsCount > 0) { // L: 12009
+					int var10 = widgetClickX + field658; // L: 12010
+					int var9 = widgetClickY + field660; // L: 12011
+					WorldMapIcon_1.method4385(class87.tempMenuAction, var10, var9); // L: 12013
+					class87.tempMenuAction = null; // L: 12014
+				}
+
+				clickedWidget = null; // L: 12018
 			}
 
 		} else {
-			if (class134.widgetDragDuration > 1) { // L: 11193
-				clickedWidget = null; // L: 11194
+			if (class87.widgetDragDuration > 1) { // L: 11951
+				clickedWidget = null; // L: 11952
 			}
 
 		}
-	} // L: 11196 11265
+	} // L: 11954 12020
 
-	@ObfuscatedName("lb")
+	@ObfuscatedName("lu")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lpb;",
-		garbageValue = "-1245448697"
+		descriptor = "(I)Lpo;",
+		garbageValue = "-1191894118"
 	)
 	@Export("username")
 	public Username username() {
-		return HealthBarDefinition.localPlayer != null ? HealthBarDefinition.localPlayer.username : null; // L: 11998
+		return class340.localPlayer != null ? class340.localPlayer.username : null; // L: 12670
 	}
 
 	public final void init() {
 		try {
-			if (this.checkHost()) { // L: 658
-				for (int var1 = 0; var1 <= 27; ++var1) { // L: 659
-					String var2 = this.getParameter(Integer.toString(var1)); // L: 660
-					if (var2 != null) { // L: 661
-						switch(var1) { // L: 662
+			if (this.checkHost()) { // L: 666
+				int var7;
+				for (int var1 = 0; var1 <= 27; ++var1) { // L: 667
+					String var2 = this.getParameter(Integer.toString(var1)); // L: 668
+					if (var2 != null) { // L: 669
+						switch(var1) { // L: 670
 						case 1:
-							useBufferedSocket = Integer.parseInt(var2) != 0; // L: 746
+							useBufferedSocket = Integer.parseInt(var2) != 0; // L: 704
 						case 2:
 						case 13:
 						case 16:
@@ -6805,128 +6691,749 @@ public final void init() {
 						default:
 							break;
 						case 3:
-							if (var2.equalsIgnoreCase("true")) { // L: 717
+							if (var2.equalsIgnoreCase("true")) { // L: 757
 								isMembersWorld = true;
 							} else {
-								isMembersWorld = false; // L: 718
+								isMembersWorld = false; // L: 758
 							}
 							break;
 						case 4:
-							if (clientType == -1) { // L: 734
-								clientType = Integer.parseInt(var2); // L: 735
+							if (clientType == -1) { // L: 709
+								clientType = Integer.parseInt(var2); // L: 710
 							}
 							break;
 						case 5:
-							worldProperties = Integer.parseInt(var2); // L: 712
-							break; // L: 713
+							worldProperties = Integer.parseInt(var2); // L: 752
+							break; // L: 753
 						case 6:
-							MouseHandler.clientLanguage = Language.method5519(Integer.parseInt(var2)); // L: 729
-							break; // L: 730
+							ScriptFrame.clientLanguage = Language.method5826(Integer.parseInt(var2)); // L: 693
+							break; // L: 694
 						case 7:
-							ArchiveLoader.field984 = WorldMapIcon_0.method3890(Integer.parseInt(var2)); // L: 707
-							break; // L: 708
+							int var4 = Integer.parseInt(var2); // L: 722
+							GameBuild[] var5 = new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.LIVE, GameBuild.WIP}; // L: 727
+							GameBuild[] var6 = var5; // L: 729
+							var7 = 0;
+
+							GameBuild var3;
+							while (true) {
+								if (var7 >= var6.length) {
+									var3 = null; // L: 740
+									break;
+								}
+
+								GameBuild var8 = var6[var7]; // L: 731
+								if (var4 == var8.buildId) { // L: 733
+									var3 = var8; // L: 734
+									break; // L: 735
+								}
+
+								++var7; // L: 730
+							}
+
+							StudioGame.field3456 = var3; // L: 742
+							break; // L: 743
 						case 8:
-							if (var2.equalsIgnoreCase("true")) { // L: 723
+							if (var2.equalsIgnoreCase("true")) { // L: 698
 							}
 							break;
 						case 9:
-							UserComparator3.field1316 = var2; // L: 682
-							break; // L: 683
+							class1.field3 = var2; // L: 716
+							break; // L: 717
 						case 10:
-							RouteStrategy.field1986 = (StudioGame)UserComparator4.findEnumerated(class157.method3084(), Integer.parseInt(var2)); // L: 665
-							if (StudioGame.oldscape == RouteStrategy.field1986) { // L: 666
-								GrandExchangeOfferUnitPriceComparator.loginType = LoginType.oldscape;
+							class338.field4054 = (StudioGame)class130.findEnumerated(WorldMapAreaData.method4894(), Integer.parseInt(var2)); // L: 763
+							if (class338.field4054 == StudioGame.oldscape) { // L: 764
+								class194.loginType = LoginType.oldscape;
 							} else {
-								GrandExchangeOfferUnitPriceComparator.loginType = LoginType.field4231; // L: 667
+								class194.loginType = LoginType.field4405; // L: 765
 							}
 							break;
 						case 11:
-							WorldMapSection1.field2203 = var2; // L: 672
-							break; // L: 673
+							class257.field3044 = var2; // L: 775
+							break;
 						case 12:
-							worldId = Integer.parseInt(var2); // L: 692
-							break; // L: 693
+							worldId = Integer.parseInt(var2); // L: 683
+							break; // L: 684
 						case 14:
-							TextureProvider.field2483 = Integer.parseInt(var2); // L: 687
-							break; // L: 688
+							FriendLoginUpdate.field4096 = Integer.parseInt(var2); // L: 770
+							break; // L: 771
 						case 15:
-							gameBuild = Integer.parseInt(var2); // L: 697
-							break; // L: 698
+							gameBuild = Integer.parseInt(var2); // L: 688
+							break; // L: 689
 						case 17:
-							BoundaryObject.field2618 = var2; // L: 702
-							break; // L: 703
+							AbstractWorldMapIcon.field2761 = var2; // L: 673
+							break; // L: 674
 						case 21:
-							field467 = Integer.parseInt(var2); // L: 677
-							break; // L: 678
+							field473 = Integer.parseInt(var2); // L: 678
+							break; // L: 679
 						case 22:
-							field619 = Integer.parseInt(var2) != 0; // L: 741
+							field526 = Integer.parseInt(var2) != 0; // L: 747
 						}
 					}
 				}
 
-				Scene.Scene_isLowDetail = false; // L: 753
-				isLowDetail = false; // L: 754
-				WorldMapIcon_0.worldHost = this.getCodeBase().getHost(); // L: 756
-				String var4 = ArchiveLoader.field984.name; // L: 757
-				byte var5 = 0; // L: 758
+				Scene.Scene_isLowDetail = false; // L: 782
+				isLowDetail = false; // L: 783
+				class185.worldHost = this.getCodeBase().getHost(); // L: 785
+				String var17 = StudioGame.field3456.name; // L: 786
+				byte var18 = 0; // L: 787
 
 				try {
-					class300.method5507("oldschool", var4, var5, 21); // L: 760
-				} catch (Exception var6) { // L: 762
-					MilliClock.RunException_sendStackTrace((String)null, var6); // L: 763
+					class143.idxCount = 21; // L: 790
+					UserComparator3.cacheGamebuild = var18; // L: 791
+
+					try {
+						Coord.operatingSystemName = System.getProperty("os.name"); // L: 793
+					} catch (Exception var32) { // L: 795
+						Coord.operatingSystemName = "Unknown"; // L: 796
+					}
+
+					JagexCache.formattedOperatingSystemName = Coord.operatingSystemName.toLowerCase(); // L: 798
+
+					try {
+						class409.userHomeDirectory = System.getProperty("user.home"); // L: 800
+						if (class409.userHomeDirectory != null) { // L: 801
+							class409.userHomeDirectory = class409.userHomeDirectory + "/";
+						}
+					} catch (Exception var31) { // L: 803
+					}
+
+					try {
+						if (JagexCache.formattedOperatingSystemName.startsWith("win")) { // L: 805
+							if (class409.userHomeDirectory == null) { // L: 806
+								class409.userHomeDirectory = System.getenv("USERPROFILE");
+							}
+						} else if (class409.userHomeDirectory == null) { // L: 809
+							class409.userHomeDirectory = System.getenv("HOME");
+						}
+
+						if (class409.userHomeDirectory != null) { // L: 811
+							class409.userHomeDirectory = class409.userHomeDirectory + "/";
+						}
+					} catch (Exception var30) { // L: 813
+					}
+
+					if (class409.userHomeDirectory == null) { // L: 814
+						class409.userHomeDirectory = "~/";
+					}
+
+					UserComparator3.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class409.userHomeDirectory, "/tmp/", ""}; // L: 815
+					BufferedSource.cacheSubPaths = new String[]{".jagex_cache_" + UserComparator3.cacheGamebuild, ".file_store_" + UserComparator3.cacheGamebuild}; // L: 816
+					int var19 = 0;
+
+					label275:
+					while (var19 < 4) {
+						String var37 = var19 == 0 ? "" : "" + var19; // L: 820
+						Huffman.JagexCache_locationFile = new File(class409.userHomeDirectory, "jagex_cl_oldschool_" + var17 + var37 + ".dat"); // L: 821
+						String var39 = null; // L: 822
+						String var20 = null; // L: 823
+						boolean var21 = false; // L: 824
+						File var42;
+						if (Huffman.JagexCache_locationFile.exists()) { // L: 825
+							try {
+								AccessFile var9 = new AccessFile(Huffman.JagexCache_locationFile, "rw", 10000L); // L: 828
+
+								Buffer var10;
+								int var11;
+								for (var10 = new Buffer((int)var9.length()); var10.offset < var10.array.length; var10.offset += var11) { // L: 829 830 833
+									var11 = var9.read(var10.array, var10.offset, var10.array.length - var10.offset); // L: 831
+									if (var11 == -1) { // L: 832
+										throw new IOException();
+									}
+								}
+
+								var10.offset = 0; // L: 835
+								var11 = var10.readUnsignedByte(); // L: 836
+								if (var11 < 1 || var11 > 3) {
+									throw new IOException("" + var11); // L: 837
+								}
+
+								int var12 = 0; // L: 838
+								if (var11 > 1) { // L: 839
+									var12 = var10.readUnsignedByte();
+								}
+
+								if (var11 <= 2) { // L: 840
+									var39 = var10.readStringCp1252NullCircumfixed(); // L: 841
+									if (var12 == 1) { // L: 842
+										var20 = var10.readStringCp1252NullCircumfixed();
+									}
+								} else {
+									var39 = var10.readCESU8(); // L: 845
+									if (var12 == 1) { // L: 846
+										var20 = var10.readCESU8();
+									}
+								}
+
+								var9.close(); // L: 848
+							} catch (IOException var34) { // L: 850
+								var34.printStackTrace(); // L: 851
+							}
+
+							if (var39 != null) { // L: 853
+								var42 = new File(var39); // L: 854
+								if (!var42.exists()) { // L: 855
+									var39 = null; // L: 856
+								}
+							}
+
+							if (var39 != null) { // L: 859
+								var42 = new File(var39, "test.dat"); // L: 860
+								if (!BoundaryObject.method4321(var42, true)) { // L: 861
+									var39 = null; // L: 862
+								}
+							}
+						}
+
+						if (var39 == null && var19 == 0) { // L: 866
+							label250:
+							for (int var22 = 0; var22 < BufferedSource.cacheSubPaths.length; ++var22) { // L: 867
+								for (int var23 = 0; var23 < UserComparator3.cacheParentPaths.length; ++var23) { // L: 868
+									File var24 = new File(UserComparator3.cacheParentPaths[var23] + BufferedSource.cacheSubPaths[var22] + File.separatorChar + "oldschool" + File.separatorChar); // L: 869
+									if (var24.exists()) { // L: 870
+										File var13 = new File(var24, "test.dat"); // L: 872
+
+										boolean var44;
+										try {
+											RandomAccessFile var14 = new RandomAccessFile(var13, "rw"); // L: 875
+											int var15 = var14.read(); // L: 876
+											var14.seek(0L); // L: 877
+											var14.write(var15); // L: 878
+											var14.seek(0L); // L: 879
+											var14.close(); // L: 880
+											var13.delete(); // L: 881
+											var44 = true; // L: 882
+										} catch (Exception var29) { // L: 884
+											var44 = false; // L: 885
+										}
+
+										if (var44) { // L: 888
+											var39 = var24.toString(); // L: 889
+											var21 = true; // L: 890
+											break label250; // L: 891
+										}
+									}
+								}
+							}
+						}
+
+						if (var39 == null) { // L: 897
+							var39 = class409.userHomeDirectory + File.separatorChar + "jagexcache" + var37 + File.separatorChar + "oldschool" + File.separatorChar + var17 + File.separatorChar; // L: 898
+							var21 = true; // L: 899
+						}
+
+						if (var20 != null) { // L: 901
+							File var41 = new File(var20); // L: 902
+							var42 = new File(var39); // L: 903
+
+							try {
+								File[] var46 = var41.listFiles(); // L: 905
+								File[] var25 = var46; // L: 907
+
+								for (int var26 = 0; var26 < var25.length; ++var26) { // L: 908
+									File var45 = var25[var26]; // L: 909
+									File var27 = new File(var42, var45.getName()); // L: 911
+									boolean var16 = var45.renameTo(var27); // L: 912
+									if (!var16) { // L: 913
+										throw new IOException();
+									}
+								}
+							} catch (Exception var33) { // L: 918
+								var33.printStackTrace(); // L: 919
+							}
+
+							var21 = true; // L: 921
+						}
+
+						if (var21) { // L: 923
+							MusicPatchPcmStream.method5272(new File(var39), (File)null);
+						}
+
+						File var28 = new File(var39); // L: 924
+						class13.cacheDir = var28; // L: 926
+						if (!class13.cacheDir.exists()) { // L: 927
+							class13.cacheDir.mkdirs();
+						}
+
+						File[] var38 = class13.cacheDir.listFiles(); // L: 928
+						if (var38 != null) { // L: 929
+							File[] var43 = var38; // L: 931
+
+							for (var7 = 0; var7 < var43.length; ++var7) { // L: 932
+								File var40 = var43[var7]; // L: 933
+								if (!BoundaryObject.method4321(var40, false)) { // L: 935
+									++var19; // L: 817
+									continue label275;
+								}
+							}
+						}
+						break;
+					}
+
+					MusicPatchNode2.method5048(class13.cacheDir); // L: 942
+					class368.method6744(); // L: 943
+					JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 944
+					JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 945
+					JagexCache.JagexCache_idxFiles = new BufferedFile[class143.idxCount]; // L: 946
+
+					for (var19 = 0; var19 < class143.idxCount; ++var19) { // L: 947
+						JagexCache.JagexCache_idxFiles[var19] = new BufferedFile(new AccessFile(GameEngine.getFile("main_file_cache.idx" + var19), "rw", 1048576L), 6000, 0); // L: 948
+					}
+				} catch (Exception var35) { // L: 952
+					AccessFile.RunException_sendStackTrace((String)null, var35); // L: 953
 				}
 
-				ArchiveLoader.client = this; // L: 765
-				RunException.clientType = clientType; // L: 766
-				if (field469 == -1) { // L: 767
-					field469 = 0; // L: 768
+				class295.client = this; // L: 955
+				class398.clientType = clientType; // L: 956
+				if (field499 == -1) { // L: 957
+					field499 = 0; // L: 958
 				}
 
-				JagexCache.field1560 = System.getenv("JX_ACCESS_TOKEN"); // L: 770
-				System.getenv("JX_REFRESH_TOKEN"); // L: 771
-				this.startThread(765, 503, 201); // L: 772
+				WorldMapAreaData.field2772 = System.getenv("JX_ACCESS_TOKEN"); // L: 960
+				System.getenv("JX_REFRESH_TOKEN"); // L: 961
+				this.startThread(765, 503, 202); // L: 962
 			}
-		} catch (RuntimeException var7) {
-			throw MouseHandler.newRunException(var7, "client.init(" + ')');
+		} catch (RuntimeException var36) {
+			throw class139.newRunException(var36, "client.init(" + ')');
 		}
-	} // L: 773
+	} // L: 963
 
 	public void setOAuthTokens(String var1, String var2) {
-		if (var1 != null && !var1.trim().isEmpty() && var2 != null && !var2.trim().isEmpty()) { // L: 776
-			JagexCache.field1560 = var1; // L: 779
-			class275.method5201(10); // L: 780
+		if (var1 != null && !var1.trim().isEmpty() && var2 != null && !var2.trim().isEmpty()) { // L: 967
+			WorldMapAreaData.field2772 = var1; // L: 970
+			PlayerType.method5521(10); // L: 971
 		}
-	} // L: 777 781
+	} // L: 968 972
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;S)I",
-		garbageValue = "-6598"
+		descriptor = "(II)V",
+		garbageValue = "242484540"
 	)
-	@Export("stringCp1252NullTerminatedByteSize")
-	public static int stringCp1252NullTerminatedByteSize(String var0) {
-		return var0.length() + 1; // L: 130
-	}
+	static void method1623(int var0) {
+		class366.field4192 = var0; // L: 21
+		class366.field4191 = new class366[var0]; // L: 22
+		class149.field1663 = 0; // L: 23
+	} // L: 24
 
-	@ObfuscatedName("fg")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1972300304"
+		descriptor = "(Lpj;II)V",
+		garbageValue = "-925897416"
 	)
-	static boolean method1643() {
-		if (archiveLoaders != null && archiveLoadersDone < archiveLoaders.size()) { // L: 1983
-			while (archiveLoadersDone < archiveLoaders.size()) { // L: 1984
-				ArchiveLoader var0 = (ArchiveLoader)archiveLoaders.get(archiveLoadersDone); // L: 1985
-				if (!var0.isLoaded()) { // L: 1986
-					return false;
+	@Export("updatePlayers")
+	static final void updatePlayers(PacketBuffer var0, int var1) {
+		int var2 = var0.offset; // L: 71
+		Players.Players_pendingUpdateCount = 0; // L: 72
+		int var3 = 0; // L: 74
+		var0.importIndex(); // L: 75
+
+		byte[] var10000;
+		int var4;
+		int var6;
+		int var7;
+		for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76
+			var7 = Players.Players_indices[var4]; // L: 77
+			if ((Players.field1243[var7] & 1) == 0) { // L: 78
+				if (var3 > 0) { // L: 79
+					--var3;
+					var10000 = Players.field1243;
+					var10000[var7] = (byte)(var10000[var7] | 2);
+				} else {
+					var6 = var0.readBits(1);
+					if (var6 == 0) { // L: 85
+						var3 = class124.method2747(var0); // L: 86
+						var10000 = Players.field1243;
+						var10000[var7] = (byte)(var10000[var7] | 2);
+					} else {
+						class231.readPlayerUpdate(var0, var7); // L: 90
+					}
 				}
+			}
+		}
 
-				++archiveLoadersDone; // L: 1987
+		var0.exportIndex(); // L: 93
+		if (var3 != 0) { // L: 94
+			throw new RuntimeException(); // L: 95
+		} else {
+			var0.importIndex(); // L: 97
+
+			for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98
+				var7 = Players.Players_indices[var4]; // L: 99
+				if ((Players.field1243[var7] & 1) != 0) { // L: 100
+					if (var3 > 0) { // L: 101
+						--var3; // L: 102
+						var10000 = Players.field1243; // L: 103
+						var10000[var7] = (byte)(var10000[var7] | 2);
+					} else {
+						var6 = var0.readBits(1); // L: 106
+						if (var6 == 0) { // L: 107
+							var3 = class124.method2747(var0); // L: 108
+							var10000 = Players.field1243; // L: 109
+							var10000[var7] = (byte)(var10000[var7] | 2);
+						} else {
+							class231.readPlayerUpdate(var0, var7); // L: 112
+						}
+					}
+				}
 			}
 
-			return true; // L: 1989
+			var0.exportIndex();
+			if (var3 != 0) { // L: 116
+				throw new RuntimeException();
+			} else {
+				var0.importIndex();
+
+				for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120
+					var7 = Players.Players_emptyIndices[var4]; // L: 121
+					if ((Players.field1243[var7] & 1) != 0) { // L: 122
+						if (var3 > 0) { // L: 123
+							--var3; // L: 124
+							var10000 = Players.field1243; // L: 125
+							var10000[var7] = (byte)(var10000[var7] | 2);
+						} else {
+							var6 = var0.readBits(1); // L: 128
+							if (var6 == 0) { // L: 129
+								var3 = class124.method2747(var0); // L: 130
+								var10000 = Players.field1243; // L: 131
+								var10000[var7] = (byte)(var10000[var7] | 2);
+							} else if (Decimator.updateExternalPlayer(var0, var7)) { // L: 134
+								var10000 = Players.field1243;
+								var10000[var7] = (byte)(var10000[var7] | 2);
+							}
+						}
+					}
+				}
+
+				var0.exportIndex(); // L: 137
+				if (var3 != 0) { // L: 138
+					throw new RuntimeException(); // L: 139
+				} else {
+					var0.importIndex(); // L: 141
+
+					for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142
+						var7 = Players.Players_emptyIndices[var4]; // L: 143
+						if ((Players.field1243[var7] & 1) == 0) { // L: 144
+							if (var3 > 0) { // L: 145
+								--var3; // L: 146
+								var10000 = Players.field1243; // L: 147
+								var10000[var7] = (byte)(var10000[var7] | 2);
+							} else {
+								var6 = var0.readBits(1); // L: 150
+								if (var6 == 0) { // L: 151
+									var3 = class124.method2747(var0); // L: 152
+									var10000 = Players.field1243; // L: 153
+									var10000[var7] = (byte)(var10000[var7] | 2);
+								} else if (Decimator.updateExternalPlayer(var0, var7)) { // L: 156
+									var10000 = Players.field1243;
+									var10000[var7] = (byte)(var10000[var7] | 2);
+								}
+							}
+						}
+					}
+
+					var0.exportIndex(); // L: 159
+					if (var3 != 0) { // L: 160
+						throw new RuntimeException(); // L: 161
+					} else {
+						Players.Players_count = 0; // L: 163
+						Players.Players_emptyIdxCount = 0; // L: 164
+
+						Player var5;
+						for (var4 = 1; var4 < 2048; ++var4) { // L: 165
+							var10000 = Players.field1243; // L: 166
+							var10000[var4] = (byte)(var10000[var4] >> 1);
+							var5 = players[var4]; // L: 167
+							if (var5 != null) { // L: 168
+								Players.Players_indices[++Players.Players_count - 1] = var4;
+							} else {
+								Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169
+							}
+						}
+
+						for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 173
+							var4 = Players.Players_pendingUpdateIndices[var3]; // L: 174
+							var5 = players[var4]; // L: 175
+							var6 = var0.readUnsignedByte(); // L: 176
+							if ((var6 & 16) != 0) { // L: 177
+								var6 += var0.readUnsignedByte() << 8;
+							}
+
+							class65.method1957(var0, var4, var5, var6); // L: 178
+						}
+
+						if (var0.offset - var2 != var1) { // L: 181
+							throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 182
+						}
+					}
+				}
+			}
+		}
+	} // L: 184
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "1203328056"
+	)
+	static final void method1662(String var0) {
+		StringBuilder var10000 = new StringBuilder();
+		Object var10001 = null; // L: 115
+		var10000 = var10000.append("Please remove ").append(var0);
+		var10001 = null;
+		String var1 = var10000.append(" from your ignore list first").toString();
+		class194.addGameMessage(30, "", var1); // L: 117
+	} // L: 119
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "-2037672270"
+	)
+	static String method1668() {
+		String var0 = ""; // L: 80
+
+		Message var2;
+		for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { // L: 81 84
+			var2 = (Message)var1.next(); // L: 82
+		}
+
+		return var0; // L: 87
+	}
+
+	@ObfuscatedName("as")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "-56"
+	)
+	static int method1667(int var0, Script var1, boolean var2) {
+		if (var0 == 6800) { // L: 4301
+			Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4302
+			return 1; // L: 4303
+		} else if (var0 != 6801 && var0 != 6802) { // L: 4305
+			if (var0 == 6850) { // L: 4309
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4310
+				return 1; // L: 4311
+			} else if (var0 != 6851 && var0 != 6852) { // L: 4313
+				if (var0 == 6853) { // L: 4317
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4318
+					return 1; // L: 4319
+				} else {
+					return 2; // L: 4321
+				}
+			} else {
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4314
+				return 1; // L: 4315
+			}
 		} else {
-			return true; // L: 1988
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4306
+			return 1; // L: 4307
 		}
 	}
+
+	@ObfuscatedName("jb")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;III)V",
+		garbageValue = "-1503401807"
+	)
+	@Export("Widget_addToMenu")
+	static final void Widget_addToMenu(Widget var0, int var1, int var2) {
+		if (var0.buttonType == 1) { // L: 11167
+			class11.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 11168
+		}
+
+		String var3;
+		if (var0.buttonType == 2 && !isSpellSelected) { // L: 11171
+			var3 = SecureRandomFuture.Widget_getSpellActionName(var0); // L: 11172
+			if (var3 != null) { // L: 11173
+				class11.insertMenuItemNoShift(var3, UserComparator5.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 11174
+			}
+		}
+
+		if (var0.buttonType == 3) { // L: 11178
+			class11.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 11179
+		}
+
+		if (var0.buttonType == 4) { // L: 11182
+			class11.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 11183
+		}
+
+		if (var0.buttonType == 5) { // L: 11186
+			class11.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 11187
+		}
+
+		if (var0.buttonType == 6 && meslayerContinueWidget == null) { // L: 11190
+			class11.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 11191
+		}
+
+		int var4;
+		int var19;
+		if (var0.type == 2) { // L: 11194
+			var19 = 0; // L: 11195
+
+			for (var4 = 0; var4 < var0.height; ++var4) { // L: 11196
+				for (int var21 = 0; var21 < var0.width; ++var21) { // L: 11197
+					int var22 = (var0.paddingX + 32) * var21; // L: 11198
+					int var7 = (var0.paddingY + 32) * var4; // L: 11199
+					if (var19 < 20) { // L: 11200
+						var22 += var0.inventoryXOffsets[var19]; // L: 11201
+						var7 += var0.inventoryYOffsets[var19]; // L: 11202
+					}
+
+					if (var1 >= var22 && var2 >= var7 && var1 < var22 + 32 && var2 < var7 + 32) { // L: 11204
+						dragItemSlotDestination = var19; // L: 11205
+						FloorOverlayDefinition.hoveredItemContainer = var0; // L: 11206
+						if (var0.itemIds[var19] > 0) { // L: 11207
+							label365: {
+								ItemComposition var8 = UserComparator6.ItemDefinition_get(var0.itemIds[var19] - 1); // L: 11208
+								boolean var9;
+								int var10;
+								if (isItemSelected == 1) { // L: 11210
+									var10 = class363.getWidgetFlags(var0); // L: 11212
+									var9 = (var10 >> 30 & 1) != 0; // L: 11214
+									if (var9) { // L: 11216
+										if (var0.id != MidiPcmStream.selectedItemWidget || var19 != Calendar.selectedItemSlot) { // L: 11217
+											class11.insertMenuItemNoShift("Use", selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); // L: 11218
+										}
+										break label365;
+									}
+								}
+
+								if (isSpellSelected) { // L: 11225
+									var10 = class363.getWidgetFlags(var0); // L: 11227
+									var9 = (var10 >> 30 & 1) != 0; // L: 11229
+									if (var9) { // L: 11231
+										if ((class91.selectedSpellFlags & 16) == 16) { // L: 11232
+											class11.insertMenuItemNoShift(selectedSpellActionName, selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); // L: 11233
+										}
+										break label365;
+									}
+								}
+
+								String[] var23 = var8.inventoryActions; // L: 11239
+								var10 = -1; // L: 11240
+								if (shiftClickDrop && ArchiveLoader.method2125()) { // L: 11241
+									var10 = var8.getShiftClickIndex(); // L: 11242
+								}
+
+								int var12 = class363.getWidgetFlags(var0); // L: 11245
+								boolean var11 = (var12 >> 30 & 1) != 0; // L: 11247
+								if (var11) { // L: 11249
+									for (int var13 = 4; var13 >= 3; --var13) { // L: 11250
+										if (var13 != var10) { // L: 11251
+											VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var13, false); // L: 11252
+										}
+									}
+								}
+
+								int var14 = class363.getWidgetFlags(var0); // L: 11256
+								boolean var24 = (var14 >> 31 & 1) != 0; // L: 11258
+								if (var24) { // L: 11260
+									class11.insertMenuItemNoShift("Use", UserComparator5.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); // L: 11261
+								}
+
+								int var16 = class363.getWidgetFlags(var0); // L: 11265
+								boolean var15 = (var16 >> 30 & 1) != 0; // L: 11267
+								int var17;
+								if (var15) { // L: 11269
+									for (var17 = 2; var17 >= 0; --var17) { // L: 11270
+										if (var17 != var10) { // L: 11271
+											VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var17, false); // L: 11272
+										}
+									}
+
+									if (var10 >= 0) { // L: 11274
+										VarbitComposition.addWidgetItemMenuItem(var0, var8, var19, var10, true); // L: 11275
+									}
+								}
+
+								var23 = var0.itemActions; // L: 11278
+								if (var23 != null) { // L: 11279
+									for (var17 = 4; var17 >= 0; --var17) { // L: 11280
+										if (var23[var17] != null) { // L: 11281
+											byte var18 = 0; // L: 11282
+											if (var17 == 0) { // L: 11283
+												var18 = 39;
+											}
+
+											if (var17 == 1) { // L: 11284
+												var18 = 40;
+											}
+
+											if (var17 == 2) { // L: 11285
+												var18 = 41;
+											}
+
+											if (var17 == 3) { // L: 11286
+												var18 = 42;
+											}
+
+											if (var17 == 4) { // L: 11287
+												var18 = 43;
+											}
+
+											class11.insertMenuItemNoShift(var23[var17], UserComparator5.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); // L: 11288
+										}
+									}
+								}
+
+								class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); // L: 11293
+							}
+						}
+					}
+
+					++var19; // L: 11299
+				}
+			}
+		}
+
+		if (var0.isIf3) { // L: 11303
+			if (isSpellSelected) { // L: 11304
+				var4 = class363.getWidgetFlags(var0); // L: 11306
+				boolean var25 = (var4 >> 21 & 1) != 0; // L: 11308
+				if (var25 && (class91.selectedSpellFlags & 32) == 32) { // L: 11310
+					class11.insertMenuItemNoShift(selectedSpellActionName, selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 11311
+				}
+			} else {
+				for (var19 = 9; var19 >= 5; --var19) { // L: 11316
+					String var20;
+					if (!WorldMapCacheName.method4864(class363.getWidgetFlags(var0), var19) && var0.onOp == null) { // L: 11319
+						var20 = null; // L: 11320
+					} else if (var0.actions != null && var0.actions.length > var19 && var0.actions[var19] != null && var0.actions[var19].trim().length() != 0) { // L: 11323
+						var20 = var0.actions[var19]; // L: 11327
+					} else {
+						var20 = null; // L: 11324
+					}
+
+					if (var20 != null) { // L: 11330
+						class11.insertMenuItemNoShift(var20, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); // L: 11331
+					}
+				}
+
+				var3 = SecureRandomFuture.Widget_getSpellActionName(var0); // L: 11335
+				if (var3 != null) { // L: 11336
+					class11.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 11337
+				}
+
+				for (var4 = 4; var4 >= 0; --var4) { // L: 11340
+					String var5;
+					if (!WorldMapCacheName.method4864(class363.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 11343
+						var5 = null; // L: 11344
+					} else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 11347
+						var5 = var0.actions[var4]; // L: 11351
+					} else {
+						var5 = null; // L: 11348
+					}
+
+					if (var5 != null) { // L: 11354
+						class21.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 11355
+					}
+				}
+
+				if (class20.method332(class363.getWidgetFlags(var0))) { // L: 11359
+					class11.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 11360
+				}
+			}
+		}
+
+	} // L: 11365
 }
diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java
index b1c3107b19..d86283005b 100644
--- a/runescape-client/src/main/java/ClientPacket.java
+++ b/runescape-client/src/main/java/ClientPacket.java
@@ -1,662 +1,663 @@
+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("ik")
+@ObfuscatedName("iu")
 @Implements("ClientPacket")
-public class ClientPacket implements class238 {
-	@ObfuscatedName("i")
+public class ClientPacket implements class251 {
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2734;
-	@ObfuscatedName("w")
+	public static final ClientPacket field2855;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2684;
-	@ObfuscatedName("s")
+	public static final ClientPacket field2803;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2757;
-	@ObfuscatedName("a")
+	public static final ClientPacket field2804;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2667;
-	@ObfuscatedName("o")
+	public static final ClientPacket field2805;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2668;
-	@ObfuscatedName("g")
+	static final ClientPacket field2806;
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2669;
-	@ObfuscatedName("e")
+	public static final ClientPacket field2847;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2693;
-	@ObfuscatedName("p")
+	public static final ClientPacket field2808;
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2755;
-	@ObfuscatedName("j")
+	public static final ClientPacket field2861;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2672;
-	@ObfuscatedName("b")
+	public static final ClientPacket field2853;
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2673;
-	@ObfuscatedName("x")
+	public static final ClientPacket field2837;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2745;
-	@ObfuscatedName("y")
+	public static final ClientPacket field2830;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2675;
-	@ObfuscatedName("k")
+	public static final ClientPacket field2880;
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2676;
-	@ObfuscatedName("t")
+	public static final ClientPacket field2814;
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2677;
-	@ObfuscatedName("l")
+	public static final ClientPacket field2815;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2713;
-	@ObfuscatedName("u")
+	public static final ClientPacket field2816;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2748;
-	@ObfuscatedName("n")
+	public static final ClientPacket field2809;
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2680;
-	@ObfuscatedName("z")
+	public static final ClientPacket field2891;
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2681;
-	@ObfuscatedName("q")
+	public static final ClientPacket field2819;
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2682;
-	@ObfuscatedName("d")
+	public static final ClientPacket field2820;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2683;
-	@ObfuscatedName("r")
+	public static final ClientPacket field2821;
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2699;
-	@ObfuscatedName("m")
+	public static final ClientPacket field2822;
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2685;
-	@ObfuscatedName("c")
+	public static final ClientPacket field2823;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2686;
-	@ObfuscatedName("f")
+	public static final ClientPacket field2829;
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2687;
-	@ObfuscatedName("h")
+	public static final ClientPacket field2825;
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2688;
-	@ObfuscatedName("v")
+	public static final ClientPacket field2836;
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2689;
-	@ObfuscatedName("ag")
+	public static final ClientPacket field2862;
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2715;
-	@ObfuscatedName("ae")
+	public static final ClientPacket field2828;
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2754;
-	@ObfuscatedName("aq")
+	public static final ClientPacket field2838;
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2750;
-	@ObfuscatedName("al")
+	public static final ClientPacket field2831;
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2758;
-	@ObfuscatedName("am")
+	public static final ClientPacket field2834;
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2692;
-	@ObfuscatedName("ai")
+	static final ClientPacket field2832;
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2733;
-	@ObfuscatedName("ah")
+	public static final ClientPacket field2833;
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2696;
-	@ObfuscatedName("as")
+	public static final ClientPacket field2811;
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2697;
-	@ObfuscatedName("at")
+	public static final ClientPacket field2868;
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	static final ClientPacket field2698;
-	@ObfuscatedName("az")
+	public static final ClientPacket field2835;
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2666;
+	public static final ClientPacket field2894;
 	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2700;
-	@ObfuscatedName("ak")
+	public static final ClientPacket field2857;
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2722;
-	@ObfuscatedName("ab")
+	public static final ClientPacket field2839;
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2739;
+	public static final ClientPacket field2840;
 	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2665;
-	@ObfuscatedName("ad")
+	public static final ClientPacket field2882;
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2704;
-	@ObfuscatedName("an")
+	public static final ClientPacket field2842;
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2705;
-	@ObfuscatedName("ax")
+	public static final ClientPacket field2843;
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2694;
-	@ObfuscatedName("av")
+	public static final ClientPacket field2844;
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2702;
-	@ObfuscatedName("ap")
+	public static final ClientPacket field2802;
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	static final ClientPacket field2708;
-	@ObfuscatedName("au")
+	public static final ClientPacket field2846;
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2709;
-	@ObfuscatedName("aj")
+	public static final ClientPacket field2841;
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2710;
-	@ObfuscatedName("af")
+	public static final ClientPacket field2827;
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2711;
-	@ObfuscatedName("aw")
+	public static final ClientPacket field2807;
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2712;
-	@ObfuscatedName("ao")
+	public static final ClientPacket field2824;
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2714;
-	@ObfuscatedName("aa")
+	public static final ClientPacket field2851;
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2679;
-	@ObfuscatedName("ay")
+	public static final ClientPacket field2852;
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2763;
-	@ObfuscatedName("bg")
+	public static final ClientPacket field2845;
+	@ObfuscatedName("bp")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2716;
-	@ObfuscatedName("bl")
+	public static final ClientPacket field2854;
+	@ObfuscatedName("bd")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2717;
-	@ObfuscatedName("bx")
+	public static final ClientPacket field2826;
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2718;
-	@ObfuscatedName("bd")
+	public static final ClientPacket field2856;
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2719;
-	@ObfuscatedName("bt")
+	public static final ClientPacket field2848;
+	@ObfuscatedName("bg")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2720;
-	@ObfuscatedName("bf")
+	static final ClientPacket field2858;
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2721;
-	@ObfuscatedName("bs")
+	public static final ClientPacket field2859;
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2695;
-	@ObfuscatedName("bh")
+	public static final ClientPacket field2860;
+	@ObfuscatedName("bm")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2723;
+	public static final ClientPacket field2812;
 	@ObfuscatedName("bw")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2724;
-	@ObfuscatedName("bm")
+	public static final ClientPacket field2849;
+	@ObfuscatedName("bl")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2725;
-	@ObfuscatedName("br")
+	public static final ClientPacket field2863;
+	@ObfuscatedName("bz")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2726;
-	@ObfuscatedName("bj")
+	public static final ClientPacket field2810;
+	@ObfuscatedName("bu")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2727;
-	@ObfuscatedName("bo")
+	public static final ClientPacket field2865;
+	@ObfuscatedName("bs")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2761;
+	public static final ClientPacket field2866;
 	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
-	)
-	public static final ClientPacket field2729;
-	@ObfuscatedName("bu")
-	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2730;
-	@ObfuscatedName("bz")
+	public static final ClientPacket field2867;
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2731;
+	public static final ClientPacket field2817;
 	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	static final ClientPacket field2732;
-	@ObfuscatedName("bi")
+	public static final ClientPacket field2869;
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2691;
-	@ObfuscatedName("bk")
+	public static final ClientPacket field2870;
+	@ObfuscatedName("bt")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2707;
-	@ObfuscatedName("bp")
+	public static final ClientPacket field2901;
+	@ObfuscatedName("bh")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2735;
+	public static final ClientPacket field2872;
 	@ObfuscatedName("bn")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2736;
-	@ObfuscatedName("be")
+	public static final ClientPacket field2873;
+	@ObfuscatedName("bj")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2737;
-	@ObfuscatedName("bb")
+	public static final ClientPacket field2874;
+	@ObfuscatedName("by")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2738;
-	@ObfuscatedName("by")
+	public static final ClientPacket field2864;
+	@ObfuscatedName("bk")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	static final ClientPacket field2674;
-	@ObfuscatedName("ba")
+	public static final ClientPacket field2876;
+	@ObfuscatedName("bo")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2671;
-	@ObfuscatedName("bq")
+	public static final ClientPacket field2877;
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2741;
-	@ObfuscatedName("ca")
+	public static final ClientPacket field2818;
+	@ObfuscatedName("be")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2742;
-	@ObfuscatedName("cq")
+	public static final ClientPacket field2879;
+	@ObfuscatedName("ce")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2743;
-	@ObfuscatedName("ck")
+	public static final ClientPacket field2893;
+	@ObfuscatedName("cl")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2744;
-	@ObfuscatedName("ci")
+	static final ClientPacket field2881;
+	@ObfuscatedName("cp")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2728;
-	@ObfuscatedName("cx")
+	public static final ClientPacket field2850;
+	@ObfuscatedName("cd")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2670;
-	@ObfuscatedName("cn")
+	public static final ClientPacket field2883;
+	@ObfuscatedName("ck")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2747;
-	@ObfuscatedName("ct")
+	public static final ClientPacket field2884;
+	@ObfuscatedName("cg")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2690;
-	@ObfuscatedName("cd")
+	public static final ClientPacket field2885;
+	@ObfuscatedName("cy")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2749;
-	@ObfuscatedName("cj")
+	public static final ClientPacket field2886;
+	@ObfuscatedName("cn")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2767;
-	@ObfuscatedName("cl")
+	public static final ClientPacket field2887;
+	@ObfuscatedName("cv")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2746;
-	@ObfuscatedName("cs")
+	public static final ClientPacket field2888;
+	@ObfuscatedName("co")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2752;
-	@ObfuscatedName("ce")
+	public static final ClientPacket field2890;
+	@ObfuscatedName("cc")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2753;
-	@ObfuscatedName("cp")
+	public static final ClientPacket field2871;
+	@ObfuscatedName("cs")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2664;
-	@ObfuscatedName("cg")
+	public static final ClientPacket field2904;
+	@ObfuscatedName("cr")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2751;
-	@ObfuscatedName("cw")
+	public static final ClientPacket field2892;
+	@ObfuscatedName("cb")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2756;
-	@ObfuscatedName("cr")
+	public static final ClientPacket field2889;
+	@ObfuscatedName("cj")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2706;
-	@ObfuscatedName("cu")
+	public static final ClientPacket field2813;
+	@ObfuscatedName("ca")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2740;
-	@ObfuscatedName("cc")
+	public static final ClientPacket field2895;
+	@ObfuscatedName("cz")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2759;
-	@ObfuscatedName("ch")
+	public static final ClientPacket field2896;
+	@ObfuscatedName("cw")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2703;
-	@ObfuscatedName("cz")
+	public static final ClientPacket field2897;
+	@ObfuscatedName("ct")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2701;
-	@ObfuscatedName("cv")
+	public static final ClientPacket field2898;
+	@ObfuscatedName("ci")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	static final ClientPacket field2762;
-	@ObfuscatedName("cf")
+	public static final ClientPacket field2899;
+	@ObfuscatedName("ch")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2769;
-	@ObfuscatedName("cm")
+	static final ClientPacket field2900;
+	@ObfuscatedName("cq")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2764;
-	@ObfuscatedName("co")
+	public static final ClientPacket field2878;
+	@ObfuscatedName("cf")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2765;
-	@ObfuscatedName("cy")
+	public static final ClientPacket field2902;
+	@ObfuscatedName("cu")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2766;
-	@ObfuscatedName("cb")
+	public static final ClientPacket field2903;
+	@ObfuscatedName("cx")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2678;
-	@ObfuscatedName("dq")
+	public static final ClientPacket field2875;
+	@ObfuscatedName("cm")
+	@ObfuscatedSignature(
+		descriptor = "Liu;"
+	)
+	public static final ClientPacket field2905;
+	@ObfuscatedName("dm")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2768;
-	@ObfuscatedName("df")
+	public static final ClientPacket field2906;
+	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
-	public static final ClientPacket field2760;
-	@ObfuscatedName("da")
+	public static final ClientPacket field2907;
+	@ObfuscatedName("ds")
 	@ObfuscatedGetter(
-		intValue = 1306190951
+		intValue = -94628489
 	)
 	@Export("id")
 	final int id;
-	@ObfuscatedName("dw")
+	@ObfuscatedName("dv")
 	@ObfuscatedGetter(
-		intValue = -2069383305
+		intValue = -1390641219
 	)
 	@Export("length")
 	final int length;
 
 	static {
-		field2734 = new ClientPacket(0, 8); // L: 5
-		field2684 = new ClientPacket(1, -1); // L: 6
-		field2757 = new ClientPacket(2, 2); // L: 7
-		field2667 = new ClientPacket(3, 8); // L: 8
-		field2668 = new ClientPacket(4, -1);
-		field2669 = new ClientPacket(5, 9); // L: 10
-		field2693 = new ClientPacket(6, 7); // L: 11
-		field2755 = new ClientPacket(7, 2); // L: 12
-		field2672 = new ClientPacket(8, 3); // L: 13
-		field2673 = new ClientPacket(9, 3); // L: 14
-		field2745 = new ClientPacket(10, 5); // L: 15
-		field2675 = new ClientPacket(11, -2); // L: 16
-		field2676 = new ClientPacket(12, -1); // L: 17
-		field2677 = new ClientPacket(13, 8); // L: 18
-		field2713 = new ClientPacket(14, 0); // L: 19
-		field2748 = new ClientPacket(15, 3); // L: 20
-		field2680 = new ClientPacket(16, 10); // L: 21
-		field2681 = new ClientPacket(17, 8); // L: 22
-		field2682 = new ClientPacket(18, 8); // L: 23
-		field2683 = new ClientPacket(19, 8); // L: 24
-		field2699 = new ClientPacket(20, 4); // L: 25
-		field2685 = new ClientPacket(21, 2); // L: 26
-		field2686 = new ClientPacket(22, 8); // L: 27
-		field2687 = new ClientPacket(23, 3); // L: 28
-		field2688 = new ClientPacket(24, 13); // L: 29
-		field2689 = new ClientPacket(25, 8); // L: 30
-		field2715 = new ClientPacket(26, 8); // L: 31
-		field2754 = new ClientPacket(27, 4); // L: 32
-		field2750 = new ClientPacket(28, -1); // L: 33
-		field2758 = new ClientPacket(29, -1); // L: 34
-		field2692 = new ClientPacket(30, 3); // L: 35
-		field2733 = new ClientPacket(31, 3); // L: 36
-		field2696 = new ClientPacket(32, 3); // L: 37
-		field2697 = new ClientPacket(33, 2); // L: 38
-		field2698 = new ClientPacket(34, -1); // L: 39
-		field2666 = new ClientPacket(35, -1); // L: 40
-		field2700 = new ClientPacket(36, -1); // L: 41
-		field2722 = new ClientPacket(37, 11); // L: 42
-		field2739 = new ClientPacket(38, 4); // L: 43
-		field2665 = new ClientPacket(39, 8); // L: 44
-		field2704 = new ClientPacket(40, -1); // L: 45
-		field2705 = new ClientPacket(41, 7); // L: 46
-		field2694 = new ClientPacket(42, 8); // L: 47
-		field2702 = new ClientPacket(43, 16); // L: 48
-		field2708 = new ClientPacket(44, -1); // L: 49
-		field2709 = new ClientPacket(45, 7); // L: 50
-		field2710 = new ClientPacket(46, 3); // L: 51
-		field2711 = new ClientPacket(47, 8); // L: 52
-		field2712 = new ClientPacket(48, 0); // L: 53
-		field2714 = new ClientPacket(49, 3); // L: 54
-		field2679 = new ClientPacket(50, 4); // L: 55
-		field2763 = new ClientPacket(51, 7); // L: 56
-		field2716 = new ClientPacket(52, -2); // L: 57
-		field2717 = new ClientPacket(53, 3); // L: 58
-		field2718 = new ClientPacket(54, 8); // L: 59
-		field2719 = new ClientPacket(55, 0); // L: 60
-		field2720 = new ClientPacket(56, 4); // L: 61
-		field2721 = new ClientPacket(57, -1); // L: 62
-		field2695 = new ClientPacket(58, 14); // L: 63
-		field2723 = new ClientPacket(59, 3); // L: 64
-		field2724 = new ClientPacket(60, -2); // L: 65
-		field2725 = new ClientPacket(61, 6); // L: 66
-		field2726 = new ClientPacket(62, 0); // L: 67
-		field2727 = new ClientPacket(63, 16); // L: 68
-		field2761 = new ClientPacket(64, 6); // L: 69
-		field2729 = new ClientPacket(65, 15); // L: 70
-		field2730 = new ClientPacket(66, 3); // L: 71
-		field2731 = new ClientPacket(67, 8); // L: 72
-		field2732 = new ClientPacket(68, 7); // L: 73
-		field2691 = new ClientPacket(69, 8); // L: 74
-		field2707 = new ClientPacket(70, -1); // L: 75
-		field2735 = new ClientPacket(71, 15); // L: 76
-		field2736 = new ClientPacket(72, 9); // L: 77
-		field2737 = new ClientPacket(73, -1); // L: 78
-		field2738 = new ClientPacket(74, 15); // L: 79
-		field2674 = new ClientPacket(75, -1); // L: 80
-		field2671 = new ClientPacket(76, 8); // L: 81
-		field2741 = new ClientPacket(77, 11); // L: 82
-		field2742 = new ClientPacket(78, 0); // L: 83
-		field2743 = new ClientPacket(79, 1); // L: 84
-		field2744 = new ClientPacket(80, 7); // L: 85
-		field2728 = new ClientPacket(81, 3); // L: 86
-		field2670 = new ClientPacket(82, 8); // L: 87
-		field2747 = new ClientPacket(83, -1); // L: 88
-		field2690 = new ClientPacket(84, 7); // L: 89
-		field2749 = new ClientPacket(85, -1); // L: 90
-		field2767 = new ClientPacket(86, 7); // L: 91
-		field2746 = new ClientPacket(87, -1); // L: 92
-		field2752 = new ClientPacket(88, -1); // L: 93
-		field2753 = new ClientPacket(89, 16); // L: 94
-		field2664 = new ClientPacket(90, 7); // L: 95
-		field2751 = new ClientPacket(91, 8); // L: 96
-		field2756 = new ClientPacket(92, 15); // L: 97
-		field2706 = new ClientPacket(93, 8); // L: 98
-		field2740 = new ClientPacket(94, 8); // L: 99
-		field2759 = new ClientPacket(95, -1); // L: 100
-		field2703 = new ClientPacket(96, -1); // L: 101
-		field2701 = new ClientPacket(97, 7); // L: 102
-		field2762 = new ClientPacket(98, 2); // L: 103
-		field2769 = new ClientPacket(99, 3); // L: 104
-		field2764 = new ClientPacket(100, -1); // L: 105
-		field2765 = new ClientPacket(101, -1); // L: 106
-		field2766 = new ClientPacket(102, -1); // L: 107
-		field2678 = new ClientPacket(103, 11); // L: 108
-		field2768 = new ClientPacket(104, 7); // L: 109
-		field2760 = new ClientPacket(105, 11); // L: 110
+		field2855 = new ClientPacket(0, 3); // L: 5
+		field2803 = new ClientPacket(1, 8); // L: 6
+		field2804 = new ClientPacket(2, 16); // L: 7
+		field2805 = new ClientPacket(3, -1); // L: 8
+		field2806 = new ClientPacket(4, -1); // L: 9
+		field2847 = new ClientPacket(5, 8); // L: 10
+		field2808 = new ClientPacket(6, 2); // L: 11
+		field2861 = new ClientPacket(7, 1); // L: 12
+		field2853 = new ClientPacket(8, 8); // L: 13
+		field2837 = new ClientPacket(9, 0); // L: 14
+		field2830 = new ClientPacket(10, 8); // L: 15
+		field2880 = new ClientPacket(11, 8); // L: 16
+		field2814 = new ClientPacket(12, 0); // L: 17
+		field2815 = new ClientPacket(13, 2); // L: 18
+		field2816 = new ClientPacket(14, 16); // L: 19
+		field2809 = new ClientPacket(15, 16); // L: 20
+		field2891 = new ClientPacket(16, 8); // L: 21
+		field2819 = new ClientPacket(17, 9); // L: 22
+		field2820 = new ClientPacket(18, 11); // L: 23
+		field2821 = new ClientPacket(19, 8); // L: 24
+		field2822 = new ClientPacket(20, 8); // L: 25
+		field2823 = new ClientPacket(21, 7); // L: 26
+		field2829 = new ClientPacket(22, 2); // L: 27
+		field2825 = new ClientPacket(23, 4); // L: 28
+		field2836 = new ClientPacket(24, 7); // L: 29
+		field2862 = new ClientPacket(25, 4); // L: 30
+		field2828 = new ClientPacket(26, -1); // L: 31
+		field2838 = new ClientPacket(27, 7); // L: 32
+		field2831 = new ClientPacket(28, 15); // L: 33
+		field2834 = new ClientPacket(29, 8); // L: 34
+		field2832 = new ClientPacket(30, -1); // L: 35
+		field2833 = new ClientPacket(31, 8); // L: 36
+		field2811 = new ClientPacket(32, 9); // L: 37
+		field2868 = new ClientPacket(33, 7); // L: 38
+		field2835 = new ClientPacket(34, 15); // L: 39
+		field2894 = new ClientPacket(35, 6); // L: 40
+		field2857 = new ClientPacket(36, -1); // L: 41
+		field2839 = new ClientPacket(37, 3); // L: 42
+		field2840 = new ClientPacket(38, 11); // L: 43
+		field2882 = new ClientPacket(39, 15); // L: 44
+		field2842 = new ClientPacket(40, 4); // L: 45
+		field2843 = new ClientPacket(41, 8); // L: 46
+		field2844 = new ClientPacket(42, 8); // L: 47
+		field2802 = new ClientPacket(43, 8); // L: 48
+		field2846 = new ClientPacket(44, -1); // L: 49
+		field2841 = new ClientPacket(45, -2); // L: 50
+		field2827 = new ClientPacket(46, 3); // L: 51
+		field2807 = new ClientPacket(47, 3); // L: 52
+		field2824 = new ClientPacket(48, 5); // L: 53
+		field2851 = new ClientPacket(49, -1); // L: 54
+		field2852 = new ClientPacket(50, -1); // L: 55
+		field2845 = new ClientPacket(51, -1); // L: 56
+		field2854 = new ClientPacket(52, -1); // L: 57
+		field2826 = new ClientPacket(53, 7); // L: 58
+		field2856 = new ClientPacket(54, 7); // L: 59
+		field2848 = new ClientPacket(55, 0); // L: 60
+		field2858 = new ClientPacket(56, 7); // L: 61
+		field2859 = new ClientPacket(57, -1); // L: 62
+		field2860 = new ClientPacket(58, -1); // L: 63
+		field2812 = new ClientPacket(59, 3); // L: 64
+		field2849 = new ClientPacket(60, -2); // L: 65
+		field2863 = new ClientPacket(61, 3); // L: 66
+		field2810 = new ClientPacket(62, 8); // L: 67
+		field2865 = new ClientPacket(63, 3); // L: 68
+		field2866 = new ClientPacket(64, 8); // L: 69
+		field2867 = new ClientPacket(65, 0); // L: 70
+		field2817 = new ClientPacket(66, 8); // L: 71
+		field2869 = new ClientPacket(67, 4); // L: 72
+		field2870 = new ClientPacket(68, 7); // L: 73
+		field2901 = new ClientPacket(69, 11); // L: 74
+		field2872 = new ClientPacket(70, 3); // L: 75
+		field2873 = new ClientPacket(71, 6); // L: 76
+		field2874 = new ClientPacket(72, 8); // L: 77
+		field2864 = new ClientPacket(73, 11); // L: 78
+		field2876 = new ClientPacket(74, 3); // L: 79
+		field2877 = new ClientPacket(75, 8); // L: 80
+		field2818 = new ClientPacket(76, 7); // L: 81
+		field2879 = new ClientPacket(77, 4); // L: 82
+		field2893 = new ClientPacket(78, -1); // L: 83
+		field2881 = new ClientPacket(79, 2); // L: 84
+		field2850 = new ClientPacket(80, 15); // L: 85
+		field2883 = new ClientPacket(81, 7); // L: 86
+		field2884 = new ClientPacket(82, 8); // L: 87
+		field2885 = new ClientPacket(83, 3); // L: 88
+		field2886 = new ClientPacket(84, 14); // L: 89
+		field2887 = new ClientPacket(85, 3); // L: 90
+		field2888 = new ClientPacket(86, -1); // L: 91
+		field2890 = new ClientPacket(87, 10); // L: 92
+		field2871 = new ClientPacket(88, 8); // L: 93
+		field2904 = new ClientPacket(89, 13); // L: 94
+		field2892 = new ClientPacket(90, 3); // L: 95
+		field2889 = new ClientPacket(91, -1); // L: 96
+		field2813 = new ClientPacket(92, 3); // L: 97
+		field2895 = new ClientPacket(93, -1); // L: 98
+		field2896 = new ClientPacket(94, 7); // L: 99
+		field2897 = new ClientPacket(95, -1); // L: 100
+		field2898 = new ClientPacket(96, 0); // L: 101
+		field2899 = new ClientPacket(97, -2); // L: 102
+		field2900 = new ClientPacket(98, -1); // L: 103
+		field2878 = new ClientPacket(99, -1); // L: 104
+		field2902 = new ClientPacket(100, 2); // L: 105
+		field2903 = new ClientPacket(101, -1); // L: 106
+		field2875 = new ClientPacket(102, -1); // L: 107
+		field2905 = new ClientPacket(103, -1); // L: 108
+		field2906 = new ClientPacket(104, 3); // L: 109
+		field2907 = new ClientPacket(105, -1); // L: 110
 	}
 
 	ClientPacket(int var1, int var2) {
@@ -664,109 +665,27 @@ public class ClientPacket implements class238 {
 		this.length = var2; // L: 116
 	} // L: 117
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "34"
-	)
-	public static boolean method4710(int var0) {
-		return (var0 & 1) != 0; // L: 9
-	}
-
-	@ObfuscatedName("gh")
-	@ObfuscatedSignature(
-		descriptor = "(Lct;B)V",
-		garbageValue = "-54"
-	)
-	static final void method4709(Actor var0) {
-		var0.isWalking = false; // L: 4458
-		SequenceDefinition var1;
-		if (var0.movementSequence != -1) { // L: 4459
-			var1 = MouseHandler.SequenceDefinition_get(var0.movementSequence); // L: 4460
-			if (var1 != null && var1.frameIds != null) { // L: 4461
-				++var0.movementFrameCycle; // L: 4462
-				if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4463
-					var0.movementFrameCycle = 1; // L: 4464
-					++var0.movementFrame; // L: 4465
-					Interpreter.method1872(var1, var0.movementFrame, var0.x, var0.y); // L: 4466
-				}
-
-				if (var0.movementFrame >= var1.frameIds.length) { // L: 4468
-					var0.movementFrameCycle = 0; // L: 4469
-					var0.movementFrame = 0; // L: 4470
-					Interpreter.method1872(var1, var0.movementFrame, var0.x, var0.y); // L: 4471
-				}
-			} else {
-				var0.movementSequence = -1; // L: 4474
-			}
-		}
-
-		if (var0.spotAnimation != -1 && Client.cycle >= var0.field1125) { // L: 4476
-			if (var0.spotAnimationFrame < 0) { // L: 4477
-				var0.spotAnimationFrame = 0;
-			}
-
-			int var3 = BZip2State.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4478
-			if (var3 != -1) { // L: 4479
-				SequenceDefinition var2 = MouseHandler.SequenceDefinition_get(var3); // L: 4480
-				if (var2 != null && var2.frameIds != null) { // L: 4481
-					++var0.spotAnimationFrameCycle; // L: 4482
-					if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 4483
-						var0.spotAnimationFrameCycle = 1; // L: 4484
-						++var0.spotAnimationFrame; // L: 4485
-						Interpreter.method1872(var2, var0.spotAnimationFrame, var0.x, var0.y); // L: 4486
-					}
-
-					if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { // L: 4488 4489
-						var0.spotAnimation = -1;
-					}
-				} else {
-					var0.spotAnimation = -1; // L: 4492
-				}
-			} else {
-				var0.spotAnimation = -1; // L: 4494
-			}
-		}
-
-		if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4496
-			var1 = MouseHandler.SequenceDefinition_get(var0.sequence); // L: 4497
-			if (var1.field1963 == 1 && var0.field1144 > 0 && var0.field1131 <= Client.cycle && var0.field1132 < Client.cycle) { // L: 4498 4499
-				var0.sequenceDelay = 1; // L: 4500
-				return; // L: 4501
-			}
-		}
-
-		if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4505
-			var1 = MouseHandler.SequenceDefinition_get(var0.sequence); // L: 4506
-			if (var1 != null && var1.frameIds != null) { // L: 4507
-				++var0.sequenceFrameCycle; // L: 4508
-				if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4509
-					var0.sequenceFrameCycle = 1; // L: 4510
-					++var0.sequenceFrame; // L: 4511
-					Interpreter.method1872(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4512
-				}
+	@ObfuscatedName("hy")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "1131418917"
+	)
+	static final void method5001(boolean var0) {
+		class148.playPcmPlayers(); // L: 6323
+		++Client.packetWriter.pendingWrites; // L: 6324
+		if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 6325
+			Client.packetWriter.pendingWrites = 0; // L: 6326
+			if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 6327
+				PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(field2814, Client.packetWriter.isaacCipher); // L: 6329
+				Client.packetWriter.addNode(var1); // L: 6330
 
-				if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4514
-					var0.sequenceFrame -= var1.frameCount; // L: 4515
-					++var0.field1116; // L: 4516
-					if (var0.field1116 >= var1.field1962) { // L: 4517
-						var0.sequence = -1;
-					} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4518
-						Interpreter.method1872(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4519
-					} else {
-						var0.sequence = -1;
-					}
+				try {
+					Client.packetWriter.flush(); // L: 6332
+				} catch (IOException var3) { // L: 6334
+					Client.hadNetworkError = true; // L: 6335
 				}
-
-				var0.isWalking = var1.field1958; // L: 4521
-			} else {
-				var0.sequence = -1; // L: 4523
 			}
-		}
 
-		if (var0.sequenceDelay > 0) { // L: 4525
-			--var0.sequenceDelay;
 		}
-
-	} // L: 4526
+	} // L: 6338
 }
diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java
index 3eee81bb1a..e923f78dca 100644
--- a/runescape-client/src/main/java/ClientPreferences.java
+++ b/runescape-client/src/main/java/ClientPreferences.java
@@ -1,4 +1,4 @@
-import java.lang.management.GarbageCollectorMXBean;
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
@@ -8,63 +8,60 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cs")
+@ObfuscatedName("cc")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1485573005
+		intValue = -1737169407
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("aj")
-	@Export("garbageCollector")
-	static GarbageCollectorMXBean garbageCollector;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -884769931
+		intValue = -194276067
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("brightness")
 	double brightness;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -162381111
+		intValue = -1211221709
 	)
 	@Export("musicVolume")
 	int musicVolume;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 452159187
+		intValue = 442935595
 	)
 	@Export("soundEffectsVolume")
 	int soundEffectsVolume;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1910295805
+		intValue = -383218273
 	)
 	@Export("areaSoundEffectsVolume")
 	int areaSoundEffectsVolume;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1017713591
+		intValue = 1553838981
 	)
-	int field1182;
-	@ObfuscatedName("k")
+	int field1197;
+	@ObfuscatedName("d")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
@@ -80,13 +77,13 @@ public class ClientPreferences {
 		this.musicVolume = 127;
 		this.soundEffectsVolume = 127;
 		this.areaSoundEffectsVolume = 127;
-		this.field1182 = -1;
+		this.field1197 = -1;
 		this.parameters = new LinkedHashMap();
-		this.method2231(true); // L: 26
+		this.method2282(true); // L: 26
 	} // L: 27
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1; // L: 15
@@ -96,7 +93,7 @@ public class ClientPreferences {
 		this.musicVolume = 127; // L: 19
 		this.soundEffectsVolume = 127; // L: 20
 		this.areaSoundEffectsVolume = 127; // L: 21
-		this.field1182 = -1; // L: 22
+		this.field1197 = -1; // L: 22
 		this.parameters = new LinkedHashMap(); // L: 23
 		if (var1 != null && var1.array != null) { // L: 30
 			int var2 = var1.readUnsignedByte(); // L: 34
@@ -114,10 +111,10 @@ public class ClientPreferences {
 				}
 
 				if (var2 > 2) { // L: 46
-					int var3 = var1.readUnsignedByte(); // L: 47
+					int var3 = var1.readUnsignedByte();
 
-					for (int var4 = 0; var4 < var3; ++var4) { // L: 48
-						int var5 = var1.readInt(); // L: 49
+					for (int var4 = 0; var4 < var3; ++var4) {
+						int var5 = var1.readInt();
 						int var6 = var1.readInt(); // L: 50
 						this.parameters.put(var5, var6); // L: 51
 					}
@@ -139,29 +136,29 @@ public class ClientPreferences {
 				}
 
 				if (var2 > 7) { // L: 66
-					this.field1182 = var1.readUnsignedByte(); // L: 67
+					this.field1197 = var1.readUnsignedByte(); // L: 67
 				}
 			} else {
-				this.method2231(true); // L: 36
+				this.method2282(true); // L: 36
 			}
 		} else {
-			this.method2231(true); // L: 31
+			this.method2282(true); // L: 31
 		}
 
 	} // L: 71
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)V",
-		garbageValue = "-1940266105"
+		garbageValue = "-1565386300"
 	)
-	void method2231(boolean var1) {
+	void method2282(boolean var1) {
 	} // L: 73
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lop;",
-		garbageValue = "2037390205"
+		descriptor = "(I)Lpi;",
+		garbageValue = "-102724797"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -185,7 +182,89 @@ Buffer toBuffer() {
 		var1.writeByte(this.musicVolume); // L: 92
 		var1.writeByte(this.soundEffectsVolume); // L: 93
 		var1.writeByte(this.areaSoundEffectsVolume); // L: 94
-		var1.writeByte(this.field1182); // L: 95
+		var1.writeByte(this.field1197); // L: 95
 		return var1; // L: 96
 	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "-1263017108"
+	)
+	public static void method2297(boolean var0) {
+		if (NetCache.NetCache_socket != null) { // L: 193
+			try {
+				Buffer var1 = new Buffer(4); // L: 195
+				var1.writeByte(var0 ? 2 : 3); // L: 196
+				var1.writeMedium(0); // L: 197
+				NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 198
+			} catch (IOException var4) {
+				try {
+					NetCache.NetCache_socket.close(); // L: 202
+				} catch (Exception var3) { // L: 204
+				}
+
+				++NetCache.NetCache_ioExceptions; // L: 205
+				NetCache.NetCache_socket = null; // L: 206
+			}
+
+		}
+	} // L: 208
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Lku;Ljava/lang/String;Ljava/lang/String;B)Lpa;",
+		garbageValue = "53"
+	)
+	@Export("SpriteBuffer_getIndexedSpriteByName")
+	public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
+		int var3 = var0.getGroupId(var1); // L: 47
+		int var4 = var0.getFileId(var3, var2); // L: 48
+		return class4.method22(var0, var3, var4); // L: 49
+	}
+
+	@ObfuscatedName("jj")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;IIIIIII)V",
+		garbageValue = "523505155"
+	)
+	static final void method2293(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (Client.field543) { // L: 10990
+			Client.alternativeScrollbarWidth = 32;
+		} else {
+			Client.alternativeScrollbarWidth = 0; // L: 10991
+		}
+
+		Client.field543 = false; // L: 10992
+		int var7;
+		if (MouseHandler.MouseHandler_currentButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10993
+			if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10994
+				var0.scrollY -= 4; // L: 10995
+				SecureRandomCallable.invalidateWidget(var0); // L: 10996
+			} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10998
+				var0.scrollY += 4; // L: 10999
+				SecureRandomCallable.invalidateWidget(var0); // L: 11000
+			} else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 11002
+				var7 = var3 * (var3 - 32) / var4; // L: 11003
+				if (var7 < 8) { // L: 11004
+					var7 = 8;
+				}
+
+				int var8 = var6 - var2 - 16 - var7 / 2; // L: 11005
+				int var9 = var3 - 32 - var7; // L: 11006
+				var0.scrollY = var8 * (var4 - var3) / var9; // L: 11007
+				SecureRandomCallable.invalidateWidget(var0); // L: 11008
+				Client.field543 = true; // L: 11009
+			}
+		}
+
+		if (Client.mouseWheelRotation != 0) { // L: 11012
+			var7 = var0.width; // L: 11013
+			if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 11014
+				var0.scrollY += Client.mouseWheelRotation * 45; // L: 11015
+				SecureRandomCallable.invalidateWidget(var0); // L: 11016
+			}
+		}
+
+	} // L: 11019
 }
diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java
index 2be7f32cb5..cd9b9629aa 100644
--- a/runescape-client/src/main/java/Clock.java
+++ b/runescape-client/src/main/java/Clock.java
@@ -3,48 +3,141 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ee")
+@ObfuscatedName("fv")
 @Implements("Clock")
 public abstract class Clock {
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "Lee;"
-	)
-	@Export("clock")
-	protected static Clock clock;
-
 	Clock() {
 	} // L: 4
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1421350581"
+		descriptor = "(B)V",
+		garbageValue = "18"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "1121035205"
+		garbageValue = "293215312"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);
 
-	@ObfuscatedName("fm")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "2"
+		descriptor = "(IILgv;Lgf;I)Z",
+		garbageValue = "-1365814358"
 	)
-	static final void method2960() {
-		if (Client.logoutTimer > 0) { // L: 3275
-			SequenceDefinition.logOut(); // L: 3276
-		} else {
-			Client.timer.method5978(); // L: 3279
-			WorldMapData_1.updateGameState(40); // L: 3280
-			Projectile.field915 = Client.packetWriter.getSocket(); // L: 3281
-			Client.packetWriter.removeSocket(); // L: 3282
+	public static final boolean method3132(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
+		int var4 = var0; // L: 19
+		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
+		class186.directions[var6][var7] = 99; // L: 25
+		class186.distances[var6][var7] = 0; // L: 26
+		byte var10 = 0; // L: 27
+		int var11 = 0; // L: 28
+		class186.bufferX[var10] = var0; // L: 29
+		byte var10001 = var10;
+		int var18 = var10 + 1;
+		class186.bufferY[var10001] = var1; // L: 30
+		int[][] var12 = var3.flags; // L: 31
+
+		while (var18 != var11) { // L: 32
+			var4 = class186.bufferX[var11]; // L: 33
+			var5 = class186.bufferY[var11]; // L: 34
+			var11 = var11 + 1 & 4095; // L: 35
+			int var16 = var4 - var8; // L: 36
+			int var17 = var5 - var9; // L: 37
+			int var13 = var4 - var3.xInset; // L: 38
+			int var14 = var5 - var3.yInset; // L: 39
+			if (var2.hasArrived(2, var4, var5, var3)) { // L: 40
+				class186.field2129 = var4; // L: 41
+				class186.field2130 = var5; // L: 42
+				return true; // L: 43
+			}
+
+			int var15 = class186.distances[var16][var17] + 1; // L: 45
+			if (var16 > 0 && class186.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 46 47 48 49
+				class186.bufferX[var18] = var4 - 1; // L: 50
+				class186.bufferY[var18] = var5; // L: 51
+				var18 = var18 + 1 & 4095; // L: 52
+				class186.directions[var16 - 1][var17] = 2; // L: 53
+				class186.distances[var16 - 1][var17] = var15; // L: 54
+			}
+
+			if (var16 < 126 && class186.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 56 57 58 59
+				class186.bufferX[var18] = var4 + 1; // L: 60
+				class186.bufferY[var18] = var5; // L: 61
+				var18 = var18 + 1 & 4095; // L: 62
+				class186.directions[var16 + 1][var17] = 8; // L: 63
+				class186.distances[var16 + 1][var17] = var15; // L: 64
+			}
+
+			if (var17 > 0 && class186.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 66 67 68 69
+				class186.bufferX[var18] = var4; // L: 70
+				class186.bufferY[var18] = var5 - 1; // L: 71
+				var18 = var18 + 1 & 4095; // L: 72
+				class186.directions[var16][var17 - 1] = 1; // L: 73
+				class186.distances[var16][var17 - 1] = var15; // L: 74
+			}
+
+			if (var17 < 126 && class186.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 76 77 78 79
+				class186.bufferX[var18] = var4; // L: 80
+				class186.bufferY[var18] = var5 + 1; // L: 81
+				var18 = var18 + 1 & 4095; // L: 82
+				class186.directions[var16][var17 + 1] = 4; // L: 83
+				class186.distances[var16][var17 + 1] = var15; // L: 84
+			}
+
+			if (var16 > 0 && var17 > 0 && class186.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: 86 87 88 89 90
+				class186.bufferX[var18] = var4 - 1; // L: 91
+				class186.bufferY[var18] = var5 - 1; // L: 92
+				var18 = var18 + 1 & 4095; // L: 93
+				class186.directions[var16 - 1][var17 - 1] = 3; // L: 94
+				class186.distances[var16 - 1][var17 - 1] = var15; // L: 95
+			}
+
+			if (var16 < 126 && var17 > 0 && class186.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: 97 98 99 100 101
+				class186.bufferX[var18] = var4 + 1; // L: 102
+				class186.bufferY[var18] = var5 - 1; // L: 103
+				var18 = var18 + 1 & 4095; // L: 104
+				class186.directions[var16 + 1][var17 - 1] = 9; // L: 105
+				class186.distances[var16 + 1][var17 - 1] = var15; // L: 106
+			}
+
+			if (var16 > 0 && var17 < 126 && class186.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: 108 109 110 111 112
+				class186.bufferX[var18] = var4 - 1; // L: 113
+				class186.bufferY[var18] = var5 + 1; // L: 114
+				var18 = var18 + 1 & 4095; // L: 115
+				class186.directions[var16 - 1][var17 + 1] = 6; // L: 116
+				class186.distances[var16 - 1][var17 + 1] = var15; // L: 117
+			}
+
+			if (var16 < 126 && var17 < 126 && class186.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: 119 120 121 122 123
+				class186.bufferX[var18] = var4 + 1; // L: 124
+				class186.bufferY[var18] = var5 + 1; // L: 125
+				var18 = var18 + 1 & 4095; // L: 126
+				class186.directions[var16 + 1][var17 + 1] = 12; // L: 127
+				class186.distances[var16 + 1][var17 + 1] = var15; // L: 128
+			}
 		}
-	} // L: 3277 3283
+
+		class186.field2129 = var4; // L: 131
+		class186.field2130 = var5; // L: 132
+		return false; // L: 133
+	}
+
+	@ObfuscatedName("ib")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1758808964"
+	)
+	static void method3144() {
+		MouseHandler.method646(GameObject.menuWidth / 2 + ModeWhere.menuX, BufferedSink.menuY); // L: 8970
+	} // L: 8971
 }
diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java
index 202c39487d..d971f67cee 100644
--- a/runescape-client/src/main/java/CollisionMap.java
+++ b/runescape-client/src/main/java/CollisionMap.java
@@ -1,40 +1,43 @@
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
 
-@ObfuscatedName("fq")
+@ObfuscatedName("gf")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("as")
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("Widget_archive")
+	static AbstractArchive Widget_archive;
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = 391726433
+		intValue = -468449553
 	)
 	@Export("xInset")
 	public int xInset;
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = -2116687229
+		intValue = 1145848025
 	)
 	@Export("yInset")
 	public int yInset;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 1517170261
+		intValue = -19746195
 	)
 	@Export("xSize")
 	int xSize;
 	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 1280119157
+		intValue = -626517961
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@Export("flags")
 	public int[][] flags;
 
@@ -47,10 +50,10 @@ public CollisionMap(int var1, int var2) {
 		this.clear(); // L: 49
 	} // L: 50
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "981190902"
+		garbageValue = "1388482876"
 	)
 	@Export("clear")
 	public void clear() {
@@ -66,12 +69,12 @@ public void clear() {
 
 	} // L: 59
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIZI)V",
-		garbageValue = "-696909470"
+		garbageValue = "-785660455"
 	)
-	public void method3465(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3721(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
@@ -151,82 +154,82 @@ public void method3465(int var1, int var2, int var3, int var4, boolean var5) {
 					this.setFlag(var1 - 1, var2, 4096); // L: 126
 				}
 
-				if (var4 == 1) {
-					this.setFlag(var1, var2, 1024);
-					this.setFlag(var1, var2 + 1, 16384);
+				if (var4 == 1) { // L: 128
+					this.setFlag(var1, var2, 1024); // L: 129
+					this.setFlag(var1, var2 + 1, 16384); // L: 130
 				}
 
-				if (var4 == 2) {
-					this.setFlag(var1, var2, 4096);
-					this.setFlag(var1 + 1, var2, 65536);
+				if (var4 == 2) { // L: 132
+					this.setFlag(var1, var2, 4096); // L: 133
+					this.setFlag(var1 + 1, var2, 65536); // L: 134
 				}
 
-				if (var4 == 3) {
+				if (var4 == 3) { // L: 136
 					this.setFlag(var1, var2, 16384); // L: 137
-					this.setFlag(var1, var2 - 1, 1024);
+					this.setFlag(var1, var2 - 1, 1024); // L: 138
 				}
 			}
 
-			if (var3 == 1 || var3 == 3) {
-				if (var4 == 0) {
-					this.setFlag(var1, var2, 512);
-					this.setFlag(var1 - 1, var2 + 1, 8192);
+			if (var3 == 1 || var3 == 3) { // L: 141
+				if (var4 == 0) { // L: 142
+					this.setFlag(var1, var2, 512); // L: 143
+					this.setFlag(var1 - 1, var2 + 1, 8192); // L: 144
 				}
 
-				if (var4 == 1) {
-					this.setFlag(var1, var2, 2048);
+				if (var4 == 1) { // L: 146
+					this.setFlag(var1, var2, 2048); // L: 147
 					this.setFlag(var1 + 1, var2 + 1, 32768); // L: 148
 				}
 
-				if (var4 == 2) {
-					this.setFlag(var1, var2, 8192);
-					this.setFlag(var1 + 1, var2 - 1, 512);
+				if (var4 == 2) { // L: 150
+					this.setFlag(var1, var2, 8192); // L: 151
+					this.setFlag(var1 + 1, var2 - 1, 512); // L: 152
 				}
 
-				if (var4 == 3) {
-					this.setFlag(var1, var2, 32768);
-					this.setFlag(var1 - 1, var2 - 1, 2048);
+				if (var4 == 3) { // L: 154
+					this.setFlag(var1, var2, 32768); // L: 155
+					this.setFlag(var1 - 1, var2 - 1, 2048); // L: 156
 				}
 			}
 
-			if (var3 == 2) {
-				if (var4 == 0) {
-					this.setFlag(var1, var2, 66560);
+			if (var3 == 2) { // L: 159
+				if (var4 == 0) { // L: 160
+					this.setFlag(var1, var2, 66560); // L: 161
 					this.setFlag(var1 - 1, var2, 4096); // L: 162
 					this.setFlag(var1, var2 + 1, 16384); // L: 163
 				}
 
-				if (var4 == 1) {
-					this.setFlag(var1, var2, 5120);
-					this.setFlag(var1, var2 + 1, 16384);
-					this.setFlag(var1 + 1, var2, 65536);
+				if (var4 == 1) { // L: 165
+					this.setFlag(var1, var2, 5120); // L: 166
+					this.setFlag(var1, var2 + 1, 16384); // L: 167
+					this.setFlag(var1 + 1, var2, 65536); // L: 168
 				}
 
 				if (var4 == 2) { // L: 170
-					this.setFlag(var1, var2, 20480);
-					this.setFlag(var1 + 1, var2, 65536);
-					this.setFlag(var1, var2 - 1, 1024);
+					this.setFlag(var1, var2, 20480); // L: 171
+					this.setFlag(var1 + 1, var2, 65536); // L: 172
+					this.setFlag(var1, var2 - 1, 1024); // L: 173
 				}
 
-				if (var4 == 3) {
-					this.setFlag(var1, var2, 81920);
-					this.setFlag(var1, var2 - 1, 1024);
-					this.setFlag(var1 - 1, var2, 4096);
+				if (var4 == 3) { // L: 175
+					this.setFlag(var1, var2, 81920); // L: 176
+					this.setFlag(var1, var2 - 1, 1024); // L: 177
+					this.setFlag(var1 - 1, var2, 4096); // L: 178
 				}
 			}
 		}
 
-	}
+	} // L: 182
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIZI)V",
-		garbageValue = "-507434937"
+		garbageValue = "517630840"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
-		int var6 = 256;
-		if (var5) {
+		int var6 = 256; // L: 185
+		if (var5) { // L: 186
 			var6 += 131072;
 		}
 
@@ -243,51 +246,51 @@ public void addGameObject(int var1, int var2, int var3, int var4, boolean var5)
 			}
 		}
 
-	}
+	} // L: 196
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-1882493146"
+		garbageValue = "729918482"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
-		var1 -= this.xInset;
-		var2 -= this.yInset;
+		var1 -= this.xInset; // L: 199
+		var2 -= this.yInset; // L: 200
 		int[] var10000 = this.flags[var1]; // L: 201
 		var10000[var2] |= 2097152;
-	}
+	} // L: 202
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(IIB)V",
-		garbageValue = "71"
+		garbageValue = "-66"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
-		var1 -= this.xInset;
-		var2 -= this.yInset;
+		var1 -= this.xInset; // L: 205
+		var2 -= this.yInset; // L: 206
 		int[] var10000 = this.flags[var1]; // L: 207
 		var10000[var2] |= 262144;
-	}
+	} // L: 208
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "-1002118940"
+		garbageValue = "-262672320"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
 		int[] var10000 = this.flags[var1]; // L: 211
 		var10000[var2] |= var3;
-	}
+	} // L: 212
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIZI)V",
-		garbageValue = "569667708"
+		garbageValue = "508874863"
 	)
-	public void method3470(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3693(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
@@ -434,10 +437,10 @@ public void method3470(int var1, int var2, int var3, int var4, boolean var5) {
 
 	} // L: 335
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIZI)V",
-		garbageValue = "230890481"
+		descriptor = "(IIIIIZB)V",
+		garbageValue = "8"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -467,10 +470,10 @@ public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5
 
 	} // L: 354
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "265042064"
+		garbageValue = "-313256425"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -478,161 +481,15 @@ void setFlagOff(int var1, int var2, int var3) {
 		var10000[var2] &= ~var3;
 	} // L: 358
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "1834026790"
+		garbageValue = "-1207646321"
 	)
-	public void method3479(int var1, int var2) {
+	public void method3701(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("s")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "696499017"
-	)
-	@Export("readReflectionCheck")
-	public static void readReflectionCheck(Buffer var0, int var1) {
-		ReflectionCheck var2 = new ReflectionCheck(); // L: 127
-		var2.size = var0.readUnsignedByte(); // L: 128
-		var2.id = var0.readInt(); // L: 129
-		var2.operations = new int[var2.size]; // L: 130
-		var2.creationErrors = new int[var2.size]; // L: 131
-		var2.fields = new Field[var2.size]; // L: 132
-		var2.intReplaceValues = new int[var2.size]; // L: 133
-		var2.methods = new Method[var2.size]; // L: 134
-		var2.arguments = new byte[var2.size][][]; // L: 135
-
-		for (int var3 = 0; var3 < var2.size; ++var3) { // L: 136
-			try {
-				int var4 = var0.readUnsignedByte(); // L: 138
-				String var5;
-				String var6;
-				int var7;
-				if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 139
-					if (var4 == 3 || var4 == 4) { // L: 149
-						var5 = var0.readStringCp1252NullTerminated(); // L: 150
-						var6 = var0.readStringCp1252NullTerminated(); // L: 151
-						var7 = var0.readUnsignedByte(); // L: 152
-						String[] var8 = new String[var7]; // L: 153
-
-						for (int var9 = 0; var9 < var7; ++var9) { // L: 154
-							var8[var9] = var0.readStringCp1252NullTerminated();
-						}
-
-						String var20 = var0.readStringCp1252NullTerminated(); // L: 155
-						byte[][] var10 = new byte[var7][]; // L: 156
-						int var12;
-						if (var4 == 3) { // L: 157
-							for (int var11 = 0; var11 < var7; ++var11) { // L: 158
-								var12 = var0.readInt(); // L: 159
-								var10[var11] = new byte[var12]; // L: 160
-								var0.readBytes(var10[var11], 0, var12); // L: 161
-							}
-						}
-
-						var2.operations[var3] = var4; // L: 164
-						Class[] var21 = new Class[var7]; // L: 165
-
-						for (var12 = 0; var12 < var7; ++var12) { // L: 166
-							var21[var12] = WorldMapLabelSize.loadClassFromDescriptor(var8[var12]);
-						}
-
-						Class var22 = WorldMapLabelSize.loadClassFromDescriptor(var20); // L: 167
-						if (WorldMapLabelSize.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 168
-							throw new SecurityException();
-						}
-
-						Method[] var13 = WorldMapLabelSize.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 169
-						Method[] var14 = var13; // L: 171
-
-						for (int var15 = 0; var15 < var14.length; ++var15) { // L: 172
-							Method var16 = var14[var15]; // L: 173
-							if (Reflection.getMethodName(var16).equals(var6)) { // L: 175
-								Class[] var17 = Reflection.getParameterTypes(var16); // L: 176
-								if (var17.length == var21.length) { // L: 177
-									boolean var18 = true; // L: 178
-
-									for (int var19 = 0; var19 < var21.length; ++var19) { // L: 179
-										if (var21[var19] != var17[var19]) { // L: 180
-											var18 = false; // L: 181
-											break; // L: 182
-										}
-									}
-
-									if (var18 && var22 == var16.getReturnType()) { // L: 185
-										var2.methods[var3] = var16; // L: 186
-									}
-								}
-							}
-						}
-
-						var2.arguments[var3] = var10; // L: 193
-					}
-				} else {
-					var5 = var0.readStringCp1252NullTerminated(); // L: 140
-					var6 = var0.readStringCp1252NullTerminated(); // L: 141
-					var7 = 0; // L: 142
-					if (var4 == 1) { // L: 143
-						var7 = var0.readInt();
-					}
-
-					var2.operations[var3] = var4; // L: 144
-					var2.intReplaceValues[var3] = var7; // L: 145
-					if (WorldMapLabelSize.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 146
-						throw new SecurityException();
-					}
-
-					var2.fields[var3] = Reflection.findField(WorldMapLabelSize.loadClassFromDescriptor(var5), var6); // L: 147
-				}
-			} catch (ClassNotFoundException var24) { // L: 196
-				var2.creationErrors[var3] = -1; // L: 197
-			} catch (SecurityException var25) { // L: 199
-				var2.creationErrors[var3] = -2; // L: 200
-			} catch (NullPointerException var26) { // L: 202
-				var2.creationErrors[var3] = -3; // L: 203
-			} catch (Exception var27) { // L: 205
-				var2.creationErrors[var3] = -4; // L: 206
-			} catch (Throwable var28) { // L: 208
-				var2.creationErrors[var3] = -5; // L: 209
-			}
-		}
-
-		class54.reflectionChecks.addFirst(var2); // L: 212
-	} // L: 213
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-67"
-	)
-	public static void method3492() {
-		ItemComposition.ItemDefinition_cached.clear(); // L: 548
-		ItemComposition.ItemDefinition_cachedModels.clear(); // L: 549
-		ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 550
-	} // L: 551
-
-	@ObfuscatedName("ff")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "121"
-	)
-	@Export("forceDisconnect")
-	static final void forceDisconnect(int var0) {
-		SequenceDefinition.logOut(); // L: 3194
-		switch(var0) { // L: 3195
-		case 1:
-			class275.method5201(24); // L: 3199
-			class1.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 3200
-			break;
-		case 2:
-			class275.method5201(24); // L: 3207
-			class1.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 3208
-		}
-
-	} // L: 3213
 }
diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java
index 198c7b998b..83e256839c 100644
--- a/runescape-client/src/main/java/Coord.java
+++ b/runescape-client/src/main/java/Coord.java
@@ -4,30 +4,38 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ie")
+@ObfuscatedName("ju")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
+	@Export("operatingSystemName")
+	public static String operatingSystemName;
+	@ObfuscatedName("gu")
+	@ObfuscatedSignature(
+		descriptor = "Lmd;"
+	)
+	static AbstractSocket field3186;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 530097433
+		intValue = 2028633895
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 780251377
+		intValue = -115571391
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1509887785
+		intValue = -193761027
 	)
 	@Export("y")
 	public int y;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lie;)V"
+		descriptor = "(Lju;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane; // L: 15
@@ -52,10 +60,10 @@ public Coord(int var1) {
 
 	} // L: 27
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1761065408"
+		garbageValue = "844590476"
 	)
 	@Export("packed")
 	public int packed() {
@@ -66,65 +74,45 @@ public int packed() {
 		return var1; // L: 37
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lie;I)Z",
-		garbageValue = "-1713093595"
+		descriptor = "(Lju;B)Z",
+		garbageValue = "-21"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
-		if (this.plane != var1.plane) { // L: 47
+		if (this.plane != var1.plane) { // L: 48
 			return false;
-		} else if (this.x != var1.x) { // L: 48
+		} else if (this.x != var1.x) { // L: 49
 			return false;
 		} else {
-			return this.y == var1.y; // L: 49
+			return this.y == var1.y; // L: 50
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-492056812"
+		garbageValue = "1213799253"
 	)
 	@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: 62
+		return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 64
 	}
 
-	public int hashCode() {
-		return this.packed();
+	public String toString() {
+		return this.toString(","); // L: 60
 	}
 
 	public boolean equals(Object var1) {
-		if (this == var1) { // L: 41
+		if (this == var1) { // L: 42
 			return true;
 		} else {
-			return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 42 43
+			return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 43 44
 		}
 	}
 
-	public String toString() {
-		return this.toString(","); // L: 58
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-65"
-	)
-	public static void method5011() {
-		while (true) {
-			ArchiveDiskAction var0;
-			synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 50
-				var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 51
-			} // L: 52
-
-			if (var0 == null) { // L: 53
-				return;
-			}
-
-			var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 54
-		}
+	public int hashCode() {
+		return this.packed(); // L: 56
 	}
 }
diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java
index 8d1ad03860..9e84767bad 100644
--- a/runescape-client/src/main/java/Decimator.java
+++ b/runescape-client/src/main/java/Decimator.java
@@ -4,178 +4,1029 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("aa")
+@ObfuscatedName("bp")
 @Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1492470375
+		intValue = -188292449
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1711646651
+		intValue = -559769321
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("table")
 	int[][] table;
 
 	public Decimator(int var1, int var2) {
 		if (var2 != var1) { // L: 14
-			int var4 = var1; // L: 16
-			int var5 = var2; // L: 17
-			if (var2 > var1) { // L: 19
-				var4 = var2; // L: 21
-				var5 = var1; // L: 22
-			}
-
-			while (var5 != 0) { // L: 24
-				int var6 = var4 % var5; // L: 25
-				var4 = var5; // L: 26
-				var5 = var6; // L: 27
-			}
-
-			var1 /= var4; // L: 32
-			var2 /= var4; // L: 33
-			this.inputRate = var1; // L: 34
-			this.outputRate = var2; // L: 35
-			this.table = new int[var1][14]; // L: 36
+			int var3 = WorldMapCacheName.method4865(var1, var2); // L: 15
+			var1 /= var3; // L: 16
+			var2 /= var3; // L: 17
+			this.inputRate = var1; // L: 18
+			this.outputRate = var2; // L: 19
+			this.table = new int[var1][14]; // L: 20
 
-			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;
+			for (int var4 = 0; var4 < var1; ++var4) { // L: 21
+				int[] var5 = this.table[var4]; // L: 22
+				double var6 = (double)var4 / (double)var1 + 6.0D; // L: 23
+				int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); // L: 24
+				if (var8 < 0) { // L: 25
+					var8 = 0;
 				}
 
-				int var12 = (int)Math.ceil(var9 + 7.0D); // L: 42
-				if (var12 > 14) { // L: 43
-					var12 = 14;
+				int var9 = (int)Math.ceil(7.0D + var6); // L: 26
+				if (var9 > 14) { // L: 27
+					var9 = 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);
+				for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { // L: 28 29
+					double var12 = ((double)var8 - var6) * 3.141592653589793D; // L: 30
+					double var14 = var10; // L: 31
+					if (var12 < -1.0E-4D || var12 > 1.0E-4D) {
+						var14 = var10 * (Math.sin(var12) / var12);
 					}
 
-					var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); // L: 49
-					var8[var11] = (int)Math.floor(var17 * 65536.0D + 0.5D); // L: 50
+					var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); // L: 33
+					var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D); // L: 34
 				}
 			}
 
 		}
-	} // L: 53
+	} // L: 37
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([BI)[B",
-		garbageValue = "-951677214"
+		descriptor = "([BB)[B",
+		garbageValue = "71"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
-		if (this.table != null) { // L: 56
-			int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; // L: 57
-			int[] var3 = new int[var2]; // L: 58
-			int var4 = 0; // L: 59
-			int var5 = 0; // L: 60
+		if (this.table != null) { // L: 40
+			int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 41
+			int[] var3 = new int[var2]; // L: 42
+			int var4 = 0; // L: 43
+			int var5 = 0; // L: 44
 
 			int var6;
-			for (var6 = 0; var6 < var1.length; ++var6) { // L: 61
-				byte var7 = var1[var6]; // L: 62
-				int[] var8 = this.table[var5]; // L: 63
+			for (var6 = 0; var6 < var1.length; ++var6) { // L: 45
+				byte var7 = var1[var6]; // L: 46
+				int[] var8 = this.table[var5]; // L: 47
 
 				int var9;
-				for (var9 = 0; var9 < 14; ++var9) { // L: 64
-					var3[var9 + var4] += var8[var9] * var7;
+				for (var9 = 0; var9 < 14; ++var9) { // L: 48
+					var3[var4 + var9] += var7 * var8[var9];
 				}
 
-				var5 += this.outputRate; // L: 65
-				var9 = var5 / this.inputRate; // L: 66
-				var4 += var9; // L: 67
-				var5 -= var9 * this.inputRate; // L: 68
+				var5 += this.outputRate; // L: 49
+				var9 = var5 / this.inputRate; // L: 50
+				var4 += var9; // L: 51
+				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
-				int var10 = var3[var6] + 32768 >> 16; // L: 72
-				if (var10 < -128) { // L: 73
+			for (var6 = 0; var6 < var2; ++var6) { // L: 55
+				int var10 = var3[var6] + 32768 >> 16; // L: 56
+				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("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "-441900901"
+		garbageValue = "679122393"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
-		if (this.table != null) { // L: 82
-			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate);
+		if (this.table != null) { // L: 66
+			var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate);
 		}
 
-		return var1; // L: 83
+		return var1; // L: 67
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "841868680"
+		descriptor = "(IB)I",
+		garbageValue = "-100"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
-		if (this.table != null) { // L: 87
-			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6;
+		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("c")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "1433736231"
+	)
+	static void method1073(int var0) {
+	} // L: 32
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(Lpj;IB)Z",
+		garbageValue = "1"
+	)
+	@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.field1248[var1] != null) { // L: 388
+					var11.read(Players.field1248[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.field1153[0] = Players.field1246[var1]; // L: 395
+				var11.plane = (byte)var8; // L: 396
+				var11.resetPath((var9 << 13) + var3 - class131.baseX, (var10 << 13) + var4 - TileItem.baseY); // L: 397
+				var11.field1055 = 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 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // 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 = var6 + var7 & 255; // L: 445
+				Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 446
+				return false; // L: 447
+			}
+		}
 	}
 
-	@ObfuscatedName("ip")
+	@ObfuscatedName("io")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-2093832763"
+		descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V",
+		garbageValue = "-646384904"
 	)
-	@Export("selectSpell")
-	static void selectSpell(int var0, int var1, int var2, int var3) {
-		Widget var4 = ItemContainer.getWidgetChild(var0, var1); // L: 9118
-		if (var4 != null && var4.onTargetEnter != null) { // L: 9119
-			ScriptEvent var5 = new ScriptEvent(); // L: 9120
-			var5.widget = var4; // L: 9121
-			var5.args = var4.onTargetEnter; // L: 9122
-			Tile.runScriptEvent(var5); // L: 9123
+	@Export("menuAction")
+	static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) {
+		if (var2 >= 2000) { // L: 9020
+			var2 -= 2000;
+		}
+
+		PacketBufferNode var8;
+		if (var2 == 1) { // L: 9021
+			Client.mouseCrossX = var6; // L: 9450
+			Client.mouseCrossY = var7; // L: 9451
+			Client.mouseCrossColor = 2; // L: 9452
+			Client.mouseCrossState = 0; // L: 9453
+			Client.destinationX = var0; // L: 9454
+			Client.destinationY = var1; // L: 9455
+			var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2831, Client.packetWriter.isaacCipher); // L: 9457
+			var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9458
+			var8.packetBuffer.writeShort(var3); // L: 9459
+			var8.packetBuffer.writeShort(class139.selectedItemId); // L: 9460
+			var8.packetBuffer.method7398(TileItem.baseY + var1); // L: 9461
+			var8.packetBuffer.method7407(MidiPcmStream.selectedItemWidget); // L: 9462
+			var8.packetBuffer.method7349(Calendar.selectedItemSlot); // L: 9463
+			var8.packetBuffer.method7349(var0 + class131.baseX); // L: 9464
+			Client.packetWriter.addNode(var8); // L: 9465
+		} else if (var2 == 2) {
+			Client.mouseCrossX = var6; // L: 9206
+			Client.mouseCrossY = var7; // L: 9207
+			Client.mouseCrossColor = 2; // L: 9208
+			Client.mouseCrossState = 0; // L: 9209
+			Client.destinationX = var0; // L: 9210
+			Client.destinationY = var1; // L: 9211
+			var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2850, Client.packetWriter.isaacCipher); // L: 9212
+			var8.packetBuffer.method7493(Client.selectedSpellChildIndex); // L: 9213
+			var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9214
+			var8.packetBuffer.method7527(class20.selectedSpellWidget); // L: 9215
+			var8.packetBuffer.method7398(Client.field633); // L: 9216
+			var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9217
+			var8.packetBuffer.method7493(var3); // L: 9218
+			var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9219
+			Client.packetWriter.addNode(var8); // L: 9220
+		} else if (var2 == 3) {
+			Client.mouseCrossX = var6; // L: 9389
+			Client.mouseCrossY = var7; // L: 9390
+			Client.mouseCrossColor = 2; // L: 9391
+			Client.mouseCrossState = 0; // L: 9392
+			Client.destinationX = var0; // L: 9393
+			Client.destinationY = var1; // L: 9394
+			var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2883, Client.packetWriter.isaacCipher); // L: 9396
+			var8.packetBuffer.method7398(var0 + class131.baseX); // L: 9397
+			var8.packetBuffer.writeShort(var3); // L: 9398
+			var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9399
+			var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9400
+			Client.packetWriter.addNode(var8); // L: 9401
+		} else if (var2 == 4) {
+			Client.mouseCrossX = var6; // L: 9329
+			Client.mouseCrossY = var7; // L: 9330
+			Client.mouseCrossColor = 2; // L: 9331
+			Client.mouseCrossState = 0; // L: 9332
+			Client.destinationX = var0; // L: 9333
+			Client.destinationY = var1; // L: 9334
+			var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2896, Client.packetWriter.isaacCipher); // L: 9336
+			var8.packetBuffer.method7398(TileItem.baseY + var1); // L: 9337
+			var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9338
+			var8.packetBuffer.method7349(var0 + class131.baseX); // L: 9339
+			var8.packetBuffer.method7398(var3); // L: 9340
+			Client.packetWriter.addNode(var8); // L: 9341
+		} else if (var2 == 5) {
+			Client.mouseCrossX = var6; // L: 9664
+			Client.mouseCrossY = var7; // L: 9665
+			Client.mouseCrossColor = 2; // L: 9666
+			Client.mouseCrossState = 0; // L: 9667
+			Client.destinationX = var0; // L: 9668
+			Client.destinationY = var1; // L: 9669
+			var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2856, Client.packetWriter.isaacCipher); // L: 9671
+			var8.packetBuffer.method7493(var3); // L: 9672
+			var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9673
+			var8.packetBuffer.writeShort(var0 + class131.baseX); // L: 9674
+			var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9675
+			Client.packetWriter.addNode(var8); // L: 9676
+		} else if (var2 == 6) {
+			Client.mouseCrossX = var6; // L: 9627
+			Client.mouseCrossY = var7; // L: 9628
+			Client.mouseCrossColor = 2; // L: 9629
+			Client.mouseCrossState = 0; // L: 9630
+			Client.destinationX = var0; // L: 9631
+			Client.destinationY = var1; // L: 9632
+			var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2870, Client.packetWriter.isaacCipher); // L: 9634
+			var8.packetBuffer.method7493(var3); // L: 9635
+			var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9636
+			var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9637
+			var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9638
+			Client.packetWriter.addNode(var8); // L: 9639
+		} else {
+			PacketBufferNode var9;
+			NPC var13;
+			if (var2 == 7) {
+				var13 = Client.npcs[var3]; // L: 9088
+				if (var13 != null) { // L: 9089
+					Client.mouseCrossX = var6; // L: 9090
+					Client.mouseCrossY = var7; // L: 9091
+					Client.mouseCrossColor = 2; // L: 9092
+					Client.mouseCrossState = 0; // L: 9093
+					Client.destinationX = var0; // L: 9094
+					Client.destinationY = var1; // L: 9095
+					var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2840, Client.packetWriter.isaacCipher); // L: 9097
+					var9.packetBuffer.method7398(class139.selectedItemId); // L: 9098
+					var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9099
+					var9.packetBuffer.method7398(var3); // L: 9100
+					var9.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); // L: 9101
+					var9.packetBuffer.method7398(Calendar.selectedItemSlot); // L: 9102
+					Client.packetWriter.addNode(var9); // L: 9103
+				}
+			} else if (var2 == 8) {
+				var13 = Client.npcs[var3]; // L: 9692
+				if (var13 != null) { // L: 9693
+					Client.mouseCrossX = var6; // L: 9694
+					Client.mouseCrossY = var7; // L: 9695
+					Client.mouseCrossColor = 2; // L: 9696
+					Client.mouseCrossState = 0; // L: 9697
+					Client.destinationX = var0; // L: 9698
+					Client.destinationY = var1; // L: 9699
+					var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2901, Client.packetWriter.isaacCipher); // L: 9700
+					var9.packetBuffer.method7407(class20.selectedSpellWidget); // L: 9701
+					var9.packetBuffer.method7398(Client.field633); // L: 9702
+					var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9703
+					var9.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9704
+					var9.packetBuffer.writeShort(var3); // L: 9705
+					Client.packetWriter.addNode(var9); // L: 9706
+				}
+			} else if (var2 == 9) {
+				var13 = Client.npcs[var3]; // L: 9611
+				if (var13 != null) { // L: 9612
+					Client.mouseCrossX = var6; // L: 9613
+					Client.mouseCrossY = var7; // L: 9614
+					Client.mouseCrossColor = 2; // L: 9615
+					Client.mouseCrossState = 0; // L: 9616
+					Client.destinationX = var0; // L: 9617
+					Client.destinationY = var1; // L: 9618
+					var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2839, Client.packetWriter.isaacCipher); // L: 9620
+					var9.packetBuffer.method7349(var3); // L: 9621
+					var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9622
+					Client.packetWriter.addNode(var9); // L: 9623
+				}
+			} else if (var2 == 10) {
+				var13 = Client.npcs[var3]; // L: 9239
+				if (var13 != null) { // L: 9240
+					Client.mouseCrossX = var6; // L: 9241
+					Client.mouseCrossY = var7; // L: 9242
+					Client.mouseCrossColor = 2; // L: 9243
+					Client.mouseCrossState = 0; // L: 9244
+					Client.destinationX = var0; // L: 9245
+					Client.destinationY = var1; // L: 9246
+					var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2865, Client.packetWriter.isaacCipher); // L: 9248
+					var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9249
+					var9.packetBuffer.method7398(var3); // L: 9250
+					Client.packetWriter.addNode(var9); // L: 9251
+				}
+			} else if (var2 == 11) {
+				var13 = Client.npcs[var3]; // L: 9768
+				if (var13 != null) { // L: 9769
+					Client.mouseCrossX = var6; // L: 9770
+					Client.mouseCrossY = var7; // L: 9771
+					Client.mouseCrossColor = 2; // L: 9772
+					Client.mouseCrossState = 0; // L: 9773
+					Client.destinationX = var0; // L: 9774
+					Client.destinationY = var1; // L: 9775
+					var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2812, Client.packetWriter.isaacCipher); // L: 9777
+					var9.packetBuffer.method7493(var3); // L: 9778
+					var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9779
+					Client.packetWriter.addNode(var9); // L: 9780
+				}
+			} else if (var2 == 12) {
+				var13 = Client.npcs[var3]; // L: 9265
+				if (var13 != null) { // L: 9266
+					Client.mouseCrossX = var6; // L: 9267
+					Client.mouseCrossY = var7; // L: 9268
+					Client.mouseCrossColor = 2; // L: 9269
+					Client.mouseCrossState = 0; // L: 9270
+					Client.destinationX = var0; // L: 9271
+					Client.destinationY = var1; // L: 9272
+					var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2872, Client.packetWriter.isaacCipher); // L: 9274
+					var9.packetBuffer.writeShort(var3); // L: 9275
+					var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9276
+					Client.packetWriter.addNode(var9); // L: 9277
+				}
+			} else if (var2 == 13) {
+				var13 = Client.npcs[var3]; // L: 9509
+				if (var13 != null) { // L: 9510
+					Client.mouseCrossX = var6; // L: 9511
+					Client.mouseCrossY = var7; // L: 9512
+					Client.mouseCrossColor = 2; // L: 9513
+					Client.mouseCrossState = 0; // L: 9514
+					Client.destinationX = var0; // L: 9515
+					Client.destinationY = var1; // L: 9516
+					var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2876, Client.packetWriter.isaacCipher); // L: 9518
+					var9.packetBuffer.method7398(var3); // L: 9519
+					var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9520
+					Client.packetWriter.addNode(var9); // L: 9521
+				}
+			} else {
+				Player var15;
+				if (var2 == 14) {
+					var15 = Client.players[var3]; // L: 9536
+					if (var15 != null) { // L: 9537
+						Client.mouseCrossX = var6; // L: 9538
+						Client.mouseCrossY = var7; // L: 9539
+						Client.mouseCrossColor = 2; // L: 9540
+						Client.mouseCrossState = 0; // L: 9541
+						Client.destinationX = var0; // L: 9542
+						Client.destinationY = var1; // L: 9543
+						var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2864, Client.packetWriter.isaacCipher); // L: 9545
+						var9.packetBuffer.method7398(class139.selectedItemId); // L: 9546
+						var9.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); // L: 9547
+						var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9548
+						var9.packetBuffer.method7493(Calendar.selectedItemSlot); // L: 9549
+						var9.packetBuffer.method7398(var3); // L: 9550
+						Client.packetWriter.addNode(var9); // L: 9551
+					}
+				} else if (var2 == 15) {
+					var15 = Client.players[var3]; // L: 9355
+					if (var15 != null) { // L: 9356
+						Client.mouseCrossX = var6; // L: 9357
+						Client.mouseCrossY = var7; // L: 9358
+						Client.mouseCrossColor = 2; // L: 9359
+						Client.mouseCrossState = 0; // L: 9360
+						Client.destinationX = var0; // L: 9361
+						Client.destinationY = var1; // L: 9362
+						var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2820, Client.packetWriter.isaacCipher); // L: 9363
+						var9.packetBuffer.method7407(class20.selectedSpellWidget); // L: 9364
+						var9.packetBuffer.writeShort(Client.field633); // L: 9365
+						var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9366
+						var9.packetBuffer.method7349(var3); // L: 9367
+						var9.packetBuffer.method7398(Client.selectedSpellChildIndex); // L: 9368
+						Client.packetWriter.addNode(var9); // L: 9369
+					}
+				} else if (var2 == 16) {
+					Client.mouseCrossX = var6; // L: 9038
+					Client.mouseCrossY = var7; // L: 9039
+					Client.mouseCrossColor = 2; // L: 9040
+					Client.mouseCrossState = 0; // L: 9041
+					Client.destinationX = var0; // L: 9042
+					Client.destinationY = var1; // L: 9043
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2882, Client.packetWriter.isaacCipher); // L: 9045
+					var8.packetBuffer.writeShort(class139.selectedItemId); // L: 9046
+					var8.packetBuffer.writeShort(Calendar.selectedItemSlot); // L: 9047
+					var8.packetBuffer.writeShort(TileItem.baseY + var1); // L: 9048
+					var8.packetBuffer.method7493(var3); // L: 9049
+					var8.packetBuffer.method7527(MidiPcmStream.selectedItemWidget); // L: 9050
+					var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9051
+					var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9052
+					Client.packetWriter.addNode(var8); // L: 9053
+				} else if (var2 == 17) {
+					Client.mouseCrossX = var6; // L: 9189
+					Client.mouseCrossY = var7; // L: 9190
+					Client.mouseCrossColor = 2; // L: 9191
+					Client.mouseCrossState = 0; // L: 9192
+					Client.destinationX = var0; // L: 9193
+					Client.destinationY = var1; // L: 9194
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2835, Client.packetWriter.isaacCipher); // L: 9195
+					var8.packetBuffer.method7398(TileItem.baseY + var1); // L: 9196
+					var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9197
+					var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9198
+					var8.packetBuffer.writeInt(class20.selectedSpellWidget); // L: 9199
+					var8.packetBuffer.writeShort(var0 + class131.baseX); // L: 9200
+					var8.packetBuffer.method7493(var3); // L: 9201
+					var8.packetBuffer.writeShort(Client.field633); // L: 9202
+					Client.packetWriter.addNode(var8); // L: 9203
+				} else if (var2 == 18) {
+					Client.mouseCrossX = var6; // L: 9555
+					Client.mouseCrossY = var7; // L: 9556
+					Client.mouseCrossColor = 2; // L: 9557
+					Client.mouseCrossState = 0; // L: 9558
+					Client.destinationX = var0; // L: 9559
+					Client.destinationY = var1; // L: 9560
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2836, Client.packetWriter.isaacCipher); // L: 9562
+					var8.packetBuffer.method7398(var0 + class131.baseX); // L: 9563
+					var8.packetBuffer.method7349(var3); // L: 9564
+					var8.packetBuffer.method7349(TileItem.baseY + var1); // L: 9565
+					var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9566
+					Client.packetWriter.addNode(var8); // L: 9567
+				} else if (var2 == 19) {
+					Client.mouseCrossX = var6; // L: 9716
+					Client.mouseCrossY = var7; // L: 9717
+					Client.mouseCrossColor = 2; // L: 9718
+					Client.mouseCrossState = 0; // L: 9719
+					Client.destinationX = var0; // L: 9720
+					Client.destinationY = var1; // L: 9721
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2838, Client.packetWriter.isaacCipher); // L: 9723
+					var8.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9724
+					var8.packetBuffer.method7493(TileItem.baseY + var1); // L: 9725
+					var8.packetBuffer.method7493(var3); // L: 9726
+					var8.packetBuffer.method7349(var0 + class131.baseX); // L: 9727
+					Client.packetWriter.addNode(var8); // L: 9728
+				} else if (var2 == 20) {
+					Client.mouseCrossX = var6; // L: 9118
+					Client.mouseCrossY = var7; // L: 9119
+					Client.mouseCrossColor = 2; // L: 9120
+					Client.mouseCrossState = 0; // L: 9121
+					Client.destinationX = var0; // L: 9122
+					Client.destinationY = var1; // L: 9123
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2818, Client.packetWriter.isaacCipher); // L: 9125
+					var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9126
+					var8.packetBuffer.writeShort(var3); // L: 9127
+					var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9128
+					var8.packetBuffer.method7349(TileItem.baseY + var1); // L: 9129
+					Client.packetWriter.addNode(var8); // L: 9130
+				} else if (var2 == 21) {
+					Client.mouseCrossX = var6; // L: 9411
+					Client.mouseCrossY = var7; // L: 9412
+					Client.mouseCrossColor = 2; // L: 9413
+					Client.mouseCrossState = 0; // L: 9414
+					Client.destinationX = var0; // L: 9415
+					Client.destinationY = var1; // L: 9416
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2823, Client.packetWriter.isaacCipher); // L: 9418
+					var8.packetBuffer.method7349(TileItem.baseY + var1); // L: 9419
+					var8.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9420
+					var8.packetBuffer.writeShort(var3); // L: 9421
+					var8.packetBuffer.method7398(var0 + class131.baseX); // L: 9422
+					Client.packetWriter.addNode(var8); // L: 9423
+				} else if (var2 == 22) {
+					Client.mouseCrossX = var6; // L: 9742
+					Client.mouseCrossY = var7; // L: 9743
+					Client.mouseCrossColor = 2; // L: 9744
+					Client.mouseCrossState = 0; // L: 9745
+					Client.destinationX = var0; // L: 9746
+					Client.destinationY = var1; // L: 9747
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2868, Client.packetWriter.isaacCipher); // L: 9749
+					var8.packetBuffer.method7398(var0 + class131.baseX); // L: 9750
+					var8.packetBuffer.method7349(TileItem.baseY + var1); // L: 9751
+					var8.packetBuffer.method7398(var3); // L: 9752
+					var8.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9753
+					Client.packetWriter.addNode(var8); // L: 9754
+				} else if (var2 == 23) {
+					if (Client.isMenuOpen) { // L: 9642
+						class7.scene.setViewportWalking(); // L: 9643
+					} else {
+						class7.scene.menuOpen(class20.Client_plane, var0, var1, true); // L: 9646
+					}
+				} else {
+					PacketBufferNode var12;
+					Widget var16;
+					if (var2 == 24) {
+						var16 = ChatChannel.getWidget(var1); // L: 9318
+						boolean var11 = true; // L: 9319
+						if (var16.contentType > 0) { // L: 9320
+							var11 = class19.method329(var16);
+						}
+
+						if (var11) { // L: 9321
+							var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); // L: 9323
+							var12.packetBuffer.writeInt(var1); // L: 9324
+							Client.packetWriter.addNode(var12); // L: 9325
+						}
+					} else {
+						if (var2 == 25) {
+							var16 = class126.getWidgetChild(var1, var0); // L: 9801
+							if (var16 != null) { // L: 9802
+								HealthBar.Widget_runOnTargetLeave(); // L: 9803
+								UrlRequest.selectSpell(var1, var0, class404.Widget_unpackTargetMask(class363.getWidgetFlags(var16)), var16.itemId); // L: 9804
+								Client.isItemSelected = 0; // L: 9805
+								Client.selectedSpellActionName = SecureRandomFuture.Widget_getSpellActionName(var16); // L: 9806
+								if (Client.selectedSpellActionName == null) { // L: 9807
+									Client.selectedSpellActionName = "null";
+								}
+
+								if (var16.isIf3) { // L: 9808
+									Client.selectedSpellName = var16.dataText + UserComparator5.colorStartTag(16777215);
+								} else {
+									Client.selectedSpellName = UserComparator5.colorStartTag(65280) + var16.spellName + UserComparator5.colorStartTag(16777215); // L: 9809
+								}
+							}
+
+							return; // L: 9811
+						}
+
+						if (var2 == 26) {
+							class4.method28(); // L: 9133
+						} else {
+							int var10;
+							Widget var14;
+							if (var2 == 28) {
+								var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); // L: 9282
+								var8.packetBuffer.writeInt(var1); // L: 9283
+								Client.packetWriter.addNode(var8); // L: 9284
+								var14 = ChatChannel.getWidget(var1); // L: 9285
+								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9286
+									var10 = var14.cs1Instructions[0][1]; // L: 9287
+									Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 9288
+									class281.changeGameOptions(var10); // L: 9289
+								}
+							} else if (var2 == 29) {
+								var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2842, Client.packetWriter.isaacCipher); // L: 9496
+								var8.packetBuffer.writeInt(var1); // L: 9497
+								Client.packetWriter.addNode(var8); // L: 9498
+								var14 = ChatChannel.getWidget(var1); // L: 9499
+								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 9500
+									var10 = var14.cs1Instructions[0][1]; // L: 9501
+									if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 9502
+										Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 9503
+										class281.changeGameOptions(var10); // L: 9504
+									}
+								}
+							} else if (var2 == 30) {
+								if (Client.meslayerContinueWidget == null) { // L: 9404
+									class288.resumePauseWidget(var1, var0); // L: 9405
+									Client.meslayerContinueWidget = class126.getWidgetChild(var1, var0); // L: 9406
+									SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); // L: 9407
+								}
+							} else if (var2 == 31) {
+								var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2804, Client.packetWriter.isaacCipher); // L: 9294
+								var8.packetBuffer.method7349(var0); // L: 9295
+								var8.packetBuffer.writeShort(class139.selectedItemId); // L: 9296
+								var8.packetBuffer.method7349(var3); // L: 9297
+								var8.packetBuffer.writeInt(MidiPcmStream.selectedItemWidget); // L: 9298
+								var8.packetBuffer.writeIntME(var1); // L: 9299
+								var8.packetBuffer.method7398(Calendar.selectedItemSlot); // L: 9300
+								Client.packetWriter.addNode(var8); // L: 9301
+								Client.field582 = 0; // L: 9302
+								WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9303
+								Client.field599 = var0; // L: 9304
+							} else if (var2 == 32) {
+								var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2886, Client.packetWriter.isaacCipher); // L: 9571
+								var8.packetBuffer.writeShort(var0); // L: 9572
+								var8.packetBuffer.writeIntME(var1); // L: 9573
+								var8.packetBuffer.method7493(Client.selectedSpellChildIndex); // L: 9574
+								var8.packetBuffer.writeShort(var3); // L: 9575
+								var8.packetBuffer.writeInt(class20.selectedSpellWidget); // L: 9576
+								Client.packetWriter.addNode(var8); // L: 9577
+								Client.field582 = 0; // L: 9578
+								WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9579
+								Client.field599 = var0; // L: 9580
+							} else if (var2 == 33) {
+								var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2874, Client.packetWriter.isaacCipher); // L: 9308
+								var8.packetBuffer.writeInt(var1); // L: 9309
+								var8.packetBuffer.method7349(var0); // L: 9310
+								var8.packetBuffer.method7349(var3); // L: 9311
+								Client.packetWriter.addNode(var8); // L: 9312
+								Client.field582 = 0; // L: 9313
+								WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9314
+								Client.field599 = var0; // L: 9315
+							} else if (var2 == 34) {
+								var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2833, Client.packetWriter.isaacCipher); // L: 9427
+								var8.packetBuffer.method7398(var3); // L: 9428
+								var8.packetBuffer.method7398(var0); // L: 9429
+								var8.packetBuffer.method7407(var1); // L: 9430
+								Client.packetWriter.addNode(var8); // L: 9431
+								Client.field582 = 0; // L: 9432
+								WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9433
+								Client.field599 = var0; // L: 9434
+							} else if (var2 == 35) {
+								var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2817, Client.packetWriter.isaacCipher); // L: 9485
+								var8.packetBuffer.method7349(var0); // L: 9486
+								var8.packetBuffer.method7349(var3); // L: 9487
+								var8.packetBuffer.writeInt(var1); // L: 9488
+								Client.packetWriter.addNode(var8); // L: 9489
+								Client.field582 = 0; // L: 9490
+								WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9491
+								Client.field599 = var0; // L: 9492
+							} else if (var2 == 36) {
+								var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2847, Client.packetWriter.isaacCipher); // L: 9164
+								var8.packetBuffer.method7527(var1); // L: 9165
+								var8.packetBuffer.method7349(var0); // L: 9166
+								var8.packetBuffer.method7398(var3); // L: 9167
+								Client.packetWriter.addNode(var8); // L: 9168
+								Client.field582 = 0; // L: 9169
+								WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9170
+								Client.field599 = var0; // L: 9171
+							} else if (var2 == 37) {
+								var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2802, Client.packetWriter.isaacCipher); // L: 9345
+								var8.packetBuffer.writeIntME(var1); // L: 9346
+								var8.packetBuffer.method7493(var0); // L: 9347
+								var8.packetBuffer.writeShort(var3); // L: 9348
+								Client.packetWriter.addNode(var8); // L: 9349
+								Client.field582 = 0; // L: 9350
+								WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9351
+								Client.field599 = var0; // L: 9352
+							} else {
+								if (var2 == 38) {
+									HealthBar.Widget_runOnTargetLeave(); // L: 9599
+									var16 = ChatChannel.getWidget(var1); // L: 9600
+									Client.isItemSelected = 1; // L: 9601
+									Calendar.selectedItemSlot = var0; // L: 9602
+									MidiPcmStream.selectedItemWidget = var1; // L: 9603
+									class139.selectedItemId = var3; // L: 9604
+									SecureRandomCallable.invalidateWidget(var16); // L: 9605
+									Client.selectedItemName = UserComparator5.colorStartTag(16748608) + UserComparator6.ItemDefinition_get(var3).name + UserComparator5.colorStartTag(16777215); // L: 9606
+									if (Client.selectedItemName == null) { // L: 9607
+										Client.selectedItemName = "null";
+									}
+
+									return; // L: 9608
+								}
+
+								if (var2 == 39) {
+									var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2844, Client.packetWriter.isaacCipher); // L: 9526
+									var8.packetBuffer.writeIntME(var1); // L: 9527
+									var8.packetBuffer.method7493(var0); // L: 9528
+									var8.packetBuffer.writeShort(var3); // L: 9529
+									Client.packetWriter.addNode(var8); // L: 9530
+									Client.field582 = 0; // L: 9531
+									WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9532
+									Client.field599 = var0; // L: 9533
+								} else if (var2 == 40) {
+									var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2871, Client.packetWriter.isaacCipher); // L: 9732
+									var8.packetBuffer.writeInt(var1); // L: 9733
+									var8.packetBuffer.method7493(var3); // L: 9734
+									var8.packetBuffer.method7493(var0); // L: 9735
+									Client.packetWriter.addNode(var8); // L: 9736
+									Client.field582 = 0; // L: 9737
+									WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9738
+									Client.field599 = var0; // L: 9739
+								} else if (var2 == 41) {
+									var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2810, Client.packetWriter.isaacCipher); // L: 9758
+									var8.packetBuffer.method7398(var3); // L: 9759
+									var8.packetBuffer.writeInt(var1); // L: 9760
+									var8.packetBuffer.method7398(var0); // L: 9761
+									Client.packetWriter.addNode(var8); // L: 9762
+									Client.field582 = 0; // L: 9763
+									WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9764
+									Client.field599 = var0; // L: 9765
+								} else if (var2 == 42) {
+									var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2803, Client.packetWriter.isaacCipher); // L: 9137
+									var8.packetBuffer.method7493(var0); // L: 9138
+									var8.packetBuffer.writeIntME(var1); // L: 9139
+									var8.packetBuffer.method7398(var3); // L: 9140
+									Client.packetWriter.addNode(var8); // L: 9141
+									Client.field582 = 0; // L: 9142
+									WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9143
+									Client.field599 = var0; // L: 9144
+								} else if (var2 == 43) {
+									var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2843, Client.packetWriter.isaacCipher); // L: 9108
+									var8.packetBuffer.writeInt(var1); // L: 9109
+									var8.packetBuffer.writeShort(var0); // L: 9110
+									var8.packetBuffer.writeShort(var3); // L: 9111
+									Client.packetWriter.addNode(var8); // L: 9112
+									Client.field582 = 0; // L: 9113
+									WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9114
+									Client.field599 = var0; // L: 9115
+								} else if (var2 == 44) {
+									var15 = Client.players[var3]; // L: 9072
+									if (var15 != null) { // L: 9073
+										Client.mouseCrossX = var6; // L: 9074
+										Client.mouseCrossY = var7; // L: 9075
+										Client.mouseCrossColor = 2; // L: 9076
+										Client.mouseCrossState = 0; // L: 9077
+										Client.destinationX = var0; // L: 9078
+										Client.destinationY = var1; // L: 9079
+										var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2887, Client.packetWriter.isaacCipher); // L: 9081
+										var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9082
+										var9.packetBuffer.method7398(var3); // L: 9083
+										Client.packetWriter.addNode(var9); // L: 9084
+									}
+								} else if (var2 == 45) {
+									var15 = Client.players[var3]; // L: 9373
+									if (var15 != null) { // L: 9374
+										Client.mouseCrossX = var6; // L: 9375
+										Client.mouseCrossY = var7; // L: 9376
+										Client.mouseCrossColor = 2; // L: 9377
+										Client.mouseCrossState = 0; // L: 9378
+										Client.destinationX = var0; // L: 9379
+										Client.destinationY = var1; // L: 9380
+										var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2813, Client.packetWriter.isaacCipher); // L: 9382
+										var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9383
+										var9.packetBuffer.method7493(var3); // L: 9384
+										Client.packetWriter.addNode(var9); // L: 9385
+									}
+								} else if (var2 == 46) {
+									var15 = Client.players[var3]; // L: 9583
+									if (var15 != null) { // L: 9584
+										Client.mouseCrossX = var6; // L: 9585
+										Client.mouseCrossY = var7; // L: 9586
+										Client.mouseCrossColor = 2; // L: 9587
+										Client.mouseCrossState = 0; // L: 9588
+										Client.destinationX = var0; // L: 9589
+										Client.destinationY = var1; // L: 9590
+										var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2827, Client.packetWriter.isaacCipher); // L: 9592
+										var9.packetBuffer.method7398(var3); // L: 9593
+										var9.packetBuffer.method7343(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9594
+										Client.packetWriter.addNode(var9); // L: 9595
+									}
+								} else if (var2 == 47) {
+									var15 = Client.players[var3]; // L: 9468
+									if (var15 != null) { // L: 9469
+										Client.mouseCrossX = var6; // L: 9470
+										Client.mouseCrossY = var7; // L: 9471
+										Client.mouseCrossColor = 2; // L: 9472
+										Client.mouseCrossState = 0; // L: 9473
+										Client.destinationX = var0; // L: 9474
+										Client.destinationY = var1; // L: 9475
+										var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2807, Client.packetWriter.isaacCipher); // L: 9477
+										var9.packetBuffer.method7349(var3); // L: 9478
+										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9479
+										Client.packetWriter.addNode(var9); // L: 9480
+									}
+								} else if (var2 == 48) {
+									var15 = Client.players[var3]; // L: 9147
+									if (var15 != null) { // L: 9148
+										Client.mouseCrossX = var6; // L: 9149
+										Client.mouseCrossY = var7; // L: 9150
+										Client.mouseCrossColor = 2; // L: 9151
+										Client.mouseCrossState = 0; // L: 9152
+										Client.destinationX = var0; // L: 9153
+										Client.destinationY = var1; // L: 9154
+										var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2892, Client.packetWriter.isaacCipher); // L: 9156
+										var9.packetBuffer.writeShort(var3); // L: 9157
+										var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9158
+										Client.packetWriter.addNode(var9); // L: 9159
+									}
+								} else if (var2 == 49) {
+									var15 = Client.players[var3]; // L: 9056
+									if (var15 != null) { // L: 9057
+										Client.mouseCrossX = var6; // L: 9058
+										Client.mouseCrossY = var7; // L: 9059
+										Client.mouseCrossColor = 2; // L: 9060
+										Client.mouseCrossState = 0; // L: 9061
+										Client.destinationX = var0; // L: 9062
+										Client.destinationY = var1; // L: 9063
+										var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2863, Client.packetWriter.isaacCipher); // L: 9065
+										var9.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9066
+										var9.packetBuffer.method7398(var3); // L: 9067
+										Client.packetWriter.addNode(var9); // L: 9068
+									}
+								} else if (var2 == 50) {
+									var15 = Client.players[var3]; // L: 9223
+									if (var15 != null) { // L: 9224
+										Client.mouseCrossX = var6; // L: 9225
+										Client.mouseCrossY = var7; // L: 9226
+										Client.mouseCrossColor = 2; // L: 9227
+										Client.mouseCrossState = 0; // L: 9228
+										Client.destinationX = var0; // L: 9229
+										Client.destinationY = var1; // L: 9230
+										var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); // L: 9232
+										var9.packetBuffer.method7362(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9233
+										var9.packetBuffer.method7493(var3); // L: 9234
+										Client.packetWriter.addNode(var9); // L: 9235
+									}
+								} else if (var2 == 51) {
+									var15 = Client.players[var3]; // L: 9022
+									if (var15 != null) { // L: 9023
+										Client.mouseCrossX = var6; // L: 9024
+										Client.mouseCrossY = var7; // L: 9025
+										Client.mouseCrossColor = 2; // L: 9026
+										Client.mouseCrossState = 0; // L: 9027
+										Client.destinationX = var0; // L: 9028
+										Client.destinationY = var1; // L: 9029
+										var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2885, Client.packetWriter.isaacCipher); // L: 9031
+										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9032
+										var9.packetBuffer.method7398(var3); // L: 9033
+										Client.packetWriter.addNode(var9); // L: 9034
+									}
+								} else if (var2 != 57 && var2 != 1007) {
+									if (var2 == 58) {
+										var16 = class126.getWidgetChild(var1, var0); // L: 9650
+										if (var16 != null) { // L: 9651
+											var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2809, Client.packetWriter.isaacCipher); // L: 9653
+											var9.packetBuffer.writeShort(var16.itemId); // L: 9654
+											var9.packetBuffer.method7527(var1); // L: 9655
+											var9.packetBuffer.method7493(Client.selectedSpellChildIndex); // L: 9656
+											var9.packetBuffer.method7398(var0); // L: 9657
+											var9.packetBuffer.writeIntME(class20.selectedSpellWidget); // L: 9658
+											var9.packetBuffer.writeShort(Client.field633); // L: 9659
+											Client.packetWriter.addNode(var9); // L: 9660
+										}
+									} else if (var2 == 1001) {
+										Client.mouseCrossX = var6; // L: 9174
+										Client.mouseCrossY = var7; // L: 9175
+										Client.mouseCrossColor = 2; // L: 9176
+										Client.mouseCrossState = 0; // L: 9177
+										Client.destinationX = var0; // L: 9178
+										Client.destinationY = var1; // L: 9179
+										var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2826, Client.packetWriter.isaacCipher); // L: 9181
+										var8.packetBuffer.method7398(TileItem.baseY + var1); // L: 9182
+										var8.packetBuffer.method7390(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9183
+										var8.packetBuffer.method7493(var0 + class131.baseX); // L: 9184
+										var8.packetBuffer.method7349(var3); // L: 9185
+										Client.packetWriter.addNode(var8); // L: 9186
+									} else if (var2 == 1002) {
+										Client.mouseCrossX = var6; // L: 9255
+										Client.mouseCrossY = var7; // L: 9256
+										Client.mouseCrossColor = 2; // L: 9257
+										Client.mouseCrossState = 0; // L: 9258
+										var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2815, Client.packetWriter.isaacCipher); // L: 9260
+										var8.packetBuffer.method7349(var3); // L: 9261
+										Client.packetWriter.addNode(var8); // L: 9262
+									} else if (var2 == 1003) {
+										Client.mouseCrossX = var6; // L: 9784
+										Client.mouseCrossY = var7; // L: 9785
+										Client.mouseCrossColor = 2; // L: 9786
+										Client.mouseCrossState = 0; // L: 9787
+										var13 = Client.npcs[var3]; // L: 9788
+										if (var13 != null) { // L: 9789
+											NPCComposition var17 = var13.definition; // L: 9790
+											if (var17.transforms != null) { // L: 9791
+												var17 = var17.transform();
+											}
+
+											if (var17 != null) { // L: 9792
+												var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2829, Client.packetWriter.isaacCipher); // L: 9794
+												var12.packetBuffer.method7398(var17.id); // L: 9795
+												Client.packetWriter.addNode(var12); // L: 9796
+											}
+										}
+									} else if (var2 == 1004) {
+										Client.mouseCrossX = var6; // L: 9440
+										Client.mouseCrossY = var7; // L: 9441
+										Client.mouseCrossColor = 2; // L: 9442
+										Client.mouseCrossState = 0; // L: 9443
+										var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); // L: 9445
+										var8.packetBuffer.method7398(var3); // L: 9446
+										Client.packetWriter.addNode(var8); // L: 9447
+									} else if (var2 == 1005) {
+										var16 = ChatChannel.getWidget(var1); // L: 9679
+										if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 9680
+											class194.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + UserComparator6.ItemDefinition_get(var3).name);
+										} else {
+											var9 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2902, Client.packetWriter.isaacCipher); // L: 9683
+											var9.packetBuffer.method7398(var3); // L: 9684
+											Client.packetWriter.addNode(var9); // L: 9685
+										}
+
+										Client.field582 = 0; // L: 9687
+										WorldMapDecoration.field2722 = ChatChannel.getWidget(var1); // L: 9688
+										Client.field599 = var0; // L: 9689
+									} else if (var2 == 1010 || var2 == 1011 || var2 == 1009 || var2 == 1012 || var2 == 1008) {
+										Varcs.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 9437
+									}
+								} else {
+									var16 = class126.getWidgetChild(var1, var0); // L: 9710
+									if (var16 != null) { // L: 9711
+										SoundCache.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 9712
+									}
+								}
+							}
+						}
+					}
+				}
+			}
 		}
 
-		Client.field627 = var3; // L: 9125
-		Client.isSpellSelected = true; // L: 9126
-		FontName.selectedSpellWidget = var0; // L: 9127
-		Client.selectedSpellChildIndex = var1; // L: 9128
-		class116.selectedSpellFlags = var2; // L: 9129
-		class184.invalidateWidget(var4); // L: 9130
-	} // L: 9131
+		if (Client.isItemSelected != 0) { // L: 9813
+			Client.isItemSelected = 0; // L: 9814
+			SecureRandomCallable.invalidateWidget(ChatChannel.getWidget(MidiPcmStream.selectedItemWidget)); // L: 9815
+		}
 
-	@ObfuscatedName("jv")
+		if (Client.isSpellSelected) { // L: 9817
+			HealthBar.Widget_runOnTargetLeave();
+		}
+
+		if (WorldMapDecoration.field2722 != null && Client.field582 == 0) { // L: 9818
+			SecureRandomCallable.invalidateWidget(WorldMapDecoration.field2722);
+		}
+
+	} // L: 9819
+
+	@ObfuscatedName("ly")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1138685196"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "-66"
 	)
-	@Export("getTapToDrop")
-	static boolean getTapToDrop() {
-		return Client.tapToDrop; // L: 10614
-	}
+	static void method1082(Buffer var0) {
+		if (Client.randomDatData != null) { // L: 12661
+			var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 12662
+		} else {
+			byte[] var1 = class118.method2684(); // L: 12665
+			var0.writeBytes(var1, 0, var1.length); // L: 12666
+		}
+	} // L: 12663 12667
 }
diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java
index 68fb00b0e5..4d6089c95d 100644
--- a/runescape-client/src/main/java/DefaultsGroup.java
+++ b/runescape-client/src/main/java/DefaultsGroup.java
@@ -4,67 +4,151 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mq")
+@ObfuscatedName("mj")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lmq;"
+		descriptor = "Lmj;"
 	)
-	static final DefaultsGroup field4002;
-	@ObfuscatedName("gq")
+	static final DefaultsGroup field4160;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1669753129
-	)
-	@Export("baseY")
-	static int baseY;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -253275399
+		intValue = 1835522207
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field4002 = new DefaultsGroup(3); // L: 4
+		field4160 = new DefaultsGroup(3); // L: 4
 	}
 
 	DefaultsGroup(int var1) {
 		this.group = var1; // L: 8
 	} // L: 9
 
-	@ObfuscatedName("gt")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "1517479091"
+		descriptor = "(Lku;Lku;ZIS)V",
+		garbageValue = "9766"
 	)
-	@Export("worldToScreen")
-	static final void worldToScreen(int var0, int var1, int var2) {
-		if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5613
-			int var3 = class392.getTileHeight(var0, var1, GrandExchangeOfferTotalQuantityComparator.Client_plane) - var2; // L: 5618
-			var0 -= WorldMapSectionType.cameraX; // L: 5619
-			var3 -= class174.cameraY; // L: 5620
-			var1 -= class65.cameraZ; // L: 5621
-			int var4 = Rasterizer3D.Rasterizer3D_sine[class121.cameraPitch]; // L: 5622
-			int var5 = Rasterizer3D.Rasterizer3D_cosine[class121.cameraPitch]; // L: 5623
-			int var6 = Rasterizer3D.Rasterizer3D_sine[WorldMapRegion.cameraYaw]; // L: 5624
-			int var7 = Rasterizer3D.Rasterizer3D_cosine[WorldMapRegion.cameraYaw]; // L: 5625
-			int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5626
-			var1 = var7 * var1 - var0 * var6 >> 16; // L: 5627
-			var0 = var8; // L: 5628
-			var8 = var3 * var5 - var4 * var1 >> 16; // L: 5629
-			var1 = var5 * var1 + var4 * var3 >> 16; // L: 5630
-			if (var1 >= 50) { // L: 5632
-				Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5633
-				Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; // L: 5634
-			} else {
-				Client.viewportTempX = -1; // L: 5637
-				Client.viewportTempY = -1; // L: 5638
+	static void method6568(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
+		if (DirectByteArrayCopier.clearLoginScreen) { // L: 167
+			if (var3 == 4) { // L: 168
+				PlayerType.method5521(4); // L: 169
 			}
 
 		} else {
-			Client.viewportTempX = -1; // L: 5614
-			Client.viewportTempY = -1; // L: 5615
+			if (var3 == 0) { // L: 173
+				class185.method3731(var2); // L: 174
+			} else {
+				PlayerType.method5521(var3); // L: 177
+			}
+
+			Rasterizer2D.Rasterizer2D_clear(); // L: 179
+			byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 180
+			WorldMapCacheName.leftTitleSprite = MouseRecorder.method2161(var4); // L: 181
+			NPC.rightTitleSprite = WorldMapCacheName.leftTitleSprite.mirrorHorizontally(); // L: 182
+			int var5 = Client.worldProperties; // L: 183
+			if ((var5 & 536870912) != 0) { // L: 185
+				Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 186
+			} else if ((var5 & 1073741824) != 0) { // L: 188
+				Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 189
+			} else {
+				Login.logoSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 192
+			}
+
+			AbstractByteArrayCopier.titleboxSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 195
+			class19.titlebuttonSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 196
+			Login.field894 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 197
+			Login.field864 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 198
+			ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 199
+			int var7 = var1.getGroupId("runes"); // L: 202
+			int var8 = var1.getFileId(var7, ""); // L: 203
+			IndexedSprite[] var9;
+			if (!class147.method3009(var1, var7, var8)) { // L: 206
+				var9 = null; // L: 207
+			} else {
+				IndexedSprite[] var11 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 212
+
+				for (int var12 = 0; var12 < class440.SpriteBuffer_spriteCount; ++var12) { // L: 213
+					IndexedSprite var13 = var11[var12] = new IndexedSprite(); // L: 214
+					var13.width = class432.SpriteBuffer_spriteWidth; // L: 215
+					var13.height = class432.SpriteBuffer_spriteHeight; // L: 216
+					var13.xOffset = class141.SpriteBuffer_xOffsets[var12]; // L: 217
+					var13.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var12]; // L: 218
+					var13.subWidth = class432.SpriteBuffer_spriteWidths[var12]; // L: 219
+					var13.subHeight = class330.SpriteBuffer_spriteHeights[var12]; // L: 220
+					var13.palette = class432.SpriteBuffer_spritePalette; // L: 221
+					var13.pixels = class369.SpriteBuffer_pixels[var12]; // L: 222
+				}
+
+				UserComparator3.method2529(); // L: 224
+				var9 = var11; // L: 227
+			}
+
+			Login.runesSprite = var9; // L: 231
+			var8 = var1.getGroupId("title_mute"); // L: 234
+			int var15 = var1.getFileId(var8, ""); // L: 235
+			IndexedSprite[] var10;
+			if (!class147.method3009(var1, var8, var15)) { // L: 238
+				var10 = null; // L: 239
+			} else {
+				IndexedSprite[] var16 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 244
+
+				for (int var17 = 0; var17 < class440.SpriteBuffer_spriteCount; ++var17) { // L: 245
+					IndexedSprite var14 = var16[var17] = new IndexedSprite(); // L: 246
+					var14.width = class432.SpriteBuffer_spriteWidth; // L: 247
+					var14.height = class432.SpriteBuffer_spriteHeight; // L: 248
+					var14.xOffset = class141.SpriteBuffer_xOffsets[var17]; // L: 249
+					var14.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var17]; // L: 250
+					var14.subWidth = class432.SpriteBuffer_spriteWidths[var17]; // L: 251
+					var14.subHeight = class330.SpriteBuffer_spriteHeights[var17]; // L: 252
+					var14.palette = class432.SpriteBuffer_spritePalette; // L: 253
+					var14.pixels = class369.SpriteBuffer_pixels[var17]; // L: 254
+				}
+
+				UserComparator3.method2529(); // L: 256
+				var10 = var16; // L: 259
+			}
+
+			Login.title_muteSprite = var10; // L: 263
+			KeyHandler.options_buttons_0Sprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 264
+			UserComparator9.field1336 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 265
+			LoginType.options_buttons_2Sprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 266
+			Login.field888 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 267
+			class315.field3918 = KeyHandler.options_buttons_0Sprite.subWidth; // L: 268
+			Huffman.field3152 = KeyHandler.options_buttons_0Sprite.subHeight; // L: 269
+			Client.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 270
+			if (var2) { // L: 271
+				Login.Login_username = ""; // L: 272
+				Login.Login_password = ""; // L: 273
+			}
+
+			class148.field1651 = 0; // L: 275
+			BufferedSource.otp = ""; // L: 276
+			Login.field882 = true; // L: 277
+			Login.worldSelectOpen = false; // L: 278
+			if (!SecureRandomFuture.clientPreferences.titleMusicDisabled) { // L: 279
+				Script.method2040(2, WorldMapScaleHandler.archive6, "scape main", "", 255, false);
+			} else {
+				class260.musicPlayerStatus = 1; // L: 281
+				class124.musicTrackArchive = null; // L: 282
+				VarcInt.musicTrackGroupId = -1; // L: 283
+				class260.musicTrackFileId = -1; // L: 284
+				ChatChannel.musicTrackVolume = 0; // L: 285
+				DynamicObject.musicTrackBoolean = false; // L: 286
+				class260.pcmSampleLength = 2; // L: 287
+			}
+
+			ClientPreferences.method2297(false); // L: 289
+			DirectByteArrayCopier.clearLoginScreen = true; // L: 290
+			Login.xPadding = (class186.canvasWidth - 765) / 2; // L: 291
+			Login.loginBoxX = Login.xPadding + 202; // L: 292
+			class138.loginBoxCenter = Login.loginBoxX + 180; // L: 293
+			WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 294
+			NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 295
+			Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 296
 		}
-	} // L: 5616 5640
+	} // L: 171 297
 }
diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java
index 5a0a68454d..57b7d9f4a5 100644
--- a/runescape-client/src/main/java/DemotingHashTable.java
+++ b/runescape-client/src/main/java/DemotingHashTable.java
@@ -3,32 +3,32 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hd")
+@ObfuscatedName("ic")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Loz;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Llm;"
+		descriptor = "Lls;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lhu;"
+		descriptor = "Lio;"
 	)
-	class232 field2655;
+	class245 field2793;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue(); // L: 11
@@ -46,7 +46,7 @@ public DemotingHashTable(int var1) {
 		this(var1, var1); // L: 15
 	} // L: 16
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27
@@ -77,16 +77,16 @@ public Object get(long var1) {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52
 		this.removeWrapper(var3); // L: 53
 	} // L: 54
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lin;)V"
+		descriptor = "(Lie;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -98,12 +98,12 @@ void removeWrapper(Wrapper var1) {
 
 	} // L: 62
 
-	@ObfuscatedName("a")
-	public void method4673(Object var1, long var2) {
+	@ObfuscatedName("m")
+	public void method4958(Object var1, long var2) {
 		this.put(var1, var2, 1); // L: 65
 	} // L: 66
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("put")
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) { // L: 69
@@ -122,8 +122,8 @@ public void put(Object var1, long var2, int var4) {
 				}
 
 				this.removeWrapper(var5); // L: 78
-				if (this.field2655 != null) { // L: 79
-					this.field2655.method4651(var5.get()); // L: 80
+				if (this.field2793 != null) { // L: 79
+					this.field2793.method4944(var5.get()); // L: 80
 				}
 			}
 
@@ -134,7 +134,7 @@ public void put(Object var1, long var2, int var4) {
 		}
 	} // L: 87
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@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 void demote(int var1) {
 
 	} // L: 109
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear(); // L: 112
diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
index ec70d18a84..cc6fe39b3c 100644
--- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
+++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
@@ -4,203 +4,209 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nj")
+@ObfuscatedName("na")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("j")
-	public static short[] field4081;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 135680211
+		intValue = -1848587341
 	)
-	int field4083;
-	@ObfuscatedName("o")
+	int field4262;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 416354637
+		intValue = -865259943
 	)
-	int field4079;
-	@ObfuscatedName("g")
+	int field4259;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1841262827
+		intValue = 494099171
 	)
-	int field4080;
+	int field4263;
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lnp;",
-		garbageValue = "-1940365419"
+		descriptor = "(B)Lnn;",
+		garbageValue = "-12"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (class176.formattedOperatingSystemName.startsWith("win")) { // L: 15
+		if (JagexCache.formattedOperatingSystemName.startsWith("win")) { // L: 16
 			var1 = 1;
-		} else if (class176.formattedOperatingSystemName.startsWith("mac")) { // L: 16
+		} else if (JagexCache.formattedOperatingSystemName.startsWith("mac")) { // L: 17
 			var1 = 2;
-		} else if (class176.formattedOperatingSystemName.startsWith("linux")) { // L: 17
+		} else if (JagexCache.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
-		} catch (Exception var27) { // L: 24
-			var2 = ""; // L: 25
+			var2 = System.getProperty("os.arch").toLowerCase(); // L: 23
+		} catch (Exception var30) { // L: 25
+			var2 = ""; // L: 26
 		}
 
 		String var3;
 		try {
-			var3 = System.getProperty("os.version").toLowerCase(); // L: 28
-		} catch (Exception var26) { // L: 30
-			var3 = ""; // L: 31
+			var3 = System.getProperty("os.version").toLowerCase(); // L: 29
+		} catch (Exception var29) { // L: 31
+			var3 = ""; // L: 32
 		}
 
-		String var4 = "Unknown"; // L: 33
-		String var5 = "1.1"; // L: 34
+		String var4 = "Unknown"; // L: 34
+		String var5 = "1.1"; // L: 35
 
 		try {
-			var4 = System.getProperty("java.vendor"); // L: 36
-			var5 = System.getProperty("java.version"); // L: 37
-		} catch (Exception var25) { // L: 39
+			var4 = System.getProperty("java.vendor"); // L: 37
+			var5 = System.getProperty("java.version"); // L: 38
+		} catch (Exception var28) { // L: 40
 		}
 
-		boolean var24;
-		if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 41
-			var24 = false; // L: 42
+		boolean var27;
+		if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 42
+			var27 = false; // L: 43
 		} else {
-			var24 = true;
+			var27 = true;
 		}
 
-		byte var7 = 0; // L: 43
-		if (var1 == 1) { // L: 44
-			if (var3.indexOf("4.0") != -1) { // L: 45
+		byte var7 = 0; // L: 44
+		if (var1 == 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
-			if (var3.indexOf("10.4") != -1) { // L: 58
+		} else if (var1 == 2) { // 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) { // L: 64
+			} else if (var3.indexOf("10.10") != -1) { // L: 65
 				var7 = 26;
-			} 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.method6448(var5); // L: 75
-		int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77
+		this.method6821(var5); // L: 76
+		boolean var9 = false; // L: 77
+		int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 78
 		int var11;
-		if (this.field4083 > 3) { // L: 80
+		if (this.field4262 > 3) { // L: 81
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
-			var11 = 0; // L: 81
+			var11 = 0; // L: 82
 		}
 
-		byte var12 = 0; // L: 82
-		String var13 = ""; // L: 83
-		String var14 = ""; // L: 84
-		String var15 = ""; // L: 85
-		String var16 = ""; // L: 86
-		String var17 = ""; // L: 87
-		String var18 = ""; // L: 88
-		int[] var23 = new int[3]; // L: 93
-		return new PlatformInfo(var1, var24, var7, var8, this.field4083, this.field4079, this.field4080, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97
+		byte var12 = 0; // L: 83
+		String var13 = ""; // L: 84
+		String var14 = ""; // L: 85
+		String var15 = ""; // L: 86
+		String var16 = ""; // L: 87
+		String var17 = ""; // L: 88
+		String var18 = ""; // L: 89
+		boolean var19 = false; // L: 90
+		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.field4262, this.field4259, this.field4263, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 98
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "51"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "742897399"
 	)
-	void method6448(String var1) {
-		if (var1.startsWith("1.")) { // L: 101
-			this.method6457(var1); // L: 102
+	void method6821(String var1) {
+		if (var1.startsWith("1.")) { // L: 102
+			this.method6822(var1); // L: 103
 		} else {
-			this.method6451(var1); // L: 105
+			this.method6823(var1); // L: 106
 		}
 
-	} // L: 107
+	} // L: 108
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "1879411976"
+		garbageValue = "-691110522"
 	)
-	void method6457(String var1) {
-		String[] var2 = var1.split("\\."); // L: 110
+	void method6822(String var1) {
+		String[] var2 = var1.split("\\."); // L: 111
 
 		try {
-			this.field4083 = Integer.parseInt(var2[1]); // L: 112
-			var2 = var2[2].split("_"); // L: 113
-			this.field4079 = Integer.parseInt(var2[0]); // L: 114
-			this.field4080 = Integer.parseInt(var2[1]); // L: 115
-		} catch (Exception var4) { // L: 117
+			this.field4262 = Integer.parseInt(var2[1]); // L: 113
+			var2 = var2[2].split("_"); // L: 114
+			this.field4259 = Integer.parseInt(var2[0]); // L: 115
+			this.field4263 = Integer.parseInt(var2[1]); // L: 116
+		} catch (Exception var4) { // L: 118
 		}
 
-	} // L: 118
+	} // L: 119
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-615789988"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "69"
 	)
-	void method6451(String var1) {
-		String[] var2 = var1.split("\\."); // L: 121
+	void method6823(String var1) {
+		String[] var2 = var1.split("\\."); // L: 122
 
 		try {
-			this.field4083 = Integer.parseInt(var2[0]); // L: 123
-			this.field4079 = Integer.parseInt(var2[1]); // L: 124
-			this.field4080 = Integer.parseInt(var2[2]); // L: 125
-		} catch (Exception var4) { // L: 127
+			this.field4262 = Integer.parseInt(var2[0]); // L: 124
+			this.field4259 = Integer.parseInt(var2[1]); // L: 125
+			this.field4263 = Integer.parseInt(var2[2]); // L: 126
+		} catch (Exception var4) { // L: 128
 		}
 
-	} // L: 128
+	} // L: 129
 }
diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java
index fd591e8d59..9b1cea680e 100644
--- a/runescape-client/src/main/java/DevicePcmPlayer.java
+++ b/runescape-client/src/main/java/DevicePcmPlayer.java
@@ -9,121 +9,114 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ag")
+@ObfuscatedName("ah")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1458693003
+		intValue = 139243337
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("byteSamples")
 	byte[] byteSamples;
 
 	DevicePcmPlayer() {
 	} // L: 18
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "54"
+		descriptor = "(I)V",
+		garbageValue = "-993652709"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)UserComparator2.field4359, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21
-		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22
-	} // L: 23
+		this.format = new AudioFormat((float)class339.field4058, 16, SpriteMask.PcmPlayer_stereo ? 2 : 1, true, false); // L: 22
+		this.byteSamples = new byte[256 << (SpriteMask.PcmPlayer_stereo ? 2 : 1)]; // L: 23
+	} // L: 24
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "122369223"
+		garbageValue = "-865384228"
 	)
 	@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
-			this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 28
-			this.line.open(); // L: 29
-			this.line.start(); // L: 30
-			this.capacity2 = var1; // L: 31
-		} catch (LineUnavailableException var5) { // L: 33
-			if (Tile.method4199(var1) != 1) { // L: 34
-				int var4 = var1 - 1; // L: 38
-				var4 |= var4 >>> 1; // L: 39
-				var4 |= var4 >>> 2; // L: 40
-				var4 |= var4 >>> 4; // L: 41
-				var4 |= var4 >>> 8; // L: 42
-				var4 |= var4 >>> 16; // L: 43
-				int var3 = var4 + 1; // L: 44
-				this.open(var3); // L: 46
+			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (SpriteMask.PcmPlayer_stereo ? 2 : 1)); // L: 29
+			this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 30
+			this.line.open(); // L: 31
+			this.line.start(); // L: 32
+			this.capacity2 = var1; // L: 33
+		} catch (LineUnavailableException var3) { // L: 35
+			if (Language.method5825(var1) != 1) { // L: 36
+				this.open(SpotAnimationDefinition.method3362(var1)); // L: 37
 			} else {
-				this.line = null; // L: 49
-				throw var5; // L: 50
+				this.line = null; // L: 40
+				throw var3; // L: 41
 			}
 		}
-	} // L: 47 52
+	} // L: 38 43
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1689594693"
+		garbageValue = "2142020678"
 	)
 	@Export("position")
 	protected int position() {
-		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 55
+		return this.capacity2 - (this.line.available() >> (SpriteMask.PcmPlayer_stereo ? 2 : 1)); // L: 47
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("write")
 	protected void write() {
-		int var1 = 256; // L: 60
-		if (PcmPlayer.PcmPlayer_stereo) { // L: 61
+		int var1 = 256; // L: 53
+		if (SpriteMask.PcmPlayer_stereo) { // L: 54
 			var1 <<= 1;
 		}
 
-		for (int var2 = 0; var2 < var1; ++var2) { // L: 62
-			int var3 = super.samples[var2]; // L: 63
-			if ((var3 + 8388608 & -16777216) != 0) { // L: 64
-				var3 = 8388607 ^ var3 >> 31; // L: 65
+		for (int var2 = 0; var2 < var1; ++var2) { // L: 55
+			int var3 = super.samples[var2]; // L: 56
+			if ((var3 + 8388608 & -16777216) != 0) { // L: 57
+				var3 = 8388607 ^ var3 >> 31; // L: 58
 			}
 
-			this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 67
-			this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 68
+			this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 60
+			this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 61
 		}
 
-		this.line.write(this.byteSamples, 0, var1 << 1); // L: 70
-	} // L: 71
+		this.line.write(this.byteSamples, 0, var1 << 1); // L: 63
+	} // L: 64
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1440644043"
+		descriptor = "(B)V",
+		garbageValue = "-88"
 	)
 	@Export("close")
 	protected void close() {
-		if (this.line != null) { // L: 74
-			this.line.close(); // L: 75
-			this.line = null; // L: 76
+		if (this.line != null) { // L: 68
+			this.line.close(); // L: 69
+			this.line = null; // L: 70
 		}
 
-	} // L: 78
+	} // L: 72
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-98"
+		descriptor = "(I)V",
+		garbageValue = "-514018891"
 	)
 	@Export("discard")
 	protected void discard() {
-		this.line.flush(); // L: 81
-	} // L: 82
+		this.line.flush(); // L: 76
+	} // L: 77
 }
diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
index f9dfd67b55..ffa4b3c533 100644
--- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java
+++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
@@ -1,279 +1,486 @@
-import java.io.File;
-import java.io.IOException;
+import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("h")
+@ObfuscatedName("i")
 @Implements("DevicePcmPlayerProvider")
-public class DevicePcmPlayerProvider implements class45 {
-	@ObfuscatedName("hu")
-	@ObfuscatedSignature(
-		descriptor = "[Low;"
-	)
-	@Export("headIconHintSprites")
-	static SpritePixels[] headIconHintSprites;
-
+public class DevicePcmPlayerProvider implements class47 {
 	DevicePcmPlayerProvider() {
 	} // L: 7
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(S)Lak;",
-		garbageValue = "6712"
+		descriptor = "(I)Lar;",
+		garbageValue = "826234570"
 	)
 	@Export("player")
 	public PcmPlayer player() {
-		return new DevicePcmPlayer(); // L: 10
+		return new DevicePcmPlayer(); // L: 11
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lnv;",
-		garbageValue = "1795857888"
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V",
+		garbageValue = "114"
 	)
-	@Export("getPreferencesFile")
-	public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
-		File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 219
-		if (var3.exists()) { // L: 220
-			try {
-				AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 222
-				return var10; // L: 223
-			} catch (IOException var9) { // L: 225
-			}
+	@Export("addChatMessage")
+	static void addChatMessage(int var0, String var1, String var2, String var3) {
+		ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23
+		if (var4 == null) { // L: 24
+			var4 = new ChatChannel(); // L: 25
+			Messages.Messages_channels.put(var0, var4); // L: 26
 		}
 
-		String var4 = ""; // L: 227
-		if (JagexCache.cacheGamebuild == 33) { // L: 228
-			var4 = "_rc";
-		} else if (JagexCache.cacheGamebuild == 34) { // L: 229
-			var4 = "_wip";
-		}
+		Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28
+		Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29
+		Messages.Messages_queue.add(var5); // L: 30
+		Client.chatCycle = Client.cycleCntr; // L: 31
+	} // L: 32
 
-		File var5 = new File(TriBool.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 230
-		AccessFile var6;
-		if (!var2 && var5.exists()) { // L: 231
-			try {
-				var6 = new AccessFile(var5, "rw", 10000L); // L: 233
-				return var6; // L: 234
-			} catch (IOException var8) { // L: 236
-			}
-		}
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/awt/Component;B)V",
+		garbageValue = "1"
+	)
+	static void method393(Component var0) {
+		var0.setFocusTraversalKeysEnabled(false); // L: 155
+		var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 156
+		var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 157
+	} // L: 158
 
-		try {
-			var6 = new AccessFile(var3, "rw", 10000L); // L: 239
-			return var6; // L: 240
-		} catch (IOException var7) { // L: 242
-			throw new RuntimeException(); // L: 243
-		}
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "30675574"
+	)
+	public static boolean method398(int var0) {
+		return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 241 242
 	}
 
-	@ObfuscatedName("ir")
+	@ObfuscatedName("he")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIS)V",
-		garbageValue = "1000"
+		descriptor = "(ZLpj;I)V",
+		garbageValue = "147077041"
 	)
-	@Export("addSceneMenuOptions")
-	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
-		if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9322
-			EnumComposition.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9323
-		}
+	@Export("loadRegions")
+	static final void loadRegions(boolean var0, PacketBuffer var1) {
+		Client.isInInstance = var0; // L: 6145
+		int var3;
+		int var4;
+		int var5;
+		int var6;
+		int var7;
+		int var8;
+		if (!Client.isInInstance) { // L: 6146
+			int var2 = var1.method7499(); // L: 6147
+			var3 = var1.method7401(); // L: 6148
+			var4 = var1.readUnsignedShort(); // L: 6149
+			WorldMapID.xteaKeys = new int[var4][4]; // L: 6150
+
+			for (var5 = 0; var5 < var4; ++var5) { // L: 6151
+				for (var6 = 0; var6 < 4; ++var6) { // L: 6152
+					WorldMapID.xteaKeys[var5][var6] = var1.readInt(); // L: 6153
+				}
+			}
 
-		long var4 = -1L; // L: 9326
-		long var6 = -1L; // L: 9327
-		int var8 = 0;
-
-		while (true) {
-			int var10 = ViewportMouse.ViewportMouse_entityCount; // L: 9332
-			if (var8 >= var10) { // L: 9334
-				if (-1L != var4) { // L: 9464
-					var8 = class138.method2827(var4); // L: 9465
-					int var9 = (int)(var4 >>> 7 & 127L); // L: 9468
-					Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9471
-					GraphicsObject.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 9472
+			class269.regions = new int[var4]; // L: 6156
+			Tiles.regionMapArchiveIds = new int[var4]; // L: 6157
+			class10.regionLandArchiveIds = new int[var4]; // L: 6158
+			TileItem.regionLandArchives = new byte[var4][]; // L: 6159
+			VarpDefinition.regionMapArchives = new byte[var4][]; // L: 6160
+			boolean var16 = false; // L: 6161
+			if (Client.field526) { // L: 6162
+				if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 6163
+					var16 = true;
 				}
 
-				return; // L: 9474
+				if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 6164
+					var16 = true;
+				}
 			}
 
-			long var24 = Player.method2159(var8); // L: 9335
-			if (var6 != var24) { // L: 9336
-				label330: {
-					var6 = var24; // L: 9337
-					int var13 = class54.method1111(var8); // L: 9338
-					int var14 = TextureProvider.method4518(var8); // L: 9339
-					long var17 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9343
-					int var16 = (int)(var17 >>> 14 & 3L); // L: 9345
-					int var26 = SoundSystem.method787(var8); // L: 9350
-					if (var16 == 2 && GameBuild.scene.getObjectFlags(GrandExchangeOfferTotalQuantityComparator.Client_plane, var13, var14, var24) >= 0) { // L: 9351 9352
-						ObjectComposition var18 = KitDefinition.getObjectDefinition(var26); // L: 9353
-						if (var18.transforms != null) { // L: 9354
-							var18 = var18.transform();
-						}
+			var4 = 0; // L: 6166
 
-						if (var18 == null) { // L: 9355
-							break label330;
-						}
+			for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 6167
+				for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 6168
+					var8 = var7 + (var6 << 8); // L: 6169
+					if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 6170
+						class269.regions[var4] = var8; // L: 6171
+						Tiles.regionMapArchiveIds[var4] = class140.archive5.getGroupId("m" + var6 + "_" + var7); // L: 6172
+						class10.regionLandArchiveIds[var4] = class140.archive5.getGroupId("l" + var6 + "_" + var7); // L: 6173
+						++var4; // L: 6174
+					}
+				}
+			}
 
-						if (Client.isItemSelected == 1) { // L: 9356
-							EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(65535) + var18.name, 1, var26, var13, var14); // L: 9357
-						} else if (Client.isSpellSelected) { // L: 9360
-							if ((class116.selectedSpellFlags & 4) == 4) { // L: 9361
-								EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(65535) + var18.name, 2, var26, var13, var14); // L: 9362
-							}
+			ModelData0.method4320(var3, var2, true); // L: 6177
+		} else {
+			boolean var15 = var1.method7392() == 1; // L: 6180
+			var3 = var1.readUnsignedShort(); // L: 6181
+			var4 = var1.method7401(); // L: 6182
+			var5 = var1.readUnsignedShort(); // L: 6183
+			var1.importIndex(); // L: 6184
+
+			int var9;
+			for (var6 = 0; var6 < 4; ++var6) { // L: 6185
+				for (var7 = 0; var7 < 13; ++var7) { // L: 6186
+					for (var8 = 0; var8 < 13; ++var8) { // L: 6187
+						var9 = var1.readBits(1); // L: 6188
+						if (var9 == 1) {
+							Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 6189
 						} else {
-							String[] var19 = var18.actions; // L: 9367
-							if (var19 != null) { // L: 9368
-								for (int var20 = 4; var20 >= 0; --var20) { // L: 9369
-									if (var19[var20] != null) { // L: 9370
-										short var21 = 0; // L: 9371
-										if (var20 == 0) { // L: 9372
-											var21 = 3;
-										}
-
-										if (var20 == 1) { // L: 9373
-											var21 = 4;
-										}
-
-										if (var20 == 2) { // L: 9374
-											var21 = 5;
-										}
-
-										if (var20 == 3) { // L: 9375
-											var21 = 6;
-										}
-
-										if (var20 == 4) { // L: 9376
-											var21 = 1001;
-										}
-
-										EnumComposition.insertMenuItemNoShift(var19[var20], MouseHandler.colorStartTag(65535) + var18.name, var21, var26, var13, var14); // L: 9377
-									}
-								}
-							}
-
-							EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(65535) + var18.name, 1002, var18.id, var13, var14); // L: 9382
+							Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 6190
 						}
 					}
+				}
+			}
 
-					Player var22;
-					int var27;
-					NPC var28;
-					int var35;
-					int[] var36;
-					if (var16 == 1) { // L: 9387
-						NPC var31 = Client.npcs[var26]; // L: 9388
-						if (var31 == null) { // L: 9389
-							break label330;
-						}
+			var1.exportIndex(); // L: 6194
+			WorldMapID.xteaKeys = new int[var5][4]; // L: 6195
+
+			for (var6 = 0; var6 < var5; ++var6) { // L: 6196
+				for (var7 = 0; var7 < 4; ++var7) { // L: 6197
+					WorldMapID.xteaKeys[var6][var7] = var1.readInt(); // L: 6198
+				}
+			}
 
-						if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { // L: 9390
-							for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 9391
-								var28 = Client.npcs[Client.npcIndices[var27]]; // L: 9392
-								if (var28 != null && var31 != var28 && var28.definition.size == 1 && var28.x == var31.x && var31.y == var28.y) { // L: 9393
-									WorldMapScaleHandler.addNpcToMenu(var28, Client.npcIndices[var27], var13, var14);
+			class269.regions = new int[var5]; // L: 6201
+			Tiles.regionMapArchiveIds = new int[var5]; // L: 6202
+			class10.regionLandArchiveIds = new int[var5]; // L: 6203
+			TileItem.regionLandArchives = new byte[var5][]; // L: 6204
+			VarpDefinition.regionMapArchives = new byte[var5][]; // L: 6205
+			var5 = 0; // L: 6206
+
+			for (var6 = 0; var6 < 4; ++var6) { // L: 6207
+				for (var7 = 0; var7 < 13; ++var7) { // L: 6208
+					for (var8 = 0; var8 < 13; ++var8) { // L: 6209
+						var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 6210
+						if (var9 != -1) { // L: 6211
+							int var10 = var9 >> 14 & 1023; // L: 6212
+							int var11 = var9 >> 3 & 2047; // L: 6213
+							int var12 = (var10 / 8 << 8) + var11 / 8; // L: 6214
+
+							int var13;
+							for (var13 = 0; var13 < var5; ++var13) { // L: 6215
+								if (class269.regions[var13] == var12) {
+									var12 = -1; // L: 6216
+									break; // L: 6217
 								}
 							}
 
-							var27 = Players.Players_count; // L: 9395
-							var36 = Players.Players_indices; // L: 9396
-
-							for (var35 = 0; var35 < var27; ++var35) { // L: 9397
-								var22 = Client.players[var36[var35]]; // L: 9398
-								if (var22 != null && var31.x == var22.x && var22.y == var31.y) { // L: 9399
-									GraphicsObject.addPlayerToMenu(var22, var36[var35], var13, var14);
-								}
+							if (var12 != -1) { // L: 6219
+								class269.regions[var5] = var12; // L: 6220
+								var13 = var12 >> 8 & 255; // L: 6221
+								int var14 = var12 & 255; // L: 6222
+								Tiles.regionMapArchiveIds[var5] = class140.archive5.getGroupId("m" + var13 + "_" + var14); // L: 6223
+								class10.regionLandArchiveIds[var5] = class140.archive5.getGroupId("l" + var13 + "_" + var14); // L: 6224
+								++var5; // L: 6225
 							}
 						}
+					}
+				}
+			}
+
+			ModelData0.method4320(var4, var3, !var15); // L: 6231
+		}
+
+	} // L: 6233
+
+	@ObfuscatedName("hb")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIII)V",
+		garbageValue = "-149129568"
+	)
+	@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: 8027
+			if (Client.isLowDetail && var0 != class20.Client_plane) { // L: 8028
+				return;
+			}
+
+			long var7 = 0L; // L: 8029
+			boolean var9 = true; // L: 8030
+			boolean var10 = false; // L: 8031
+			boolean var11 = false; // L: 8032
+			if (var1 == 0) { // L: 8033
+				var7 = class7.scene.getBoundaryObjectTag(var0, var2, var3);
+			}
+
+			if (var1 == 1) { // L: 8034
+				var7 = class7.scene.getWallDecorationTag(var0, var2, var3);
+			}
+
+			if (var1 == 2) { // L: 8035
+				var7 = class7.scene.getGameObjectTag(var0, var2, var3);
+			}
+
+			if (var1 == 3) { // L: 8036
+				var7 = class7.scene.getFloorDecorationTag(var0, var2, var3);
+			}
+
+			int var12;
+			if (var7 != 0L) { // L: 8037
+				var12 = class7.scene.getObjectFlags(var0, var2, var3, var7); // L: 8038
+				int var38 = PacketWriter.Entity_unpackID(var7); // L: 8039
+				int var39 = var12 & 31; // L: 8040
+				int var40 = var12 >> 6 & 3; // L: 8041
+				ObjectComposition var13;
+				if (var1 == 0) { // L: 8042
+					class7.scene.removeBoundaryObject(var0, var2, var3); // L: 8043
+					var13 = class148.getObjectDefinition(var38); // L: 8044
+					if (var13.interactType != 0) { // L: 8045
+						Client.collisionMaps[var0].method3693(var2, var3, var39, var40, var13.boolean1);
+					}
+				}
+
+				if (var1 == 1) { // L: 8047
+					class7.scene.removeWallDecoration(var0, var2, var3);
+				}
+
+				if (var1 == 2) { // L: 8048
+					class7.scene.removeGameObject(var0, var2, var3); // L: 8049
+					var13 = class148.getObjectDefinition(var38); // L: 8050
+					if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 8051
+						return;
+					}
+
+					if (var13.interactType != 0) { // L: 8052
+						Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1);
+					}
+				}
+
+				if (var1 == 3) { // L: 8054
+					class7.scene.removeFloorDecoration(var0, var2, var3); // L: 8055
+					var13 = class148.getObjectDefinition(var38); // L: 8056
+					if (var13.interactType == 1) { // L: 8057
+						Client.collisionMaps[var0].method3701(var2, var3);
+					}
+				}
+			}
+
+			if (var4 >= 0) { // L: 8060
+				var12 = var0; // L: 8061
+				if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 8062
+					var12 = var0 + 1;
+				}
+
+				Scene var41 = class7.scene; // L: 8063
+				CollisionMap var14 = Client.collisionMaps[var0]; // L: 8064
+				ObjectComposition var15 = class148.getObjectDefinition(var4); // L: 8066
+				int var16;
+				int var17;
+				if (var5 != 1 && var5 != 3) { // L: 8069
+					var16 = var15.sizeX; // L: 8074
+					var17 = var15.sizeY; // L: 8075
+				} else {
+					var16 = var15.sizeY; // L: 8070
+					var17 = var15.sizeX; // L: 8071
+				}
+
+				int var18;
+				int var19;
+				if (var16 + var2 <= 104) { // L: 8081
+					var18 = (var16 >> 1) + var2; // L: 8082
+					var19 = var2 + (var16 + 1 >> 1); // L: 8083
+				} else {
+					var18 = var2; // L: 8086
+					var19 = var2 + 1; // L: 8087
+				}
+
+				int var20;
+				int var21;
+				if (var3 + var17 <= 104) { // L: 8089
+					var20 = var3 + (var17 >> 1); // L: 8090
+					var21 = var3 + (var17 + 1 >> 1); // L: 8091
+				} else {
+					var20 = var3; // L: 8094
+					var21 = var3 + 1; // L: 8095
+				}
+
+				int[][] var22 = Tiles.Tiles_heights[var12]; // L: 8097
+				int var23 = var22[var18][var20] + var22[var19][var20] + var22[var18][var21] + var22[var19][var21] >> 2; // L: 8098
+				int var24 = (var2 << 7) + (var16 << 6); // L: 8099
+				int var25 = (var3 << 7) + (var17 << 6); // L: 8100
+				long var26 = SecureRandomFuture.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 8101
+				int var28 = (var5 << 6) + var6; // L: 8102
+				if (var15.int3 == 1) { // L: 8103
+					var28 += 256;
+				}
 
-						WorldMapScaleHandler.addNpcToMenu(var31, var26, var13, var14); // L: 9402
+				Object var36;
+				if (var6 == 22) { // L: 8104
+					if (var15.animationId == -1 && var15.transforms == null) { // L: 8106
+						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: 8107
 					}
 
-					if (var16 == 0) { // L: 9404
-						Player var32 = Client.players[var26]; // L: 9405
-						if (var32 == null) { // L: 9406
-							break label330;
+					var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 8108
+					if (var15.interactType == 1) { // L: 8109
+						var14.setBlockedByFloorDec(var2, var3);
+					}
+				} else if (var6 != 10 && var6 != 11) { // L: 8112
+					if (var6 >= 12) { // L: 8120
+						if (var15.animationId == -1 && var15.transforms == null) { // L: 8122
+							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: 8123
 						}
 
-						if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { // L: 9407
-							for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 9408
-								var28 = Client.npcs[Client.npcIndices[var27]]; // L: 9409
-								if (var28 != null && var28.definition.size == 1 && var32.x == var28.x && var32.y == var28.y) { // L: 9410
-									WorldMapScaleHandler.addNpcToMenu(var28, Client.npcIndices[var27], var13, var14);
-								}
+						var41.method3960(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 8124
+						if (var15.interactType != 0) { // L: 8125
+							var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
+						}
+					} else if (var6 == 0) { // L: 8128
+						if (var15.animationId == -1 && var15.transforms == null) { // L: 8130
+							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: 8131
+						}
+
+						var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field969[var5], 0, var26, var28); // L: 8132
+						if (var15.interactType != 0) { // L: 8133
+							var14.method3721(var2, var3, var6, var5, var15.boolean1);
+						}
+					} else if (var6 == 1) { // L: 8136
+						if (var15.animationId == -1 && var15.transforms == null) { // L: 8138
+							var36 = var15.getModel(1, var5, var22, var24, var23, var25);
+						} else {
+							var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8139
+						}
+
+						var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field970[var5], 0, var26, var28); // L: 8140
+						if (var15.interactType != 0) { // L: 8141
+							var14.method3721(var2, var3, var6, var5, var15.boolean1);
+						}
+					} else {
+						int var29;
+						if (var6 == 2) { // L: 8144
+							var29 = var5 + 1 & 3; // L: 8145
+							Object var31;
+							Object var37;
+							if (var15.animationId == -1 && var15.transforms == null) { // L: 8148
+								var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 8149
+								var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 8150
+							} else {
+								var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8153
+								var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8154
 							}
 
-							var27 = Players.Players_count; // L: 9412
-							var36 = Players.Players_indices; // L: 9413
+							var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field969[var5], Tiles.field969[var29], var26, var28); // L: 8156
+							if (var15.interactType != 0) { // L: 8157
+								var14.method3721(var2, var3, var6, var5, var15.boolean1);
+							}
+						} else if (var6 == 3) { // L: 8160
+							if (var15.animationId == -1 && var15.transforms == null) { // L: 8162
+								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: 8163
+							}
 
-							for (var35 = 0; var35 < var27; ++var35) { // L: 9414
-								var22 = Client.players[var36[var35]]; // L: 9415
-								if (var22 != null && var22 != var32 && var32.x == var22.x && var32.y == var22.y) { // L: 9416
-									GraphicsObject.addPlayerToMenu(var22, var36[var35], var13, var14);
-								}
+							var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field970[var5], 0, var26, var28); // L: 8164
+							if (var15.interactType != 0) { // L: 8165
+								var14.method3721(var2, var3, var6, var5, var15.boolean1);
+							}
+						} else if (var6 == 9) { // L: 8168
+							if (var15.animationId == -1 && var15.transforms == null) { // L: 8170
+								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: 8171
+							}
+
+							var41.method3960(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 8172
+							if (var15.interactType != 0) { // L: 8173
+								var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
+							}
+						} else if (var6 == 4) { // L: 8176
+							if (var15.animationId == -1 && var15.transforms == null) { // L: 8178
+								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: 8179
 							}
-						}
 
-						if (var26 != Client.combatTargetPlayerIndex) { // L: 9419
-							GraphicsObject.addPlayerToMenu(var32, var26, var13, var14);
+							var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field969[var5], 0, 0, 0, var26, var28); // L: 8180
 						} else {
-							var4 = var24; // L: 9420
-						}
-					}
+							long var30;
+							Object var32;
+							if (var6 == 5) { // L: 8183
+								var29 = 16; // L: 8184
+								var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 8185
+								if (var30 != 0L) { // L: 8186
+									var29 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var30)).int2;
+								}
+
+								if (var15.animationId == -1 && var15.transforms == null) { // L: 8188
+									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: 8189
+								}
+
+								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field969[var5], 0, var29 * Tiles.field976[var5], var29 * Tiles.field966[var5], var26, var28); // L: 8190
+							} else if (var6 == 6) { // L: 8193
+								var29 = 8; // L: 8194
+								var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 8195
+								if (var30 != 0L) { // L: 8196
+									var29 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var30)).int2 / 2;
+								}
+
+								if (var15.animationId == -1 && var15.transforms == null) { // L: 8198
+									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: 8199
+								}
+
+								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field973[var5], var29 * Tiles.field974[var5], var26, var28); // L: 8200
+							} else if (var6 == 7) { // L: 8203
+								int var35 = var5 + 2 & 3; // L: 8205
+								if (var15.animationId == -1 && var15.transforms == null) { // L: 8206
+									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: 8207
+								}
 
-					if (var16 == 3) { // L: 9422
-						NodeDeque var34 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var13][var14]; // L: 9423
-						if (var34 != null) { // L: 9424
-							for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { // L: 9425 9426 9459
-								ItemComposition var37 = TaskHandler.ItemDefinition_get(var33.id); // L: 9427
-								if (Client.isItemSelected == 1) { // L: 9428
-									EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(16748608) + var37.name, 16, var33.id, var13, var14); // L: 9429
-								} else if (Client.isSpellSelected) { // L: 9432
-									if ((class116.selectedSpellFlags & 1) == 1) { // L: 9433
-										EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(16748608) + var37.name, 17, var33.id, var13, var14); // L: 9434
-									}
+								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 8208
+							} else if (var6 == 8) { // L: 8211
+								var29 = 8; // L: 8212
+								var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 8213
+								if (0L != var30) { // L: 8214
+									var29 = class148.getObjectDefinition(PacketWriter.Entity_unpackID(var30)).int2 / 2;
+								}
+
+								int var34 = var5 + 2 & 3; // L: 8217
+								Object var33;
+								if (var15.animationId == -1 && var15.transforms == null) { // L: 8218
+									var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 8219
+									var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 8220
 								} else {
-									String[] var29 = var37.groundActions; // L: 9439
-
-									for (int var30 = 4; var30 >= 0; --var30) { // L: 9440
-										if (var29 != null && var29[var30] != null) { // L: 9441
-											byte var23 = 0; // L: 9442
-											if (var30 == 0) { // L: 9443
-												var23 = 18;
-											}
-
-											if (var30 == 1) { // L: 9444
-												var23 = 19;
-											}
-
-											if (var30 == 2) { // L: 9445
-												var23 = 20;
-											}
-
-											if (var30 == 3) { // L: 9446
-												var23 = 21;
-											}
-
-											if (var30 == 4) { // L: 9447
-												var23 = 22;
-											}
-
-											EnumComposition.insertMenuItemNoShift(var29[var30], MouseHandler.colorStartTag(16748608) + var37.name, var23, var33.id, var13, var14); // L: 9448
-										} else if (var30 == 2) { // L: 9451
-											EnumComposition.insertMenuItemNoShift("Take", MouseHandler.colorStartTag(16748608) + var37.name, 20, var33.id, var13, var14); // L: 9452
-										}
-									}
-
-									EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(16748608) + var37.name, 1004, var33.id, var13, var14); // L: 9456
+									var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8223
+									var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 8224
 								}
+
+								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field973[var5], var29 * Tiles.field974[var5], var26, var28); // L: 8226
 							}
 						}
 					}
+				} else {
+					if (var15.animationId == -1 && var15.transforms == null) { // L: 8114
+						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: 8115
+					}
+
+					if (var36 != null) { // L: 8116
+						var41.method3960(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28);
+					}
+
+					if (var15.interactType != 0) { // L: 8117
+						var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
+					}
 				}
 			}
-
-			++var8; // L: 9328
 		}
-	}
+
+	} // L: 8231
 }
diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java
index da0d9ec219..786e3f2b8e 100644
--- a/runescape-client/src/main/java/DirectByteArrayCopier.java
+++ b/runescape-client/src/main/java/DirectByteArrayCopier.java
@@ -7,28 +7,17 @@
 @ObfuscatedName("jz")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("ItemDefinition_archive")
-	public static AbstractArchive ItemDefinition_archive;
-	@ObfuscatedName("j")
-	static int[][] field3212;
-	@ObfuscatedName("bn")
-	@ObfuscatedSignature(
-		descriptor = "[Low;"
-	)
-	@Export("worldSelectBackSprites")
-	static SpritePixels[] worldSelectBackSprites;
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
+	@Export("clearLoginScreen")
+	static boolean clearLoginScreen;
+	@ObfuscatedName("c")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)[B",
-		garbageValue = "99"
+		descriptor = "(I)[B",
+		garbageValue = "1918796592"
 	)
 	@Export("get")
 	byte[] get() {
@@ -38,10 +27,10 @@ byte[] get() {
 		return var1; // L: 16
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "([BB)V",
-		garbageValue = "-48"
+		descriptor = "([BI)V",
+		garbageValue = "-1795617978"
 	)
 	@Export("set")
 	public void set(byte[] var1) {
@@ -50,14 +39,316 @@ public void set(byte[] var1) {
 		this.directBuffer.put(var1); // L: 22
 	} // L: 23
 
-	@ObfuscatedName("ju")
+	@ObfuscatedName("ha")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1646184786"
+		descriptor = "(Lif;B)V",
+		garbageValue = "14"
 	)
-	static final void method5179(int var0) {
-		if (class174.loadInterface(var0)) { // L: 11315
-			class135.drawModelComponents(WorldMapSection1.Widget_interfaceComponents[var0], -1); // L: 11316
+	static final void method5328(class253 var0) {
+		PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7664
+		int var6;
+		int var7;
+		int var8;
+		int var9;
+		int var11;
+		int var37;
+		int var38;
+		int var39;
+		int var40;
+		if (class253.field2911 == var0) { // L: 7665
+			var37 = var1.method7403(); // L: 7666
+			var38 = var1.method7520(); // L: 7667
+			var39 = (var38 >> 4 & 7) + class17.field90; // L: 7668
+			var40 = (var38 & 7) + class167.field1813; // L: 7669
+			var6 = var1.method7394(); // L: 7670
+			var7 = var6 >> 2; // L: 7671
+			var8 = var6 & 3; // L: 7672
+			var9 = Client.field537[var7]; // L: 7673
+			if (var39 >= 0 && var40 >= 0 && var39 < 103 && var40 < 103) { // L: 7674
+				if (var9 == 0) { // L: 7675
+					BoundaryObject var36 = class7.scene.method4105(class20.Client_plane, var39, var40); // L: 7676
+					if (var36 != null) { // L: 7677
+						var11 = PacketWriter.Entity_unpackID(var36.tag); // L: 7678
+						if (var7 == 2) { // L: 7679
+							var36.renderable1 = new DynamicObject(var11, 2, var8 + 4, class20.Client_plane, var39, var40, var37, false, var36.renderable1); // L: 7680
+							var36.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class20.Client_plane, var39, var40, var37, false, var36.renderable2); // L: 7681
+						} else {
+							var36.renderable1 = new DynamicObject(var11, var7, var8, class20.Client_plane, var39, var40, var37, false, var36.renderable1); // L: 7683
+						}
+					}
+				}
+
+				if (var9 == 1) { // L: 7686
+					WallDecoration var44 = class7.scene.method3973(class20.Client_plane, var39, var40); // L: 7687
+					if (var44 != null) { // L: 7688
+						var11 = PacketWriter.Entity_unpackID(var44.tag); // L: 7689
+						if (var7 != 4 && var7 != 5) { // L: 7690
+							if (var7 == 6) { // L: 7691
+								var44.renderable1 = new DynamicObject(var11, 4, var8 + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1);
+							} else if (var7 == 7) { // L: 7692
+								var44.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1);
+							} else if (var7 == 8) { // L: 7693
+								var44.renderable1 = new DynamicObject(var11, 4, var8 + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable1); // L: 7694
+								var44.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class20.Client_plane, var39, var40, var37, false, var44.renderable2); // L: 7695
+							}
+						} else {
+							var44.renderable1 = new DynamicObject(var11, 4, var8, class20.Client_plane, var39, var40, var37, false, var44.renderable1);
+						}
+					}
+				}
+
+				if (var9 == 2) { // L: 7699
+					GameObject var45 = class7.scene.getGameObject(class20.Client_plane, var39, var40); // L: 7700
+					if (var7 == 11) { // L: 7701
+						var7 = 10;
+					}
+
+					if (var45 != null) { // L: 7702
+						var45.renderable = new DynamicObject(PacketWriter.Entity_unpackID(var45.tag), var7, var8, class20.Client_plane, var39, var40, var37, false, var45.renderable);
+					}
+				}
+
+				if (var9 == 3) { // L: 7704
+					FloorDecoration var46 = class7.scene.getFloorDecoration(class20.Client_plane, var39, var40); // L: 7705
+					if (var46 != null) { // L: 7706
+						var46.renderable = new DynamicObject(PacketWriter.Entity_unpackID(var46.tag), 22, var8, class20.Client_plane, var39, var40, var37, false, var46.renderable);
+					}
+				}
+			}
+
+		} else {
+			int var10;
+			int var12;
+			int var13;
+			int var14;
+			if (class253.field2913 == var0) { // L: 7711
+				byte var2 = var1.method7396(); // L: 7712
+				byte var3 = var1.readByte(); // L: 7713
+				byte var4 = var1.method7396(); // L: 7714
+				byte var5 = var1.readByte(); // L: 7715
+				var6 = var1.readUnsignedShort(); // L: 7716
+				var7 = var1.method7499(); // L: 7717
+				var8 = var1.readUnsignedShort(); // L: 7718
+				var9 = var1.method7520(); // L: 7719
+				var10 = (var9 >> 4 & 7) + class17.field90; // L: 7720
+				var11 = (var9 & 7) + class167.field1813; // L: 7721
+				var12 = var1.method7392(); // L: 7722
+				var13 = var12 >> 2; // L: 7723
+				var14 = var12 & 3; // L: 7724
+				int var15 = Client.field537[var13]; // L: 7725
+				int var16 = var1.method7401(); // L: 7726
+				Player var17;
+				if (var16 == Client.localPlayerIndex) { // L: 7728
+					var17 = class340.localPlayer;
+				} else {
+					var17 = Client.players[var16]; // L: 7729
+				}
+
+				if (var17 != null) { // L: 7730
+					ObjectComposition var18 = class148.getObjectDefinition(var6); // L: 7731
+					int var19;
+					int var20;
+					if (var14 != 1 && var14 != 3) { // L: 7734
+						var19 = var18.sizeX; // L: 7739
+						var20 = var18.sizeY; // L: 7740
+					} else {
+						var19 = var18.sizeY; // L: 7735
+						var20 = var18.sizeX; // L: 7736
+					}
+
+					int var21 = var10 + (var19 >> 1); // L: 7742
+					int var22 = var10 + (var19 + 1 >> 1); // L: 7743
+					int var23 = var11 + (var20 >> 1); // L: 7744
+					int var24 = var11 + (var20 + 1 >> 1); // L: 7745
+					int[][] var25 = Tiles.Tiles_heights[class20.Client_plane]; // L: 7746
+					int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; // L: 7747
+					int var27 = (var10 << 7) + (var19 << 6); // L: 7748
+					int var28 = (var11 << 7) + (var20 << 6); // L: 7749
+					Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); // L: 7750
+					if (var29 != null) { // L: 7751
+						Varcs.updatePendingSpawn(class20.Client_plane, var10, var11, var15, -1, 0, 0, var7 + 1, var8 + 1); // L: 7752
+						var17.animationCycleStart = var7 + Client.cycle; // L: 7753
+						var17.animationCycleEnd = var8 + Client.cycle; // L: 7754
+						var17.model0 = var29; // L: 7755
+						var17.field1056 = var19 * 64 + var10 * 128; // L: 7756
+						var17.field1058 = var20 * 64 + var11 * 128; // L: 7757
+						var17.tileHeight2 = var26; // L: 7758
+						byte var30;
+						if (var3 > var2) { // L: 7759
+							var30 = var3; // L: 7760
+							var3 = var2; // L: 7761
+							var2 = var30; // L: 7762
+						}
+
+						if (var5 > var4) { // L: 7764
+							var30 = var5; // L: 7765
+							var5 = var4; // L: 7766
+							var4 = var30; // L: 7767
+						}
+
+						var17.minX = var10 + var3; // L: 7769
+						var17.maxX = var10 + var2; // L: 7770
+						var17.minY = var11 + var5; // L: 7771
+						var17.maxY = var4 + var11; // L: 7772
+					}
+				}
+			}
+
+			if (class253.field2920 == var0) { // L: 7776
+				var37 = var1.method7392(); // L: 7777
+				var38 = (var37 >> 4 & 7) + class17.field90; // L: 7778
+				var39 = (var37 & 7) + class167.field1813; // L: 7779
+				var40 = var1.method7404(); // L: 7780
+				byte var41 = var1.method7396(); // L: 7781
+				var7 = var1.readUnsignedShort(); // L: 7782
+				var8 = var1.readUnsignedByte(); // L: 7783
+				var9 = var1.method7401(); // L: 7784
+				var10 = var1.readUnsignedByte() * 4; // L: 7785
+				var11 = var1.method7520(); // L: 7786
+				var12 = var1.method7403(); // L: 7787
+				var13 = var1.readUnsignedByte() * 4; // L: 7788
+				byte var42 = var1.method7465(); // L: 7789
+				var6 = var41 + var38; // L: 7790
+				var14 = var42 + var39; // L: 7791
+				if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104 && var6 >= 0 && var14 >= 0 && var6 < 104 && var14 < 104 && var9 != 65535) { // L: 7792
+					var38 = var38 * 128 + 64; // L: 7793
+					var39 = var39 * 128 + 64; // L: 7794
+					var6 = var6 * 128 + 64; // L: 7795
+					var14 = var14 * 128 + 64; // L: 7796
+					Projectile var35 = new Projectile(var9, class20.Client_plane, var38, var39, FaceNormal.getTileHeight(var38, var39, class20.Client_plane) - var10, var12 + Client.cycle, var7 + Client.cycle, var11, var8, var40, var13); // L: 7797
+					var35.setDestination(var6, var14, FaceNormal.getTileHeight(var6, var14, class20.Client_plane) - var13, var12 + Client.cycle); // L: 7798
+					Client.projectiles.addFirst(var35); // L: 7799
+				}
+
+			} else if (class253.field2916 == var0) { // L: 7803
+				var37 = var1.method7394(); // L: 7804
+				var38 = var37 >> 2; // L: 7805
+				var39 = var37 & 3; // L: 7806
+				var40 = Client.field537[var38]; // L: 7807
+				var6 = var1.method7394(); // L: 7808
+				var7 = (var6 >> 4 & 7) + class17.field90; // L: 7809
+				var8 = (var6 & 7) + class167.field1813; // L: 7810
+				var9 = var1.method7403(); // L: 7811
+				if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7812
+					Varcs.updatePendingSpawn(class20.Client_plane, var7, var8, var40, var9, var38, var39, 0, -1); // L: 7813
+				}
+
+			} else if (class253.field2918 == var0) { // L: 7817
+				var37 = var1.readUnsignedByte(); // L: 7818
+				var38 = var37 >> 2; // L: 7819
+				var39 = var37 & 3; // L: 7820
+				var40 = Client.field537[var38]; // L: 7821
+				var6 = var1.method7392(); // L: 7822
+				var7 = (var6 >> 4 & 7) + class17.field90; // L: 7823
+				var8 = (var6 & 7) + class167.field1813; // L: 7824
+				if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7825
+					Varcs.updatePendingSpawn(class20.Client_plane, var7, var8, var40, -1, var38, var39, 0, -1); // L: 7826
+				}
+
+			} else {
+				TileItem var33;
+				if (class253.field2917 == var0) { // L: 7830
+					var37 = var1.method7392(); // L: 7831
+					var38 = (var37 >> 4 & 7) + class17.field90; // L: 7832
+					var39 = (var37 & 7) + class167.field1813; // L: 7833
+					var40 = var1.method7401(); // L: 7834
+					if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { // L: 7835
+						NodeDeque var34 = Client.groundItems[class20.Client_plane][var38][var39]; // L: 7836
+						if (var34 != null) { // L: 7837
+							for (var33 = (TileItem)var34.last(); var33 != null; var33 = (TileItem)var34.previous()) { // L: 7838 7839 7844
+								if ((var40 & 32767) == var33.id) { // L: 7840
+									var33.remove(); // L: 7841
+									break;
+								}
+							}
+
+							if (var34.last() == null) { // L: 7846
+								Client.groundItems[class20.Client_plane][var38][var39] = null;
+							}
+
+							MouseHandler.updateItemPile(var38, var39); // L: 7847
+						}
+					}
+
+				} else if (class253.field2914 == var0) { // L: 7852
+					var37 = var1.readUnsignedShort(); // L: 7853
+					var38 = var1.method7394(); // L: 7854
+					var39 = (var38 >> 4 & 7) + class17.field90; // L: 7855
+					var40 = (var38 & 7) + class167.field1813; // L: 7856
+					var6 = var1.method7401(); // L: 7857
+					if (var39 >= 0 && var40 >= 0 && var39 < 104 && var40 < 104) { // L: 7858
+						var33 = new TileItem(); // L: 7859
+						var33.id = var37; // L: 7860
+						var33.quantity = var6; // L: 7861
+						if (Client.groundItems[class20.Client_plane][var39][var40] == null) { // L: 7862
+							Client.groundItems[class20.Client_plane][var39][var40] = new NodeDeque();
+						}
+
+						Client.groundItems[class20.Client_plane][var39][var40].addFirst(var33); // L: 7863
+						MouseHandler.updateItemPile(var39, var40); // L: 7864
+					}
+
+				} else if (class253.field2912 == var0) { // L: 7868
+					var37 = var1.method7392(); // L: 7869
+					var38 = (var37 >> 4 & 7) + class17.field90; // L: 7870
+					var39 = (var37 & 7) + class167.field1813; // L: 7871
+					var40 = var1.method7403(); // L: 7872
+					var6 = var1.method7520(); // L: 7873
+					var7 = var1.readUnsignedShort(); // L: 7874
+					if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { // L: 7875
+						var38 = var38 * 128 + 64; // L: 7876
+						var39 = var39 * 128 + 64; // L: 7877
+						GraphicsObject var43 = new GraphicsObject(var40, class20.Client_plane, var38, var39, FaceNormal.getTileHeight(var38, var39, class20.Client_plane) - var6, var7, Client.cycle); // L: 7878
+						Client.graphicsObjects.addFirst(var43); // L: 7879
+					}
+
+				} else {
+					if (class253.field2915 == var0) { // L: 7883
+						var37 = var1.readUnsignedByte(); // L: 7884
+						var38 = var37 >> 4 & 15; // L: 7885
+						var39 = var37 & 7; // L: 7886
+						var40 = var1.method7392(); // L: 7887
+						var6 = var1.readUnsignedByte(); // L: 7888
+						var7 = (var6 >> 4 & 7) + class17.field90; // L: 7889
+						var8 = (var6 & 7) + class167.field1813; // L: 7890
+						var9 = var1.method7499(); // L: 7891
+						if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7892
+							var10 = var38 + 1; // L: 7893
+							if (class340.localPlayer.pathX[0] >= var7 - var10 && class340.localPlayer.pathX[0] <= var10 + var7 && class340.localPlayer.pathY[0] >= var8 - var10 && class340.localPlayer.pathY[0] <= var10 + var8 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0 && var39 > 0 && Client.soundEffectCount < 50) { // L: 7894 7895
+								Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7896
+								Client.queuedSoundEffectLoops[Client.soundEffectCount] = var39; // L: 7897
+								Client.queuedSoundEffectDelays[Client.soundEffectCount] = var40; // L: 7898
+								Client.soundEffects[Client.soundEffectCount] = null; // L: 7899
+								Client.soundLocations[Client.soundEffectCount] = var38 + (var8 << 8) + (var7 << 16); // L: 7900
+								++Client.soundEffectCount; // L: 7901
+							}
+						}
+					}
+
+					if (class253.field2919 == var0) { // L: 7906
+						var37 = var1.readUnsignedShort(); // L: 7907
+						var38 = var1.method7499(); // L: 7908
+						var39 = var1.method7392(); // L: 7909
+						var40 = (var39 >> 4 & 7) + class17.field90; // L: 7910
+						var6 = (var39 & 7) + class167.field1813; // L: 7911
+						var7 = var1.method7401(); // L: 7912
+						if (var40 >= 0 && var6 >= 0 && var40 < 104 && var6 < 104) { // L: 7913
+							NodeDeque var31 = Client.groundItems[class20.Client_plane][var40][var6]; // L: 7914
+							if (var31 != null) { // L: 7915
+								for (TileItem var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { // L: 7916 7917 7922
+									if ((var7 & 32767) == var32.id && var38 == var32.quantity) { // L: 7918
+										var32.quantity = var37; // L: 7919
+										break;
+									}
+								}
+
+								MouseHandler.updateItemPile(var40, var6); // L: 7924
+							}
+						}
+
+					}
+				}
+			}
 		}
-	} // L: 11317
+	} // L: 7709 7801 7815 7828 7850 7866 7881 7927 7929
 }
diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java
index 28780d24f5..fe4ac026db 100644
--- a/runescape-client/src/main/java/DirectWrapper.java
+++ b/runescape-client/src/main/java/DirectWrapper.java
@@ -2,10 +2,10 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("id")
+@ObfuscatedName("is")
 @Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("obj")
 	Object obj;
 
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1; // L: 8
 	} // L: 9
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("get")
 	Object get() {
 		return this.obj; // L: 12
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("isSoft")
 	boolean isSoft() {
 		return false; // L: 16
diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java
index 51fbf2a05b..d84195a7cc 100644
--- a/runescape-client/src/main/java/DualNode.java
+++ b/runescape-client/src/main/java/DualNode.java
@@ -3,26 +3,26 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nt")
+@ObfuscatedName("nc")
 @Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("cc")
+	@ObfuscatedName("cu")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("ch")
+	@ObfuscatedName("cx")
 	@ObfuscatedSignature(
-		descriptor = "Lnt;"
+		descriptor = "Lnc;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cz")
+	@ObfuscatedName("cm")
 	@ObfuscatedSignature(
-		descriptor = "Lnt;"
+		descriptor = "Lnc;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("cb")
+	@ObfuscatedName("do")
 	@Export("removeDual")
 	public void removeDual() {
 		if (this.nextDual != null) { // L: 9
diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java
index e1d6d47fef..2c0f38a4cc 100644
--- a/runescape-client/src/main/java/DualNodeDeque.java
+++ b/runescape-client/src/main/java/DualNodeDeque.java
@@ -3,12 +3,12 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ka")
+@ObfuscatedName("la")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lnt;"
+		descriptor = "Lnc;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public DualNodeDeque() {
 		this.sentinel.nextDual = this.sentinel; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lnt;)V"
+		descriptor = "(Lnc;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public void addFirst(DualNode var1) {
 		var1.previousDual.nextDual = var1; // L: 18
 	} // L: 19
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lnt;)V"
+		descriptor = "(Lnc;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public void addLast(DualNode var1) {
 		var1.previousDual.nextDual = var1; // L: 26
 	} // L: 27
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "()Lnt;"
+		descriptor = "()Lnc;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {
diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java
index 359caefe4e..9a82337678 100644
--- a/runescape-client/src/main/java/DynamicObject.java
+++ b/runescape-client/src/main/java/DynamicObject.java
@@ -4,86 +4,84 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bn")
+@ObfuscatedName("bj")
 @Implements("DynamicObject")
 public class DynamicObject extends Renderable {
-	@ObfuscatedName("jy")
-	@ObfuscatedGetter(
-		intValue = -740824161
-	)
-	static int field942;
-	@ObfuscatedName("i")
+	@ObfuscatedName("o")
+	@Export("musicTrackBoolean")
+	public static boolean musicTrackBoolean;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1547181131
+		intValue = 1712801751
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1678803105
+		intValue = 2015197805
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 625040997
+		intValue = 1555173169
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 168532931
+		intValue = -393716715
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -636498467
+		intValue = -332192069
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1279572157
+		intValue = 1639785979
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lfm;"
+		descriptor = "Lgn;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1999016109
+		intValue = -724114563
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1531671951
+		intValue = 343705565
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIZLhj;)V"
+		descriptor = "(IIIIIIIZLgt;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) {
-		this.id = var1;
-		this.type = var2;
-		this.orientation = var3;
+		this.id = var1; // L: 20
+		this.type = var2; // L: 21
+		this.orientation = var3; // L: 22
 		this.plane = var4; // L: 23
-		this.x = var5;
-		this.y = var6;
-		if (var7 != -1) {
-			this.sequenceDefinition = MouseHandler.SequenceDefinition_get(var7);
-			this.frame = 0;
+		this.x = var5; // L: 24
+		this.y = var6; // L: 25
+		if (var7 != -1) { // L: 26
+			this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var7); // L: 27
+			this.frame = 0; // L: 28
 			this.cycleStart = Client.cycle - 1; // L: 29
-			if (this.sequenceDefinition.field1965 == 0 && var9 != null && var9 instanceof DynamicObject) {
+			if (this.sequenceDefinition.field2078 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
 				DynamicObject var10 = (DynamicObject)var9; // L: 31
-				if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32
+				if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32
 					this.frame = var10.frame; // L: 33
 					this.cycleStart = var10.cycleStart; // L: 34
 					return; // L: 35
@@ -91,285 +89,125 @@ public class DynamicObject extends Renderable {
 			}
 
 			if (var8 && this.sequenceDefinition.frameCount != -1) { // L: 38
-				this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length);
-				this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]);
+				if (!this.sequenceDefinition.method3690()) { // L: 39
+					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.method3647()); // L: 44
+				}
 			}
 		}
 
-	} // L: 43
+	} // L: 48
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lhl;",
-		garbageValue = "461766541"
+		descriptor = "(I)Lgo;",
+		garbageValue = "202861607"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		if (this.sequenceDefinition != null) {
-			int var1 = Client.cycle - this.cycleStart;
-			if (var1 > 100 && this.sequenceDefinition.frameCount > 0) {
+		int var2;
+		if (this.sequenceDefinition != null) { // L: 51
+			int var1 = Client.cycle - this.cycleStart; // L: 52
+			if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { // L: 53
 				var1 = 100;
 			}
 
-			label54: {
-				do {
+			if (this.sequenceDefinition.method3690()) { // L: 54
+				var2 = this.sequenceDefinition.method3647(); // L: 68
+				this.frame += var1; // L: 69
+				var1 = 0; // L: 70
+				if (this.frame >= var2) { // L: 71
+					this.frame = var2 - this.sequenceDefinition.frameCount; // L: 72
+					if (this.frame < 0 || this.frame > var2) { // L: 73
+						this.sequenceDefinition = null;
+					}
+				}
+			} else {
+				label79: {
 					do {
-						if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
-							break label54;
-						}
+						do {
+							if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 55
+								break label79;
+							}
 
-						var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 50
-						++this.frame;
-					} while(this.frame < this.sequenceDefinition.frameIds.length);
+							var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 56
+							++this.frame; // L: 57
+						} while(this.frame < this.sequenceDefinition.frameIds.length); // L: 58
 
-					this.frame -= this.sequenceDefinition.frameCount;
-				} while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 54
+						this.frame -= this.sequenceDefinition.frameCount; // L: 59
+					} while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 60
 
-				this.sequenceDefinition = null;
+					this.sequenceDefinition = null; // L: 61
+				}
 			}
 
-			this.cycleStart = Client.cycle - var1;
+			this.cycleStart = Client.cycle - var1; // L: 78
 		}
 
-		ObjectComposition var12 = KitDefinition.getObjectDefinition(this.id); // L: 62
-		if (var12.transforms != null) { // L: 63
+		ObjectComposition var12 = class148.getObjectDefinition(this.id);
+		if (var12.transforms != null) {
 			var12 = var12.transform();
 		}
 
-		if (var12 == null) { // L: 64
+		if (var12 == null) { // L: 82
 			return null;
 		} else {
-			int var2;
 			int var3;
-			if (this.orientation != 1 && this.orientation != 3) { // L: 67
-				var2 = var12.sizeX; // L: 72
-				var3 = var12.sizeY; // L: 73
+			if (this.orientation != 1 && this.orientation != 3) {
+				var2 = var12.sizeX; // L: 90
+				var3 = var12.sizeY;
 			} else {
-				var2 = var12.sizeY; // L: 68
-				var3 = var12.sizeX; // L: 69
+				var2 = var12.sizeY; // L: 86
+				var3 = var12.sizeX;
 			}
 
-			int var4 = (var2 >> 1) + this.x; // L: 75
-			int var5 = (var2 + 1 >> 1) + this.x; // L: 76
-			int var6 = (var3 >> 1) + this.y; // L: 77
-			int var7 = (var3 + 1 >> 1) + this.y; // L: 78
-			int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 79
-			int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2; // L: 80
-			int var10 = (this.x << 7) + (var2 << 6); // L: 81
-			int var11 = (this.y << 7) + (var3 << 6); // L: 82
-			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83
-		}
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
-		garbageValue = "-1313175336"
-	)
-	public static String method2003(CharSequence[] var0, int var1, int var2) {
-		if (var2 == 0) { // L: 11
-			return "";
-		} else if (var2 == 1) { // L: 12
-			CharSequence var10 = var0[var1]; // L: 13
-			return var10 == null ? "null" : var10.toString(); // L: 14 15
-		} else {
-			int var3 = var2 + var1; // L: 17
-			int var4 = 0; // L: 18
-
-			for (int var5 = var1; var5 < var3; ++var5) { // L: 19
-				CharSequence var9 = var0[var5]; // L: 20
-				if (var9 == null) { // L: 21
-					var4 += 4;
-				} else {
-					var4 += var9.length(); // L: 22
-				}
-			}
-
-			StringBuilder var8 = new StringBuilder(var4); // L: 24
-
-			for (int var6 = var1; var6 < var3; ++var6) { // L: 25
-				CharSequence var7 = var0[var6]; // L: 26
-				if (var7 == null) { // L: 27
-					var8.append("null");
-				} else {
-					var8.append(var7); // L: 28
-				}
-			}
-
-			return var8.toString(); // L: 30
-		}
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Loj;I)I",
-		garbageValue = "-1853618931"
-	)
-	static int method1998(PacketBuffer var0) {
-		int var1 = var0.readBits(2); // L: 350
-		int var2;
-		if (var1 == 0) { // L: 352
-			var2 = 0;
-		} else if (var1 == 1) { // L: 353
-			var2 = var0.readBits(5);
-		} else if (var1 == 2) { // L: 354
-			var2 = var0.readBits(8);
-		} else {
-			var2 = var0.readBits(11); // L: 355
+			int var4 = (var2 >> 1) + this.x;
+			int var5 = (var2 + 1 >> 1) + this.x; // L: 94
+			int var6 = (var3 >> 1) + this.y;
+			int var7 = (var3 + 1 >> 1) + this.y; // L: 96
+			int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 97
+			int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; // L: 98
+			int var10 = (this.x << 7) + (var2 << 6); // L: 99
+			int var11 = (this.y << 7) + (var3 << 6); // L: 100
+			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 101
 		}
-
-		return var2; // L: 356
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "1555132909"
-	)
-	@Export("itemContainerSetItem")
-	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
-		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
-			int[] var5 = new int[var1 + 1]; // L: 45
-			int[] var6 = new int[var1 + 1]; // L: 46
-
-			int var7;
-			for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47
-				var5[var7] = var4.ids[var7]; // L: 48
-				var6[var7] = var4.quantities[var7]; // L: 49
-			}
-
-			for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51
-				var5[var7] = -1; // L: 52
-				var6[var7] = 0; // L: 53
-			}
-
-			var4.ids = var5; // L: 55
-			var4.quantities = var6; // L: 56
+		descriptor = "(II)I",
+		garbageValue = "-2047180013"
+	)
+	@Export("iLog")
+	public static int iLog(int var0) {
+		int var1 = 0; // L: 74
+		if (var0 < 0 || var0 >= 65536) { // L: 75
+			var0 >>>= 16; // L: 76
+			var1 += 16; // L: 77
 		}
 
-		var4.ids[var1] = var2; // L: 58
-		var4.quantities[var1] = var3; // L: 59
-	} // L: 60
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "-339727725"
-	)
-	static boolean method2001(char var0) {
-		return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 857
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lho;",
-		garbageValue = "-1655778063"
-	)
-	@Export("getFrames")
-	static Frames getFrames(int var0) {
-		Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181
-		if (var1 != null) { // L: 182
-			return var1;
-		} else {
-			AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 184
-			AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 185
-			boolean var5 = true; // L: 187
-			int[] var6 = var3.getGroupFileIds(var0); // L: 188
-
-			for (int var7 = 0; var7 < var6.length; ++var7) { // L: 189
-				byte[] var8 = var3.getFile(var0, var6[var7]); // L: 190
-				if (var8 == null) { // L: 191
-					var5 = false; // L: 192
-				} else {
-					int var9 = (var8[0] & 255) << 8 | var8[1] & 255; // L: 195
-					byte[] var10 = var4.getFile(var9, 0); // L: 198
-					if (var10 == null) { // L: 199
-						var5 = false;
-					}
-				}
-			}
-
-			Frames var2;
-			if (!var5) { // L: 201
-				var2 = null; // L: 202
-			} else {
-				try {
-					var2 = new Frames(var3, var4, var0, false); // L: 206
-				} catch (Exception var12) { // L: 208
-					var2 = null; // L: 209
-				}
-			}
-
-			if (var2 != null) { // L: 213
-				SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0);
-			}
-
-			return var2; // L: 214
+		if (var0 >= 256) { // L: 79
+			var0 >>>= 8; // L: 80
+			var1 += 8; // L: 81
 		}
-	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "1"
-	)
-	static final int method2002(int var0, int var1) {
-		int var2 = class117.method2573(var0 - 1, var1 - 1) + class117.method2573(1 + var0, var1 - 1) + class117.method2573(var0 - 1, 1 + var1) + class117.method2573(var0 + 1, 1 + var1); // L: 557
-		int var3 = class117.method2573(var0 - 1, var1) + class117.method2573(1 + var0, var1) + class117.method2573(var0, var1 - 1) + class117.method2573(var0, 1 + var1); // L: 558
-		int var4 = class117.method2573(var0, var1); // L: 559
-		return var2 / 16 + var3 / 8 + var4 / 4; // L: 560
-	}
 
-	@ObfuscatedName("ki")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)Lcq;",
-		garbageValue = "-1244172652"
-	)
-	static final InterfaceParent method1997(int var0, int var1, int var2) {
-		InterfaceParent var3 = new InterfaceParent(); // L: 11517
-		var3.group = var1; // L: 11518
-		var3.type = var2; // L: 11519
-		Client.interfaceParents.put(var3, (long)var0); // L: 11520
-		Player.Widget_resetModelFrames(var1); // L: 11521
-		Widget var4 = UserComparator9.getWidget(var0); // L: 11522
-		class184.invalidateWidget(var4); // L: 11523
-		if (Client.meslayerContinueWidget != null) { // L: 11524
-			class184.invalidateWidget(Client.meslayerContinueWidget); // L: 11525
-			Client.meslayerContinueWidget = null; // L: 11526
+		if (var0 >= 16) { // L: 83
+			var0 >>>= 4; // L: 84
+			var1 += 4; // L: 85
 		}
 
-		for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 11529
-			if (class122.method2607(Client.menuOpcodes[var5])) { // L: 11530
-				if (var5 < Client.menuOptionsCount - 1) { // L: 11531
-					for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { // L: 11532
-						Client.menuActions[var6] = Client.menuActions[var6 + 1]; // L: 11533
-						Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; // L: 11534
-						Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; // L: 11535
-						Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; // L: 11536
-						Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; // L: 11537
-						Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; // L: 11538
-						Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; // L: 11539
-					}
-				}
-
-				--var5; // L: 11542
-				--Client.menuOptionsCount; // L: 11543
-			}
+		if (var0 >= 4) { // L: 87
+			var0 >>>= 2; // L: 88
+			var1 += 2; // L: 89
 		}
 
-		class262.method5136(); // L: 11546
-		MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11548
-		class54.runWidgetOnLoadListener(var1); // L: 11549
-		if (Client.rootInterface != -1) { // L: 11550
-			ItemComposition.runIntfCloseListeners(Client.rootInterface, 1);
+		if (var0 >= 1) { // L: 91
+			var0 >>>= 1; // L: 92
+			++var1; // L: 93
 		}
 
-		return var3; // L: 11551
+		return var0 + var1; // L: 95
 	}
 }
diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java
index 6c47c57675..314114dda5 100644
--- a/runescape-client/src/main/java/EnumComposition.java
+++ b/runescape-client/src/main/java/EnumComposition.java
@@ -4,49 +4,49 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fi")
+@ObfuscatedName("fz")
 @Implements("EnumComposition")
 public class EnumComposition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("EnumDefinition_archive")
-	static AbstractArchive EnumDefinition_archive;
-	@ObfuscatedName("w")
+	public static AbstractArchive EnumDefinition_archive;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("EnumDefinition_cached")
 	static EvictingDualNodeHashTable EnumDefinition_cached;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("inputType")
 	public char inputType;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("outputType")
 	public char outputType;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1626628953
+		intValue = -129402643
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -997141697
+		intValue = -988434495
 	)
 	@Export("outputCount")
 	public int outputCount;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("keys")
 	public int[] keys;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("intVals")
 	public int[] intVals;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("strVals")
 	public String[] strVals;
 
@@ -57,245 +57,204 @@ public class EnumComposition extends DualNode {
 	EnumComposition() {
 		this.defaultStr = "null"; // L: 15
 		this.outputCount = 0; // L: 17
-	}
+	} // L: 22
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1999375204"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1550875336"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 40
-			if (var2 == 0) { // L: 41
-				return; // L: 44
+			int var2 = var1.readUnsignedByte(); // L: 36
+			if (var2 == 0) { // L: 37
+				return; // L: 40
 			}
 
-			this.decodeNext(var1, var2); // L: 42
+			this.decodeNext(var1, var2); // L: 38
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "498308918"
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "-68"
 	)
 	@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
-				this.outputCount = var1.readUnsignedShort(); // L: 52
-				this.keys = new int[this.outputCount]; // L: 53
-				this.strVals = new String[this.outputCount]; // L: 54
+			if (var2 == 5) { // L: 47
+				this.outputCount = var1.readUnsignedShort(); // L: 48
+				this.keys = new int[this.outputCount]; // L: 49
+				this.strVals = new String[this.outputCount]; // L: 50
 
-				for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55
-					this.keys[var3] = var1.readInt(); // L: 56
-					this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57
+				for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 51
+					this.keys[var3] = var1.readInt(); // L: 52
+					this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 53
 				}
-			} else if (var2 == 6) { // L: 60
-				this.outputCount = var1.readUnsignedShort(); // L: 61
-				this.keys = new int[this.outputCount]; // L: 62
-				this.intVals = new int[this.outputCount]; // L: 63
+			} else if (var2 == 6) { // L: 56
+				this.outputCount = var1.readUnsignedShort(); // L: 57
+				this.keys = new int[this.outputCount]; // L: 58
+				this.intVals = new int[this.outputCount]; // L: 59
 
-				for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64
-					this.keys[var3] = var1.readInt(); // L: 65
-					this.intVals[var3] = var1.readInt(); // L: 66
+				for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 60
+					this.keys[var3] = var1.readInt(); // L: 61
+					this.intVals[var3] = var1.readInt(); // L: 62
 				}
 			}
 		}
 
-	} // L: 70
+	} // L: 66
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "689416040"
+		garbageValue = "-2125042449"
 	)
 	@Export("size")
 	public int size() {
-		return this.outputCount; // L: 73
+		return this.outputCount; // L: 69
 	}
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "([BI)[B",
-		garbageValue = "211547863"
-	)
-	public static byte[] method3106(byte[] var0) {
-		int var1 = var0.length; // L: 22
-		byte[] var2 = new byte[var1]; // L: 23
-		System.arraycopy(var0, 0, var2, 0, var1); // L: 24
-		return var2; // L: 25
-	}
-
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "1659130731"
+		descriptor = "(IIIIIZI)Lpl;",
+		garbageValue = "1794851975"
 	)
-	static void method3097(boolean var0) {
-		byte var1 = 0; // L: 878
-		boolean var2 = class408.clientPreferences.field1182 >= Client.field467; // L: 881
-		if (!var2) { // L: 883
-			var1 = 12; // L: 884
-		} else if (ArchiveLoader.client.method1166()) { // L: 886
-			var1 = 10; // L: 887
+	@Export("getItemSprite")
+	public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
+		if (var1 == -1) { // L: 357
+			var4 = 0;
+		} else if (var4 == 2 && var1 != 1) { // L: 358
+			var4 = 1;
 		}
 
-		class275.method5201(var1); // L: 889
-		if (var0) { // L: 890
-			Login.Login_username = ""; // L: 891
-			Login.Login_password = ""; // L: 892
-			ReflectionCheck.field429 = 0; // L: 893
-			Tiles.otp = ""; // L: 894
-		}
-
-		if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 897
-			if (class408.clientPreferences.rememberedUsername != null) { // L: 898
-				Login.Login_username = class408.clientPreferences.rememberedUsername; // L: 899
-				Client.Login_isUsernameRemembered = true; // L: 900
-			} else {
-				Client.Login_isUsernameRemembered = false; // L: 902
+		long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); // L: 359
+		SpritePixels var8;
+		if (!var5) { // L: 361
+			var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 362
+			if (var8 != null) { // L: 363
+				return var8;
 			}
 		}
 
-		ParamComposition.method3216(); // L: 904
-	} // L: 905
-
-	@ObfuscatedName("hf")
-	@ObfuscatedSignature(
-		descriptor = "(IIZB)V",
-		garbageValue = "11"
-	)
-	static final void method3107(int var0, int var1, boolean var2) {
-		if (!var2 || var0 != ItemLayer.field2243 || WallDecoration.field2630 != var1) { // L: 5791
-			ItemLayer.field2243 = var0; // L: 5794
-			WallDecoration.field2630 = var1; // L: 5795
-			WorldMapData_1.updateGameState(25); // L: 5796
-			class91.drawLoadingMessage("Loading - please wait.", true); // L: 5797
-			int var3 = class19.baseX; // L: 5798
-			int var4 = DefaultsGroup.baseY; // L: 5799
-			class19.baseX = (var0 - 6) * 8; // L: 5800
-			DefaultsGroup.baseY = (var1 - 6) * 8; // L: 5801
-			int var5 = class19.baseX - var3; // L: 5802
-			int var6 = DefaultsGroup.baseY - var4; // L: 5803
-			var3 = class19.baseX; // L: 5804
-			var4 = DefaultsGroup.baseY; // L: 5805
-
-			int var7;
-			int var9;
-			int[] var10000;
-			for (var7 = 0; var7 < 32768; ++var7) { // L: 5806
-				NPC var19 = Client.npcs[var7]; // L: 5807
-				if (var19 != null) { // L: 5808
-					for (var9 = 0; var9 < 10; ++var9) { // L: 5809
-						var10000 = var19.pathX; // L: 5810
-						var10000[var9] -= var5;
-						var10000 = var19.pathY; // L: 5811
-						var10000[var9] -= var6;
-					}
+		ItemComposition var9 = UserComparator6.ItemDefinition_get(var0); // L: 365
+		if (var1 > 1 && var9.countobj != null) { // L: 366
+			int var10 = -1; // L: 367
 
-					var19.x -= var5 * 128; // L: 5813
-					var19.y -= var6 * 128; // L: 5814
+			for (int var11 = 0; var11 < 10; ++var11) { // L: 368
+				if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 369
+					var10 = var9.countobj[var11];
 				}
 			}
 
-			for (var7 = 0; var7 < 2048; ++var7) { // L: 5817
-				Player var22 = Client.players[var7]; // L: 5818
-				if (var22 != null) { // L: 5819
-					for (var9 = 0; var9 < 10; ++var9) { // L: 5820
-						var10000 = var22.pathX; // L: 5821
-						var10000[var9] -= var5;
-						var10000 = var22.pathY; // L: 5822
-						var10000[var9] -= var6;
-					}
+			if (var10 != -1) { // L: 371
+				var9 = UserComparator6.ItemDefinition_get(var10);
+			}
+		}
 
-					var22.x -= var5 * 128; // L: 5824
-					var22.y -= var6 * 128; // L: 5825
+		Model var21 = var9.getModel(1); // L: 373
+		if (var21 == null) { // L: 374
+			return null;
+		} else {
+			SpritePixels var22 = null; // L: 375
+			if (var9.noteTemplate != -1) { // L: 376
+				var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 377
+				if (var22 == null) { // L: 378
+					return null;
+				}
+			} else if (var9.notedId != -1) { // L: 380
+				var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 381
+				if (var22 == null) { // L: 382
+					return null;
+				}
+			} else if (var9.placeholderTemplate != -1) { // L: 384
+				var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 385
+				if (var22 == null) { // L: 386
+					return null;
 				}
 			}
 
-			byte var20 = 0; // L: 5828
-			byte var8 = 104; // L: 5829
-			byte var21 = 1; // L: 5830
-			if (var5 < 0) { // L: 5831
-				var20 = 103; // L: 5832
-				var8 = -1; // L: 5833
-				var21 = -1; // L: 5834
+			int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 388
+			int var13 = Rasterizer2D.Rasterizer2D_width; // L: 389
+			int var14 = Rasterizer2D.Rasterizer2D_height; // L: 390
+			int[] var15 = new int[4]; // L: 391
+			Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 392
+			var8 = new SpritePixels(36, 32); // L: 393
+			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 394
+			Rasterizer2D.Rasterizer2D_clear(); // L: 395
+			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 396
+			Rasterizer3D.method3913(16, 16); // L: 397
+			Rasterizer3D.field2276 = false; // L: 398
+			if (var9.placeholderTemplate != -1) { // L: 399
+				var22.drawTransBgAt(0, 0);
 			}
 
-			byte var10 = 0; // L: 5836
-			byte var11 = 104; // L: 5837
-			byte var12 = 1; // L: 5838
-			if (var6 < 0) { // L: 5839
-				var10 = 103; // L: 5840
-				var11 = -1; // L: 5841
-				var12 = -1; // L: 5842
+			int var16 = var9.zoom2d; // L: 400
+			if (var5) { // L: 401
+				var16 = (int)(1.5D * (double)var16);
+			} else if (var2 == 2) { // L: 402
+				var16 = (int)((double)var16 * 1.04D);
 			}
 
-			int var14;
-			for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5844
-				for (var14 = var10; var11 != var14; var14 += var12) { // L: 5845
-					int var15 = var13 + var5; // L: 5846
-					int var16 = var6 + var14; // L: 5847
+			int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 403
+			int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 404
+			var21.calculateBoundsCylinder(); // L: 405
+			var21.method4241(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 406
+			if (var9.notedId != -1) { // L: 407
+				var22.drawTransBgAt(0, 0);
+			}
 
-					for (int var17 = 0; var17 < 4; ++var17) { // L: 5848
-						if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
-							Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5849
-						} else {
-							Client.groundItems[var17][var13][var14] = null; // L: 5850
-						}
-					}
-				}
+			if (var2 >= 1) { // L: 408
+				var8.outline(1);
 			}
 
-			for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5854 5855 5859
-				var18.x -= var5; // L: 5856
-				var18.y -= var6; // L: 5857
-				if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5858
-					var18.remove();
-				}
+			if (var2 >= 2) { // L: 409
+				var8.outline(16777215);
+			}
+
+			if (var3 != 0) { // L: 410
+				var8.shadow(var3);
 			}
 
-			if (Client.destinationX != 0) { // L: 5861
-				Client.destinationX -= var5; // L: 5862
-				Client.destinationY -= var6; // L: 5863
+			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 411
+			if (var9.noteTemplate != -1) { // L: 412
+				var22.drawTransBgAt(0, 0);
 			}
 
-			Client.soundEffectCount = 0; // L: 5865
-			Client.isCameraLocked = false; // L: 5866
-			WorldMapSectionType.cameraX -= var5 << 7; // L: 5867
-			class65.cameraZ -= var6 << 7; // L: 5868
-			class320.oculusOrbFocalPointX -= var5 << 7; // L: 5869
-			class18.oculusOrbFocalPointY -= var6 << 7; // L: 5870
-			Client.field701 = -1; // L: 5871
-			Client.graphicsObjects.clear(); // L: 5872
-			Client.projectiles.clear(); // L: 5873
+			if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 413
+				Font var19 = ItemComposition.ItemDefinition_fontPlain11; // L: 414
+				String var20;
+				if (var1 < 100000) { // L: 417
+					var20 = "<col=ffff00>" + var1 + "</col>"; // L: 418
+				} else if (var1 < 10000000) { // L: 421
+					var20 = "<col=ffffff>" + var1 / 1000 + "K" + "</col>"; // L: 422
+				} else {
+					var20 = "<col=00ff80>" + var1 / 1000000 + "M" + "</col>"; // L: 425
+				}
 
-			for (var14 = 0; var14 < 4; ++var14) { // L: 5874
-				Client.collisionMaps[var14].clear();
+				var19.draw(var20, 0, 9, 16776960, 1); // L: 427
 			}
 
-		}
-	} // L: 5792 5875
+			if (!var5) { // L: 429
+				ItemComposition.ItemDefinition_cachedSprites.put(var8, var6);
+			}
 
-	@ObfuscatedName("im")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V",
-		garbageValue = "1038996465"
-	)
-	@Export("insertMenuItemNoShift")
-	public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
-		ModelData0.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9294
-	} // L: 9295
+			Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 430
+			Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 431
+			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 432
+			Rasterizer3D.field2276 = true; // L: 433
+			return var8; // L: 434
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java
index c091ad8ae3..5ff9c2f41b 100644
--- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java
+++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java
@@ -3,35 +3,35 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ig")
+@ObfuscatedName("iq")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lnt;"
+		descriptor = "Lnc;"
 	)
-	DualNode field2657;
-	@ObfuscatedName("w")
+	DualNode field2797;
+	@ObfuscatedName("b")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("remainingCapacity")
 	int remainingCapacity;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Loz;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Llm;"
+		descriptor = "Lls;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
 
 	public EvictingDualNodeHashTable(int var1) {
-		this.field2657 = new DualNode(); // L: 8
+		this.field2797 = new DualNode(); // L: 8
 		this.deque = new IterableDualNodeQueue(); // L: 12
 		this.capacity = var1; // L: 15
 		this.remainingCapacity = var1; // L: 16
@@ -43,61 +43,61 @@ public EvictingDualNodeHashTable(int var1) {
 		this.hashTable = new IterableNodeHashTable(var2); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(J)Lnt;"
+		descriptor = "(J)Lnc;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
-		DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 23
-		if (var3 != null) { // L: 24
-			this.deque.add(var3); // L: 25
+		DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 24
+		if (var3 != null) { // L: 25
+			this.deque.add(var3); // L: 26
 		}
 
-		return var3; // L: 28
+		return var3; // L: 29
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("remove")
 	public void remove(long var1) {
-		DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32
-		if (var3 != null) { // L: 33
-			var3.remove(); // L: 34
-			var3.removeDual(); // L: 35
-			++this.remainingCapacity; // L: 36
+		DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 33
+		if (var3 != null) { // L: 34
+			var3.remove(); // L: 35
+			var3.removeDual(); // L: 36
+			++this.remainingCapacity; // L: 37
 		}
 
-	} // L: 38
+	} // L: 39
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lnt;J)V"
+		descriptor = "(Lnc;J)V"
 	)
 	@Export("put")
 	public void put(DualNode var1, long var2) {
-		if (this.remainingCapacity == 0) { // L: 41
-			DualNode var4 = this.deque.removeLast(); // L: 42
-			var4.remove(); // L: 43
-			var4.removeDual(); // L: 44
-			if (var4 == this.field2657) { // L: 45
-				var4 = this.deque.removeLast(); // L: 46
-				var4.remove(); // L: 47
-				var4.removeDual(); // L: 48
+		if (this.remainingCapacity == 0) { // L: 42
+			DualNode var4 = this.deque.removeLast(); // L: 43
+			var4.remove(); // L: 44
+			var4.removeDual(); // L: 45
+			if (var4 == this.field2797) { // L: 46
+				var4 = this.deque.removeLast(); // L: 47
+				var4.remove(); // L: 48
+				var4.removeDual(); // L: 49
 			}
 		} else {
-			--this.remainingCapacity; // L: 51
+			--this.remainingCapacity; // L: 52
 		}
 
-		this.hashTable.put(var1, var2); // L: 52
-		this.deque.add(var1); // L: 53
-	} // L: 54
+		this.hashTable.put(var1, var2); // L: 53
+		this.deque.add(var1); // L: 54
+	} // L: 55
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("clear")
 	public void clear() {
-		this.deque.clear(); // L: 57
-		this.hashTable.clear(); // L: 58
-		this.field2657 = new DualNode(); // L: 59
-		this.remainingCapacity = this.capacity; // L: 60
-	} // L: 61
+		this.deque.clear(); // L: 58
+		this.hashTable.clear(); // L: 59
+		this.field2797 = new DualNode(); // L: 60
+		this.remainingCapacity = this.capacity; // L: 61
+	} // L: 62
 }
diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java
index 341b678107..da3464c94a 100644
--- a/runescape-client/src/main/java/FaceNormal.java
+++ b/runescape-client/src/main/java/FaceNormal.java
@@ -4,24 +4,24 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hq")
+@ObfuscatedName("gh")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 114850491
+		intValue = -38617703
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 2059790001
+		intValue = -1161789305
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1654198693
+		intValue = 1924631327
 	)
 	@Export("z")
 	int z;
@@ -29,33 +29,38 @@ public class FaceNormal {
 	FaceNormal() {
 	} // L: 8
 
-	@ObfuscatedName("gn")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Lcx;IIB)V",
-		garbageValue = "-51"
+		descriptor = "(IIB)I",
+		garbageValue = "37"
 	)
-	@Export("performPlayerAnimation")
-	static void performPlayerAnimation(Player var0, int var1, int var2) {
-		if (var0.sequence == var1 && var1 != -1) { // L: 4529
-			int var3 = MouseHandler.SequenceDefinition_get(var1).field1965; // L: 4530
-			if (var3 == 1) { // L: 4531
-				var0.sequenceFrame = 0; // L: 4532
-				var0.sequenceFrameCycle = 0; // L: 4533
-				var0.sequenceDelay = var2; // L: 4534
-				var0.field1116 = 0; // L: 4535
-			}
+	public static int method4142(int var0, int var1) {
+		int var2 = var0 >>> 31; // L: 109
+		return (var0 + var2) / var1 - var2; // L: 110
+	}
 
-			if (var3 == 2) { // L: 4537
-				var0.field1116 = 0; // L: 4538
+	@ObfuscatedName("hr")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)I",
+		garbageValue = "-2015271850"
+	)
+	@Export("getTileHeight")
+	static final int getTileHeight(int var0, int var1, int var2) {
+		int var3 = var0 >> 7; // L: 6079
+		int var4 = var1 >> 7; // L: 6080
+		if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 6081
+			int var5 = var2; // L: 6082
+			if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 6083
+				var5 = var2 + 1;
 			}
-		} else if (var1 == -1 || var0.sequence == -1 || MouseHandler.SequenceDefinition_get(var1).field1959 >= MouseHandler.SequenceDefinition_get(var0.sequence).field1959) { // L: 4541
-			var0.sequence = var1; // L: 4542
-			var0.sequenceFrame = 0; // L: 4543
-			var0.sequenceFrameCycle = 0; // L: 4544
-			var0.sequenceDelay = var2; // L: 4545
-			var0.field1116 = 0; // L: 4546
-			var0.field1144 = var0.pathLength; // L: 4547
-		}
 
-	} // L: 4549
+			int var6 = var0 & 127; // L: 6084
+			int var7 = var1 & 127; // L: 6085
+			int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 6086
+			int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 6087
+			return var8 * (128 - var7) + var9 * var7 >> 7; // L: 6088
+		} else {
+			return 0;
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java
index 1bbc7b86be..eb78dd949a 100644
--- a/runescape-client/src/main/java/FileSystem.java
+++ b/runescape-client/src/main/java/FileSystem.java
@@ -1,49 +1,55 @@
-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("ez")
+@ObfuscatedName("ew")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("po")
-	@ObfuscatedSignature(
-		descriptor = "Lno;"
-	)
-	static class387 field1564;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("FileSystem_hasPermissions")
 	static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("w")
-	@Export("FileSystem_cacheDir")
-	static File FileSystem_cacheDir;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "Lim;"
+	)
+	@Export("worldMapEvent")
+	static WorldMapEvent worldMapEvent;
 
 	static {
 		FileSystem_hasPermissions = false; // L: 7
 		FileSystem_cacheFiles = new Hashtable(16);
 	} // L: 9
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)Low;",
-		garbageValue = "-2058198182"
-	)
-	static SpritePixels method2909(int var0, int var1, int var2) {
-		return (SpritePixels)WorldMapRegion.WorldMapRegion_cachedSprites.get(NetSocket.method2923(var0, var1, var2)); // L: 42
-	}
-
-	@ObfuscatedName("g")
+	@ObfuscatedName("ix")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-322420667"
+		garbageValue = "497428397"
 	)
-	public static void method2908() {
-		HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 89
-		HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 90
-	} // L: 91
+	static void method3084() {
+		for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 10063
+			if (InvDefinition.method3157(Client.menuOpcodes[var0])) { // L: 10064
+				if (var0 < Client.menuOptionsCount - 1) { // L: 10065
+					for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 10066
+						Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 10067
+						Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 10068
+						Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 10069
+						Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 10070
+						Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 10071
+						Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 10072
+						Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 10073
+					}
+				}
+
+				--var0; // L: 10076
+				--Client.menuOptionsCount; // L: 10077
+			}
+		}
+
+		Clock.method3144(); // L: 10080
+	} // L: 10081
 }
diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java
index 5651141621..78a019533a 100644
--- a/runescape-client/src/main/java/FillMode.java
+++ b/runescape-client/src/main/java/FillMode.java
@@ -4,55 +4,49 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("om")
+@ObfuscatedName("pg")
 @Implements("FillMode")
 public enum FillMode implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lom;"
+		descriptor = "Lpg;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lom;"
+		descriptor = "Lpg;"
 	)
-	field4378(1, 1),
-	@ObfuscatedName("s")
+	field4552(1, 1),
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lom;"
+		descriptor = "Lpg;"
 	)
-	field4377(2, 2);
+	field4553(2, 2);
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 2036544943
+		intValue = -1360847973
 	)
-	@Export("musicTrackGroupId")
-	public static int musicTrackGroupId;
-	@ObfuscatedName("a")
+	public final int field4554;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1855010985
+		intValue = -54692009
 	)
-	public final int field4379;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = 1812864379
-	)
-	final int field4380;
+	final int field4551;
 
 	FillMode(int var3, int var4) {
-		this.field4379 = var3; // L: 19
-		this.field4380 = var4; // L: 20
+		this.field4554 = var3; // L: 19
+		this.field4551 = var4; // L: 20
 	} // L: 21
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.field4380; // L: 24
+		return this.field4551; // L: 25
 	}
 }
diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java
index d3ecb3c988..f0760a3cb5 100644
--- a/runescape-client/src/main/java/FloorDecoration.java
+++ b/runescape-client/src/main/java/FloorDecoration.java
@@ -4,42 +4,42 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gq")
+@ObfuscatedName("gx")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1221894569
+		intValue = -1861325243
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1725833807
+		intValue = -1924923823
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 636569371
+		intValue = -2119498473
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lhj;"
-	)
-	@Export("renderable")
-	public Renderable renderable;
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = -3843450359883300141L
+		longValue = -7418429141280982005L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Lgt;"
+	)
+	@Export("renderable")
+	public Renderable renderable;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1362157209
+		intValue = 1944235645
 	)
 	@Export("flags")
 	int flags;
@@ -47,22 +47,205 @@ public final class FloorDecoration {
 	FloorDecoration() {
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("ih")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lpz;",
-		garbageValue = "1947599529"
+		descriptor = "(IIIIB)V",
+		garbageValue = "28"
 	)
-	public static PrivateChatMode method4189(int var0) {
-		PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field4425, PrivateChatMode.field4423, PrivateChatMode.field4422}; // L: 18
-		PrivateChatMode[] var2 = var1; // L: 20
-
-		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21
-			PrivateChatMode var4 = var2[var3]; // L: 22
-			if (var0 == var4.field4424) { // L: 24
-				return var4;
+	@Export("addSceneMenuOptions")
+	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
+		if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 10088
+			class11.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 10089
+		}
+
+		long var4 = -1L; // L: 10092
+		long var6 = -1L; // L: 10093
+
+		int var8;
+		for (var8 = 0; var8 < class113.method2616(); ++var8) { // L: 10094
+			long var23 = MenuAction.method1960(var8); // L: 10095
+			if (var23 != var6) { // L: 10096
+				var6 = var23; // L: 10097
+				int var25 = FloorOverlayDefinition.method3618(var8); // L: 10098
+				long var14 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 10102
+				int var13 = (int)(var14 >>> 7 & 127L); // L: 10104
+				var13 = var13; // L: 10108
+				int var26 = class114.method2629(var8); // L: 10109
+				int var15 = PacketWriter.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 10112
+				int var16 = var15; // L: 10114
+				if (var26 == 2 && class7.scene.getObjectFlags(class20.Client_plane, var25, var13, var23) >= 0) { // L: 10115 10116
+					ObjectComposition var17 = class148.getObjectDefinition(var15); // L: 10117
+					if (var17.transforms != null) { // L: 10118
+						var17 = var17.transform();
+					}
+
+					if (var17 == null) { // L: 10119
+						continue;
+					}
+
+					if (Client.isItemSelected == 1) { // L: 10120
+						class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 1, var15, var25, var13); // L: 10121
+					} else if (Client.isSpellSelected) { // L: 10124
+						if ((class91.selectedSpellFlags & 4) == 4) { // L: 10125
+							class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 2, var15, var25, var13); // L: 10126
+						}
+					} else {
+						String[] var18 = var17.actions; // L: 10131
+						if (var18 != null) { // L: 10132
+							for (int var19 = 4; var19 >= 0; --var19) { // L: 10133
+								if (var18[var19] != null) { // L: 10134
+									short var20 = 0; // L: 10135
+									if (var19 == 0) { // L: 10136
+										var20 = 3;
+									}
+
+									if (var19 == 1) { // L: 10137
+										var20 = 4;
+									}
+
+									if (var19 == 2) { // L: 10138
+										var20 = 5;
+									}
+
+									if (var19 == 3) { // L: 10139
+										var20 = 6;
+									}
+
+									if (var19 == 4) { // L: 10140
+										var20 = 1001;
+									}
+
+									class11.insertMenuItemNoShift(var18[var19], UserComparator5.colorStartTag(65535) + var17.name, var20, var16, var25, var13); // L: 10141
+								}
+							}
+						}
+
+						class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(65535) + var17.name, 1002, var17.id, var25, var13); // L: 10146
+					}
+				}
+
+				Player var21;
+				int var27;
+				NPC var28;
+				int var35;
+				int[] var36;
+				if (var26 == 1) { // L: 10151
+					NPC var31 = Client.npcs[var16]; // L: 10152
+					if (var31 == null) { // L: 10153
+						continue;
+					}
+
+					if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { // L: 10154
+						for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 10155
+							var28 = Client.npcs[Client.npcIndices[var27]]; // L: 10156
+							if (var28 != null && var28 != var31 && var28.definition.size == 1 && var31.x == var28.x && var28.y == var31.y) { // L: 10157
+								GrandExchangeOfferAgeComparator.addNpcToMenu(var28, Client.npcIndices[var27], var25, var13);
+							}
+						}
+
+						var27 = Players.Players_count; // L: 10159
+						var36 = Players.Players_indices; // L: 10160
+
+						for (var35 = 0; var35 < var27; ++var35) { // L: 10161
+							var21 = Client.players[var36[var35]]; // L: 10162
+							if (var21 != null && var31.x == var21.x && var21.y == var31.y) { // L: 10163
+								class233.addPlayerToMenu(var21, var36[var35], var25, var13);
+							}
+						}
+					}
+
+					GrandExchangeOfferAgeComparator.addNpcToMenu(var31, var16, var25, var13); // L: 10166
+				}
+
+				if (var26 == 0) { // L: 10168
+					Player var32 = Client.players[var16]; // L: 10169
+					if (var32 == null) { // L: 10170
+						continue;
+					}
+
+					if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { // L: 10171
+						for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 10172
+							var28 = Client.npcs[Client.npcIndices[var27]]; // L: 10173
+							if (var28 != null && var28.definition.size == 1 && var32.x == var28.x && var32.y == var28.y) { // L: 10174
+								GrandExchangeOfferAgeComparator.addNpcToMenu(var28, Client.npcIndices[var27], var25, var13);
+							}
+						}
+
+						var27 = Players.Players_count; // L: 10176
+						var36 = Players.Players_indices; // L: 10177
+
+						for (var35 = 0; var35 < var27; ++var35) { // L: 10178
+							var21 = Client.players[var36[var35]]; // L: 10179
+							if (var21 != null && var32 != var21 && var21.x == var32.x && var21.y == var32.y) { // L: 10180
+								class233.addPlayerToMenu(var21, var36[var35], var25, var13);
+							}
+						}
+					}
+
+					if (var16 != Client.combatTargetPlayerIndex) { // L: 10183
+						class233.addPlayerToMenu(var32, var16, var25, var13);
+					} else {
+						var4 = var23; // L: 10184
+					}
+				}
+
+				if (var26 == 3) { // L: 10186
+					NodeDeque var34 = Client.groundItems[class20.Client_plane][var25][var13]; // L: 10187
+					if (var34 != null) { // L: 10188
+						for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { // L: 10189 10190 10223
+							ItemComposition var37 = UserComparator6.ItemDefinition_get(var33.id); // L: 10191
+							if (Client.isItemSelected == 1) { // L: 10192
+								class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 16, var33.id, var25, var13); // L: 10193
+							} else if (Client.isSpellSelected) { // L: 10196
+								if ((class91.selectedSpellFlags & 1) == 1) { // L: 10197
+									class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 17, var33.id, var25, var13); // L: 10198
+								}
+							} else {
+								String[] var29 = var37.groundActions; // L: 10203
+
+								for (int var30 = 4; var30 >= 0; --var30) { // L: 10204
+									if (var29 != null && var29[var30] != null) { // L: 10205
+										byte var22 = 0; // L: 10206
+										if (var30 == 0) { // L: 10207
+											var22 = 18;
+										}
+
+										if (var30 == 1) { // L: 10208
+											var22 = 19;
+										}
+
+										if (var30 == 2) { // L: 10209
+											var22 = 20;
+										}
+
+										if (var30 == 3) { // L: 10210
+											var22 = 21;
+										}
+
+										if (var30 == 4) { // L: 10211
+											var22 = 22;
+										}
+
+										class11.insertMenuItemNoShift(var29[var30], UserComparator5.colorStartTag(16748608) + var37.name, var22, var33.id, var25, var13); // L: 10212
+									} else if (var30 == 2) { // L: 10215
+										class11.insertMenuItemNoShift("Take", UserComparator5.colorStartTag(16748608) + var37.name, 20, var33.id, var25, var13); // L: 10216
+									}
+								}
+
+								class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var37.name, 1004, var33.id, var25, var13); // L: 10220
+							}
+						}
+					}
+				}
 			}
 		}
 
-		return null; // L: 28
-	}
+		if (-1L != var4) { // L: 10228
+			var8 = MouseRecorder.method2159(var4); // L: 10229
+			int var9 = (int)(var4 >>> 7 & 127L); // L: 10232
+			Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 10235
+			class233.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 10236
+		}
+
+	} // L: 10238
 }
diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java
index a9a063de00..e2dae1c9ba 100644
--- a/runescape-client/src/main/java/FloorOverlayDefinition.java
+++ b/runescape-client/src/main/java/FloorOverlayDefinition.java
@@ -4,75 +4,81 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fu")
+@ObfuscatedName("fw")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("FloorOverlayDefinition_archive")
 	public static AbstractArchive FloorOverlayDefinition_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("FloorOverlayDefinition_cached")
-	public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("s")
+	static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
+	@ObfuscatedName("kz")
+	@ObfuscatedSignature(
+		descriptor = "Ljm;"
+	)
+	@Export("hoveredItemContainer")
+	static Widget hoveredItemContainer;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -895663505
+		intValue = 1992003453
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1431978933
+		intValue = -1656898905
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1633990945
+		intValue = -1327711179
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1872138701
+		intValue = -1999079223
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1122011313
+		intValue = -1848123961
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 358729949
+		intValue = 1467113517
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1228616867
+		intValue = -1581427721
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1504346497
+		intValue = -4711899
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 2075535817
+		intValue = 2013975253
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -88,10 +94,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.secondaryRgb = -1; // L: 15
 	} // L: 23
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "0"
+		garbageValue = "-40"
 	)
 	@Export("postDecode")
 	void postDecode() {
@@ -105,10 +111,10 @@ void postDecode() {
 		this.setHsl(this.primaryRgb); // L: 43
 	} // L: 44
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "-730203033"
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "105"
 	)
 	@Export("decode")
 	void decode(Buffer var1, int var2) {
@@ -122,10 +128,10 @@ void decode(Buffer var1, int var2) {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;III)V",
-		garbageValue = "641310816"
+		descriptor = "(Lpi;III)V",
+		garbageValue = "624487611"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -133,23 +139,23 @@ void decodeNext(Buffer var1, int var2, int var3) {
 			this.primaryRgb = var1.readMedium();
 		} else if (var2 == 2) {
 			this.texture = var1.readUnsignedByte(); // L: 56
-		} else if (var2 == 5) { // L: 57
+		} else if (var2 == 5) {
 			this.hideUnderlay = false;
 		} else if (var2 == 7) {
-			this.secondaryRgb = var1.readMedium(); // L: 58
-		} else if (var2 == 8) { // L: 59
+			this.secondaryRgb = var1.readMedium();
+		} else if (var2 == 8) {
 		}
 
 	} // L: 61
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-1"
+		descriptor = "(II)V",
+		garbageValue = "-1711015885"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
-		double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 64
+		double var2 = (double)(var1 >> 16 & 255) / 256.0D;
 		double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 65
 		double var6 = (double)(var1 & 255) / 256.0D; // L: 66
 		double var8 = var2; // L: 67
@@ -172,8 +178,8 @@ void setHsl(int var1) {
 
 		double var12 = 0.0D; // L: 73
 		double var14 = 0.0D; // L: 74
-		double var16 = (var10 + var8) / 2.0D; // L: 75
-		if (var10 != var8) { // L: 76
+		double var16 = (var8 + var10) / 2.0D; // L: 75
+		if (var8 != var10) { // L: 76
 			if (var16 < 0.5D) { // L: 77
 				var14 = (var10 - var8) / (var8 + var10);
 			}
@@ -184,16 +190,16 @@ void setHsl(int var1) {
 
 			if (var10 == var2) { // L: 79
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var4 == var10) { // L: 80
+			} else if (var10 == var4) { // L: 80
 				var12 = 2.0D + (var6 - var2) / (var10 - var8);
-			} else if (var6 == var10) {
-				var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 81
+			} else if (var10 == var6) {
+				var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 81
 			}
 		}
 
 		var12 /= 6.0D; // L: 83
 		this.hue = (int)(var12 * 256.0D); // L: 84
-		this.saturation = (int)(var14 * 256.0D); // L: 85
+		this.saturation = (int)(256.0D * var14); // L: 85
 		this.lightness = (int)(var16 * 256.0D); // L: 86
 		if (this.saturation < 0) { // L: 87
 			this.saturation = 0;
@@ -209,86 +215,24 @@ void setHsl(int var1) {
 
 	} // L: 91
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lfi;",
-		garbageValue = "1313428327"
+		descriptor = "(II)I",
+		garbageValue = "-1253625598"
 	)
-	@Export("getEnum")
-	public static EnumComposition getEnum(int var0) {
-		EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29
-		if (var1 != null) { // L: 30
-			return var1;
-		} else {
-			byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31
-			var1 = new EnumComposition(); // L: 32
-			if (var2 != null) { // L: 33
-				var1.decode(new Buffer(var2));
-			}
-
-			EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34
-			return var1; // L: 35
-		}
+	public static int method3618(int var0) {
+		return MouseRecorder.method2159(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 64
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "([BIIIIIII[Lfq;I)V",
-		garbageValue = "1444717536"
-	)
-	static final void method3427(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) {
-		int var10;
-		for (int var9 = 0; var9 < 8; ++var9) { // L: 95
-			for (var10 = 0; var10 < 8; ++var10) { // L: 96
-				if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 97
-					int[] var10000 = var8[var1].flags[var9 + var2];
-					var10000[var3 + var10] &= -16777217;
-				}
-			}
-		}
-
-		Buffer var28 = new Buffer(var0); // L: 100
-
-		for (var10 = 0; var10 < 4; ++var10) { // L: 101
-			for (int var11 = 0; var11 < 64; ++var11) { // L: 102
-				for (int var12 = 0; var12 < 64; ++var12) { // L: 103
-					if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 104
-						int var17 = var11 & 7; // L: 109
-						int var18 = var12 & 7; // L: 110
-						int var19 = var7 & 3; // L: 113
-						int var16;
-						if (var19 == 0) { // L: 114
-							var16 = var17; // L: 115
-						} else if (var19 == 1) { // L: 118
-							var16 = var18; // L: 119
-						} else if (var19 == 2) { // L: 122
-							var16 = 7 - var17; // L: 123
-						} else {
-							var16 = 7 - var18; // L: 126
-						}
-
-						int var22 = var16 + var2; // L: 130
-						int var25 = var11 & 7; // L: 133
-						int var26 = var12 & 7; // L: 134
-						int var27 = var7 & 3; // L: 137
-						int var24;
-						if (var27 == 0) { // L: 138
-							var24 = var26; // L: 139
-						} else if (var27 == 1) { // L: 142
-							var24 = 7 - var25; // L: 143
-						} else if (var27 == 2) { // L: 146
-							var24 = 7 - var26; // L: 147
-						} else {
-							var24 = var25; // L: 150
-						}
-
-						GameEngine.loadTerrain(var28, var1, var22, var24 + var3, 0, 0, var7); // L: 152
-					} else {
-						GameEngine.loadTerrain(var28, 0, -1, -1, 0, 0, 0); // L: 154
-					}
-				}
-			}
-		}
-
-	} // L: 158
+		descriptor = "(IIII)I",
+		garbageValue = "1421542986"
+	)
+	public static int method3636(int var0, int var1, int var2) {
+		int var3 = WorldMapEvent.method4942(var2 - var1 + 1); // L: 57
+		var3 <<= var1; // L: 58
+		var0 |= var3; // L: 59
+		return var0; // L: 60
+	}
 }
diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java
index cd41ae0660..892f9e3b90 100644
--- a/runescape-client/src/main/java/FloorUnderlayDefinition.java
+++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java
@@ -4,48 +4,48 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fp")
+@ObfuscatedName("fl")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
-	public static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("w")
+	static AbstractArchive FloorUnderlayDefinition_archive;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -775773749
+		intValue = 1774321609
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -842998907
+		intValue = 553925567
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 2077270313
+		intValue = -2042462735
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1956452595
+		intValue = 94444395
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 660177459
+		intValue = 1721469493
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -54,137 +54,142 @@ public class FloorUnderlayDefinition extends DualNode {
 		FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
 	}
 
-	public FloorUnderlayDefinition() {
-		this.rgb = 0;
-	}
+	FloorUnderlayDefinition() {
+		this.rgb = 0; // L: 12
+	} // L: 18
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "2098968671"
+		garbageValue = "1836461831"
 	)
 	@Export("postDecode")
-	public void postDecode() {
-		this.setHsl(this.rgb); // L: 19
-	} // L: 20
+	void postDecode() {
+		this.setHsl(this.rgb); // L: 36
+	} // L: 37
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "-1624898788"
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "-45"
 	)
 	@Export("decode")
-	public void decode(Buffer var1, int var2) {
+	void decode(Buffer var1, int var2) {
 		while (true) {
-			int var3 = var1.readUnsignedByte(); // L: 24
-			if (var3 == 0) { // L: 25
-				return; // L: 28
+			int var3 = var1.readUnsignedByte(); // L: 41
+			if (var3 == 0) { // L: 42
+				return; // L: 45
 			}
 
-			this.decodeNext(var1, var3, var2); // L: 26
+			this.decodeNext(var1, var3, var2); // L: 43
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;III)V",
-		garbageValue = "1243167673"
+		descriptor = "(Lpi;III)V",
+		garbageValue = "1721469493"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
-		if (var2 == 1) { // L: 31
+		if (var2 == 1) { // L: 48
 			this.rgb = var1.readMedium();
 		}
 
-	} // L: 33
+	} // L: 50
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "44"
+		descriptor = "(II)V",
+		garbageValue = "506647207"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
-		double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 36
-		double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 37
-		double var6 = (double)(var1 & 255) / 256.0D; // L: 38
-		double var8 = var2; // L: 39
-		if (var4 < var2) { // L: 40
+		double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 53
+		double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 54
+		double var6 = (double)(var1 & 255) / 256.0D; // L: 55
+		double var8 = var2; // L: 56
+		if (var4 < var2) { // L: 57
 			var8 = var4;
 		}
 
-		if (var6 < var8) { // L: 41
+		if (var6 < var8) { // L: 58
 			var8 = var6;
 		}
 
-		double var10 = var2; // L: 42
-		if (var4 > var2) { // L: 43
+		double var10 = var2; // L: 59
+		if (var4 > var2) { // L: 60
 			var10 = var4;
 		}
 
-		if (var6 > var10) { // L: 44
+		if (var6 > var10) { // L: 61
 			var10 = var6;
 		}
 
-		double var12 = 0.0D; // L: 45
-		double var14 = 0.0D; // L: 46
-		double var16 = (var10 + var8) / 2.0D; // L: 47
-		if (var8 != var10) { // L: 48
-			if (var16 < 0.5D) { // L: 49
+		double var12 = 0.0D; // L: 62
+		double var14 = 0.0D; // L: 63
+		double var16 = (var8 + var10) / 2.0D; // L: 64
+		if (var10 != var8) { // L: 65
+			if (var16 < 0.5D) { // L: 66
 				var14 = (var10 - var8) / (var8 + var10);
 			}
 
-			if (var16 >= 0.5D) { // L: 50
+			if (var16 >= 0.5D) { // L: 67
 				var14 = (var10 - var8) / (2.0D - var10 - var8);
 			}
 
-			if (var10 == var2) { // L: 51
+			if (var10 == var2) { // L: 68
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var10 == var4) { // L: 52
-				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
+			} else if (var4 == var10) { // L: 69
+				var12 = 2.0D + (var6 - var2) / (var10 - var8);
 			} else if (var6 == var10) {
-				var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 53
+				var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 70
 			}
 		}
 
-		var12 /= 6.0D; // L: 55
-		this.saturation = (int)(var14 * 256.0D); // L: 56
-		this.lightness = (int)(var16 * 256.0D); // L: 57
-		if (this.saturation < 0) { // L: 58
+		var12 /= 6.0D; // L: 72
+		this.saturation = (int)(var14 * 256.0D); // L: 73
+		this.lightness = (int)(var16 * 256.0D); // L: 74
+		if (this.saturation < 0) { // L: 75
 			this.saturation = 0;
-		} else if (this.saturation > 255) { // L: 59
+		} else if (this.saturation > 255) { // L: 76
 			this.saturation = 255;
 		}
 
-		if (this.lightness < 0) { // L: 60
+		if (this.lightness < 0) { // L: 77
 			this.lightness = 0;
-		} else if (this.lightness > 255) { // L: 61
+		} else if (this.lightness > 255) { // L: 78
 			this.lightness = 255;
 		}
 
-		if (var16 > 0.5D) { // L: 62
-			this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D);
+		if (var16 > 0.5D) { // L: 79
+			this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D);
 		} else {
-			this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 63
+			this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 80
 		}
 
-		if (this.hueMultiplier < 1) { // L: 64
+		if (this.hueMultiplier < 1) { // L: 81
 			this.hueMultiplier = 1;
 		}
 
-		this.hue = (int)((double)this.hueMultiplier * var12); // L: 65
-	} // L: 66
-
-	@ObfuscatedName("i")
-	public static final void method3190(long var0) {
-		if (var0 > 0L) { // L: 9
-			if (var0 % 10L == 0L) { // L: 10
-				AttackOption.method2308(var0 - 1L); // L: 11
-				AttackOption.method2308(1L); // L: 12
-			} else {
-				AttackOption.method2308(var0); // L: 14
-			}
+		this.hue = (int)((double)this.hueMultiplier * var12); // L: 82
+	} // L: 83
 
-		}
-	} // L: 15
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lpc;",
+		garbageValue = "1097818392"
+	)
+	static PrivateChatMode[] method3381() {
+		return new PrivateChatMode[]{PrivateChatMode.field4594, PrivateChatMode.field4595, PrivateChatMode.field4596}; // L: 11
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lca;",
+		garbageValue = "440486773"
+	)
+	static AttackOption[] method3376() {
+		return new AttackOption[]{AttackOption.field1232, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.field1234, AttackOption.AttackOption_alwaysRightClick}; // L: 12748
+	}
 }
diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java
index ffe0f05712..2468bd0207 100644
--- a/runescape-client/src/main/java/Font.java
+++ b/runescape-client/src/main/java/Font.java
@@ -2,7 +2,7 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("le")
+@ObfuscatedName("lx")
 @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 Font(byte[] var1) {
 		super(var1); // L: 11
 	} // L: 12
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("drawGlyph")
 	final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15
@@ -55,7 +55,7 @@ final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int va
 		}
 	} // L: 44
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@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
diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java
index 9eff2f08ec..5b29d4b777 100644
--- a/runescape-client/src/main/java/FontName.java
+++ b/runescape-client/src/main/java/FontName.java
@@ -1,61 +1,54 @@
 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("ot")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("si")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Laa;"
-	)
-	@Export("decimator")
-	static Decimator decimator;
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lny;"
+		descriptor = "Lot;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lny;"
+		descriptor = "Lot;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lny;"
+		descriptor = "Lot;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lny;"
+		descriptor = "Lot;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lny;"
+		descriptor = "Lot;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lny;"
+		descriptor = "Lot;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("nb")
-	@ObfuscatedGetter(
-		intValue = -1205124413
+	@ObfuscatedName("dw")
+	@ObfuscatedSignature(
+		descriptor = "Lmd;"
 	)
-	@Export("selectedSpellWidget")
-	static int selectedSpellWidget;
-	@ObfuscatedName("e")
+	@Export("js5Socket")
+	static AbstractSocket js5Socket;
+	@ObfuscatedName("j")
 	@Export("name")
 	String name;
 
@@ -65,76 +58,34 @@ public class FontName {
 		FontName_bold12 = new FontName("b12_full"); // L: 9
 		FontName_verdana11 = new FontName("verdana_11pt_regular"); // L: 10
 		FontName_verdana13 = new FontName("verdana_13pt_regular"); // L: 11
-		FontName_verdana15 = new FontName("verdana_15pt_regular"); // L: 12
+		FontName_verdana15 = new FontName("verdana_15pt_regular");
 	}
 
 	FontName(String var1) {
 		this.name = var1; // L: 16
 	} // L: 17
 
-	@ObfuscatedName("w")
-	@Export("base37DecodeLong")
-	public static String base37DecodeLong(long var0) {
-		if (var0 > 0L && var0 < 6582952005840035281L) { // L: 31
-			if (0L == var0 % 37L) { // L: 32
-				return null;
-			} else {
-				int var2 = 0; // L: 33
-
-				for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 34 35 37
-					++var2; // L: 36
-				}
-
-				StringBuilder var5;
-				char var8;
-				for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 39 40 49
-					long var6 = var0; // L: 41
-					var0 /= 37L; // L: 42
-					var8 = class320.base37Table[(int)(var6 - 37L * var0)]; // L: 43
-					if (var8 == '_') { // L: 44
-						int var9 = var5.length() - 1; // L: 45
-						var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 46
-						var8 = 160; // L: 47
-					}
-				}
-
-				var5.reverse(); // L: 51
-				var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 52
-				return var5.toString(); // L: 53
-			}
-		} else {
-			return null;
-		}
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lj;",
+		garbageValue = "-2104552307"
+	)
+	public static class6[] method7075() {
+		return new class6[]{class6.field15}; // L: 12
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "([BIIII[Lfq;I)V",
-		garbageValue = "1067712640"
+		descriptor = "(IIB)I",
+		garbageValue = "-4"
 	)
-	static final void method6688(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
-		int var7;
-		int var8;
-		for (int var6 = 0; var6 < 4; ++var6) { // L: 77
-			for (var7 = 0; var7 < 64; ++var7) { // L: 78
-				for (var8 = 0; var8 < 64; ++var8) { // L: 79
-					if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 80
-						int[] var10000 = var5[var6].flags[var7 + var1];
-						var10000[var2 + var8] &= -16777217;
-					}
-				}
-			}
+	public static int method7074(int var0, int var1) {
+		int var2;
+		for (var2 = 0; var1 > 0; --var1) { // L: 99 100 103
+			var2 = var2 << 1 | var0 & 1; // L: 101
+			var0 >>>= 1; // L: 102
 		}
 
-		Buffer var10 = new Buffer(var0); // L: 84
-
-		for (var7 = 0; var7 < 4; ++var7) { // L: 85
-			for (var8 = 0; var8 < 64; ++var8) { // L: 86
-				for (int var9 = 0; var9 < 64; ++var9) { // L: 87
-					GameEngine.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 88
-				}
-			}
-		}
-
-	} // L: 92
+		return var2; // L: 105
+	}
 }
diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java
index 0dcb54e2d8..526174bcfd 100644
--- a/runescape-client/src/main/java/Fonts.java
+++ b/runescape-client/src/main/java/Fonts.java
@@ -3,29 +3,28 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("nu")
+@ObfuscatedName("oh")
 @Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lko;Lko;)V"
+		descriptor = "(Lku;Lku;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1; // L: 14
@@ -33,10 +32,10 @@ public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.map = new HashMap(); // L: 16
 	} // L: 17
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([Lny;I)Ljava/util/HashMap;",
-		garbageValue = "-870343448"
+		descriptor = "([Lot;I)Ljava/util/HashMap;",
+		garbageValue = "700588236"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -48,160 +47,35 @@ public HashMap createMap(FontName[] var1) {
 			if (this.map.containsKey(var5)) { // L: 26
 				var2.put(var5, this.map.get(var5)); // L: 27
 			} else {
-				Font var6 = UserComparator1.method7234(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
-				}
-			}
-		}
-
-		return var2; // L: 39
-	}
-
-	@ObfuscatedName("al")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "31"
-	)
-	static int method6687(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2684
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2685
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2686
-			return 1; // L: 2687
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2689
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2690
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2691
-			return 1; // L: 2692
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2694
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2695
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2696
-			return 1; // L: 2697
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2699
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2700
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2701
-			return 1; // L: 2702
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2704
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2705
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2706
-			return 1; // L: 2707
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2709
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2710
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2711
-			return 1; // L: 2712
-		} else {
-			int var13;
-			if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2714
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2715
-				var13 = Client.grandExchangeOffers[var3].status(); // L: 2716
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2717
-				return 1; // L: 2718
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2720
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2721
-				var13 = Client.grandExchangeOffers[var3].status(); // L: 2722
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2723
-				return 1; // L: 2724
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2726
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2727
-				var13 = Client.grandExchangeOffers[var3].status(); // L: 2728
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2729
-				return 1; // L: 2730
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2732
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2733
-				var13 = Client.grandExchangeOffers[var3].status(); // L: 2734
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2735
-				return 1; // L: 2736
-			} else {
-				boolean var12;
-				if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2738
-					var12 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2739
-					if (JagexCache.grandExchangeEvents != null) { // L: 2740
-						JagexCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2741
-					}
-
-					return 1; // L: 2743
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2745
-					var12 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2746
-					if (JagexCache.grandExchangeEvents != null) { // L: 2747
-						JagexCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2748
-					}
-
-					return 1; // L: 2750
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2752
-					class14.Interpreter_intStackSize -= 2; // L: 2753
-					var12 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] == 1; // L: 2754
-					boolean var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 2755
-					if (JagexCache.grandExchangeEvents != null) { // L: 2756
-						Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2757
-						JagexCache.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2758
-					}
-
-					return 1; // L: 2760
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2762
-					var12 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2763
-					if (JagexCache.grandExchangeEvents != null) { // L: 2764
-						JagexCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2765
-					}
-
-					return 1; // L: 2767
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2769
-					var12 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2770
-					if (JagexCache.grandExchangeEvents != null) { // L: 2771
-						JagexCache.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2772
-					}
-
-					return 1; // L: 2774
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2776
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = JagexCache.grandExchangeEvents == null ? 0 : JagexCache.grandExchangeEvents.events.size(); // L: 2777
-					return 1; // L: 2778
+				AbstractArchive var7 = this.spritesArchive; // L: 31
+				AbstractArchive var8 = this.fontsArchive; // L: 32
+				String var9 = var5.name; // L: 33
+				int var10 = var7.getGroupId(var9); // L: 35
+				int var11 = var7.getFileId(var10, ""); // L: 36
+				Font var12;
+				if (!class147.method3009(var7, var10, var11)) { // L: 39
+					var12 = null; // L: 40
 				} else {
-					GrandExchangeEvent var4;
-					if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2780
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2781
-						var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2782
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.world; // L: 2783
-						return 1; // L: 2784
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2786
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2787
-						var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2788
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2789
-						return 1; // L: 2790
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2792
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2793
-						var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2794
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2795
-						return 1; // L: 2796
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2798
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2799
-						var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2800
-						long var5 = class111.method2516() - GrandExchangeOfferUnitPriceComparator.field3758 - var4.age; // L: 2801
-						int var7 = (int)(var5 / 3600000L); // L: 2802
-						int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2803
-						int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2804
-						String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2805
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var10; // L: 2806
-						return 1; // L: 2807
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2809
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2810
-						var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2811
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2812
-						return 1; // L: 2813
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2815
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2816
-						var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2817
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2818
-						return 1; // L: 2819
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2821
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2822
-						var4 = (GrandExchangeEvent)JagexCache.grandExchangeEvents.events.get(var3); // L: 2823
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2824
-						return 1; // L: 2825
+					byte[] var14 = var8.takeFile(var10, var11); // L: 44
+					Font var13;
+					if (var14 == null) { // L: 46
+						var13 = null; // L: 47
 					} else {
-						return 2; // L: 2827
+						Font var15 = new Font(var14, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); // L: 50
+						UserComparator3.method2529(); // L: 51
+						var13 = var15; // L: 52
 					}
+
+					var12 = var13; // L: 54
+				}
+
+				if (var12 != null) { // L: 59
+					this.map.put(var5, var12); // L: 60
+					var2.put(var5, var12); // L: 61
 				}
 			}
 		}
+
+		return var2; // L: 67
 	}
 }
diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java
index 4033e1064b..80f09f80f7 100644
--- a/runescape-client/src/main/java/Frames.java
+++ b/runescape-client/src/main/java/Frames.java
@@ -1,33 +1,20 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ho")
+@ObfuscatedName("gg")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
-	)
-	@Export("scriptActiveWidget")
-	static Widget scriptActiveWidget;
-	@ObfuscatedName("mx")
-	@ObfuscatedGetter(
-		intValue = -1716567897
-	)
-	@Export("menuY")
-	static int menuY;
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "[Lhe;"
+		descriptor = "[Lgu;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lko;Lko;IZ)V",
+		descriptor = "(Lku;Lku;IZ)V",
 		garbageValue = "0"
 	)
 	public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
@@ -42,7 +29,7 @@ public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4
 			int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 18
 
 			for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 19 20 25
-				if (var11 == var12.id) { // L: 21
+				if (var11 == var12.id) {
 					var10 = var12; // L: 22
 					break;
 				}
@@ -59,26 +46,22 @@ public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4
 
 	} // L: 36
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "1499014717"
+		descriptor = "(IB)Z",
+		garbageValue = "-102"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
 		return this.frames[var1].hasAlphaTransform; // L: 39
 	}
 
-	@ObfuscatedName("gb")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "1"
+		descriptor = "(IB)I",
+		garbageValue = "-24"
 	)
-	static void method4481() {
-		PacketBufferNode var0 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2745, Client.packetWriter.isaacCipher); // L: 4570
-		var0.packetBuffer.writeByte(class134.getWindowedMode()); // L: 4571
-		var0.packetBuffer.writeShort(GameEngine.canvasWidth); // L: 4572
-		var0.packetBuffer.writeShort(KeyHandler.canvasHeight); // L: 4573
-		Client.packetWriter.addNode(var0); // L: 4574
-	} // L: 4575
+	public static int method4149(int var0) {
+		return var0 >> 17 & 7; // L: 21
+	}
 }
diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java
index 76032c23a0..5fca196385 100644
--- a/runescape-client/src/main/java/Friend.java
+++ b/runescape-client/src/main/java/Friend.java
@@ -3,21 +3,26 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lv")
+@ObfuscatedName("mw")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("i")
-	boolean field3942;
-	@ObfuscatedName("w")
-	boolean field3941;
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "Lej;"
+	)
+	static ClanSettings field4084;
+	@ObfuscatedName("c")
+	boolean field4085;
+	@ObfuscatedName("b")
+	boolean field4086;
 
 	Friend() {
 	} // L: 9
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;I)I",
-		garbageValue = "-1418759266"
+		descriptor = "(Lmw;B)I",
+		garbageValue = "-44"
 	)
 	@Export("compareToFriend")
 	int compareToFriend(Friend var1) {
@@ -29,51 +34,112 @@ int compareToFriend(Friend var1) {
 			return -1;
 		} else if (var1.world != 0 && super.world == 0) { // L: 15
 			return 1;
-		} else if (this.field3942 && !var1.field3942) { // L: 16
+		} else if (this.field4085 && !var1.field4085) { // L: 16
 			return -1;
-		} else if (!this.field3942 && var1.field3942) { // L: 17
+		} else if (!this.field4085 && var1.field4085) { // L: 17
 			return 1;
-		} else if (this.field3941 && !var1.field3941) { // L: 18
+		} else if (this.field4086 && !var1.field4086) { // L: 18
 			return -1;
-		} else if (!this.field3941 && var1.field3941) { // L: 19
+		} else if (!this.field4086 && var1.field4086) { // L: 19
 			return 1;
 		} else {
 			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;I)I",
-		garbageValue = "-1073614160"
+		descriptor = "(Lmv;I)I",
+		garbageValue = "-1921032172"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
-		return this.compareToFriend((Friend)var1); // L: 29
+		return this.compareToFriend((Friend)var1);
 	}
 
 	public int compareTo(Object var1) {
 		return this.compareToFriend((Friend)var1); // L: 33
 	}
 
-	@ObfuscatedName("fr")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "1293240706"
+		descriptor = "(B)Lns;",
+		garbageValue = "28"
+	)
+	public static class365 method6296() {
+		synchronized(class365.field4189) { // L: 26
+			if (class365.field4185 == 0) { // L: 27
+				return new class365();
+			} else {
+				class365.field4189[--class365.field4185].method6627(); // L: 29
+				return class365.field4189[class365.field4185]; // L: 30
+			}
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(S)V",
+		garbageValue = "337"
 	)
-	static void method6057(int var0, int var1) {
-		if (class408.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 4098
-			Archive var2 = AbstractWorldMapIcon.archive11; // L: 4099
-			int var3 = class408.clientPreferences.musicVolume; // L: 4100
-			class247.musicPlayerStatus = 1; // L: 4102
-			class128.musicTrackArchive = var2; // L: 4103
-			FillMode.musicTrackGroupId = var0; // L: 4104
-			ArchiveDiskActionHandler.musicTrackFileId = 0; // L: 4105
-			class247.musicTrackVolume = var3; // L: 4106
-			SecureRandomCallable.musicTrackBoolean = false; // L: 4107
-			class247.pcmSampleLength = 10000; // L: 4108
-			Client.field710 = true; // L: 4110
+	public static void method6294() {
+		if (MouseHandler.MouseHandler_instance != null) { // L: 50
+			synchronized(MouseHandler.MouseHandler_instance) {
+				MouseHandler.MouseHandler_instance = null;
+			} // L: 53
 		}
 
-	} // L: 4112
+	} // L: 55
+
+	@ObfuscatedName("ac")
+	@ObfuscatedSignature(
+		descriptor = "([BIII)I",
+		garbageValue = "-696884945"
+	)
+	public static int method6298(byte[] var0, int var1, int var2) {
+		int var3 = -1; // L: 47
+
+		for (int var4 = var1; var4 < var2; ++var4) { // L: 48
+			var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49
+		}
+
+		var3 = ~var3; // L: 51
+		return var3; // L: 52
+	}
+
+	@ObfuscatedName("it")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "2055581970"
+	)
+	static final void method6288(int var0, int var1) {
+		if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 8795
+			if (Client.showMouseOverText) { // L: 8796
+				int var2 = UserComparator10.method2543(); // L: 8797
+				String var3;
+				if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 8799
+					var3 = "Use" + " " + Client.selectedItemName + " " + "->";
+				} else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 8800
+					var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
+				} else {
+					String var4;
+					if (var2 < 0) { // L: 8804
+						var4 = ""; // L: 8805
+					} else if (Client.menuTargets[var2].length() > 0) { // L: 8808
+						var4 = Client.menuActions[var2] + " " + Client.menuTargets[var2];
+					} else {
+						var4 = Client.menuActions[var2]; // L: 8809
+					}
+
+					var3 = var4; // L: 8811
+				}
+
+				if (Client.menuOptionsCount > 2) { // L: 8813
+					var3 = var3 + UserComparator5.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
+				}
+
+				class136.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 8814
+			}
+		}
+	} // L: 8815
 }
diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java
index e71adb78d7..8637b1ff63 100644
--- a/runescape-client/src/main/java/FriendLoginUpdate.java
+++ b/runescape-client/src/main/java/FriendLoginUpdate.java
@@ -4,55 +4,35 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lw")
+@ObfuscatedName("ml")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("x")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = 1837653609
+		intValue = -1607694617
 	)
-	static int field3943;
-	@ObfuscatedName("gu")
-	@ObfuscatedSignature(
-		descriptor = "Lle;"
-	)
-	@Export("fontPlain11")
-	static Font fontPlain11;
-	@ObfuscatedName("i")
+	static int field4096;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1663283777
+		intValue = -1414251107
 	)
-	public int field3945;
-	@ObfuscatedName("w")
+	public int field4097;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lpb;"
+		descriptor = "Lpo;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;I)V"
+		descriptor = "(Lpo;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field3945 = (int)(class111.method2516() / 1000L); // L: 107
-		this.username = var1; // L: 108
-		this.world = (short)var2; // L: 109
-	} // L: 110
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-106"
-	)
-	static void method6058() {
-		for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30
-			if (var0.obj != null) { // L: 31
-				var0.set();
-			}
-		}
-
-	} // L: 33
+		this.field4097 = (int)(Ignored.method6459() / 1000L); // L: 109
+		this.username = var1; // L: 110
+		this.world = (short)var2; // L: 111
+	} // L: 112
 }
diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java
index 59dae5f66a..61d5051445 100644
--- a/runescape-client/src/main/java/FriendSystem.java
+++ b/runescape-client/src/main/java/FriendSystem.java
@@ -1,92 +1,92 @@
-import java.util.Iterator;
+import java.util.LinkedHashMap;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bm")
+@ObfuscatedName("bl")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Llg;"
+		descriptor = "Lmm;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Llr;"
+		descriptor = "Lmq;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -991444483
+		intValue = 1452528577
 	)
-	int field765;
+	int field778;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lni;)V"
+		descriptor = "(Low;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field765 = 0; // L: 23
+		this.field778 = 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("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1885773213"
+		garbageValue = "1072720259"
 	)
-	boolean method1757() {
-		return this.field765 == 2; // L: 32
+	boolean method1728() {
+		return this.field778 == 2; // L: 32
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1636767062"
+		garbageValue = "-1893042213"
 	)
-	final void method1746() {
-		this.field765 = 1; // L: 36
+	final void method1764() {
+		this.field778 = 1; // L: 36
 	} // L: 37
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;IB)V",
-		garbageValue = "-3"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-532227317"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2); // L: 40
-		this.field765 = 2; // L: 41
-		UserComparator8.method2462(); // L: 42
+		this.field778 = 2; // L: 41
+		WorldMapSection1.method4831(); // L: 42
 	} // L: 43
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "-41"
+		garbageValue = "5"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
 		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 46
-			if ((long)var1.field3945 < class111.method2516() / 1000L - 5L) { // L: 47
+			if ((long)var1.field4097 < Ignored.method6459() / 1000L - 5L) { // L: 47
 				if (var1.world > 0) {
-					class397.addGameMessage(5, "", var1.username + " has logged in."); // L: 48
+					class194.addGameMessage(5, "", var1.username + " has logged in."); // L: 48
 				}
 
 				if (var1.world == 0) { // L: 49
-					class397.addGameMessage(5, "", var1.username + " has logged out.");
+					class194.addGameMessage(5, "", var1.username + " has logged out.");
 				}
 
 				var1.remove(); // L: 50
@@ -95,38 +95,38 @@ final void processFriendUpdates() {
 
 	} // L: 53
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-903439002"
+		descriptor = "(B)V",
+		garbageValue = "-119"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field765 = 0; // L: 56
+		this.field778 = 0; // L: 56
 		this.friendsList.clear(); // L: 57
 		this.ignoreList.clear(); // L: 58
 	} // L: 59
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;ZI)Z",
-		garbageValue = "-1394062445"
+		descriptor = "(Lpo;ZB)Z",
+		garbageValue = "14"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) { // L: 62
 			return false;
-		} else if (var1.equals(HealthBarDefinition.localPlayer.username)) { // L: 63
+		} else if (var1.equals(class340.localPlayer.username)) { // L: 63
 			return true;
 		} else {
 			return this.friendsList.isFriended(var1, var2); // L: 64
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;I)Z",
-		garbageValue = "624915849"
+		descriptor = "(Lpo;B)Z",
+		garbageValue = "0"
 	)
 	@Export("isIgnored")
 	final boolean isIgnored(Username var1) {
@@ -137,10 +137,10 @@ final boolean isIgnored(Username var1) {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "1752227266"
+		garbageValue = "1825841589"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
@@ -148,233 +148,777 @@ final void addFriend(String var1) {
 			Username var2 = new Username(var1, this.loginType); // L: 76
 			if (var2.hasCleanName()) { // L: 77
 				if (this.friendsListIsFull()) { // L: 78
-					class20.method294(); // L: 79
+					ScriptEvent.method2152(); // L: 79
 				} else {
 					StringBuilder var10000;
-					String var4;
-					if (HealthBarDefinition.localPlayer.username.equals(var2)) { // L: 82
+					String var3;
+					if (class340.localPlayer.username.equals(var2)) { // L: 82
 						var10000 = null; // L: 84
-						var4 = "You can't add yourself to your own friend list";
-						class397.addGameMessage(30, "", var4); // L: 86
+						var3 = "You can't add yourself to your own friend list";
+						class194.addGameMessage(30, "", var3); // L: 86
 					} else if (this.isFriended(var2, false)) { // L: 91
 						var10000 = (new StringBuilder()).append(var1); // L: 93
 						Object var10001 = null;
-						var4 = var10000.append(" is already on your friend list").toString();
-						class397.addGameMessage(30, "", var4); // L: 95
+						var3 = var10000.append(" is already on your friend list").toString();
+						class194.addGameMessage(30, "", var3); // L: 95
 					} else if (this.isIgnored(var2)) { // L: 100
-						class279.method5217(var1); // L: 101
+						Client.method1662(var1); // L: 101
 					} else {
-						PacketBufferNode var3 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2747, Client.packetWriter.isaacCipher); // L: 106
-						var3.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var1)); // L: 107
-						var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 108
-						Client.packetWriter.addNode(var3); // L: 109
+						class10.method123(var1); // L: 104
 					}
 				}
 			}
 		}
-	} // L: 80 89 98 102 111
+	} // L: 80 89 98 102 105
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1476294097"
+		garbageValue = "2001895195"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field588 != 1; // L: 128
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field594 != 1; // L: 130
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "1282328040"
+		garbageValue = "879373364"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
-		if (var1 != null) { // L: 135
-			Username var2 = new Username(var1, this.loginType); // L: 136
-			if (var2.hasCleanName()) { // L: 137
+		if (var1 != null) { // L: 137
+			Username var2 = new Username(var1, this.loginType); // L: 138
+			if (var2.hasCleanName()) { // L: 139
 				StringBuilder var10000;
 				String var3;
-				if (this.canAddIgnore()) { // L: 138
-					var10000 = null; // L: 140
+				if (this.canAddIgnore()) { // L: 140
+					var10000 = null; // L: 142
 					var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
-					class397.addGameMessage(30, "", var3); // L: 142
-				} else if (HealthBarDefinition.localPlayer.username.equals(var2)) { // L: 147
-					var10000 = null; // L: 149
-					var3 = "You can't add yourself to your own ignore list";
-					class397.addGameMessage(30, "", var3); // L: 151
-				} else if (this.isIgnored(var2)) { // L: 156
-					var10000 = (new StringBuilder()).append(var1); // L: 158
-					Object var10001 = null;
-					var3 = var10000.append(" is already on your ignore list").toString();
-					class397.addGameMessage(30, "", var3); // L: 160
-				} else if (this.isFriended(var2, false)) { // L: 165
-					KeyHandler.method324(var1); // L: 166
+					class194.addGameMessage(30, "", var3); // L: 144
+				} else if (class340.localPlayer.username.equals(var2)) { // L: 149
+					Skills.method5487(); // L: 150
 				} else {
-					class9.method82(var1); // L: 169
+					Object var10001;
+					if (this.isIgnored(var2)) { // L: 153
+						var10000 = (new StringBuilder()).append(var1); // L: 155
+						var10001 = null;
+						var3 = var10000.append(" is already on your ignore list").toString();
+						class194.addGameMessage(30, "", var3); // L: 157
+					} else if (this.isFriended(var2, false)) { // L: 162
+						var10000 = new StringBuilder();
+						var10001 = null; // L: 164
+						var10000 = var10000.append("Please remove ").append(var1);
+						var10001 = null;
+						var3 = var10000.append(" from your friend list first").toString();
+						class194.addGameMessage(30, "", var3); // L: 166
+					} else {
+						class6.method55(var1); // L: 171
+					}
 				}
 			}
 		}
-	} // L: 145 154 163 167 170
+	} // L: 147 151 160 169 172
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-31"
+		descriptor = "(I)Z",
+		garbageValue = "688284401"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field588 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field594 != 1; // L: 190
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "11"
+		garbageValue = "29"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
-		if (var1 != null) { // L: 195
-			Username var2 = new Username(var1, this.loginType); // L: 196
-			if (var2.hasCleanName()) { // L: 197
-				if (this.friendsList.removeByUsername(var2)) {
-					VarcInt.method3033();
-					PacketBufferNode var3 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2684, Client.packetWriter.isaacCipher); // L: 201
-					var3.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var1));
-					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-					Client.packetWriter.addNode(var3);
-				}
-
-				for (int var5 = 0; var5 < Players.Players_count; ++var5) {
-					Player var4 = Client.players[Players.Players_indices[var5]];
-					var4.clearIsFriend();
-				}
-
-				Iterator var6 = Messages.Messages_hashTable.iterator(); // L: 212
-
-				while (var6.hasNext()) {
-					Message var7 = (Message)var6.next();
-					var7.clearIsFromFriend();
-				}
-
-				if (AbstractArchive.friendsChat != null) { // L: 219
-					AbstractArchive.friendsChat.clearFriends(); // L: 220
+		if (var1 != null) { // L: 197
+			Username var2 = new Username(var1, this.loginType); // L: 198
+			if (var2.hasCleanName()) { // L: 199
+				if (this.friendsList.removeByUsername(var2)) { // L: 200
+					class409.method7267(); // L: 201
+					PacketBufferNode var3 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2854, Client.packetWriter.isaacCipher); // L: 203
+					var3.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var1)); // L: 204
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 205
+					Client.packetWriter.addNode(var3); // L: 206
 				}
 
+				WorldMapSection1.method4831(); // L: 208
 			}
 		}
-	} // L: 223
+	} // L: 209
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "42"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "1642682121"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
-		if (var1 != null) { // L: 226
-			Username var2 = new Username(var1, this.loginType); // L: 227
-			if (var2.hasCleanName()) { // L: 228
-				if (this.ignoreList.removeByUsername(var2)) { // L: 229
-					VarcInt.method3033(); // L: 230
-					PacketBufferNode var3 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2700, Client.packetWriter.isaacCipher); // L: 232
-					var3.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var1)); // L: 233
-					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 234
-					Client.packetWriter.addNode(var3); // L: 235
+		if (var1 != null) { // L: 212
+			Username var2 = new Username(var1, this.loginType); // L: 213
+			if (var2.hasCleanName()) { // L: 214
+				if (this.ignoreList.removeByUsername(var2)) { // L: 215
+					class409.method7267(); // L: 216
+					PacketBufferNode var3 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2805, Client.packetWriter.isaacCipher); // L: 218
+					var3.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var1)); // L: 219
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 220
+					Client.packetWriter.addNode(var3); // L: 221
 				}
 
-				TextureProvider.FriendSystem_invalidateIgnoreds(); // L: 237
+				Skeleton.FriendSystem_invalidateIgnoreds(); // L: 223
 			}
 		}
-	} // L: 238
+	} // L: 224
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;I)Z",
-		garbageValue = "1383012789"
+		descriptor = "(Lpo;I)Z",
+		garbageValue = "743208502"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
-		Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 250
-		return var2 != null && var2.hasWorld(); // L: 251
+		Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 236
+		return var2 != null && var2.hasWorld(); // L: 237
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("fs")
 	@ObfuscatedSignature(
-		descriptor = "(IIIZIZB)V",
-		garbageValue = "87"
+		descriptor = "(ZB)V",
+		garbageValue = "32"
 	)
-	@Export("doWorldSorting")
-	static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
-		if (var0 < var1) { // L: 177
-			int var6 = (var0 + var1) / 2; // L: 178
-			int var7 = var0; // L: 179
-			World var8 = WorldMapEvent.World_worlds[var6]; // L: 180
-			WorldMapEvent.World_worlds[var6] = WorldMapEvent.World_worlds[var1]; // L: 181
-			WorldMapEvent.World_worlds[var1] = var8; // L: 182
-
-			for (int var9 = var0; var9 < var1; ++var9) { // L: 183
-				World var11 = WorldMapEvent.World_worlds[var9]; // L: 185
-				int var12 = WorldMapArchiveLoader.compareWorlds(var11, var8, var2, var3); // L: 187
-				int var10;
-				if (var12 != 0) { // L: 188
-					if (var3) { // L: 189
-						var10 = -var12; // L: 190
-					} else {
-						var10 = var12; // L: 194
-					}
-				} else if (var4 == -1) { // L: 198
-					var10 = 0; // L: 199
-				} else {
-					int var13 = WorldMapArchiveLoader.compareWorlds(var11, var8, var4, var5); // L: 202
-					if (var5) { // L: 203
-						var10 = -var13;
-					} else {
-						var10 = var13; // L: 204
-					}
-				}
+	static final void method1791(boolean var0) {
+		if (var0) { // L: 3658
+			Client.field507 = Login.field882 ? class122.field1471 : class122.field1474; // L: 3659
+		} else {
+			LinkedHashMap var1 = SecureRandomFuture.clientPreferences.parameters; // L: 3662
+			String var3 = Login.Login_username; // L: 3664
+			int var4 = var3.length(); // L: 3666
+			int var5 = 0; // L: 3667
 
-				if (var10 <= 0) { // L: 206
-					World var14 = WorldMapEvent.World_worlds[var9]; // L: 207
-					WorldMapEvent.World_worlds[var9] = WorldMapEvent.World_worlds[var7]; // L: 208
-					WorldMapEvent.World_worlds[var7++] = var14; // L: 209
-				}
+			for (int var6 = 0; var6 < var4; ++var6) { // L: 3668
+				var5 = (var5 << 5) - var5 + var3.charAt(var6);
 			}
 
-			WorldMapEvent.World_worlds[var1] = WorldMapEvent.World_worlds[var7]; // L: 213
-			WorldMapEvent.World_worlds[var7] = var8; // L: 214
-			doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 215
-			doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 216
+			Client.field507 = var1.containsKey(var5) ? class122.field1476 : class122.field1473; // L: 3671
 		}
 
-	} // L: 218
+	} // L: 3673
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("jk")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "-1917272702"
+		descriptor = "(II)Ljava/lang/String;",
+		garbageValue = "-2038294042"
 	)
-	public static void method1755(boolean var0) {
-		if (var0 != BuddyRankComparator.ItemDefinition_inMembersWorld) { // L: 554
-			CollisionMap.method3492(); // L: 555
-			BuddyRankComparator.ItemDefinition_inMembersWorld = var0; // L: 556
+	@Export("formatItemStacks")
+	static final String formatItemStacks(int var0) {
+		String var1 = Integer.toString(var0); // L: 10895
+
+		for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10896
+			var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10897
 		}
 
-	} // L: 558
+		if (var1.length() > 9) { // L: 10899
+			return " " + UserComparator5.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
+		} else {
+			return var1.length() > 6 ? " " + UserComparator5.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + UserComparator5.colorStartTag(16776960) + var1 + "</col>"; // L: 10900 10901
+		}
+	}
 
-	@ObfuscatedName("hb")
+	@ObfuscatedName("ji")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-725135495"
+		descriptor = "([Ljm;IIIIIIII)V",
+		garbageValue = "-415188399"
 	)
-	@Export("addCancelMenuEntry")
-	static void addCancelMenuEntry() {
-		KeyHandler.method343(); // L: 8059
-		Client.menuActions[0] = "Cancel"; // L: 8060
-		Client.menuTargets[0] = ""; // L: 8061
-		Client.menuOpcodes[0] = 1006; // L: 8062
-		Client.menuShiftClick[0] = false; // L: 8063
-		Client.menuOptionsCount = 1; // L: 8064
-	} // L: 8065
+	@Export("updateInterface")
+	static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+		for (int var8 = 0; var8 < var0.length; ++var8) { // L: 11386
+			Widget var9 = var0[var8]; // L: 11387
+			if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class363.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 11388 11389 11390
+				if (var9.isIf3) { // L: 11391
+					if (StudioGame.isComponentHidden(var9)) { // L: 11392
+						continue;
+					}
+				} else if (var9.type == 0 && var9 != class4.mousedOverWidgetIf1 && StudioGame.isComponentHidden(var9)) { // L: 11395
+					continue;
+				}
+
+				int var10 = var9.x + var6; // L: 11397
+				int var11 = var7 + var9.y; // L: 11398
+				int var12;
+				int var13;
+				int var14;
+				int var15;
+				int var17;
+				int var18;
+				if (var9.type == 2) { // L: 11403
+					var12 = var2; // L: 11404
+					var13 = var3; // L: 11405
+					var14 = var4; // L: 11406
+					var15 = var5; // L: 11407
+				} else {
+					int var16;
+					if (var9.type == 9) { // L: 11409
+						var16 = var10; // L: 11410
+						var17 = var11; // L: 11411
+						var18 = var10 + var9.width; // L: 11412
+						int var19 = var11 + var9.height; // L: 11413
+						if (var18 < var10) { // L: 11414
+							var16 = var18; // L: 11416
+							var18 = var10; // L: 11417
+						}
+
+						if (var19 < var11) { // L: 11419
+							var17 = var19; // L: 11421
+							var19 = var11; // L: 11422
+						}
+
+						++var18; // L: 11424
+						++var19; // L: 11425
+						var12 = var16 > var2 ? var16 : var2; // L: 11426
+						var13 = var17 > var3 ? var17 : var3; // L: 11427
+						var14 = var18 < var4 ? var18 : var4; // L: 11428
+						var15 = var19 < var5 ? var19 : var5; // L: 11429
+					} else {
+						var16 = var10 + var9.width; // L: 11432
+						var17 = var11 + var9.height; // L: 11433
+						var12 = var10 > var2 ? var10 : var2; // L: 11434
+						var13 = var11 > var3 ? var11 : var3; // L: 11435
+						var14 = var16 < var4 ? var16 : var4; // L: 11436
+						var15 = var17 < var5 ? var17 : var5; // L: 11437
+					}
+				}
+
+				if (var9 == Client.clickedWidget) { // L: 11439
+					Client.field657 = true; // L: 11440
+					Client.field658 = var10; // L: 11441
+					Client.field660 = var11; // L: 11442
+				}
+
+				boolean var33 = false; // L: 11444
+				if (var9.field3299) { // L: 11445
+					switch(Client.field638) { // L: 11446
+					case 0:
+						var33 = true; // L: 11458
+					case 1:
+					default:
+						break;
+					case 2:
+						if (Client.field639 == var9.id >>> 16) { // L: 11453
+							var33 = true; // L: 11454
+						}
+						break;
+					case 3:
+						if (var9.id == Client.field639) { // L: 11448
+							var33 = true; // L: 11449
+						}
+					}
+				}
+
+				if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 11462
+					if (var9.isIf3) { // L: 11463
+						ScriptEvent var26;
+						if (var9.noClickThrough) { // L: 11464
+							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11465
+								for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11466
+									if (var26.isMouseInputEvent) { // L: 11467
+										var26.remove(); // L: 11468
+										var26.widget.containsMouse = false; // L: 11469
+									}
+								}
+
+								if (class87.widgetDragDuration == 0) { // L: 11472
+									Client.clickedWidget = null; // L: 11473
+									Client.clickedWidgetParent = null; // L: 11474
+								}
+
+								if (!Client.isMenuOpen) { // L: 11476
+									WorldMapElement.addCancelMenuEntry(); // L: 11477
+								}
+							}
+						} else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11481 11482
+							for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11483
+								if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 11484
+									var26.remove(); // L: 11485
+								}
+							}
+						}
+					}
+
+					var17 = MouseHandler.MouseHandler_x; // L: 11491
+					var18 = MouseHandler.MouseHandler_y; // L: 11492
+					if (MouseHandler.MouseHandler_lastButton != 0) { // L: 11493
+						var17 = MouseHandler.MouseHandler_lastPressedX; // L: 11494
+						var18 = MouseHandler.MouseHandler_lastPressedY; // L: 11495
+					}
+
+					boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 11497
+					if (var9.contentType == 1337) { // L: 11498
+						if (!Client.isLoading && !Client.isMenuOpen && var34) { // L: 11499
+							FloorDecoration.addSceneMenuOptions(var17, var18, var12, var13);
+						}
+					} else if (var9.contentType == 1338) { // L: 11502
+						class312.checkIfMinimapClicked(var9, var10, var11); // L: 11503
+					} else {
+						if (var9.contentType == 1400) { // L: 11506
+							Varcs.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); // L: 11507
+						}
+
+						if (!Client.isMenuOpen && var34) { // L: 11509
+							if (var9.contentType == 1400) { // L: 11510
+								Varcs.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 11511
+							} else {
+								Client.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 11514
+							}
+						}
+
+						boolean var21;
+						int var23;
+						if (var33) { // L: 11517
+							for (int var20 = 0; var20 < var9.field3300.length; ++var20) { // L: 11518
+								var21 = false; // L: 11519
+								boolean var27 = false; // L: 11520
+								if (!var21 && var9.field3300[var20] != null) { // L: 11521
+									for (var23 = 0; var23 < var9.field3300[var20].length; ++var23) { // L: 11522
+										boolean var24 = false; // L: 11523
+										if (var9.field3368 != null) { // L: 11524
+											var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3300[var20][var23]]; // L: 11525
+										}
+
+										if (BZip2State.method7571(var9.field3300[var20][var23]) || var24) { // L: 11527
+											var21 = true; // L: 11528
+											if (var9.field3368 != null && var9.field3368[var20] > Client.cycle) { // L: 11529
+												break;
+											}
+
+											byte var32 = var9.field3301[var20][var23]; // L: 11530
+											if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 11531 11532 11533 11534 11535
+												var27 = true; // L: 11537
+												break; // L: 11538
+											}
+										}
+									}
+								}
+
+								if (var27) { // L: 11543
+									if (var20 < 10) { // L: 11544
+										SoundCache.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
+									} else if (var20 == 10) { // L: 11545
+										HealthBar.Widget_runOnTargetLeave(); // L: 11546
+										UrlRequest.selectSpell(var9.id, var9.childIndex, class404.Widget_unpackTargetMask(class363.getWidgetFlags(var9)), var9.itemId); // L: 11547
+										Client.selectedSpellActionName = SecureRandomFuture.Widget_getSpellActionName(var9); // L: 11548
+										if (Client.selectedSpellActionName == null) { // L: 11549
+											Client.selectedSpellActionName = "null";
+										}
+
+										Client.selectedSpellName = var9.dataText + UserComparator5.colorStartTag(16777215); // L: 11550
+									}
+
+									var23 = var9.field3302[var20]; // L: 11552
+									if (var9.field3368 == null) { // L: 11553
+										var9.field3368 = new int[var9.field3300.length];
+									}
+
+									if (var9.field3303 == null) { // L: 11554
+										var9.field3303 = new int[var9.field3300.length];
+									}
+
+									if (var23 != 0) { // L: 11555
+										if (var9.field3368[var20] == 0) { // L: 11556
+											var9.field3368[var20] = var23 + Client.cycle + var9.field3303[var20];
+										} else {
+											var9.field3368[var20] = var23 + Client.cycle; // L: 11557
+										}
+									} else {
+										var9.field3368[var20] = Integer.MAX_VALUE; // L: 11559
+									}
+								}
+
+								if (!var21 && var9.field3368 != null) { // L: 11561 11562
+									var9.field3368[var20] = 0;
+								}
+							}
+						}
+
+						if (var9.isIf3) { // L: 11566
+							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11567
+								var34 = true;
+							} else {
+								var34 = false; // L: 11568
+							}
+
+							boolean var35 = false; // L: 11569
+							if ((MouseHandler.MouseHandler_currentButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { // L: 11570
+								var35 = true;
+							}
+
+							var21 = false; // L: 11571
+							if ((MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 11572
+								var21 = true;
+							}
+
+							if (var21) { // L: 11573
+								class29.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
+							}
+
+							if (var9.contentType == 1400) { // L: 11574
+								Varcs.worldMap.method7062(var17, var18, var34 & var35, var34 & var21); // L: 11575
+							}
+
+							if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && class136.method2841(class363.getWidgetFlags(var9))) { // L: 11577
+								Client.draggedOnWidget = var9;
+							}
+
+							if (var9 == Client.clickedWidgetParent) { // L: 11578
+								Client.field531 = true; // L: 11579
+								Client.field681 = var10; // L: 11580
+								Client.field659 = var11; // L: 11581
+							}
+
+							if (var9.hasListener) { // L: 11583
+								ScriptEvent var22;
+								if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 11584
+									var22 = new ScriptEvent(); // L: 11585
+									var22.isMouseInputEvent = true; // L: 11586
+									var22.widget = var9; // L: 11587
+									var22.mouseY = Client.mouseWheelRotation; // L: 11588
+									var22.args = var9.onScroll; // L: 11589
+									Client.scriptEvents.addFirst(var22); // L: 11590
+								}
+
+								if (Client.clickedWidget != null || class143.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11592
+									var21 = false; // L: 11593
+									var35 = false; // L: 11594
+									var34 = false; // L: 11595
+								}
+
+								if (!var9.isClicked && var21) { // L: 11597
+									var9.isClicked = true; // L: 11598
+									if (var9.onClick != null) { // L: 11599
+										var22 = new ScriptEvent(); // L: 11600
+										var22.isMouseInputEvent = true; // L: 11601
+										var22.widget = var9; // L: 11602
+										var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 11603
+										var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 11604
+										var22.args = var9.onClick; // L: 11605
+										Client.scriptEvents.addFirst(var22); // L: 11606
+									}
+								}
+
+								if (var9.isClicked && var35 && var9.onClickRepeat != null) { // L: 11609 11610
+									var22 = new ScriptEvent(); // L: 11611
+									var22.isMouseInputEvent = true; // L: 11612
+									var22.widget = var9; // L: 11613
+									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11614
+									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11615
+									var22.args = var9.onClickRepeat; // L: 11616
+									Client.scriptEvents.addFirst(var22); // L: 11617
+								}
+
+								if (var9.isClicked && !var35) { // L: 11620
+									var9.isClicked = false; // L: 11621
+									if (var9.onRelease != null) { // L: 11622
+										var22 = new ScriptEvent(); // L: 11623
+										var22.isMouseInputEvent = true; // L: 11624
+										var22.widget = var9; // L: 11625
+										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11626
+										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11627
+										var22.args = var9.onRelease; // L: 11628
+										Client.field579.addFirst(var22); // L: 11629
+									}
+								}
+
+								if (var35 && var9.onHold != null) { // L: 11632 11633
+									var22 = new ScriptEvent(); // L: 11634
+									var22.isMouseInputEvent = true; // L: 11635
+									var22.widget = var9; // L: 11636
+									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11637
+									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11638
+									var22.args = var9.onHold; // L: 11639
+									Client.scriptEvents.addFirst(var22); // L: 11640
+								}
+
+								if (!var9.containsMouse && var34) { // L: 11643
+									var9.containsMouse = true; // L: 11644
+									if (var9.onMouseOver != null) { // L: 11645
+										var22 = new ScriptEvent(); // L: 11646
+										var22.isMouseInputEvent = true; // L: 11647
+										var22.widget = var9; // L: 11648
+										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11649
+										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11650
+										var22.args = var9.onMouseOver; // L: 11651
+										Client.scriptEvents.addFirst(var22); // L: 11652
+									}
+								}
+
+								if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { // L: 11655 11656
+									var22 = new ScriptEvent(); // L: 11657
+									var22.isMouseInputEvent = true; // L: 11658
+									var22.widget = var9; // L: 11659
+									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11660
+									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11661
+									var22.args = var9.onMouseRepeat; // L: 11662
+									Client.scriptEvents.addFirst(var22); // L: 11663
+								}
+
+								if (var9.containsMouse && !var34) { // L: 11666
+									var9.containsMouse = false; // L: 11667
+									if (var9.onMouseLeave != null) { // L: 11668
+										var22 = new ScriptEvent(); // L: 11669
+										var22.isMouseInputEvent = true; // L: 11670
+										var22.widget = var9; // L: 11671
+										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 11672
+										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 11673
+										var22.args = var9.onMouseLeave; // L: 11674
+										Client.field579.addFirst(var22); // L: 11675
+									}
+								}
+
+								if (var9.onTimer != null) { // L: 11678
+									var22 = new ScriptEvent(); // L: 11679
+									var22.widget = var9; // L: 11680
+									var22.args = var9.onTimer; // L: 11681
+									Client.field680.addFirst(var22); // L: 11682
+								}
+
+								ScriptEvent var25;
+								int var36;
+								int var37;
+								if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3363) { // L: 11684
+									if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3363 <= 32) { // L: 11685
+										label809:
+										for (var37 = var9.field3363; var37 < Client.changedVarpCount; ++var37) { // L: 11692
+											var23 = Client.changedVarps[var37 & 31]; // L: 11693
+
+											for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { // L: 11694
+												if (var23 == var9.varTransmitTriggers[var36]) { // L: 11695
+													var25 = new ScriptEvent(); // L: 11696
+													var25.widget = var9; // L: 11697
+													var25.args = var9.onVarTransmit; // L: 11698
+													Client.scriptEvents.addFirst(var25); // L: 11699
+													break label809; // L: 11700
+												}
+											}
+										}
+									} else {
+										var22 = new ScriptEvent(); // L: 11686
+										var22.widget = var9; // L: 11687
+										var22.args = var9.onVarTransmit; // L: 11688
+										Client.scriptEvents.addFirst(var22); // L: 11689
+									}
+
+									var9.field3363 = Client.changedVarpCount; // L: 11705
+								}
+
+								if (var9.onInvTransmit != null && Client.field665 > var9.field3364) { // L: 11707
+									if (var9.invTransmitTriggers != null && Client.field665 - var9.field3364 <= 32) { // L: 11708
+										label785:
+										for (var37 = var9.field3364; var37 < Client.field665; ++var37) { // L: 11715
+											var23 = Client.changedItemContainers[var37 & 31]; // L: 11716
+
+											for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { // L: 11717
+												if (var23 == var9.invTransmitTriggers[var36]) { // L: 11718
+													var25 = new ScriptEvent(); // L: 11719
+													var25.widget = var9; // L: 11720
+													var25.args = var9.onInvTransmit; // L: 11721
+													Client.scriptEvents.addFirst(var25); // L: 11722
+													break label785; // L: 11723
+												}
+											}
+										}
+									} else {
+										var22 = new ScriptEvent(); // L: 11709
+										var22.widget = var9; // L: 11710
+										var22.args = var9.onInvTransmit; // L: 11711
+										Client.scriptEvents.addFirst(var22); // L: 11712
+									}
+
+									var9.field3364 = Client.field665; // L: 11728
+								}
+
+								if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3365) { // L: 11730
+									if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3365 <= 32) { // L: 11731
+										label761:
+										for (var37 = var9.field3365; var37 < Client.changedSkillsCount; ++var37) { // L: 11738
+											var23 = Client.changedSkills[var37 & 31]; // L: 11739
+
+											for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { // L: 11740
+												if (var23 == var9.statTransmitTriggers[var36]) { // L: 11741
+													var25 = new ScriptEvent(); // L: 11742
+													var25.widget = var9; // L: 11743
+													var25.args = var9.onStatTransmit; // L: 11744
+													Client.scriptEvents.addFirst(var25); // L: 11745
+													break label761; // L: 11746
+												}
+											}
+										}
+									} else {
+										var22 = new ScriptEvent(); // L: 11732
+										var22.widget = var9; // L: 11733
+										var22.args = var9.onStatTransmit; // L: 11734
+										Client.scriptEvents.addFirst(var22); // L: 11735
+									}
+
+									var9.field3365 = Client.changedSkillsCount; // L: 11751
+								}
+
+								if (Client.chatCycle > var9.field3341 && var9.onChatTransmit != null) { // L: 11753
+									var22 = new ScriptEvent(); // L: 11754
+									var22.widget = var9; // L: 11755
+									var22.args = var9.onChatTransmit; // L: 11756
+									Client.scriptEvents.addFirst(var22); // L: 11757
+								}
+
+								if (Client.field671 > var9.field3341 && var9.onFriendTransmit != null) { // L: 11759
+									var22 = new ScriptEvent(); // L: 11760
+									var22.widget = var9; // L: 11761
+									var22.args = var9.onFriendTransmit; // L: 11762
+									Client.scriptEvents.addFirst(var22); // L: 11763
+								}
+
+								if (Client.field672 > var9.field3341 && var9.onClanTransmit != null) { // L: 11765
+									var22 = new ScriptEvent(); // L: 11766
+									var22.widget = var9; // L: 11767
+									var22.args = var9.onClanTransmit; // L: 11768
+									Client.scriptEvents.addFirst(var22); // L: 11769
+								}
+
+								if (Client.field673 > var9.field3341 && var9.field3217 != null) { // L: 11771
+									var22 = new ScriptEvent(); // L: 11772
+									var22.widget = var9; // L: 11773
+									var22.args = var9.field3217; // L: 11774
+									Client.scriptEvents.addFirst(var22); // L: 11775
+								}
+
+								if (Client.field583 > var9.field3341 && var9.field3340 != null) { // L: 11777
+									var22 = new ScriptEvent(); // L: 11778
+									var22.widget = var9; // L: 11779
+									var22.args = var9.field3340; // L: 11780
+									Client.scriptEvents.addFirst(var22); // L: 11781
+								}
+
+								if (Client.field675 > var9.field3341 && var9.onStockTransmit != null) { // L: 11783
+									var22 = new ScriptEvent(); // L: 11784
+									var22.widget = var9; // L: 11785
+									var22.args = var9.onStockTransmit; // L: 11786
+									Client.scriptEvents.addFirst(var22); // L: 11787
+								}
+
+								if (Client.field669 > var9.field3341 && var9.field3294 != null) { // L: 11789
+									var22 = new ScriptEvent(); // L: 11790
+									var22.widget = var9; // L: 11791
+									var22.args = var9.field3294; // L: 11792
+									Client.scriptEvents.addFirst(var22); // L: 11793
+								}
+
+								if (Client.field471 > var9.field3341 && var9.onMiscTransmit != null) { // L: 11795
+									var22 = new ScriptEvent(); // L: 11796
+									var22.widget = var9; // L: 11797
+									var22.args = var9.onMiscTransmit; // L: 11798
+									Client.scriptEvents.addFirst(var22); // L: 11799
+								}
+
+								var9.field3341 = Client.cycleCntr; // L: 11801
+								if (var9.onKey != null) { // L: 11802
+									for (var37 = 0; var37 < Client.field701; ++var37) { // L: 11803
+										ScriptEvent var31 = new ScriptEvent(); // L: 11804
+										var31.widget = var9; // L: 11805
+										var31.keyTyped = Client.field522[var37]; // L: 11806
+										var31.keyPressed = Client.field758[var37]; // L: 11807
+										var31.args = var9.onKey; // L: 11808
+										Client.scriptEvents.addFirst(var31); // L: 11809
+									}
+								}
+
+								ScriptEvent var30;
+								int[] var38;
+								if (var9.field3335 != null) { // L: 11812
+									var38 = class78.method2140(); // L: 11813
+
+									for (var23 = 0; var23 < var38.length; ++var23) { // L: 11814
+										var30 = new ScriptEvent(); // L: 11815
+										var30.widget = var9; // L: 11816
+										var30.keyTyped = var38[var23]; // L: 11817
+										var30.args = var9.field3335; // L: 11818
+										Client.scriptEvents.addFirst(var30); // L: 11819
+									}
+								}
+
+								if (var9.field3336 != null) { // L: 11822
+									var38 = Language.method5840(); // L: 11823
+
+									for (var23 = 0; var23 < var38.length; ++var23) { // L: 11824
+										var30 = new ScriptEvent(); // L: 11825
+										var30.widget = var9; // L: 11826
+										var30.keyTyped = var38[var23]; // L: 11827
+										var30.args = var9.field3336; // L: 11828
+										Client.scriptEvents.addFirst(var30); // L: 11829
+									}
+								}
+							}
+						}
+
+						if (!var9.isIf3) { // L: 11834
+							if (Client.clickedWidget != null || class143.dragInventoryWidget != null || Client.isMenuOpen) { // L: 11835
+								continue;
+							}
+
+							if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11836
+								if (var9.mouseOverRedirect >= 0) { // L: 11837
+									class4.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
+								} else {
+									class4.mousedOverWidgetIf1 = var9; // L: 11838
+								}
+							}
+
+							if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 11840
+								class281.field3375 = var9; // L: 11841
+							}
+
+							if (var9.scrollHeight > var9.height) { // L: 11843
+								ClientPreferences.method2293(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
+							}
+						}
+
+						if (var9.type == 0) { // L: 11845
+							updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 11846
+							if (var9.children != null) { // L: 11847
+								updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
+							}
+
+							InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 11848
+							if (var28 != null) { // L: 11849
+								if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 11850
+									for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 11851
+										if (var29.isMouseInputEvent) { // L: 11852
+											var29.remove(); // L: 11853
+											var29.widget.containsMouse = false; // L: 11854
+										}
+									}
+
+									if (class87.widgetDragDuration == 0) { // L: 11857
+										Client.clickedWidget = null; // L: 11858
+										Client.clickedWidgetParent = null; // L: 11859
+									}
+
+									if (!Client.isMenuOpen) { // L: 11861
+										WorldMapElement.addCancelMenuEntry(); // L: 11862
+									}
+								}
+
+								class13.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 11865
+							}
+						}
+					}
+				}
+			}
+		}
+
+	} // L: 11869
 }
diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java
index 9eaa8c564a..b76bb416a2 100644
--- a/runescape-client/src/main/java/FriendsChat.java
+++ b/runescape-client/src/main/java/FriendsChat.java
@@ -4,226 +4,199 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lz")
+@ObfuscatedName("mc")
 @Implements("FriendsChat")
 public class FriendsChat extends UserList {
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Llc;"
+		descriptor = "Lmz;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1093956825
+		intValue = -541938127
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -724455409
+		intValue = 805449653
 	)
-	int field3939;
+	int field4090;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lni;Llc;)V"
+		descriptor = "(Low;Lmz;)V"
 	)
 	public FriendsChat(LoginType var1, Usernamed var2) {
 		super(100); // L: 19
 		this.name = null; // L: 12
 		this.owner = null; // L: 13
-		this.field3939 = 1; // L: 16
+		this.field4090 = 1; // L: 16
 		this.loginType = var1; // L: 20
 		this.localUser = var2; // L: 21
 	} // L: 22
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lla;",
-		garbageValue = "-450730044"
+		descriptor = "(B)Lmv;",
+		garbageValue = "2"
 	)
 	@Export("newInstance")
 	User newInstance() {
-		return new ClanMate(); // L: 25
+		return new ClanMate(); // L: 26
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[Lla;",
-		garbageValue = "91"
+		descriptor = "(II)[Lmv;",
+		garbageValue = "-813912346"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
-		return new ClanMate[var1]; // L: 29
+		return new ClanMate[var1]; // L: 31
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-763520850"
+		garbageValue = "982680902"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		this.name = class134.method2788(var1); // L: 33
-	} // L: 34
+		this.name = class92.method2353(var1); // L: 35
+	} // L: 36
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1960344003"
+		garbageValue = "550170662"
 	)
 	@Export("setOwner")
 	final void setOwner(String var1) {
-		this.owner = class134.method2788(var1); // L: 37
-	} // L: 38
+		this.owner = class92.method2353(var1); // L: 39
+	} // L: 40
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "248840752"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1860574080"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
-		this.setOwner(var1.readStringCp1252NullTerminated()); // L: 41
-		long var2 = var1.readLong(); // L: 42
-		long var5 = var2; // L: 44
-		String var4;
-		int var7;
-		if (var2 > 0L && var2 < 6582952005840035281L) { // L: 46
-			if (0L == var2 % 37L) { // L: 50
-				var4 = null; // L: 51
-			} else {
-				var7 = 0; // L: 54
-
-				for (long var8 = var2; 0L != var8; var8 /= 37L) { // L: 55 56 58
-					++var7; // L: 57
-				}
-
-				StringBuilder var10 = new StringBuilder(var7); // L: 60
-
-				while (var5 != 0L) { // L: 61
-					long var11 = var5; // L: 62
-					var5 /= 37L; // L: 63
-					var10.append(class320.base37Table[(int)(var11 - var5 * 37L)]); // L: 64
-				}
-
-				var4 = var10.reverse().toString(); // L: 66
-			}
-		} else {
-			var4 = null; // L: 47
-		}
-
-		this.readName(var4); // L: 68
-		this.minKick = var1.readByte(); // L: 69
-		var7 = var1.readUnsignedByte(); // L: 70
-		if (var7 != 255) { // L: 71
-			this.clear(); // L: 72
-
-			for (int var13 = 0; var13 < var7; ++var13) { // L: 73
-				ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 74
-				int var14 = var1.readUnsignedShort(); // L: 75
-				var9.set(var14, ++this.field3939 - 1); // L: 76
-				var9.rank = var1.readByte(); // L: 77
-				var1.readStringCp1252NullTerminated(); // L: 78
-				this.isLocalPlayer(var9); // L: 79
+		this.setOwner(var1.readStringCp1252NullTerminated()); // L: 43
+		long var2 = var1.readLong(); // L: 44
+		this.readName(BufferedNetSocket.method6496(var2)); // L: 45
+		this.minKick = var1.readByte(); // L: 46
+		int var4 = var1.readUnsignedByte(); // L: 47
+		if (var4 != 255) { // L: 48
+			this.clear(); // L: 49
+
+			for (int var5 = 0; var5 < var4; ++var5) { // L: 50
+				ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 51
+				int var7 = var1.readUnsignedShort(); // L: 52
+				var6.set(var7, ++this.field4090 - 1); // L: 53
+				var6.rank = var1.readByte(); // L: 54
+				var1.readStringCp1252NullTerminated(); // L: 55
+				this.isLocalPlayer(var6); // L: 56
 			}
 
 		}
-	} // L: 81
+	} // L: 58
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "65280"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "191521599"
 	)
-	public final void method6040(Buffer var1) {
-		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 84
-		int var3 = var1.readUnsignedShort(); // L: 85
-		byte var4 = var1.readByte(); // L: 86
-		boolean var5 = false; // L: 87
-		if (var4 == -128) { // L: 88
+	public final void method6305(Buffer var1) {
+		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 61
+		int var3 = var1.readUnsignedShort(); // L: 62
+		byte var4 = var1.readByte(); // L: 63
+		boolean var5 = false; // L: 64
+		if (var4 == -128) { // L: 65
 			var5 = true;
 		}
 
 		ClanMate var6;
-		if (var5) { // L: 89
-			if (this.getSize() == 0) { // L: 90
+		if (var5) { // L: 66
+			if (this.getSize() == 0) { // L: 67
 				return;
 			}
 
-			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 91
-			if (var6 != null && var6.getWorld() == var3) { // L: 92
-				this.remove(var6); // L: 93
+			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 68
+			if (var6 != null && var6.getWorld() == var3) { // L: 69
+				this.remove(var6); // L: 70
 			}
 		} else {
-			var1.readStringCp1252NullTerminated(); // L: 97
-			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 98
-			if (var6 == null) { // L: 99
-				if (this.getSize() > super.capacity) { // L: 100
+			var1.readStringCp1252NullTerminated(); // L: 74
+			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 75
+			if (var6 == null) { // L: 76
+				if (this.getSize() > super.capacity) { // L: 77
 					return;
 				}
 
-				var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 101
+				var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 78
 			}
 
-			var6.set(var3, ++this.field3939 - 1); // L: 103
-			var6.rank = var4; // L: 104
-			this.isLocalPlayer(var6); // L: 105
+			var6.set(var3, ++this.field4090 - 1); // L: 80
+			var6.rank = var4; // L: 81
+			this.isLocalPlayer(var6); // L: 82
 		}
 
-	} // L: 107
+	} // L: 84
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "98"
+		descriptor = "(I)V",
+		garbageValue = "-1074072286"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
-		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 110
-			((ClanMate)this.get(var1)).clearIsFriend(); // L: 111
+		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 87
+			((ClanMate)this.get(var1)).clearIsFriend(); // L: 88
 		}
 
-	} // L: 113
+	} // L: 90
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-12509743"
+		garbageValue = "-1945019430"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
-		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 116
-			((ClanMate)this.get(var1)).clearIsIgnored(); // L: 117
+		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 93
+			((ClanMate)this.get(var1)).clearIsIgnored(); // L: 94
 		}
 
-	} // L: 119
+	} // L: 96
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(Llp;I)V",
-		garbageValue = "609728257"
+		descriptor = "(Lmx;I)V",
+		garbageValue = "133175483"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {
-		if (var1.getUsername().equals(this.localUser.username())) { // L: 122
+		if (var1.getUsername().equals(this.localUser.username())) { // L: 99
 			this.rank = var1.rank;
 		}
 
-	} // L: 123
+	} // L: 100
 }
diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java
index 6020f5c643..8b95e3e071 100644
--- a/runescape-client/src/main/java/FriendsList.java
+++ b/runescape-client/src/main/java/FriendsList.java
@@ -4,158 +4,158 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lg")
+@ObfuscatedName("mm")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1344623889
+		intValue = -2043730647
 	)
-	int field3929;
-	@ObfuscatedName("o")
+	int field4081;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lky;"
+		descriptor = "Llc;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lni;)V"
+		descriptor = "(Low;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400); // L: 18
-		this.field3929 = 1; // L: 14
+		this.field4081 = 1; // L: 14
 		this.friendLoginUpdates = new LinkDeque(); // L: 15
 		this.loginType = var1; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lla;",
-		garbageValue = "-450730044"
+		descriptor = "(B)Lmv;",
+		garbageValue = "2"
 	)
 	@Export("newInstance")
 	User newInstance() {
-		return new Friend(); // L: 23
+		return new Friend(); // L: 24
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[Lla;",
-		garbageValue = "91"
+		descriptor = "(II)[Lmv;",
+		garbageValue = "-813912346"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
-		return new Friend[var1]; // L: 27
+		return new Friend[var1]; // L: 29
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;ZI)Z",
-		garbageValue = "-294857324"
+		descriptor = "(Lpo;ZI)Z",
+		garbageValue = "-611613577"
 	)
 	@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("e")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "563373210"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "2023217222"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
 		while (true) {
-			if (var1.offset < var2) { // L: 38
-				boolean var3 = var1.readUnsignedByte() == 1; // L: 39
-				Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 40
-				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 41
-				int var6 = var1.readUnsignedShort(); // L: 42
-				int var7 = var1.readUnsignedByte(); // L: 43
-				int var8 = var1.readUnsignedByte(); // L: 44
-				boolean var9 = (var8 & 2) != 0; // L: 45
-				boolean var10 = (var8 & 1) != 0; // L: 46
-				if (var6 > 0) { // L: 47
-					var1.readStringCp1252NullTerminated(); // L: 48
-					var1.readUnsignedByte(); // L: 49
-					var1.readInt(); // L: 50
+			if (var1.offset < var2) { // L: 40
+				boolean var3 = var1.readUnsignedByte() == 1; // L: 41
+				Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 42
+				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 43
+				int var6 = var1.readUnsignedShort(); // L: 44
+				int var7 = var1.readUnsignedByte(); // L: 45
+				int var8 = var1.readUnsignedByte(); // L: 46
+				boolean var9 = (var8 & 2) != 0; // L: 47
+				boolean var10 = (var8 & 1) != 0; // L: 48
+				if (var6 > 0) { // L: 49
+					var1.readStringCp1252NullTerminated(); // L: 50
+					var1.readUnsignedByte(); // L: 51
+					var1.readInt(); // L: 52
 				}
 
-				var1.readStringCp1252NullTerminated(); // L: 52
-				if (var4 != null && var4.hasCleanName()) { // L: 53
-					Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 54
-					if (var3) { // L: 55
-						Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 56
-						if (var12 != null && var12 != var11) { // L: 57
-							if (var11 != null) { // L: 58
-								this.remove(var12); // L: 59
+				var1.readStringCp1252NullTerminated(); // L: 54
+				if (var4 != null && var4.hasCleanName()) { // L: 55
+					Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 56
+					if (var3) { // L: 57
+						Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 58
+						if (var12 != null && var11 != var12) { // L: 59
+							if (var11 != null) { // L: 60
+								this.remove(var12); // L: 61
 							} else {
-								var11 = var12; // L: 62
+								var11 = var12; // L: 64
 							}
 						}
 					}
 
-					if (var11 != null) { // L: 66
-						this.changeName(var11, var4, var5); // L: 67
-						if (var6 != var11.world) { // L: 68
-							boolean var14 = true; // L: 69
-
-							for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 70
-								if (var13.username.equals(var4)) { // L: 71
-									if (var6 != 0 && var13.world == 0) { // L: 72
-										var13.remove(); // L: 73
-										var14 = false; // L: 74
-									} else if (var6 == 0 && var13.world != 0) { // L: 76
-										var13.remove(); // L: 77
-										var14 = false; // L: 78
+					if (var11 != null) { // L: 68
+						this.changeName(var11, var4, var5); // L: 69
+						if (var6 != var11.world) { // L: 70
+							boolean var14 = true; // L: 71
+
+							for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) {
+								if (var13.username.equals(var4)) { // L: 73
+									if (var6 != 0 && var13.world == 0) { // L: 74
+										var13.remove(); // L: 75
+										var14 = false; // L: 76
+									} else if (var6 == 0 && var13.world != 0) { // L: 78
+										var13.remove(); // L: 79
+										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
-						var11.int2 = ++this.field3929 - 1; // L: 90
-						if (var11.world == -1 && var6 == 0) { // L: 91
-							var11.int2 = -(var11.int2 * -939883657) * -641382841;
+					if (var6 != var11.world) { // L: 91
+						var11.int2 = ++this.field4081 - 1; // L: 92
+						if (var11.world == -1 && var6 == 0) { // L: 93
+							var11.int2 = -(var11.int2 * -818070345) * -79798009;
 						}
 
-						var11.world = var6; // L: 92
+						var11.world = var6; // L: 94
 					}
 
-					var11.rank = var7; // L: 94
-					var11.field3942 = var9; // L: 95
-					var11.field3941 = var10; // L: 96
-					continue; // L: 97
+					var11.rank = var7; // L: 96
+					var11.field4085 = var9; // L: 97
+					var11.field4086 = var10; // L: 98
+					continue; // L: 99
 				}
 
-				throw new IllegalStateException();
+				throw new IllegalStateException(); // L: 72
 			}
 
-			this.sort(); // L: 98
-			return; // L: 99
+			this.sort(); // L: 100
+			return; // L: 101
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java
index db46a44ce8..0eaef9e4b5 100644
--- a/runescape-client/src/main/java/GZipDecompressor.java
+++ b/runescape-client/src/main/java/GZipDecompressor.java
@@ -4,17 +4,13 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("pd")
+@ObfuscatedName("pt")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("inflater")
 	Inflater inflater;
 
-	public GZipDecompressor() {
-		this(-1, 1000000, 1000000); // L: 10
-	} // L: 11
-
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
 		garbageValue = "1000000"
@@ -22,10 +18,14 @@ public GZipDecompressor() {
 	GZipDecompressor(int var1, int var2, int var3) {
 	} // L: 13
 
-	@ObfuscatedName("i")
+	public GZipDecompressor() {
+		this(-1, 1000000, 1000000); // L: 10
+	} // L: 11
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;[BB)V",
-		garbageValue = "-63"
+		descriptor = "(Lpi;[BI)V",
+		garbageValue = "1547217663"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {
diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java
index ca26e09f72..7c59bd2ab3 100644
--- a/runescape-client/src/main/java/GameBuild.java
+++ b/runescape-client/src/main/java/GameBuild.java
@@ -1,51 +1,46 @@
+import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jk")
+@ObfuscatedName("kd")
 @Implements("GameBuild")
 public class GameBuild {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ljk;"
+		descriptor = "Lkd;"
 	)
 	@Export("LIVE")
-	static final GameBuild LIVE;
-	@ObfuscatedName("w")
+	public static final GameBuild LIVE;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Ljk;"
+		descriptor = "Lkd;"
 	)
 	@Export("BUILDLIVE")
-	static final GameBuild BUILDLIVE;
-	@ObfuscatedName("s")
+	public static final GameBuild BUILDLIVE;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Ljk;"
+		descriptor = "Lkd;"
 	)
 	@Export("RC")
-	static final GameBuild RC;
-	@ObfuscatedName("a")
+	public static final GameBuild RC;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Ljk;"
+		descriptor = "Lkd;"
 	)
 	@Export("WIP")
-	static final GameBuild WIP;
-	@ObfuscatedName("hk")
-	@ObfuscatedSignature(
-		descriptor = "Lhf;"
-	)
-	@Export("scene")
-	static Scene scene;
-	@ObfuscatedName("o")
+	public static final GameBuild WIP;
+	@ObfuscatedName("t")
 	@Export("name")
 	public final String name;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1492187841
+		intValue = -794048651
 	)
 	@Export("buildId")
-	final int buildId;
+	public final int buildId;
 
 	static {
 		LIVE = new GameBuild("LIVE", 0); // L: 5
@@ -55,369 +50,19 @@ public class GameBuild {
 	}
 
 	GameBuild(String var1, int var2) {
-		this.name = var1; // L: 17
-		this.buildId = var2; // L: 18
-	} // L: 19
+		this.name = var1; // L: 13
+		this.buildId = var2; // L: 14
+	} // L: 15
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Loj;II)V",
-		garbageValue = "-1245191259"
+		descriptor = "(Ljava/awt/Component;I)V",
+		garbageValue = "727628854"
 	)
-	@Export("updatePlayers")
-	static final void updatePlayers(PacketBuffer var0, int var1) {
-		int var2 = var0.offset; // L: 71
-		Players.Players_pendingUpdateCount = 0; // L: 72
-		int var3 = 0; // L: 74
-		var0.importIndex(); // L: 75
-
-		int var4;
-		int var6;
-		byte[] var10000;
-		int var19;
-		for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76
-			var19 = Players.Players_indices[var4]; // L: 77
-			if ((Players.field1244[var19] & 1) == 0) { // L: 78
-				if (var3 > 0) { // L: 79
-					--var3; // L: 80
-					var10000 = Players.field1244; // L: 81
-					var10000[var19] = (byte)(var10000[var19] | 2);
-				} else {
-					var6 = var0.readBits(1); // L: 84
-					if (var6 == 0) { // L: 85
-						var3 = DynamicObject.method1998(var0); // L: 86
-						var10000 = Players.field1244; // L: 87
-						var10000[var19] = (byte)(var10000[var19] | 2);
-					} else {
-						Projectile.readPlayerUpdate(var0, var19); // L: 90
-					}
-				}
-			}
-		}
-
-		var0.exportIndex(); // L: 93
-		if (var3 != 0) { // L: 94
-			throw new RuntimeException(); // L: 95
-		} else {
-			var0.importIndex(); // L: 97
-
-			for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98
-				var19 = Players.Players_indices[var4]; // L: 99
-				if ((Players.field1244[var19] & 1) != 0) { // L: 100
-					if (var3 > 0) { // L: 101
-						--var3; // L: 102
-						var10000 = Players.field1244; // L: 103
-						var10000[var19] = (byte)(var10000[var19] | 2);
-					} else {
-						var6 = var0.readBits(1); // L: 106
-						if (var6 == 0) { // L: 107
-							var3 = DynamicObject.method1998(var0); // L: 108
-							var10000 = Players.field1244; // L: 109
-							var10000[var19] = (byte)(var10000[var19] | 2);
-						} else {
-							Projectile.readPlayerUpdate(var0, var19); // L: 112
-						}
-					}
-				}
-			}
-
-			var0.exportIndex(); // L: 115
-			if (var3 != 0) { // L: 116
-				throw new RuntimeException(); // L: 117
-			} else {
-				var0.importIndex(); // L: 119
-
-				for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120
-					var19 = Players.Players_emptyIndices[var4]; // L: 121
-					if ((Players.field1244[var19] & 1) != 0) { // L: 122
-						if (var3 > 0) { // L: 123
-							--var3; // L: 124
-							var10000 = Players.field1244; // L: 125
-							var10000[var19] = (byte)(var10000[var19] | 2);
-						} else {
-							var6 = var0.readBits(1); // L: 128
-							if (var6 == 0) { // L: 129
-								var3 = DynamicObject.method1998(var0); // L: 130
-								var10000 = Players.field1244; // L: 131
-								var10000[var19] = (byte)(var10000[var19] | 2);
-							} else if (WorldMapData_0.updateExternalPlayer(var0, var19)) { // L: 134
-								var10000 = Players.field1244;
-								var10000[var19] = (byte)(var10000[var19] | 2);
-							}
-						}
-					}
-				}
-
-				var0.exportIndex(); // L: 137
-				if (var3 != 0) { // L: 138
-					throw new RuntimeException(); // L: 139
-				} else {
-					var0.importIndex(); // L: 141
-
-					for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142
-						var19 = Players.Players_emptyIndices[var4]; // L: 143
-						if ((Players.field1244[var19] & 1) == 0) { // L: 144
-							if (var3 > 0) { // L: 145
-								--var3; // L: 146
-								var10000 = Players.field1244; // L: 147
-								var10000[var19] = (byte)(var10000[var19] | 2);
-							} else {
-								var6 = var0.readBits(1); // L: 150
-								if (var6 == 0) { // L: 151
-									var3 = DynamicObject.method1998(var0); // L: 152
-									var10000 = Players.field1244; // L: 153
-									var10000[var19] = (byte)(var10000[var19] | 2);
-								} else if (WorldMapData_0.updateExternalPlayer(var0, var19)) { // L: 156
-									var10000 = Players.field1244;
-									var10000[var19] = (byte)(var10000[var19] | 2);
-								}
-							}
-						}
-					}
-
-					var0.exportIndex(); // L: 159
-					if (var3 != 0) { // L: 160
-						throw new RuntimeException(); // L: 161
-					} else {
-						Players.Players_count = 0; // L: 163
-						Players.Players_emptyIdxCount = 0; // L: 164
-
-						Player var5;
-						for (var4 = 1; var4 < 2048; ++var4) { // L: 165
-							var10000 = Players.field1244; // L: 166
-							var10000[var4] = (byte)(var10000[var4] >> 1);
-							var5 = Client.players[var4]; // L: 167
-							if (var5 != null) { // L: 168
-								Players.Players_indices[++Players.Players_count - 1] = var4;
-							} else {
-								Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169
-							}
-						}
-
-						for (var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 173
-							var4 = Players.Players_pendingUpdateIndices[var3]; // L: 174
-							var5 = Client.players[var4]; // L: 175
-							var6 = var0.readUnsignedByte(); // L: 176
-							if ((var6 & 128) != 0) { // L: 177
-								var6 += var0.readUnsignedByte() << 8;
-							}
-
-							byte var7 = -1; // L: 179
-							if ((var6 & 4) != 0) { // L: 180
-								var5.targetIndex = var0.method7120(); // L: 181
-								if (var5.targetIndex == 65535) { // L: 182
-									var5.targetIndex = -1;
-								}
-							}
-
-							if ((var6 & 32) != 0) { // L: 184
-								var5.field1112 = var0.method7120(); // L: 185
-								if (var5.pathLength == 0) { // L: 186
-									var5.orientation = var5.field1112; // L: 187
-									var5.field1112 = -1; // L: 188
-								}
-							}
-
-							int var8;
-							int var11;
-							int var12;
-							int var15;
-							if ((var6 & 16) != 0) { // L: 191
-								var8 = var0.method7120(); // L: 192
-								PlayerType var9 = (PlayerType)UserComparator4.findEnumerated(VarbitComposition.PlayerType_values(), var0.method6996()); // L: 193
-								boolean var10 = var0.readUnsignedByte() == 1; // L: 194
-								var11 = var0.readUnsignedByte(); // L: 195
-								var12 = var0.offset; // L: 196
-								if (var5.username != null && var5.appearance != null) { // L: 197
-									boolean var13 = false; // L: 198
-									if (var9.isUser && class112.friendSystem.isIgnored(var5.username)) { // L: 199 200
-										var13 = true;
-									}
-
-									if (!var13 && Client.field539 == 0 && !var5.isHidden) { // L: 202
-										Players.field1240.offset = 0; // L: 203
-										var0.method7017(Players.field1240.array, 0, var11); // L: 204
-										Players.field1240.offset = 0; // L: 205
-										String var14 = AbstractFont.escapeBrackets(class19.method277(MilliClock.method2955(Players.field1240))); // L: 206
-										var5.overheadText = var14.trim(); // L: 207
-										var5.overheadTextColor = var8 >> 8; // L: 208
-										var5.overheadTextEffect = var8 & 255; // L: 209
-										var5.overheadTextCyclesRemaining = 150; // L: 210
-										var5.isAutoChatting = var10; // L: 211
-										var5.field1099 = var5 != HealthBarDefinition.localPlayer && var9.isUser && "" != Client.field692 && var14.toLowerCase().indexOf(Client.field692) == -1; // L: 212
-										if (var9.isPrivileged) { // L: 214
-											var15 = var10 ? 91 : 1;
-										} else {
-											var15 = var10 ? 90 : 2; // L: 215
-										}
-
-										if (var9.modIcon != -1) { // L: 216
-											class397.addGameMessage(var15, SpriteMask.method4998(var9.modIcon) + var5.username.getName(), var14);
-										} else {
-											class397.addGameMessage(var15, var5.username.getName(), var14); // L: 217
-										}
-									}
-								}
-
-								var0.offset = var11 + var12; // L: 220
-							}
-
-							if ((var6 & 64) != 0) { // L: 222
-								var5.overheadText = var0.readStringCp1252NullTerminated(); // L: 223
-								if (var5.overheadText.charAt(0) == '~') { // L: 224
-									var5.overheadText = var5.overheadText.substring(1); // L: 225
-									class397.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 226
-								} else if (var5 == HealthBarDefinition.localPlayer) { // L: 228
-									class397.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 229
-								}
-
-								var5.isAutoChatting = false; // L: 231
-								var5.overheadTextColor = 0; // L: 232
-								var5.overheadTextEffect = 0; // L: 233
-								var5.overheadTextCyclesRemaining = 150; // L: 234
-							}
-
-							if ((var6 & 1) != 0) { // L: 236
-								var8 = var0.readUnsignedByte(); // L: 237
-								byte[] var20 = new byte[var8]; // L: 238
-								Buffer var16 = new Buffer(var20); // L: 239
-								var0.method7131(var20, 0, var8); // L: 240
-								Players.field1242[var4] = var16; // L: 241
-								var5.read(var16); // L: 242
-							}
-
-							if ((var6 & 1024) != 0) { // L: 244
-								for (var8 = 0; var8 < 3; ++var8) { // L: 245
-									var5.actions[var8] = var0.readStringCp1252NullTerminated();
-								}
-							}
-
-							int var17;
-							if ((var6 & 8) != 0) { // L: 247
-								var8 = var0.method7120(); // L: 248
-								if (var8 == 65535) { // L: 249
-									var8 = -1;
-								}
-
-								var17 = var0.method6996(); // L: 250
-								FaceNormal.performPlayerAnimation(var5, var8, var17); // L: 251
-							}
-
-							if ((var6 & 512) != 0) { // L: 253
-								var5.field1083 = var0.method6973(); // L: 254
-								var5.field1100 = var0.readByte(); // L: 255
-								var5.field1128 = var0.readByte(); // L: 256
-								var5.field1130 = var0.readByte(); // L: 257
-								var5.field1131 = var0.method7004() + Client.cycle; // L: 258
-								var5.field1132 = var0.method7120() + Client.cycle; // L: 259
-								var5.field1133 = var0.readUnsignedShort(); // L: 260
-								if (var5.field1067) { // L: 261
-									var5.field1083 += var5.tileX; // L: 262
-									var5.field1100 += var5.tileY; // L: 263
-									var5.field1128 += var5.tileX; // L: 264
-									var5.field1130 += var5.tileY; // L: 265
-									var5.pathLength = 0; // L: 266
-								} else {
-									var5.field1083 += var5.pathX[0]; // L: 269
-									var5.field1100 += var5.pathY[0]; // L: 270
-									var5.field1128 += var5.pathX[0]; // L: 271
-									var5.field1130 += var5.pathY[0]; // L: 272
-									var5.pathLength = 1; // L: 273
-								}
-
-								var5.field1144 = 0; // L: 275
-							}
-
-							if ((var6 & 4096) != 0) { // L: 277
-								var7 = var0.method6999(); // L: 278
-							}
-
-							if ((var6 & 256) != 0) { // L: 280
-								var5.spotAnimation = var0.method7004(); // L: 281
-								var8 = var0.readInt(); // L: 282
-								var5.field1126 = var8 >> 16; // L: 283
-								var5.field1125 = (var8 & 65535) + Client.cycle; // L: 284
-								var5.spotAnimationFrame = 0; // L: 285
-								var5.spotAnimationFrameCycle = 0; // L: 286
-								if (var5.field1125 > Client.cycle) { // L: 287
-									var5.spotAnimationFrame = -1;
-								}
-
-								if (var5.spotAnimation == 65535) { // L: 288
-									var5.spotAnimation = -1;
-								}
-							}
-
-							if ((var6 & 2048) != 0) { // L: 290
-								Players.field1241[var4] = var0.method6999(); // L: 291
-							}
-
-							if ((var6 & 2) != 0) { // L: 293
-								var8 = var0.method6997(); // L: 294
-								int var18;
-								int var21;
-								int var23;
-								if (var8 > 0) { // L: 295
-									for (var17 = 0; var17 < var8; ++var17) { // L: 296
-										var11 = -1; // L: 298
-										var12 = -1; // L: 299
-										var23 = -1; // L: 300
-										var21 = var0.readUShortSmart(); // L: 301
-										if (var21 == 32767) { // L: 302
-											var21 = var0.readUShortSmart(); // L: 303
-											var12 = var0.readUShortSmart(); // L: 304
-											var11 = var0.readUShortSmart(); // L: 305
-											var23 = var0.readUShortSmart(); // L: 306
-										} else if (var21 != 32766) { // L: 308
-											var12 = var0.readUShortSmart(); // L: 309
-										} else {
-											var21 = -1; // L: 311
-										}
-
-										var18 = var0.readUShortSmart(); // L: 312
-										var5.addHitSplat(var21, var12, var11, var23, Client.cycle, var18); // L: 313
-									}
-								}
-
-								var17 = var0.method6995(); // L: 316
-								if (var17 > 0) { // L: 317
-									for (var21 = 0; var21 < var17; ++var21) { // L: 318
-										var11 = var0.readUShortSmart(); // L: 319
-										var12 = var0.readUShortSmart(); // L: 320
-										if (var12 != 32767) { // L: 321
-											var23 = var0.readUShortSmart(); // L: 322
-											var18 = var0.method6997(); // L: 323
-											var15 = var12 > 0 ? var0.method6997() : var18; // L: 324
-											var5.addHealthBar(var11, Client.cycle, var12, var23, var18, var15); // L: 325
-										} else {
-											var5.removeHealthBar(var11); // L: 327
-										}
-									}
-								}
-							}
-
-							if (var5.field1067) { // L: 331
-								if (var7 == 127) { // L: 332
-									var5.resetPath(var5.tileX, var5.tileY);
-								} else {
-									byte var22;
-									if (var7 != -1) { // L: 335
-										var22 = var7;
-									} else {
-										var22 = Players.field1241[var4]; // L: 336
-									}
-
-									var5.method2109(var5.tileX, var5.tileY, var22); // L: 337
-								}
-							}
-						}
-
-						if (var0.offset - var2 != var1) { // L: 344
-							throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 345
-						}
-					}
-				}
-			}
-		}
-	} // L: 347
+	static void method5494(Component var0) {
+		var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 43
+		var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 44
+		var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 45
+		MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 46
+	} // L: 47
 }
diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java
index 84f1d3641e..cefbdcb301 100644
--- a/runescape-client/src/main/java/GameEngine.java
+++ b/runescape-client/src/main/java/GameEngine.java
@@ -17,211 +17,214 @@
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.awt.image.ImageObserver;
+import java.io.File;
+import java.io.RandomAccessFile;
 import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ai")
+@ObfuscatedName("am")
 @Implements("GameEngine")
 public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener {
-	@ObfuscatedName("i")
+	@ObfuscatedName("ts")
 	@ObfuscatedSignature(
-		descriptor = "Lew;"
+		descriptor = "Lbl;"
+	)
+	@Export("friendSystem")
+	public static FriendSystem friendSystem;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Leb;"
 	)
 	@Export("taskHandler")
 	protected static TaskHandler taskHandler;
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lai;"
+		descriptor = "Lam;"
 	)
 	@Export("gameEngine")
 	static GameEngine gameEngine;
-	@ObfuscatedName("a")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -858712261
+		intValue = 101195885
 	)
 	@Export("GameEngine_redundantStartThreadCount")
 	static int GameEngine_redundantStartThreadCount;
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = -5031362625863510515L
+		longValue = 1041392062207193601L
 	)
 	@Export("stopTimeMs")
 	static long stopTimeMs;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("isKilled")
 	static boolean isKilled;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 617104153
+		intValue = -449593007
+	)
+	@Export("gameCyclesToDo")
+	protected static int gameCyclesToDo;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = 361879733
 	)
 	@Export("cycleDurationMillis")
 	static int cycleDurationMillis;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 2102456181
+		intValue = 2003926073
 	)
 	@Export("fiveOrOne")
 	static int fiveOrOne;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 390027783
+		intValue = 1529824095
 	)
 	@Export("fps")
 	protected static int fps;
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
 	@Export("graphicsTickTimes")
 	protected static long[] graphicsTickTimes;
-	@ObfuscatedName("z")
-	@Export("clientTickTimes")
-	protected static long[] clientTickTimes;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = 688008119
-	)
-	static int field178;
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = 1856914925
-	)
-	@Export("canvasWidth")
-	public static int canvasWidth;
-	@ObfuscatedName("az")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 942844513
+		intValue = 1869136141
 	)
 	static int field191;
+	@ObfuscatedName("e")
+	@Export("clientTickTimes")
+	protected static long[] clientTickTimes;
 	@ObfuscatedName("ap")
+	@ObfuscatedGetter(
+		intValue = 1200359535
+	)
+	static int field204;
+	@ObfuscatedName("at")
 	@Export("volatileFocus")
 	static volatile boolean volatileFocus;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		longValue = 4237137078128785361L
+		longValue = 5901538680007950845L
 	)
 	@Export("garbageCollectorLastCollectionTime")
 	static long garbageCollectorLastCollectionTime;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		longValue = 2056276932530273441L
+		longValue = -3709786579924747147L
 	)
 	@Export("garbageCollectorLastCheckTimeMs")
 	static long garbageCollectorLastCheckTimeMs;
-	@ObfuscatedName("in")
-	@ObfuscatedSignature(
-		descriptor = "[Loe;"
-	)
-	@Export("scrollBarSprites")
-	static IndexedSprite[] scrollBarSprites;
-	@ObfuscatedName("e")
+	@ObfuscatedName("s")
 	@Export("hasErrored")
 	boolean hasErrored;
-	@ObfuscatedName("d")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 32100603
+		intValue = -484792125
 	)
 	@Export("contentWidth")
 	protected int contentWidth;
-	@ObfuscatedName("r")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -160724727
+		intValue = -1903337841
 	)
 	@Export("contentHeight")
 	protected int contentHeight;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -827932873
+		intValue = 523594845
 	)
 	@Export("canvasX")
 	int canvasX;
-	@ObfuscatedName("c")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1933012565
+		intValue = 1957375435
 	)
 	@Export("canvasY")
 	int canvasY;
-	@ObfuscatedName("v")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1123175499
+		intValue = -193525917
 	)
-	int field184;
-	@ObfuscatedName("ag")
+	int field197;
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 2060371379
+		intValue = 1511981227
 	)
-	int field185;
-	@ObfuscatedName("ae")
+	int field195;
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 1530282643
+		intValue = -1719280099
 	)
 	@Export("maxCanvasWidth")
 	int maxCanvasWidth;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -628736541
+		intValue = 1219535973
 	)
 	@Export("maxCanvasHeight")
 	int maxCanvasHeight;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@Export("frame")
 	Frame frame;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@Export("canvas")
 	java.awt.Canvas canvas;
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@Export("fullRedraw")
 	volatile boolean fullRedraw;
 	@ObfuscatedName("ac")
 	@Export("resizeCanvasNextFrame")
 	boolean resizeCanvasNextFrame;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@Export("isCanvasInvalid")
 	volatile boolean isCanvasInvalid;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		longValue = 578203363854775073L
+		longValue = -5964602634567771817L
 	)
-	volatile long field195;
-	@ObfuscatedName("an")
+	volatile long field207;
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "Lc;"
+		descriptor = "Lx;"
 	)
 	@Export("mouseWheelHandler")
 	MouseWheelHandler mouseWheelHandler;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@Export("clipboard")
 	Clipboard clipboard;
-	@ObfuscatedName("av")
+	@ObfuscatedName("as")
 	@Export("eventQueue")
 	final EventQueue eventQueue;
 
 	static {
 		gameEngine = null;
-		GameEngine_redundantStartThreadCount = 0; // L: 43
-		stopTimeMs = 0L;
-		isKilled = false;
+		GameEngine_redundantStartThreadCount = 0;
+		stopTimeMs = 0L; // L: 44
+		isKilled = false; // L: 45
 		cycleDurationMillis = 20;
-		fiveOrOne = 1;
+		fiveOrOne = 1; // L: 49
 		fps = 0; // L: 50
-		graphicsTickTimes = new long[32];
-		clientTickTimes = new long[32];
-		field191 = 500; // L: 73
+		graphicsTickTimes = new long[32]; // L: 53
+		clientTickTimes = new long[32]; // L: 55
+		field204 = 500; // L: 73
 		volatileFocus = true; // L: 82
 		garbageCollectorLastCollectionTime = -1L; // L: 85
 		garbageCollectorLastCheckTimeMs = -1L; // L: 86
 	}
 
 	protected GameEngine() {
-		this.hasErrored = false; // L: 46
+		this.hasErrored = false;
 		this.canvasX = 0; // L: 59
 		this.canvasY = 0; // L: 60
 		this.fullRedraw = true; // L: 71
-		this.resizeCanvasNextFrame = false;
+		this.resizeCanvasNextFrame = false; // L: 74
 		this.isCanvasInvalid = false; // L: 75
-		this.field195 = 0L; // L: 76
-		EventQueue var1 = null;
+		this.field207 = 0L; // L: 76
+		EventQueue var1 = null; // L: 89
 
 		try {
 			var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); // L: 91
@@ -229,362 +232,322 @@ protected GameEngine() {
 		}
 
 		this.eventQueue = var1; // L: 94
-		DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider();
-		ItemContainer.pcmPlayerProvider = var2; // L: 97
-	} // L: 99
+		class130.method2795(new DevicePcmPlayerProvider()); // L: 95
+	} // L: 96
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-608909834"
+		garbageValue = "-271494890"
 	)
 	@Export("setMaxCanvasSize")
 	protected final void setMaxCanvasSize(int var1, int var2) {
-		if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102
-			this.method533();
+		if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 99
+			this.method482();
 		}
 
-		this.maxCanvasWidth = var1;
-		this.maxCanvasHeight = var2;
-	} // L: 105
+		this.maxCanvasWidth = var1; // L: 100
+		this.maxCanvasHeight = var2; // L: 101
+	} // L: 102
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;I)V",
-		garbageValue = "-2098346454"
+		descriptor = "(Ljava/lang/Object;B)V",
+		garbageValue = "109"
 	)
 	@Export("post")
 	final void post(Object var1) {
-		if (this.eventQueue != null) {
-			for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109
-				FloorUnderlayDefinition.method3190(1L);
+		if (this.eventQueue != null) { // L: 105
+			for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 106
+				Bounds.method6608(1L);
 			}
 
 			if (var1 != null) {
-				this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 110
+				this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 107
 			}
 
 		}
-	} // L: 111
+	} // L: 108
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(B)Leg;",
-		garbageValue = "97"
+		descriptor = "(I)Leq;",
+		garbageValue = "247241900"
 	)
 	@Export("mouseWheel")
-	protected class144 mouseWheel() {
-		if (this.mouseWheelHandler == null) { // L: 114
-			this.mouseWheelHandler = new MouseWheelHandler(); // L: 115
-			this.mouseWheelHandler.addTo(this.canvas);
+	protected class154 mouseWheel() {
+		if (this.mouseWheelHandler == null) { // L: 111
+			this.mouseWheelHandler = new MouseWheelHandler(); // L: 112
+			this.mouseWheelHandler.addTo(this.canvas); // L: 113
 		}
 
-		return this.mouseWheelHandler; // L: 118
+		return this.mouseWheelHandler; // L: 115
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-999701566"
+		garbageValue = "-1865121079"
 	)
 	@Export("setUpClipboard")
 	protected void setUpClipboard() {
-		this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122
-	} // L: 123
+		this.clipboard = this.getToolkit().getSystemClipboard(); // L: 119
+	} // L: 120
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "-1"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "1085024846"
 	)
-	protected void method484(String var1) {
-		this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126
-	} // L: 127
+	protected void method492(String var1) {
+		this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 123
+	} // L: 124
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-99443969"
+		garbageValue = "-1640324259"
 	)
 	@Export("setUpKeyboard")
 	protected final void setUpKeyboard() {
-		if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) {
-			KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 132
-			KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 133
-			KeyHandler.KeyHandler_keyCodes[188] = 71;
-			KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 135
-			KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 136
-			KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 137
-			KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 138
-			KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 139
-			KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 140
-			KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 141
-			KeyHandler.KeyHandler_keyCodes[222] = 59;
-			KeyHandler.KeyHandler_keyCodes[223] = 28;
-		} else {
-			KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 146
-			KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 147
-			KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 148
-			KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 149
-			KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 150
-			KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 151
-			KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 152
-			KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 153
-			KeyHandler.KeyHandler_keyCodes[93] = 43;
-			KeyHandler.KeyHandler_keyCodes[192] = 28;
-			KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 156
-			KeyHandler.KeyHandler_keyCodes[520] = 59;
-		}
-
-		java.awt.Canvas var1 = this.canvas; // L: 160
-		var1.setFocusTraversalKeysEnabled(false);
-		var1.addKeyListener(KeyHandler.KeyHandler_instance);
-		var1.addFocusListener(KeyHandler.KeyHandler_instance);
-	}
+		class132.method2810(); // L: 127
+		DevicePcmPlayerProvider.method393(this.canvas); // L: 128
+	} // L: 129
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1124509937"
+		garbageValue = "-150976467"
 	)
-	protected final void method440() {
-		java.awt.Canvas var1 = this.canvas; // L: 169
-		var1.addMouseListener(MouseHandler.MouseHandler_instance);
-		var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 172
-		var1.addFocusListener(MouseHandler.MouseHandler_instance);
-	}
+	protected final void method472() {
+		class136.method2839(this.canvas); // L: 132
+	} // L: 133
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-86"
+		descriptor = "(I)V",
+		garbageValue = "-740959937"
 	)
 	@Export("resizeCanvas")
 	final void resizeCanvas() {
-		Container var1 = this.container(); // L: 178
-		if (var1 != null) {
-			Bounds var2 = this.getFrameContentBounds(); // L: 180
-			this.contentWidth = Math.max(var2.highX, this.field184);
-			this.contentHeight = Math.max(var2.highY, this.field185); // L: 182
-			if (this.contentWidth <= 0) { // L: 183
+		Container var1 = this.container(); // L: 136
+		if (var1 != null) { // L: 137
+			Bounds var2 = this.getFrameContentBounds(); // L: 138
+			this.contentWidth = Math.max(var2.highX, this.field197); // L: 139
+			this.contentHeight = Math.max(var2.highY, this.field195); // L: 140
+			if (this.contentWidth <= 0) { // L: 141
 				this.contentWidth = 1;
 			}
 
-			if (this.contentHeight <= 0) {
+			if (this.contentHeight <= 0) { // L: 142
 				this.contentHeight = 1;
 			}
 
-			canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth);
-			KeyHandler.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight);
-			this.canvasX = (this.contentWidth - canvasWidth) / 2;
-			this.canvasY = 0;
-			this.canvas.setSize(canvasWidth, KeyHandler.canvasHeight); // L: 189
-			Canvas.rasterProvider = new RasterProvider(canvasWidth, KeyHandler.canvasHeight, this.canvas); // L: 190
-			if (var1 == this.frame) {
-				Insets var3 = this.frame.getInsets();
-				this.canvas.setLocation(this.canvasX + var3.left, this.canvasY + var3.top);
+			class186.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 143
+			BoundaryObject.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 144
+			this.canvasX = (this.contentWidth - class186.canvasWidth) / 2; // L: 145
+			this.canvasY = 0; // L: 146
+			this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); // L: 147
+			class19.rasterProvider = new RasterProvider(class186.canvasWidth, BoundaryObject.canvasHeight, this.canvas); // L: 148
+			if (var1 == this.frame) { // L: 149
+				Insets var3 = this.frame.getInsets(); // L: 150
+				this.canvas.setLocation(var3.left + this.canvasX, var3.top + this.canvasY); // L: 151
 			} else {
-				this.canvas.setLocation(this.canvasX, this.canvasY); // L: 195
+				this.canvas.setLocation(this.canvasX, this.canvasY); // L: 153
 			}
 
-			this.fullRedraw = true; // L: 196
-			this.resizeGame();
+			this.fullRedraw = true; // L: 154
+			this.resizeGame(); // L: 155
 		}
-	}
+	} // L: 156
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1701018417"
+		garbageValue = "-2122855875"
 	)
 	@Export("resizeGame")
 	protected abstract void resizeGame();
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "48"
+		descriptor = "(I)V",
+		garbageValue = "-1990507849"
 	)
 	@Export("clearBackground")
 	void clearBackground() {
-		int var1 = this.canvasX; // L: 203
-		int var2 = this.canvasY; // L: 204
-		int var3 = this.contentWidth - canvasWidth - var1; // L: 205
-		int var4 = this.contentHeight - KeyHandler.canvasHeight - var2;
-		if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) {
+		int var1 = this.canvasX; // L: 161
+		int var2 = this.canvasY; // L: 162
+		int var3 = this.contentWidth - class186.canvasWidth - var1; // L: 163
+		int var4 = this.contentHeight - BoundaryObject.canvasHeight - var2; // L: 164
+		if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 165
 			try {
-				Container var5 = this.container();
-				int var6 = 0; // L: 210
-				int var7 = 0; // L: 211
-				if (var5 == this.frame) {
-					Insets var8 = this.frame.getInsets(); // L: 213
-					var6 = var8.left; // L: 214
-					var7 = var8.top;
+				Container var5 = this.container(); // L: 167
+				int var6 = 0; // L: 168
+				int var7 = 0; // L: 169
+				if (var5 == this.frame) { // L: 170
+					Insets var8 = this.frame.getInsets(); // L: 171
+					var6 = var8.left; // L: 172
+					var7 = var8.top; // L: 173
 				}
 
-				Graphics var10 = var5.getGraphics(); // L: 217
-				var10.setColor(Color.black); // L: 218
+				Graphics var10 = var5.getGraphics(); // L: 175
+				var10.setColor(Color.black); // L: 176
 				if (var1 > 0) {
-					var10.fillRect(var6, var7, var1, this.contentHeight); // L: 219
+					var10.fillRect(var6, var7, var1, this.contentHeight); // L: 177
 				}
 
-				if (var2 > 0) { // L: 220
+				if (var2 > 0) { // L: 178
 					var10.fillRect(var6, var7, this.contentWidth, var2);
 				}
 
-				if (var3 > 0) { // L: 221
+				if (var3 > 0) { // L: 179
 					var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight);
 				}
 
-				if (var4 > 0) { // L: 222
+				if (var4 > 0) { // L: 180
 					var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4);
 				}
-			} catch (Exception var9) { // L: 224
+			} catch (Exception var9) { // L: 182
 			}
 		}
 
-	} // L: 226
+	} // L: 184
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1296094559"
+		garbageValue = "-168794893"
 	)
 	@Export("replaceCanvas")
 	final void replaceCanvas() {
-		java.awt.Canvas var1 = this.canvas; // L: 229
-		var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 231
-		var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 232
-		KeyHandler.field122 = -1; // L: 233
-		ModeWhere.method5543(this.canvas); // L: 235
-		if (this.mouseWheelHandler != null) { // L: 236
+		java.awt.Canvas var1 = this.canvas; // L: 187
+		var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 189
+		var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 190
+		KeyHandler.field120 = -1; // L: 191
+		GameBuild.method5494(this.canvas); // L: 193
+		if (this.mouseWheelHandler != null) { // L: 194
 			this.mouseWheelHandler.removeFrom(this.canvas);
 		}
 
-		this.addCanvas(); // L: 237
-		java.awt.Canvas var2 = this.canvas; // L: 238
-		var2.setFocusTraversalKeysEnabled(false); // L: 240
-		var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 241
-		var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 242
-		java.awt.Canvas var3 = this.canvas; // L: 244
-		var3.addMouseListener(MouseHandler.MouseHandler_instance); // L: 246
-		var3.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 247
-		var3.addFocusListener(MouseHandler.MouseHandler_instance); // L: 248
-		if (this.mouseWheelHandler != null) { // L: 250
+		this.addCanvas(); // L: 195
+		DevicePcmPlayerProvider.method393(this.canvas); // L: 196
+		class136.method2839(this.canvas); // L: 197
+		if (this.mouseWheelHandler != null) { // L: 198
 			this.mouseWheelHandler.addTo(this.canvas);
 		}
 
-		this.method533(); // L: 251
-	} // L: 252
+		this.method482(); // L: 199
+	} // L: 200
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "-417163265"
+		garbageValue = "-2147483648"
 	)
 	@Export("startThread")
 	protected final void startThread(int var1, int var2, int var3) {
 		try {
-			if (gameEngine != null) { // L: 256
-				++GameEngine_redundantStartThreadCount; // L: 257
-				if (GameEngine_redundantStartThreadCount >= 3) { // L: 258
-					this.error("alreadyloaded"); // L: 259
-					return; // L: 260
+			if (gameEngine != null) { // L: 204
+				++GameEngine_redundantStartThreadCount; // L: 205
+				if (GameEngine_redundantStartThreadCount >= 3) { // L: 206
+					this.error("alreadyloaded"); // L: 207
+					return; // L: 208
 				}
 
-				this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 262
-				return; // L: 263
+				this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 210
+				return; // L: 211
 			}
 
-			gameEngine = this; // L: 265
-			canvasWidth = var1; // L: 266
-			KeyHandler.canvasHeight = var2; // L: 267
-			RunException.RunException_revision = var3; // L: 268
-			RunException.RunException_applet = this; // L: 269
-			if (taskHandler == null) { // L: 270
+			gameEngine = this; // L: 213
+			class186.canvasWidth = var1; // L: 214
+			BoundaryObject.canvasHeight = var2; // L: 215
+			RunException.RunException_revision = var3; // L: 216
+			RunException.RunException_applet = this; // L: 217
+			if (taskHandler == null) { // L: 218
 				taskHandler = new TaskHandler();
 			}
 
-			taskHandler.newThreadTask(this, 1); // L: 271
-		} catch (Exception var5) { // L: 273
-			MilliClock.RunException_sendStackTrace((String)null, var5); // L: 274
-			this.error("crash"); // L: 275
+			taskHandler.newThreadTask(this, 1); // L: 219
+		} catch (Exception var5) { // L: 221
+			AccessFile.RunException_sendStackTrace((String)null, var5); // L: 222
+			this.error("crash"); // L: 223
 		}
 
-	} // L: 277
+	} // L: 225
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "86"
+		descriptor = "(I)V",
+		garbageValue = "1171942510"
 	)
 	@Export("addCanvas")
 	final synchronized void addCanvas() {
-		Container var1 = this.container(); // L: 280
-		if (this.canvas != null) { // L: 281
-			this.canvas.removeFocusListener(this); // L: 282
-			var1.remove(this.canvas); // L: 283
+		Container var1 = this.container(); // L: 228
+		if (this.canvas != null) { // L: 229
+			this.canvas.removeFocusListener(this); // L: 230
+			var1.remove(this.canvas); // L: 231
 		}
 
-		canvasWidth = Math.max(var1.getWidth(), this.field184); // L: 285
-		KeyHandler.canvasHeight = Math.max(var1.getHeight(), this.field185); // L: 286
+		class186.canvasWidth = Math.max(var1.getWidth(), this.field197); // L: 233
+		BoundaryObject.canvasHeight = Math.max(var1.getHeight(), this.field195); // L: 234
 		Insets var2;
-		if (this.frame != null) { // L: 287
-			var2 = this.frame.getInsets(); // L: 288
-			canvasWidth -= var2.left + var2.right; // L: 289
-			KeyHandler.canvasHeight -= var2.bottom + var2.top; // L: 290
+		if (this.frame != null) { // L: 235
+			var2 = this.frame.getInsets(); // L: 236
+			class186.canvasWidth -= var2.right + var2.left; // L: 237
+			BoundaryObject.canvasHeight -= var2.top + var2.bottom; // L: 238
 		}
 
-		this.canvas = new Canvas(this); // L: 292
-		var1.setBackground(Color.BLACK); // L: 293
-		var1.setLayout((LayoutManager)null); // L: 294
-		var1.add(this.canvas); // L: 295
-		this.canvas.setSize(canvasWidth, KeyHandler.canvasHeight); // L: 296
-		this.canvas.setVisible(true); // L: 297
-		this.canvas.setBackground(Color.BLACK); // L: 298
-		if (var1 == this.frame) { // L: 299
-			var2 = this.frame.getInsets(); // L: 300
-			this.canvas.setLocation(var2.left + this.canvasX, this.canvasY + var2.top); // L: 301
+		this.canvas = new Canvas(this); // L: 240
+		var1.setBackground(Color.BLACK); // L: 241
+		var1.setLayout((LayoutManager)null); // L: 242
+		var1.add(this.canvas); // L: 243
+		this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); // L: 244
+		this.canvas.setVisible(true); // L: 245
+		this.canvas.setBackground(Color.BLACK); // L: 246
+		if (var1 == this.frame) { // L: 247
+			var2 = this.frame.getInsets(); // L: 248
+			this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 249
 		} else {
-			this.canvas.setLocation(this.canvasX, this.canvasY); // L: 303
+			this.canvas.setLocation(this.canvasX, this.canvasY); // L: 251
 		}
 
-		this.canvas.addFocusListener(this); // L: 304
-		this.canvas.requestFocus(); // L: 305
-		this.fullRedraw = true; // L: 306
-		if (Canvas.rasterProvider != null && canvasWidth == Canvas.rasterProvider.width && KeyHandler.canvasHeight == Canvas.rasterProvider.height) { // L: 307
-			((RasterProvider)Canvas.rasterProvider).setComponent(this.canvas); // L: 308
-			Canvas.rasterProvider.drawFull(0, 0); // L: 309
+		this.canvas.addFocusListener(this); // L: 252
+		this.canvas.requestFocus(); // L: 253
+		this.fullRedraw = true; // L: 254
+		if (class19.rasterProvider != null && class186.canvasWidth == class19.rasterProvider.width && BoundaryObject.canvasHeight == class19.rasterProvider.height) { // L: 255
+			((RasterProvider)class19.rasterProvider).setComponent(this.canvas); // L: 256
+			class19.rasterProvider.drawFull(0, 0); // L: 257
 		} else {
-			Canvas.rasterProvider = new RasterProvider(canvasWidth, KeyHandler.canvasHeight, this.canvas); // L: 312
+			class19.rasterProvider = new RasterProvider(class186.canvasWidth, BoundaryObject.canvasHeight, this.canvas); // L: 260
 		}
 
-		this.isCanvasInvalid = false; // L: 314
-		this.field195 = class111.method2516(); // L: 315
-	} // L: 316
+		this.isCanvasInvalid = false; // L: 262
+		this.field207 = Ignored.method6459(); // L: 263
+	} // L: 264
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-597352233"
+		garbageValue = "-426429067"
 	)
 	@Export("checkHost")
 	protected final boolean checkHost() {
-		String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 319
-		if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 320
-			if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 321
-				if (var1.endsWith("127.0.0.1")) { // L: 322
+		String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 267
+		if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 268
+			if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 269
+				if (var1.endsWith("127.0.0.1")) { // L: 270
 					return true;
 				} else {
-					while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
-						var1 = var1.substring(0, var1.length() - 1); // L: 323
+					while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { // L: 271
+						var1 = var1.substring(0, var1.length() - 1);
 					}
 
-					if (var1.endsWith("192.168.1.")) { // L: 324
+					if (var1.endsWith("192.168.1.")) { // L: 272
 						return true;
 					} else {
-						this.error("invalidhost"); // L: 325
-						return false; // L: 326
+						this.error("invalidhost"); // L: 273
+						return false; // L: 274
 					}
 				}
 			} else {
@@ -595,694 +558,823 @@ protected final boolean checkHost() {
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-754121126"
+		descriptor = "(B)V",
+		garbageValue = "71"
 	)
 	@Export("clientTick")
 	void clientTick() {
-		long var1 = class111.method2516(); // L: 379
-		long var3 = clientTickTimes[field178]; // L: 380
-		clientTickTimes[field178] = var1; // L: 381
-		field178 = field178 + 1 & 31; // L: 382
-		if (0L != var3 && var1 > var3) { // L: 383
+		long var1 = Ignored.method6459(); // L: 327
+		long var3 = clientTickTimes[ScriptFrame.field448]; // L: 328
+		clientTickTimes[ScriptFrame.field448] = var1; // L: 329
+		ScriptFrame.field448 = ScriptFrame.field448 + 1 & 31; // L: 330
+		if (var3 != 0L && var1 > var3) { // L: 331
 		}
 
-		synchronized(this) { // L: 384
-			WorldMapSectionType.hasFocus = volatileFocus; // L: 385
-		} // L: 386
+		synchronized(this) { // L: 332
+			World.hasFocus = volatileFocus; // L: 333
+		} // L: 334
 
-		this.doCycle(); // L: 387
-	} // L: 388
+		this.doCycle(); // L: 335
+	} // L: 336
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "25949374"
+		descriptor = "(B)V",
+		garbageValue = "10"
 	)
 	@Export("graphicsTick")
 	void graphicsTick() {
-		Container var1 = this.container(); // L: 391
-		long var2 = class111.method2516(); // L: 392
-		long var4 = graphicsTickTimes[class362.field4057]; // L: 393
-		graphicsTickTimes[class362.field4057] = var2; // L: 394
-		class362.field4057 = class362.field4057 + 1 & 31; // L: 395
-		if (var4 != 0L && var2 > var4) { // L: 396
-			int var6 = (int)(var2 - var4); // L: 397
-			fps = ((var6 >> 1) + 32000) / var6; // L: 398
+		Container var1 = this.container(); // L: 339
+		long var2 = Ignored.method6459(); // L: 340
+		long var4 = graphicsTickTimes[field191]; // L: 341
+		graphicsTickTimes[field191] = var2; // L: 342
+		field191 = field191 + 1 & 31; // L: 343
+		if (var4 != 0L && var2 > var4) { // L: 344
+			int var6 = (int)(var2 - var4); // L: 345
+			fps = ((var6 >> 1) + 32000) / var6; // L: 346
 		}
 
-		if (++field191 - 1 > 50) { // L: 400
-			field191 -= 50; // L: 401
-			this.fullRedraw = true; // L: 402
-			this.canvas.setSize(canvasWidth, KeyHandler.canvasHeight); // L: 403
-			this.canvas.setVisible(true); // L: 404
-			if (var1 == this.frame) { // L: 405
-				Insets var7 = this.frame.getInsets(); // L: 406
-				this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 407
+		if (++field204 - 1 > 50) { // L: 348
+			field204 -= 50; // L: 349
+			this.fullRedraw = true; // L: 350
+			this.canvas.setSize(class186.canvasWidth, BoundaryObject.canvasHeight); // L: 351
+			this.canvas.setVisible(true); // L: 352
+			if (var1 == this.frame) { // L: 353
+				Insets var7 = this.frame.getInsets(); // L: 354
+				this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 355
 			} else {
-				this.canvas.setLocation(this.canvasX, this.canvasY); // L: 409
+				this.canvas.setLocation(this.canvasX, this.canvasY); // L: 357
 			}
 		}
 
-		if (this.isCanvasInvalid) { // L: 411
+		if (this.isCanvasInvalid) { // L: 359
 			this.replaceCanvas();
 		}
 
-		this.method449(); // L: 412
-		this.draw(this.fullRedraw); // L: 413
-		if (this.fullRedraw) { // L: 414
+		this.method594(); // L: 360
+		this.draw(this.fullRedraw); // L: 361
+		if (this.fullRedraw) { // L: 362
 			this.clearBackground();
 		}
 
-		this.fullRedraw = false; // L: 415
-	} // L: 416
+		this.fullRedraw = false; // L: 363
+	} // L: 364
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1812985306"
+		garbageValue = "1862280135"
 	)
-	final void method449() {
-		Bounds var1 = this.getFrameContentBounds(); // L: 419
-		if (var1.highX != this.contentWidth || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 420
-			this.resizeCanvas(); // L: 421
-			this.resizeCanvasNextFrame = false; // L: 422
+	final void method594() {
+		Bounds var1 = this.getFrameContentBounds(); // L: 367
+		if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 368
+			this.resizeCanvas(); // L: 369
+			this.resizeCanvasNextFrame = false; // L: 370
 		}
 
-	} // L: 424
+	} // L: 372
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1443705423"
+		descriptor = "(B)V",
+		garbageValue = "73"
 	)
-	final void method533() {
-		this.resizeCanvasNextFrame = true; // L: 427
-	} // L: 428
+	final void method482() {
+		this.resizeCanvasNextFrame = true; // L: 375
+	} // L: 376
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1010664187"
+		descriptor = "(B)V",
+		garbageValue = "8"
 	)
 	@Export("kill")
 	final synchronized void kill() {
-		if (!isKilled) { // L: 431
-			isKilled = true; // L: 432
+		if (!isKilled) { // L: 379
+			isKilled = true; // L: 380
 
 			try {
-				this.canvas.removeFocusListener(this); // L: 434
-			} catch (Exception var5) { // L: 436
+				this.canvas.removeFocusListener(this); // L: 382
+			} catch (Exception var5) { // L: 384
 			}
 
 			try {
-				this.kill0(); // L: 438
-			} catch (Exception var4) { // L: 440
+				this.kill0(); // L: 386
+			} catch (Exception var4) { // L: 388
 			}
 
-			if (this.frame != null) { // L: 441
+			if (this.frame != null) { // L: 389
 				try {
-					System.exit(0); // L: 443
-				} catch (Throwable var3) { // L: 445
+					System.exit(0); // L: 391
+				} catch (Throwable var3) { // L: 393
 				}
 			}
 
-			if (taskHandler != null) { // L: 447
+			if (taskHandler != null) { // L: 395
 				try {
-					taskHandler.close(); // L: 449
-				} catch (Exception var2) { // L: 451
+					taskHandler.close(); // L: 397
+				} catch (Exception var2) { // L: 399
 				}
 			}
 
-			this.vmethod1164(); // L: 453
+			this.vmethod1151(); // L: 401
 		}
-	} // L: 454
+	} // L: 402
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-2071280922"
+		garbageValue = "264122801"
 	)
 	@Export("setUp")
 	protected abstract void setUp();
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "466223513"
+		descriptor = "(S)V",
+		garbageValue = "-24240"
 	)
 	@Export("doCycle")
 	protected abstract void doCycle();
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)V",
-		garbageValue = "1302395481"
+		garbageValue = "549681271"
 	)
 	@Export("draw")
 	protected abstract void draw(boolean var1);
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "-9054"
+		descriptor = "(I)V",
+		garbageValue = "-1665222357"
 	)
 	@Export("kill0")
 	protected abstract void kill0();
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;ZI)V",
-		garbageValue = "-1526487406"
+		garbageValue = "-1887501266"
 	)
 	@Export("drawInitial")
 	protected final void drawInitial(int var1, String var2, boolean var3) {
 		try {
-			Graphics var4 = this.canvas.getGraphics(); // L: 514
-			if (class115.fontHelvetica13 == null) { // L: 515
-				class115.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 516
-				class28.loginScreenFontMetrics = this.canvas.getFontMetrics(class115.fontHelvetica13); // L: 517
+			Graphics var4 = this.canvas.getGraphics(); // L: 488
+			if (class131.fontHelvetica13 == null) { // L: 489
+				class131.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 490
+				class114.loginScreenFontMetrics = this.canvas.getFontMetrics(class131.fontHelvetica13); // L: 491
 			}
 
-			if (var3) { // L: 519
-				var4.setColor(Color.black); // L: 520
-				var4.fillRect(0, 0, canvasWidth, KeyHandler.canvasHeight); // L: 521
+			if (var3) { // L: 493
+				var4.setColor(Color.black); // L: 494
+				var4.fillRect(0, 0, class186.canvasWidth, BoundaryObject.canvasHeight); // L: 495
 			}
 
-			Color var5 = new Color(140, 17, 17); // L: 523
+			Color var5 = new Color(140, 17, 17); // L: 497
 
 			try {
-				if (class19.field89 == null) { // L: 525
-					class19.field89 = this.canvas.createImage(304, 34);
+				if (class18.field97 == null) { // L: 499
+					class18.field97 = this.canvas.createImage(304, 34);
 				}
 
-				Graphics var6 = class19.field89.getGraphics(); // L: 526
-				var6.setColor(var5); // L: 527
-				var6.drawRect(0, 0, 303, 33); // L: 528
-				var6.fillRect(2, 2, var1 * 3, 30); // L: 529
-				var6.setColor(Color.black); // L: 530
-				var6.drawRect(1, 1, 301, 31); // L: 531
-				var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 532
-				var6.setFont(class115.fontHelvetica13); // L: 533
-				var6.setColor(Color.white); // L: 534
-				var6.drawString(var2, (304 - class28.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 535
-				var4.drawImage(class19.field89, canvasWidth / 2 - 152, KeyHandler.canvasHeight / 2 - 18, (ImageObserver)null); // L: 536
-			} catch (Exception var9) { // L: 538
-				int var7 = canvasWidth / 2 - 152; // L: 539
-				int var8 = KeyHandler.canvasHeight / 2 - 18; // L: 540
-				var4.setColor(var5); // L: 541
-				var4.drawRect(var7, var8, 303, 33); // L: 542
-				var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 543
-				var4.setColor(Color.black); // L: 544
-				var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 545
-				var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 546
-				var4.setFont(class115.fontHelvetica13); // L: 547
-				var4.setColor(Color.white); // L: 548
-				var4.drawString(var2, var7 + (304 - class28.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 549
+				Graphics var6 = class18.field97.getGraphics(); // L: 500
+				var6.setColor(var5); // L: 501
+				var6.drawRect(0, 0, 303, 33); // L: 502
+				var6.fillRect(2, 2, var1 * 3, 30); // L: 503
+				var6.setColor(Color.black); // L: 504
+				var6.drawRect(1, 1, 301, 31); // L: 505
+				var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 506
+				var6.setFont(class131.fontHelvetica13); // L: 507
+				var6.setColor(Color.white); // L: 508
+				var6.drawString(var2, (304 - class114.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 509
+				var4.drawImage(class18.field97, class186.canvasWidth / 2 - 152, BoundaryObject.canvasHeight / 2 - 18, (ImageObserver)null); // L: 510
+			} catch (Exception var9) { // L: 512
+				int var7 = class186.canvasWidth / 2 - 152; // L: 513
+				int var8 = BoundaryObject.canvasHeight / 2 - 18; // L: 514
+				var4.setColor(var5); // L: 515
+				var4.drawRect(var7, var8, 303, 33); // L: 516
+				var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 517
+				var4.setColor(Color.black); // L: 518
+				var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 519
+				var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 520
+				var4.setFont(class131.fontHelvetica13); // L: 521
+				var4.setColor(Color.white); // L: 522
+				var4.drawString(var2, var7 + (304 - class114.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 523
 			}
-		} catch (Exception var10) { // L: 552
-			this.canvas.repaint(); // L: 553
+		} catch (Exception var10) { // L: 526
+			this.canvas.repaint(); // L: 527
 		}
 
-	} // L: 555
+	} // L: 529
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1801681604"
+		descriptor = "(B)V",
+		garbageValue = "98"
 	)
-	protected final void method508() {
-		class19.field89 = null; // L: 558
-		class115.fontHelvetica13 = null; // L: 559
-		class28.loginScreenFontMetrics = null; // L: 560
-	} // L: 561
+	protected final void method498() {
+		class18.field97 = null; // L: 532
+		class131.fontHelvetica13 = null; // L: 533
+		class114.loginScreenFontMetrics = null; // L: 534
+	} // L: 535
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "1990615273"
+		garbageValue = "-1493080137"
 	)
 	@Export("error")
 	protected void error(String var1) {
-		if (!this.hasErrored) { // L: 564
-			this.hasErrored = true; // L: 565
-			System.out.println("error_game_" + var1); // L: 566
+		if (!this.hasErrored) { // L: 538
+			this.hasErrored = true; // L: 539
+			System.out.println("error_game_" + var1); // L: 540
 
 			try {
-				this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 568
-			} catch (Exception var3) { // L: 570
+				this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 542
+			} catch (Exception var3) { // L: 544
 			}
 
 		}
-	} // L: 571
+	} // L: 545
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/awt/Container;",
-		garbageValue = "-2036429987"
+		garbageValue = "-9231929"
 	)
 	@Export("container")
 	Container container() {
-		return (Container)(this.frame != null ? this.frame : this); // L: 574
+		return (Container)(this.frame != null ? this.frame : this); // L: 548
 	}
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lmo;",
-		garbageValue = "1380374752"
+		descriptor = "(I)Lme;",
+		garbageValue = "441270158"
 	)
 	@Export("getFrameContentBounds")
 	Bounds getFrameContentBounds() {
-		Container var1 = this.container(); // L: 579
-		int var2 = Math.max(var1.getWidth(), this.field184); // L: 580
-		int var3 = Math.max(var1.getHeight(), this.field185); // L: 581
-		if (this.frame != null) { // L: 582
-			Insets var4 = this.frame.getInsets(); // L: 583
-			var2 -= var4.right + var4.left; // L: 584
-			var3 -= var4.bottom + var4.top; // L: 585
+		Container var1 = this.container(); // L: 553
+		int var2 = Math.max(var1.getWidth(), this.field197); // L: 554
+		int var3 = Math.max(var1.getHeight(), this.field195); // L: 555
+		if (this.frame != null) { // L: 556
+			Insets var4 = this.frame.getInsets(); // L: 557
+			var2 -= var4.left + var4.right; // L: 558
+			var3 -= var4.top + var4.bottom; // L: 559
 		}
 
-		return new Bounds(var2, var3); // L: 587
+		return new Bounds(var2, var3); // L: 561
 	}
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(S)Z",
-		garbageValue = "1980"
+		descriptor = "(B)Z",
+		garbageValue = "0"
 	)
 	@Export("hasFrame")
 	protected final boolean hasFrame() {
-		return this.frame != null; // L: 591
+		return this.frame != null; // L: 565
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "-71"
+		garbageValue = "-3"
 	)
-	protected abstract void vmethod1164();
-
-	public final void destroy() {
-		if (this == gameEngine && !isKilled) { // L: 467
-			stopTimeMs = class111.method2516(); // L: 468
-			FloorUnderlayDefinition.method3190(5000L); // L: 469
-			this.kill(); // L: 470
-		}
-	} // L: 471
+	protected abstract void vmethod1151();
 
 	public final synchronized void paint(Graphics var1) {
-		if (this == gameEngine && !isKilled) { // L: 478
-			this.fullRedraw = true; // L: 479
-			if (class111.method2516() - this.field195 > 1000L) { // L: 480
-				Rectangle var2 = var1.getClipBounds(); // L: 481
-				if (var2 == null || var2.width >= canvasWidth && var2.height >= KeyHandler.canvasHeight) {
-					this.isCanvasInvalid = true; // L: 482
+		if (this == gameEngine && !isKilled) { // L: 438
+			this.fullRedraw = true; // L: 439
+			if (Ignored.method6459() - this.field207 > 1000L) { // L: 440
+				Rectangle var2 = var1.getClipBounds(); // L: 441
+				if (var2 == null || var2.width >= class186.canvasWidth && var2.height >= BoundaryObject.canvasHeight) {
+					this.isCanvasInvalid = true; // L: 442
 				}
 			}
 
 		}
-	} // L: 484
+	} // L: 444
 
-	public final void windowClosing(WindowEvent var1) {
-		this.destroy(); // L: 499
-	} // L: 500
-
-	public final void windowIconified(WindowEvent var1) {
-	} // L: 504
-
-	public final void start() {
-		if (this == gameEngine && !isKilled) { // L: 457
-			stopTimeMs = 0L; // L: 458
+	public final void destroy() {
+		if (this == gameEngine && !isKilled) { // L: 425
+			stopTimeMs = Ignored.method6459(); // L: 426
+			Bounds.method6608(5000L); // L: 427
+			this.kill(); // L: 428
 		}
-	} // L: 459
+	} // L: 429
 
 	public final void windowClosed(WindowEvent var1) {
-	} // L: 496
-
-	public final void windowDeiconified(WindowEvent var1) {
-	} // L: 503
-
-	public final void windowOpened(WindowEvent var1) {
-	} // L: 505
-
-	public abstract void init();
-
-	public final void focusLost(FocusEvent var1) {
-		volatileFocus = false; // L: 492
-	} // L: 493
-
-	public final void stop() {
-		if (this == gameEngine && !isKilled) { // L: 462
-			stopTimeMs = class111.method2516() + 4000L; // L: 463
-		}
-	} // L: 464
-
-	public final void windowActivated(WindowEvent var1) {
-	} // L: 495
-
-	public final void focusGained(FocusEvent var1) {
-		volatileFocus = true; // L: 487
-		this.fullRedraw = true; // L: 488
-	} // L: 489
+	} // L: 461
 
 	public final void windowDeactivated(WindowEvent var1) {
-	} // L: 502
-
-	public final void update(Graphics var1) {
-		this.paint(var1); // L: 474
-	} // L: 475
+	} // L: 469
 
 	public void run() {
 		try {
-			if (TaskHandler.javaVendor != null) { // L: 331
-				String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 332
-				if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 333
-					String var2 = GrandExchangeOfferAgeComparator.javaVersion; // L: 334
-					if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 335
-						this.error("wrongjava"); // L: 336
-						return; // L: 337
+			if (TaskHandler.javaVendor != null) { // L: 279
+				String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 280
+				if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 281
+					String var2 = NPC.javaVersion; // L: 282
+					if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 283
+						this.error("wrongjava"); // L: 284
+						return; // L: 285
 					}
 
-					if (var2.startsWith("1.6.0_")) { // L: 339
+					if (var2.startsWith("1.6.0_")) { // L: 287
 						int var3;
-						for (var3 = 6; var3 < var2.length() && class117.isDigit(var2.charAt(var3)); ++var3) { // L: 340 341
+						for (var3 = 6; var3 < var2.length() && class277.isDigit(var2.charAt(var3)); ++var3) { // L: 288 289
 						}
 
-						String var4 = var2.substring(6, var3); // L: 342
-						if (class129.isNumber(var4) && TaskHandler.method2881(var4) < 10) { // L: 343
-							this.error("wrongjava"); // L: 344
-							return; // L: 345
+						String var4 = var2.substring(6, var3); // L: 290
+						if (ClanSettings.isNumber(var4) && ClanChannelMember.method2778(var4) < 10) { // L: 291
+							this.error("wrongjava"); // L: 292
+							return; // L: 293
 						}
 					}
 
-					fiveOrOne = 5; // L: 348
+					fiveOrOne = 5; // L: 296
 				}
 			}
 
-			this.setFocusCycleRoot(true); // L: 351
-			this.addCanvas(); // L: 352
-			this.setUp(); // L: 353
+			this.setFocusCycleRoot(true); // L: 299
+			this.addCanvas(); // L: 300
+			this.setUp(); // L: 301
 
 			Object var8;
 			try {
-				var8 = new NanoClock(); // L: 357
-			} catch (Throwable var6) { // L: 359
-				var8 = new MilliClock(); // L: 360
+				var8 = new NanoClock(); // L: 305
+			} catch (Throwable var6) { // L: 307
+				var8 = new MilliClock(); // L: 308
 			}
 
-			Clock.clock = (Clock)var8; // L: 363
+			class91.clock = (Clock)var8; // L: 311
 
-			while (stopTimeMs == 0L || class111.method2516() < stopTimeMs) { // L: 364
-				class1.gameCyclesToDo = Clock.clock.wait(cycleDurationMillis, fiveOrOne); // L: 365
+			while (0L == stopTimeMs || Ignored.method6459() < stopTimeMs) { // L: 312
+				gameCyclesToDo = class91.clock.wait(cycleDurationMillis, fiveOrOne); // L: 313
 
-				for (int var5 = 0; var5 < class1.gameCyclesToDo; ++var5) { // L: 366
+				for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { // L: 314
 					this.clientTick();
 				}
 
-				this.graphicsTick(); // L: 367
-				this.post(this.canvas); // L: 368
+				this.graphicsTick(); // L: 315
+				this.post(this.canvas); // L: 316
 			}
-		} catch (Exception var7) { // L: 371
-			MilliClock.RunException_sendStackTrace((String)null, var7); // L: 372
-			this.error("crash"); // L: 373
+		} catch (Exception var7) { // L: 319
+			AccessFile.RunException_sendStackTrace((String)null, var7); // L: 320
+			this.error("crash"); // L: 321
 		}
 
-		this.kill(); // L: 375
-	} // L: 376
+		this.kill(); // L: 323
+	} // L: 324
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1953693522"
-	)
-	public static int method584() {
-		return KeyHandler.KeyHandler_idleCycles; // L: 134
-	}
+	public final void stop() {
+		if (this == gameEngine && !isKilled) { // L: 419
+			stopTimeMs = Ignored.method6459() + 4000L; // L: 420
+		}
+	} // L: 421
 
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;Lni;I)Ljava/lang/String;",
-		garbageValue = "658724655"
-	)
-	public static String method585(CharSequence var0, LoginType var1) {
-		if (var0 == null) { // L: 32
-			return null;
-		} else {
-			int var2 = 0; // L: 33
+	public final void update(Graphics var1) {
+		this.paint(var1); // L: 433
+	} // L: 434
 
-			int var3;
-			for (var3 = var0.length(); var2 < var3 && Ignored.method6212(var0.charAt(var2)); ++var2) { // L: 34 35
-			}
+	public final void focusGained(FocusEvent var1) {
+		volatileFocus = true; // L: 448
+		this.fullRedraw = true; // L: 449
+	} // L: 450
 
-			while (var3 > var2 && Ignored.method6212(var0.charAt(var3 - 1))) { // L: 36
-				--var3;
-			}
+	public final void focusLost(FocusEvent var1) {
+		volatileFocus = false; // L: 454
+	} // L: 455
 
-			int var4 = var3 - var2; // L: 37
-			if (var4 >= 1 && var4 <= SecureRandomCallable.method2052(var1)) { // L: 38
-				StringBuilder var5 = new StringBuilder(var4); // L: 39
-
-				for (int var6 = var2; var6 < var3; ++var6) { // L: 40
-					char var7 = var0.charAt(var6); // L: 41
-					boolean var8;
-					if (Character.isISOControl(var7)) { // L: 44
-						var8 = false; // L: 45
-					} else if (ObjectComposition.isAlphaNumeric(var7)) { // L: 48
-						var8 = true; // L: 49
-					} else {
-						char[] var9 = class383.field4236; // L: 53
-						int var10 = 0;
-
-						label93:
-						while (true) {
-							char var11;
-							if (var10 >= var9.length) {
-								var9 = class383.field4237; // L: 63
-
-								for (var10 = 0; var10 < var9.length; ++var10) { // L: 64
-									var11 = var9[var10]; // L: 65
-									if (var11 == var7) { // L: 66
-										var8 = true; // L: 67
-										break label93; // L: 68
-									}
-								}
+	public final void windowOpened(WindowEvent var1) {
+	} // L: 478
 
-								var8 = false; // L: 72
-								break;
-							}
+	public final void windowActivated(WindowEvent var1) {
+	} // L: 458
 
-							var11 = var9[var10]; // L: 55
-							if (var7 == var11) { // L: 56
-								var8 = true; // L: 57
-								break; // L: 58
-							}
+	public final void windowDeiconified(WindowEvent var1) {
+	} // L: 472
 
-							++var10; // L: 54
-						}
-					}
+	public abstract void init();
 
-					if (var8) { // L: 74
-						char var12;
-						switch(var7) { // L: 77
-						case ' ':
-						case '-':
-						case '_':
-						case ' ':
-							var12 = '_'; // L: 95
-							break; // L: 96
-						case '#':
-						case '[':
-						case ']':
-							var12 = var7; // L: 112
-							break; // L: 113
-						case 'À':
-						case 'Á':
-						case 'Â':
-						case 'Ã':
-						case 'Ä':
-						case 'à':
-						case 'á':
-						case 'â':
-						case 'ã':
-						case 'ä':
-							var12 = 'a'; // L: 154
-							break; // L: 155
-						case 'Ç':
-						case 'ç':
-							var12 = 'c'; // L: 116
-							break; // L: 117
-						case 'È':
-						case 'É':
-						case 'Ê':
-						case 'Ë':
-						case 'è':
-						case 'é':
-						case 'ê':
-						case 'ë':
-							var12 = 'e'; // L: 130
-							break; // L: 131
-						case 'Í':
-						case 'Î':
-						case 'Ï':
-						case 'í':
-						case 'î':
-						case 'ï':
-							var12 = 'i'; // L: 103
-							break; // L: 104
-						case 'Ñ':
-						case 'ñ':
-							var12 = 'n'; // L: 107
-							break; // L: 108
-						case 'Ò':
-						case 'Ó':
-						case 'Ô':
-						case 'Õ':
-						case 'Ö':
-						case 'ò':
-						case 'ó':
-						case 'ô':
-						case 'õ':
-						case 'ö':
-							var12 = 'o'; // L: 142
-							break; // L: 143
-						case 'Ù':
-						case 'Ú':
-						case 'Û':
-						case 'Ü':
-						case 'ù':
-						case 'ú':
-						case 'û':
-						case 'ü':
-							var12 = 'u'; // L: 89
-							break; // L: 90
-						case 'ß':
-							var12 = 'b'; // L: 157
-							break;
-						case 'ÿ':
-						case 'Ÿ':
-							var12 = 'y'; // L: 120
-							break; // L: 121
-						default:
-							var12 = Character.toLowerCase(var7); // L: 79
-						}
+	public final void windowIconified(WindowEvent var1) {
+	} // L: 475
+
+	public final void windowClosing(WindowEvent var1) {
+		this.destroy(); // L: 465
+	} // L: 466
 
-						if (var12 != 0) {
-							var5.append(var12); // L: 163
+	public final void start() {
+		if (this == gameEngine && !isKilled) { // L: 413
+			stopTimeMs = 0L; // L: 414
+		}
+	} // L: 415
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)Ljava/io/File;",
+		garbageValue = "-1157157000"
+	)
+	@Export("getFile")
+	public static File getFile(String var0) {
+		if (!FileSystem.FileSystem_hasPermissions) { // L: 22
+			throw new RuntimeException("");
+		} else {
+			File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23
+			if (var1 != null) { // L: 24
+				return var1;
+			} else {
+				File var2 = new File(class125.FileSystem_cacheDir, var0); // L: 25
+				RandomAccessFile var3 = null; // L: 26
+
+				try {
+					File var4 = new File(var2.getParent()); // L: 28
+					if (!var4.exists()) { // L: 29
+						throw new RuntimeException("");
+					} else {
+						var3 = new RandomAccessFile(var2, "rw"); // L: 30
+						int var5 = var3.read(); // L: 31
+						var3.seek(0L); // L: 32
+						var3.write(var5); // L: 33
+						var3.seek(0L); // L: 34
+						var3.close(); // L: 35
+						FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36
+						return var2; // L: 37
+					}
+				} catch (Exception var8) {
+					try {
+						if (var3 != null) { // L: 41
+							var3.close(); // L: 42
+							var3 = null; // L: 43
 						}
+					} catch (Exception var7) { // L: 46
 					}
-				}
 
-				if (var5.length() == 0) {
-					return null;
-				} else {
-					return var5.toString();
+					throw new RuntimeException(); // L: 48
 				}
-			} else {
-				return null;
 			}
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;IIIIIII)V",
-		garbageValue = "1750259584"
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "15"
 	)
-	@Export("loadTerrain")
-	static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		int var7;
-		if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 161
-			Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 162
-
-			while (true) {
-				var7 = var0.readUnsignedByte(); // L: 164
-				if (var7 == 0) { // L: 165
-					if (var1 == 0) { // L: 166
-						int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 167
-						int var11 = var2 + var4 + 932731; // L: 170
-						int var12 = var3 + var5 + 556238; // L: 171
-						int var13 = class19.method291(var11 + 45365, var12 + 91923, 4) - 128 + (class19.method291(10294 + var11, var12 + 37821, 2) - 128 >> 1) + (class19.method291(var11, var12, 1) - 128 >> 2); // L: 173
-						var13 = (int)(0.3D * (double)var13) + 35; // L: 174
-						if (var13 < 10) { // L: 175
-							var13 = 10;
-						} else if (var13 > 60) { // L: 176
-							var13 = 60;
+	static int method581(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == 6600) { // L: 3908
+			var3 = class20.Client_plane; // L: 3909
+			int var15 = (class340.localPlayer.x >> 7) + class131.baseX; // L: 3910
+			int var8 = (class340.localPlayer.y >> 7) + TileItem.baseY; // L: 3911
+			WorldMapRectangle.getWorldMap().method6870(var3, var15, var8, true); // L: 3912
+			return 1; // L: 3913
+		} else {
+			WorldMapArea var9;
+			if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3915
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3916
+				String var16 = ""; // L: 3917
+				var9 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 3918
+				if (var9 != null) { // L: 3919
+					var16 = var9.getExternalName(); // L: 3920
+				}
+
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var16; // L: 3922
+				return 1; // L: 3923
+			} else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3925
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3926
+				WorldMapRectangle.getWorldMap().setCurrentMapAreaId(var3); // L: 3927
+				return 1; // L: 3928
+			} else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3930
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getZoomLevel(); // L: 3931
+				return 1; // L: 3932
+			} else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3934
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3935
+				WorldMapRectangle.getWorldMap().setZoomPercentage(var3); // L: 3936
+				return 1; // L: 3937
+			} else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3939
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3940
+				return 1; // L: 3941
+			} else {
+				Coord var14;
+				if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3943
+					var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 3944
+					WorldMapRectangle.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3945
+					return 1; // L: 3946
+				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3948
+					var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 3949
+					WorldMapRectangle.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3950
+					return 1; // L: 3951
+				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3953
+					var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 3954
+					WorldMapRectangle.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3955
+					return 1; // L: 3956
+				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3958
+					var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 3959
+					WorldMapRectangle.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3960
+					return 1; // L: 3961
+				} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3963
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayX(); // L: 3964
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayY(); // L: 3965
+					return 1; // L: 3966
+				} else {
+					WorldMapArea var11;
+					if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3968
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3969
+						var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 3970
+						if (var11 == null) { // L: 3971
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3972
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3975
 						}
 
-						var14[var3] = -var13 * 8; // L: 179
-					} else {
-						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 181
-					}
-					break;
-				}
+						return 1; // L: 3977
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3979
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3980
+						var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 3981
+						if (var11 == null) { // L: 3982
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3983
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3984
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3987
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3988
+						}
 
-				if (var7 == 1) { // L: 184
-					int var8 = var0.readUnsignedByte(); // L: 185
-					if (var8 == 1) { // L: 186
-						var8 = 0;
-					}
+						return 1; // L: 3990
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3992
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3993
+						var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 3994
+						if (var11 == null) { // L: 3995
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3996
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3997
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3998
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3999
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 4002
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 4003
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 4004
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 4005
+						}
 
-					if (var1 == 0) { // L: 187
-						Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
-					} else {
-						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 188
-					}
-					break;
-				}
+						return 1; // L: 4007
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 4009
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4010
+						var11 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 4011
+						if (var11 == null) { // L: 4012
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4013
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 4016
+						}
 
-				if (var7 <= 49) { // L: 191
-					Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 192
-					Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 193
-					Tiles.field969[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 194
-				} else if (var7 <= 81) { // L: 197
-					Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 198
-				} else {
-					Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 201
-				}
-			}
-		} else {
-			while (true) {
-				var7 = var0.readUnsignedByte(); // L: 206
-				if (var7 == 0) { // L: 207
-					break;
-				}
+						return 1; // L: 4018
+					} else if (var0 == 6615) { // L: 4020
+						var14 = WorldMapRectangle.getWorldMap().getDisplayCoord(); // L: 4021
+						if (var14 == null) { // L: 4022
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4023
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4024
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var14.x; // L: 4027
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var14.y; // L: 4028
+						}
 
-				if (var7 == 1) { // L: 208
-					var0.readUnsignedByte(); // L: 209
-					break;
-				}
+						return 1; // L: 4030
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 4032
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().currentMapAreaId(); // L: 4033
+						return 1; // L: 4034
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 4036
+						var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4037
+						var11 = WorldMapRectangle.getWorldMap().getCurrentMapArea(); // L: 4038
+						if (var11 == null) { // L: 4039
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4040
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4041
+							return 1; // L: 4042
+						} else {
+							int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 4044
+							if (var12 == null) { // L: 4045
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4046
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4047
+							} else {
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12[0]; // L: 4050
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12[1]; // L: 4051
+							}
 
-				if (var7 <= 49) { // L: 212
-					var0.readUnsignedByte();
-				}
-			}
-		}
+							return 1; // L: 4053
+						}
+					} else {
+						Coord var5;
+						if (var0 == 6618) { // L: 4055
+							var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4056
+							var11 = WorldMapRectangle.getWorldMap().getCurrentMapArea(); // L: 4057
+							if (var11 == null) { // L: 4058
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4059
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4060
+								return 1; // L: 4061
+							} else {
+								var5 = var11.coord(var14.x, var14.y); // L: 4063
+								if (var5 == null) { // L: 4064
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4065
+								} else {
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.packed(); // L: 4068
+								}
 
-	} // L: 215
+								return 1; // L: 4070
+							}
+						} else {
+							Coord var10;
+							if (var0 == 6619) { // L: 4072
+								IsaacCipher.Interpreter_intStackSize -= 2; // L: 4073
+								var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4074
+								var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 4075
+								SoundCache.method831(var3, var10, false); // L: 4076
+								return 1; // L: 4077
+							} else if (var0 == 6620) { // L: 4079
+								IsaacCipher.Interpreter_intStackSize -= 2; // L: 4080
+								var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4081
+								var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 4082
+								SoundCache.method831(var3, var10, true); // L: 4083
+								return 1; // L: 4084
+							} else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4086
+								IsaacCipher.Interpreter_intStackSize -= 2; // L: 4087
+								var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4088
+								var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 4089
+								var9 = WorldMapRectangle.getWorldMap().getMapArea(var3); // L: 4090
+								if (var9 == null) { // L: 4091
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4092
+									return 1; // L: 4093
+								} else {
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4095
+									return 1; // L: 4096
+								}
+							} else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4098
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayWith(); // L: 4099
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getDisplayHeight(); // L: 4100
+								return 1; // L: 4101
+							} else if (var0 == 6623) { // L: 4103
+								var14 = new Coord(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4104
+								var11 = WorldMapRectangle.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4105
+								if (var11 == null) { // L: 4106
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4107
+								} else {
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var11.getId(); // L: 4110
+								}
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "8"
-	)
-	static int method555(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == 3500) { // L: 2114
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2115
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = PlayerType.method5239(var3) ? 1 : 0; // L: 2116
-			return 1; // L: 2117
-		} else if (var0 == 3501) { // L: 2119
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2120
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Varps.method5007(var3) ? 1 : 0; // L: 2121
-			return 1; // L: 2122
-		} else if (var0 == 3502) { // L: 2124
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2125
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ItemComposition.method3403(var3) ? 1 : 0; // L: 2126
-			return 1; // L: 2127
-		} else {
-			return 2; // L: 2129
+								return 1; // L: 4112
+							} else if (var0 == 6624) { // L: 4114
+								WorldMapRectangle.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4115
+								return 1; // L: 4116
+							} else if (var0 == 6625) { // L: 4118
+								WorldMapRectangle.getWorldMap().resetMaxFlashCount(); // L: 4119
+								return 1; // L: 4120
+							} else if (var0 == 6626) { // L: 4122
+								WorldMapRectangle.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 4123
+								return 1; // L: 4124
+							} else if (var0 == 6627) { // L: 4126
+								WorldMapRectangle.getWorldMap().resetCyclesPerFlash(); // L: 4127
+								return 1; // L: 4128
+							} else {
+								boolean var13;
+								if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4130
+									var13 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 4131
+									WorldMapRectangle.getWorldMap().setPerpetualFlash(var13); // L: 4132
+									return 1; // L: 4133
+								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4135
+									var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4136
+									WorldMapRectangle.getWorldMap().flashElement(var3); // L: 4137
+									return 1; // L: 4138
+								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4140
+									var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4141
+									WorldMapRectangle.getWorldMap().flashCategory(var3); // L: 4142
+									return 1; // L: 4143
+								} else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4145
+									WorldMapRectangle.getWorldMap().stopCurrentFlashes(); // L: 4146
+									return 1; // L: 4147
+								} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4149
+									var13 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 4150
+									WorldMapRectangle.getWorldMap().setElementsDisabled(var13); // L: 4151
+									return 1; // L: 4152
+								} else {
+									boolean var7;
+									if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4154
+										IsaacCipher.Interpreter_intStackSize -= 2; // L: 4155
+										var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4156
+										var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 4157
+										WorldMapRectangle.getWorldMap().disableElement(var3, var7); // L: 4158
+										return 1; // L: 4159
+									} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4161
+										IsaacCipher.Interpreter_intStackSize -= 2; // L: 4162
+										var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4163
+										var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 4164
+										WorldMapRectangle.getWorldMap().setCategoryDisabled(var3, var7); // L: 4165
+										return 1; // L: 4166
+									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4168
+										Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4169
+										return 1; // L: 4170
+									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4172
+										var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4173
+										Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4174
+										return 1; // L: 4175
+									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4177
+										var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4178
+										Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapRectangle.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4179
+										return 1; // L: 4180
+									} else if (var0 == 6638) { // L: 4182
+										IsaacCipher.Interpreter_intStackSize -= 2; // L: 4183
+										var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 4184
+										var10 = new Coord(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 4185
+										var5 = WorldMapRectangle.getWorldMap().method6988(var3, var10); // L: 4186
+										if (var5 == null) { // L: 4187
+											Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4188
+										} else {
+											Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.packed(); // L: 4191
+										}
+
+										return 1; // L: 4193
+									} else {
+										AbstractWorldMapIcon var6;
+										if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4195
+											var6 = WorldMapRectangle.getWorldMap().iconStart(); // L: 4196
+											if (var6 == null) { // L: 4197
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4198
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4199
+											} else {
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4202
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4203
+											}
+
+											return 1; // L: 4205
+										} else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4207
+											var6 = WorldMapRectangle.getWorldMap().iconNext(); // L: 4208
+											if (var6 == null) { // L: 4209
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4210
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4211
+											} else {
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4214
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4215
+											}
+
+											return 1; // L: 4217
+										} else {
+											WorldMapElement var4;
+											if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4219
+												var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4220
+												var4 = class78.WorldMapElement_get(var3); // L: 4221
+												if (var4.name == null) { // L: 4222
+													Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4223
+												} else {
+													Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.name; // L: 4226
+												}
+
+												return 1; // L: 4228
+											} else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4230
+												var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4231
+												var4 = class78.WorldMapElement_get(var3); // L: 4232
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.textSize; // L: 4233
+												return 1; // L: 4234
+											} else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4236
+												var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4237
+												var4 = class78.WorldMapElement_get(var3); // L: 4238
+												if (var4 == null) { // L: 4239
+													Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4240
+												} else {
+													Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.category; // L: 4243
+												}
+
+												return 1; // L: 4245
+											} else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4247
+												var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4248
+												var4 = class78.WorldMapElement_get(var3); // L: 4249
+												if (var4 == null) { // L: 4250
+													Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4251
+												} else {
+													Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4254
+												}
+
+												return 1; // L: 4256
+											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4258
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.mapElement; // L: 4259
+												return 1; // L: 4260
+											} else if (var0 == 6698) { // L: 4262
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.coord1.packed(); // L: 4263
+												return 1; // L: 4264
+											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4266
+												Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FileSystem.worldMapEvent.coord2.packed(); // L: 4267
+												return 1; // L: 4268
+											} else {
+												return 2; // L: 4270
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java
index 4a3758da55..3f0034a4be 100644
--- a/runescape-client/src/main/java/GameObject.java
+++ b/runescape-client/src/main/java/GameObject.java
@@ -1,93 +1,104 @@
-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("hv")
+@ObfuscatedName("hl")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("i")
+	@ObfuscatedName("fk")
 	@ObfuscatedGetter(
-		intValue = 704202637
+		intValue = -1234198713
+	)
+	@Export("worldPort")
+	static int worldPort;
+	@ObfuscatedName("ma")
+	@ObfuscatedGetter(
+		intValue = -1786079239
+	)
+	@Export("menuWidth")
+	static int menuWidth;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -1089622701
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -494879285
+		intValue = -465774691
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 211210251
+		intValue = 1923590497
 	)
 	@Export("centerX")
 	int centerX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1996180969
+	)
+	@Export("orientation")
+	int orientation;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1046564479
+		intValue = 1051509529
 	)
 	@Export("centerY")
 	int centerY;
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lhj;"
+		descriptor = "Lgt;"
 	)
 	@Export("renderable")
 	public Renderable renderable;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -1520193173
-	)
-	@Export("orientation")
-	int orientation;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -478459065
+		intValue = 1723330507
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -849496909
+		intValue = -621074209
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 427250493
+		intValue = -178409117
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1968764473
+		intValue = 144998379
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1764486953
+		intValue = 1469340071
 	)
-	int field2641;
-	@ObfuscatedName("y")
+	int field2548;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1523827707
+		intValue = 800381971
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = -6523351122347780293L
+		longValue = -3336818157473405963L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -269494523
+		intValue = -1622989155
 	)
 	@Export("flags")
 	int flags;
@@ -97,102 +108,38 @@ public final class GameObject {
 		this.flags = 0; // L: 17
 	} // L: 19
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "(Lmp;ZB)V",
-		garbageValue = "38"
-	)
-	public static void method4647(AbstractSocket var0, boolean var1) {
-		if (NetCache.NetCache_socket != null) { // L: 42
-			try {
-				NetCache.NetCache_socket.close(); // L: 44
-			} catch (Exception var8) { // L: 46
-			}
-
-			NetCache.NetCache_socket = null; // L: 47
-		}
-
-		NetCache.NetCache_socket = var0; // L: 49
-		Buffer var2;
-		if (NetCache.NetCache_socket != null) { // L: 51
-			try {
-				var2 = new Buffer(4); // L: 53
-				var2.writeByte(var1 ? 2 : 3); // L: 54
-				var2.writeMedium(0); // L: 55
-				NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 56
-			} catch (IOException var7) {
-				try {
-					NetCache.NetCache_socket.close(); // L: 60
-				} catch (Exception var6) { // L: 62
-				}
-
-				++NetCache.NetCache_ioExceptions; // L: 63
-				NetCache.NetCache_socket = null; // L: 64
-			}
-		}
-
-		NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 67
-		class131.NetCache_currentResponse = null; // L: 68
-		class138.NetCache_responseArchiveBuffer = null; // L: 69
-		NetCache.field3707 = 0; // L: 70
-
-		while (true) {
-			NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 72
-			if (var9 == null) { // L: 73
-				while (true) {
-					var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 79
-					if (var9 == null) { // L: 80
-						if (NetCache.field3719 != 0) { // L: 86
-							try {
-								var2 = new Buffer(4); // L: 88
-								var2.writeByte(4); // L: 89
-								var2.writeByte(NetCache.field3719); // L: 90
-								var2.writeShort(0); // L: 91
-								NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 92
-							} catch (IOException var5) {
-								try {
-									NetCache.NetCache_socket.close(); // L: 96
-								} catch (Exception var4) { // L: 98
-								}
-
-								++NetCache.NetCache_ioExceptions; // L: 99
-								NetCache.NetCache_socket = null; // L: 100
-							}
-						}
-
-						NetCache.NetCache_loadTime = 0; // L: 103
-						class423.field4436 = class111.method2516(); // L: 104
-						return; // L: 105
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "210014678"
+	)
+	static int method4341(int var0, Script var1, boolean var2) {
+		if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4274
+			if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4279
+				if (var0 == 6750) { // L: 4283
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4284
+					return 1; // L: 4285
+				} else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4287
+					if (var0 == 6754) { // L: 4291
+						int var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 4292
+						NPCComposition var4 = WorldMapLabelSize.getNpcDefinition(var3); // L: 4293
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4294
+						return 1; // L: 4295
+					} else {
+						return 2; // L: 4297
 					}
-
-					NetCache.NetCache_pendingWritesQueue.addLast(var9); // L: 81
-					NetCache.NetCache_pendingWrites.put(var9, var9.key); // L: 82
-					++NetCache.NetCache_pendingWritesCount; // L: 83
-					--NetCache.NetCache_pendingResponsesCount; // L: 84
+				} else {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4288
+					return 1; // L: 4289
 				}
-			}
-
-			NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); // L: 74
-			++NetCache.NetCache_pendingPriorityWritesCount; // L: 75
-			--NetCache.NetCache_pendingPriorityResponsesCount; // L: 76
-		}
-	}
-
-	@ObfuscatedName("ku")
-	@ObfuscatedSignature(
-		descriptor = "(Ljf;IIIB)V",
-		garbageValue = "-109"
-	)
-	@Export("drawCompass")
-	static final void drawCompass(Widget var0, int var1, int var2, int var3) {
-		SpriteMask var4 = var0.getSpriteMask(false); // L: 11713
-		if (var4 != null) { // L: 11714
-			if (Client.minimapState < 3) { // L: 11715
-				class114.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
 			} else {
-				Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11716
+				--IsaacCipher.Interpreter_intStackSize; // L: 4280
+				return 1; // L: 4281
 			}
-
+		} else {
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 4275
+			--class13.Interpreter_stringStackSize; // L: 4276
+			return 1; // L: 4277
 		}
-	} // L: 11717
+	}
 }
diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java
index f82994c122..86a3cb1a11 100644
--- a/runescape-client/src/main/java/GrandExchangeEvent.java
+++ b/runescape-client/src/main/java/GrandExchangeEvent.java
@@ -4,36 +4,36 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kt")
+@ObfuscatedName("kj")
 @Implements("GrandExchangeEvent")
 public class GrandExchangeEvent {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1932555191
+		intValue = -613018659
 	)
 	@Export("world")
 	public final int world;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		longValue = -3074264375035497163L
+		longValue = -97265200533879513L
 	)
 	@Export("age")
 	public final long age;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lkh;"
+		descriptor = "Lkb;"
 	)
 	@Export("grandExchangeOffer")
 	public final GrandExchangeOffer grandExchangeOffer;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("offerName")
 	String offerName;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("previousOfferName")
 	String previousOfferName;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;BI)V"
+		descriptor = "(Lpi;BI)V"
 	)
 	GrandExchangeEvent(Buffer var1, byte var2, int var3) {
 		this.offerName = var1.readStringCp1252NullTerminated(); // L: 111
@@ -43,91 +43,53 @@ public class GrandExchangeEvent {
 		int var4 = var1.readInt(); // L: 115
 		int var5 = var1.readInt(); // L: 116
 		this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117
-		this.grandExchangeOffer.method5454(2); // L: 118
-		this.grandExchangeOffer.method5455(var2);
-		this.grandExchangeOffer.unitPrice = var4;
-		this.grandExchangeOffer.totalQuantity = var5;
-		this.grandExchangeOffer.currentQuantity = 0;
-		this.grandExchangeOffer.currentPrice = 0;
-		this.grandExchangeOffer.id = var3;
-	}
+		this.grandExchangeOffer.method5765(2); // L: 118
+		this.grandExchangeOffer.method5766(var2); // L: 119
+		this.grandExchangeOffer.unitPrice = var4; // L: 120
+		this.grandExchangeOffer.totalQuantity = var5; // L: 121
+		this.grandExchangeOffer.currentQuantity = 0; // L: 122
+		this.grandExchangeOffer.currentPrice = 0; // L: 123
+		this.grandExchangeOffer.id = var3; // L: 124
+	} // L: 125
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-1492995549"
+		descriptor = "(B)Ljava/lang/String;",
+		garbageValue = "0"
 	)
 	@Export("getOfferName")
 	public String getOfferName() {
-		return this.offerName;
+		return this.offerName; // L: 128
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-681990835"
+		garbageValue = "442226804"
 	)
 	@Export("getPreviousOfferName")
 	public String getPreviousOfferName() {
-		return this.previousOfferName;
+		return this.previousOfferName; // L: 132
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIZI)Ljava/lang/String;",
-		garbageValue = "1279033906"
+		descriptor = "(S)V",
+		garbageValue = "3161"
 	)
-	static String method5448(int var0, int var1, boolean var2) {
-		if (var1 >= 2 && var1 <= 36) { // L: 119
-			if (var2 && var0 >= 0) { // L: 120
-				int var3 = 2; // L: 121
-
-				for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 122 123 125
-					var4 /= var1; // L: 124
-				}
-
-				char[] var5 = new char[var3]; // L: 127
-				var5[0] = '+'; // L: 128
-
-				for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 129
-					int var7 = var0; // L: 130
-					var0 /= var1; // L: 131
-					int var8 = var7 - var0 * var1; // L: 132
-					if (var8 >= 10) { // L: 133
-						var5[var6] = (char)(var8 + 87);
-					} else {
-						var5[var6] = (char)(var8 + 48); // L: 134
-					}
-				}
-
-				return new String(var5); // L: 136
-			} else {
-				return Integer.toString(var0, var1);
+	static void method5760() {
+		for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30
+			if (var0.stream1 != null) { // L: 31
+				class281.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32
+				var0.stream1 = null; // L: 33
 			}
-		} else {
-			throw new IllegalArgumentException("" + var1);
-		}
-	}
-
-	@ObfuscatedName("iu")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljf;I)Ljava/lang/String;",
-		garbageValue = "-1477810111"
-	)
-	static String method5449(String var0, Widget var1) {
-		if (var0.indexOf("%") != -1) { // L: 10186
-			for (int var2 = 1; var2 <= 5; ++var2) { // L: 10187
-				while (true) {
-					int var3 = var0.indexOf("%" + var2); // L: 10189
-					if (var3 == -1) { // L: 10190
-						break;
-					}
 
-					var0 = var0.substring(0, var3) + WorldMapLabelSize.method3534(class113.method2532(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10191
-				}
+			if (var0.stream2 != null) { // L: 35
+				class281.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36
+				var0.stream2 = null; // L: 37
 			}
 		}
 
-		return var0; // L: 10195
-	}
+		ObjectSound.objectSounds.clear(); // L: 40
+	} // L: 41
 }
diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java
index 1b03232c93..f1eac06998 100644
--- a/runescape-client/src/main/java/GrandExchangeEvents.java
+++ b/runescape-client/src/main/java/GrandExchangeEvents.java
@@ -7,22 +7,22 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kx")
+@ObfuscatedName("ka")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("events")
 	public final List events;
 
@@ -35,7 +35,7 @@ public class GrandExchangeEvents {
 	} // L: 67
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;Z)V",
+		descriptor = "(Lpi;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -57,10 +57,10 @@ public GrandExchangeEvents(Buffer var1, boolean var2) {
 
 	} // L: 92
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/Comparator;ZB)V",
-		garbageValue = "35"
+		garbageValue = "39"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {
@@ -72,117 +72,17 @@ public void sort(Comparator var1, boolean var2) {
 
 	} // L: 101
 
-	@ObfuscatedName("ib")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILjava/lang/String;I)V",
-		garbageValue = "1979542286"
+		descriptor = "(B)V",
+		garbageValue = "40"
 	)
-	@Export("widgetDefaultMenuAction")
-	static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) {
-		Widget var5 = ItemContainer.getWidgetChild(var1, var2); // L: 9156
-		if (var5 != null) { // L: 9157
-			if (var5.onOp != null) { // L: 9158
-				ScriptEvent var6 = new ScriptEvent(); // L: 9159
-				var6.widget = var5; // L: 9160
-				var6.opIndex = var0; // L: 9161
-				var6.targetName = var4; // L: 9162
-				var6.args = var5.onOp; // L: 9163
-				Tile.runScriptEvent(var6); // L: 9164
-			}
-
-			boolean var11 = true; // L: 9166
-			if (var5.contentType > 0) { // L: 9167
-				var11 = GrandExchangeOfferAgeComparator.method5423(var5);
-			}
-
-			if (var11) { // L: 9168
-				int var8 = PendingSpawn.getWidgetFlags(var5); // L: 9170
-				int var9 = var0 - 1; // L: 9171
-				boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 9173
-				if (var7) { // L: 9175
-					PacketBufferNode var10;
-					if (var0 == 1) { // L: 9178
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2686, Client.packetWriter.isaacCipher); // L: 9180
-						var10.packetBuffer.writeInt(var1); // L: 9181
-						var10.packetBuffer.writeShort(var2); // L: 9182
-						var10.packetBuffer.writeShort(var3); // L: 9183
-						Client.packetWriter.addNode(var10); // L: 9184
-					}
-
-					if (var0 == 2) { // L: 9186
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2681, Client.packetWriter.isaacCipher); // L: 9188
-						var10.packetBuffer.writeInt(var1); // L: 9189
-						var10.packetBuffer.writeShort(var2); // L: 9190
-						var10.packetBuffer.writeShort(var3); // L: 9191
-						Client.packetWriter.addNode(var10); // L: 9192
-					}
-
-					if (var0 == 3) { // L: 9194
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2682, Client.packetWriter.isaacCipher); // L: 9196
-						var10.packetBuffer.writeInt(var1); // L: 9197
-						var10.packetBuffer.writeShort(var2); // L: 9198
-						var10.packetBuffer.writeShort(var3); // L: 9199
-						Client.packetWriter.addNode(var10); // L: 9200
-					}
-
-					if (var0 == 4) { // L: 9202
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2683, Client.packetWriter.isaacCipher); // L: 9204
-						var10.packetBuffer.writeInt(var1); // L: 9205
-						var10.packetBuffer.writeShort(var2); // L: 9206
-						var10.packetBuffer.writeShort(var3); // L: 9207
-						Client.packetWriter.addNode(var10); // L: 9208
-					}
-
-					if (var0 == 5) { // L: 9210
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2734, Client.packetWriter.isaacCipher); // L: 9212
-						var10.packetBuffer.writeInt(var1); // L: 9213
-						var10.packetBuffer.writeShort(var2); // L: 9214
-						var10.packetBuffer.writeShort(var3); // L: 9215
-						Client.packetWriter.addNode(var10); // L: 9216
-					}
-
-					if (var0 == 6) { // L: 9218
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); // L: 9220
-						var10.packetBuffer.writeInt(var1); // L: 9221
-						var10.packetBuffer.writeShort(var2); // L: 9222
-						var10.packetBuffer.writeShort(var3); // L: 9223
-						Client.packetWriter.addNode(var10); // L: 9224
-					}
-
-					if (var0 == 7) { // L: 9226
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2715, Client.packetWriter.isaacCipher); // L: 9228
-						var10.packetBuffer.writeInt(var1); // L: 9229
-						var10.packetBuffer.writeShort(var2); // L: 9230
-						var10.packetBuffer.writeShort(var3); // L: 9231
-						Client.packetWriter.addNode(var10); // L: 9232
-					}
-
-					if (var0 == 8) { // L: 9234
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2751, Client.packetWriter.isaacCipher); // L: 9236
-						var10.packetBuffer.writeInt(var1); // L: 9237
-						var10.packetBuffer.writeShort(var2); // L: 9238
-						var10.packetBuffer.writeShort(var3); // L: 9239
-						Client.packetWriter.addNode(var10); // L: 9240
-					}
-
-					if (var0 == 9) { // L: 9242
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2711, Client.packetWriter.isaacCipher); // L: 9244
-						var10.packetBuffer.writeInt(var1); // L: 9245
-						var10.packetBuffer.writeShort(var2); // L: 9246
-						var10.packetBuffer.writeShort(var3); // L: 9247
-						Client.packetWriter.addNode(var10); // L: 9248
-					}
-
-					if (var0 == 10) { // L: 9250
-						var10 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2689, Client.packetWriter.isaacCipher); // L: 9252
-						var10.packetBuffer.writeInt(var1); // L: 9253
-						var10.packetBuffer.writeShort(var2); // L: 9254
-						var10.packetBuffer.writeShort(var3); // L: 9255
-						Client.packetWriter.addNode(var10); // L: 9256
-					}
-
-				}
-			}
+	public static void method5716() {
+		if (KeyHandler.KeyHandler_instance != null) { // L: 161
+			synchronized(KeyHandler.KeyHandler_instance) { // L: 162
+				KeyHandler.KeyHandler_instance = null; // L: 163
+			} // L: 164
 		}
-	} // L: 9176 9258
+
+	} // L: 166
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java
index 4c026b625c..5c1f469a0d 100644
--- a/runescape-client/src/main/java/GrandExchangeOffer.java
+++ b/runescape-client/src/main/java/GrandExchangeOffer.java
@@ -4,39 +4,39 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kh")
+@ObfuscatedName("kb")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 174142221
+		intValue = 449294439
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -2013850227
+		intValue = -119875967
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1123785695
+		intValue = 589510857
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1874435099
+		intValue = -1743574527
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 185412579
+		intValue = -309462137
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -45,7 +45,7 @@ public GrandExchangeOffer() {
 	} // L: 13
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;Z)V",
+		descriptor = "(Lpi;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -57,70 +57,46 @@ public GrandExchangeOffer(Buffer var1, boolean var2) {
 		this.currentPrice = var1.readInt(); // L: 21
 	} // L: 22
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "857978313"
+		descriptor = "(B)I",
+		garbageValue = "0"
 	)
 	@Export("status")
 	public int status() {
-		return this.state & 7;
+		return this.state & 7; // L: 50
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1294725733"
+		garbageValue = "-365049139"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0; // L: 54
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-39336237"
+		garbageValue = "2147483647"
 	)
-	void method5454(int var1) {
+	void method5765(int var1) {
 		this.state &= -8; // L: 58
-		this.state = (byte)(this.state | var1 & 7);
+		this.state = (byte)(this.state | var1 & 7); // L: 59
 	} // L: 60
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-33"
+		descriptor = "(II)V",
+		garbageValue = "-435429796"
 	)
-	void method5455(int var1) {
+	void method5766(int var1) {
 		this.state &= -9; // L: 63
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8); // L: 64
 		}
 
 	} // L: 65
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(CB)Z",
-		garbageValue = "0"
-	)
-	public static boolean method5473(char var0) {
-		if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { // L: 45
-			return true;
-		} else {
-			if (var0 != 0) { // L: 46
-				char[] var1 = class316.cp1252AsciiExtension; // L: 48
-
-				for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49
-					char var3 = var1[var2]; // L: 50
-					if (var0 == var3) { // L: 52
-						return true; // L: 53
-					}
-				}
-			}
-
-			return false; // L: 59
-		}
-	}
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
index 938af4722a..367457b624 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
@@ -4,72 +4,147 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kr")
+@ObfuscatedName("kc")
 @Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("w")
-	@Export("javaVersion")
-	public static String javaVersion;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("HealthBarDefinition_archive")
+	static AbstractArchive HealthBarDefinition_archive;
+	@ObfuscatedName("ar")
+	protected static String field3882;
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lkt;Lkt;I)I",
-		garbageValue = "-1967726110"
+		descriptor = "(Lkj;Lkj;B)I",
+		garbageValue = "75"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); // L: 13
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 21
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17
 	}
 
-	@ObfuscatedName("kr")
+	public boolean equals(Object var1) {
+		return super.equals(var1); // L: 21
+	}
+
+	@ObfuscatedName("ii")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;S)Z",
-		garbageValue = "-6395"
+		descriptor = "(Lcr;IIII)V",
+		garbageValue = "1259918287"
 	)
-	static final boolean method5423(Widget var0) {
-		int var1 = var0.contentType; // L: 11600
-		if (var1 == 205) { // L: 11601
-			Client.logoutTimer = 250; // L: 11602
-			return true; // L: 11603
-		} else {
-			int var2;
-			int var3;
-			if (var1 >= 300 && var1 <= 313) { // L: 11605
-				var2 = (var1 - 300) / 2; // L: 11606
-				var3 = var1 & 1; // L: 11607
-				Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11608
+	@Export("addNpcToMenu")
+	static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) {
+		NPCComposition var4 = var0.definition; // L: 10241
+		if (Client.menuOptionsCount < 400) { // L: 10242
+			if (var4.transforms != null) { // L: 10243
+				var4 = var4.transform();
 			}
 
-			if (var1 >= 314 && var1 <= 323) { // L: 11610
-				var2 = (var1 - 314) / 2; // L: 11611
-				var3 = var1 & 1; // L: 11612
-				Client.playerAppearance.method5045(var2, var3 == 1); // L: 11613
-			}
+			if (var4 != null) { // L: 10244
+				if (var4.isInteractable) { // L: 10245
+					if (!var4.isFollower || Client.followerIndex == var1) { // L: 10246
+						String var5 = var4.name; // L: 10247
+						int var6;
+						if (var4.combatLevel != 0 && var0.field1119 != 0) { // L: 10248
+							var6 = var0.field1119 != -1 ? var0.field1119 * 658677507 * 787891115 : var4.combatLevel * -73157727 * -2058162079; // L: 10249
+							var5 = var5 + Tiles.method2108(var6, class340.localPlayer.combatLevel) + " " + " (" + "level-" + var6 + ")"; // L: 10250
+						}
 
-			if (var1 == 324) {
-				Client.playerAppearance.changeSex(false); // L: 11615
-			}
+						if (var4.isFollower && Client.followerOpsLowPriority) { // L: 10252
+							class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10253
+						}
 
-			if (var1 == 325) { // L: 11616
-				Client.playerAppearance.changeSex(true);
-			}
+						if (Client.isItemSelected == 1) { // L: 10256
+							class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 10257
+						} else if (Client.isSpellSelected) { // L: 10260
+							if ((class91.selectedSpellFlags & 2) == 2) { // L: 10261
+								class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 10262
+							}
+						} else {
+							var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 10267
+							String[] var7 = var4.actions; // L: 10268
+							int var8;
+							int var9;
+							if (var7 != null) { // L: 10269
+								for (var8 = 4; var8 >= 0; --var8) { // L: 10270
+									if (var7[var8] != null && !var7[var8].equalsIgnoreCase("Attack")) { // L: 10271
+										var9 = 0; // L: 10272
+										if (var8 == 0) { // L: 10273
+											var9 = var6 + 9;
+										}
+
+										if (var8 == 1) { // L: 10274
+											var9 = var6 + 10;
+										}
 
-			if (var1 == 326) { // L: 11617
-				PacketBufferNode var4 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2688, Client.packetWriter.isaacCipher); // L: 11619
-				Client.playerAppearance.write(var4.packetBuffer); // L: 11620
-				Client.packetWriter.addNode(var4); // L: 11621
-				return true; // L: 11622
-			} else {
-				return false; // L: 11624
+										if (var8 == 2) { // L: 10275
+											var9 = var6 + 11;
+										}
+
+										if (var8 == 3) { // L: 10276
+											var9 = var6 + 12;
+										}
+
+										if (var8 == 4) { // L: 10277
+											var9 = var6 + 13;
+										}
+
+										class11.insertMenuItemNoShift(var7[var8], UserComparator5.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10278
+									}
+								}
+							}
+
+							if (var7 != null) { // L: 10283
+								for (var8 = 4; var8 >= 0; --var8) { // L: 10284
+									if (var7[var8] != null && var7[var8].equalsIgnoreCase("Attack")) { // L: 10285
+										short var10 = 0; // L: 10286
+										if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 10287
+											if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > class340.localPlayer.combatLevel) { // L: 10288
+												var10 = 2000; // L: 10289
+											}
+
+											var9 = 0; // L: 10291
+											if (var8 == 0) { // L: 10292
+												var9 = var10 + 9;
+											}
+
+											if (var8 == 1) { // L: 10293
+												var9 = var10 + 10;
+											}
+
+											if (var8 == 2) { // L: 10294
+												var9 = var10 + 11;
+											}
+
+											if (var8 == 3) { // L: 10295
+												var9 = var10 + 12;
+											}
+
+											if (var8 == 4) { // L: 10296
+												var9 = var10 + 13;
+											}
+
+											class11.insertMenuItemNoShift(var7[var8], UserComparator5.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 10297
+										}
+									}
+								}
+							}
+
+							if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 10302
+								class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 10303
+							}
+						}
+
+					}
+				}
 			}
 		}
-	}
+	} // L: 10307
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
index 1e7a31a1b3..ab42c829f6 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
@@ -4,13 +4,13 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("km")
+@ObfuscatedName("ki")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lkt;Lkt;B)I",
-		garbageValue = "48"
+		descriptor = "(Lkj;Lkj;I)I",
+		garbageValue = "-1633503560"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -24,4 +24,13 @@ public boolean equals(Object var1) {
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "640641737"
+	)
+	public static int method5727(int var0) {
+		return class378.field4237[var0 & 16383]; // L: 37
+	}
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
index 61d6fbd4f9..4e2e087834 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
@@ -3,181 +3,471 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bh")
+@ObfuscatedName("bm")
 @Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("em")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive8")
-	static Archive archive8;
-	@ObfuscatedName("eo")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive20")
-	static Archive archive20;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("filterWorlds")
 	boolean filterWorlds;
 
 	GrandExchangeOfferOwnWorldComparator() {
-	} // L: 12097
+	} // L: 12774
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lkt;Lkt;I)I",
-		garbageValue = "1561546631"
+		descriptor = "(Lkj;Lkj;I)I",
+		garbageValue = "1461383419"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-		if (var2.world == var1.world) { // L: 12100
+		if (var2.world == var1.world) { // L: 12777
 			return 0;
 		} else {
-			if (this.filterWorlds) { // L: 12101
-				if (Client.worldId == var1.world) { // L: 12102
+			if (this.filterWorlds) { // L: 12778
+				if (Client.worldId == var1.world) { // L: 12779
 					return -1;
 				}
 
-				if (var2.world == Client.worldId) { // L: 12103
+				if (var2.world == Client.worldId) { // L: 12780
 					return 1;
 				}
 			}
 
-			return var1.world < var2.world ? -1 : 1; // L: 12105
+			return var1.world < var2.world ? -1 : 1; // L: 12782
 		}
 	}
 
 	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 12113
+		return super.equals(var1); // L: 12790
 	}
 
 	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12109
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 12786
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)I",
-		garbageValue = "-90"
+		descriptor = "(Ljava/lang/Object;ZI)[B",
+		garbageValue = "2109757925"
 	)
-	public static int method1162(int var0, int var1, int var2) {
-		int var3 = class123.method2619(var2 - var1 + 1); // L: 54
-		var3 <<= var1; // L: 55
-		var0 |= var3; // L: 56
-		return var0; // L: 57
+	public static byte[] method1147(Object var0, boolean var1) {
+		if (var0 == null) { // L: 8
+			return null;
+		} else if (var0 instanceof byte[]) { // L: 9
+			byte[] var3 = (byte[])((byte[])var0); // L: 10
+			return var1 ? TaskHandler.method3047(var3) : var3; // L: 11
+		} else if (var0 instanceof AbstractByteArrayCopier) { // L: 14
+			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 15
+			return var2.get(); // L: 16
+		} else {
+			throw new IllegalArgumentException(); // L: 18
+		}
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("gm")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "69"
+		descriptor = "(I)V",
+		garbageValue = "48029406"
 	)
-	static int method1158(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3638
-			class14.Interpreter_intStackSize -= 2; // L: 3639
-			Client.field464 = (short)class9.method83(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]); // L: 3640
-			if (Client.field464 <= 0) { // L: 3641
-				Client.field464 = 256;
-			}
+	static final void method1148() {
+		class1.method12(class127.field1498, class117.field1433, class33.field243); // L: 4528
+		SecureRandomFuture.method2025(class142.field1615, ApproximateRouteStrategy.field460); // L: 4529
+		if (UserComparator7.cameraX == class127.field1498 && AbstractByteArrayCopier.cameraY == class117.field1433 && class33.field243 == UserComparator10.cameraZ && class142.field1615 == UserComparator7.cameraPitch && ApproximateRouteStrategy.field460 == class379.cameraYaw) { // L: 4530
+			Client.field724 = false; // L: 4531
+			Client.isCameraLocked = false; // L: 4532
+			PlayerComposition.field3193 = 0; // L: 4533
+			MusicPatchNode.field3150 = 0; // L: 4534
+			ModeWhere.field3951 = 0; // L: 4535
+			WorldMapSection1.field2755 = 0; // L: 4536
+			ChatChannel.field956 = 0; // L: 4537
+			ItemComposition.field2012 = 0; // L: 4538
+			Renderable.field2358 = 0; // L: 4539
+			class167.field1811 = 0; // L: 4540
+			VarpDefinition.field1748 = 0; // L: 4541
+			UserComparator9.field1335 = 0; // L: 4542
+		}
 
-			Client.field550 = (short)class9.method83(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 3642
-			if (Client.field550 <= 0) { // L: 3643
-				Client.field550 = 256;
-			}
+	} // L: 4545
 
-			return 1; // L: 3644
-		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3646
-			class14.Interpreter_intStackSize -= 2; // L: 3647
-			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3648
-			if (Client.zoomHeight <= 0) { // L: 3649
-				Client.zoomHeight = 256;
+	@ObfuscatedName("hm")
+	@ObfuscatedSignature(
+		descriptor = "(ZLpj;B)V",
+		garbageValue = "6"
+	)
+	@Export("updateNpcs")
+	static final void updateNpcs(boolean var0, PacketBuffer var1) {
+		Client.field597 = 0; // L: 8272
+		Client.field520 = 0; // L: 8273
+		PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 8275
+		var2.importIndex(); // L: 8276
+		int var3 = var2.readBits(8); // L: 8277
+		int var4;
+		if (var3 < Client.npcCount) { // L: 8278
+			for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 8279
+				Client.field598[++Client.field597 - 1] = Client.npcIndices[var4];
 			}
+		}
 
-			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3650
-			if (Client.zoomWidth <= 0) { // L: 3651
-				Client.zoomWidth = 320;
-			}
+		if (var3 > Client.npcCount) { // L: 8281
+			throw new RuntimeException("");
+		} else {
+			Client.npcCount = 0; // L: 8282
 
-			return 1; // L: 3652
-		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3654
-			class14.Interpreter_intStackSize -= 4; // L: 3655
-			Client.field727 = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3656
-			if (Client.field727 <= 0) { // L: 3657
-				Client.field727 = 1;
-			}
+			int var5;
+			int var7;
+			int var8;
+			int var9;
+			int var10;
+			for (var4 = 0; var4 < var3; ++var4) { // L: 8283
+				var5 = Client.npcIndices[var4]; // L: 8284
+				NPC var16 = Client.npcs[var5]; // L: 8285
+				var7 = var2.readBits(1); // L: 8286
+				if (var7 == 0) { // L: 8287
+					Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8288
+					var16.npcCycle = Client.cycle; // L: 8289
+				} else {
+					var8 = var2.readBits(2); // L: 8292
+					if (var8 == 0) { // L: 8293
+						Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8294
+						var16.npcCycle = Client.cycle; // L: 8295
+						Client.field605[++Client.field520 - 1] = var5; // L: 8296
+					} else if (var8 == 1) { // L: 8299
+						Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8300
+						var16.npcCycle = Client.cycle; // L: 8301
+						var9 = var2.readBits(3); // L: 8302
+						var16.method2319(var9, class185.field2123); // L: 8303
+						var10 = var2.readBits(1); // L: 8304
+						if (var10 == 1) { // L: 8305
+							Client.field605[++Client.field520 - 1] = var5;
+						}
+					} else if (var8 == 2) { // L: 8308
+						Client.npcIndices[++Client.npcCount - 1] = var5; // L: 8309
+						var16.npcCycle = Client.cycle; // L: 8310
+						if (var2.readBits(1) == 1) { // L: 8311
+							var9 = var2.readBits(3); // L: 8312
+							var16.method2319(var9, class185.field2122); // L: 8313
+							var10 = var2.readBits(3); // L: 8314
+							var16.method2319(var10, class185.field2122); // L: 8315
+						} else {
+							var9 = var2.readBits(3); // L: 8318
+							var16.method2319(var9, class185.field2120); // L: 8319
+						}
 
-			Client.field600 = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3658
-			if (Client.field600 <= 0) { // L: 3659
-				Client.field600 = 32767;
-			} else if (Client.field600 < Client.field727) { // L: 3660
-				Client.field600 = Client.field727;
+						var9 = var2.readBits(1); // L: 8321
+						if (var9 == 1) { // L: 8322
+							Client.field605[++Client.field520 - 1] = var5;
+						}
+					} else if (var8 == 3) { // L: 8325
+						Client.field598[++Client.field597 - 1] = var5; // L: 8326
+					}
+				}
 			}
 
-			Client.field729 = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 3661
-			if (Client.field729 <= 0) { // L: 3662
-				Client.field729 = 1;
+			int var6;
+			int var14;
+			NPC var15;
+			while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 8333
+				var14 = var1.readBits(15); // L: 8334
+				if (var14 == 32767) { // L: 8335
+					break;
+				}
+
+				boolean var17 = false; // L: 8336
+				if (Client.npcs[var14] == null) { // L: 8337
+					Client.npcs[var14] = new NPC(); // L: 8338
+					var17 = true; // L: 8339
+				}
+
+				var15 = Client.npcs[var14]; // L: 8341
+				Client.npcIndices[++Client.npcCount - 1] = var14; // L: 8342
+				var15.npcCycle = Client.cycle; // L: 8343
+				if (class12.field72) { // L: 8347
+					boolean var18 = var1.readBits(1) == 1; // L: 8348
+					if (var18) { // L: 8349
+						var1.readBits(32); // L: 8350
+					}
+
+					var9 = var1.readBits(1); // L: 8352
+					if (var9 == 1) { // L: 8353
+						Client.field605[++Client.field520 - 1] = var14;
+					}
+
+					var10 = Client.defaultRotations[var1.readBits(3)]; // L: 8354
+					if (var17) { // L: 8355
+						var15.orientation = var15.rotation = var10;
+					}
+
+					if (var0) { // L: 8356
+						var7 = var1.readBits(8); // L: 8357
+						if (var7 > 127) { // L: 8358
+							var7 -= 256;
+						}
+					} else {
+						var7 = var1.readBits(5); // L: 8361
+						if (var7 > 15) { // L: 8362
+							var7 -= 32;
+						}
+					}
+
+					var5 = var1.readBits(1); // L: 8364
+					var15.definition = WorldMapLabelSize.getNpcDefinition(var1.readBits(14)); // L: 8365
+					if (var0) { // L: 8366
+						var6 = var1.readBits(8); // L: 8367
+						if (var6 > 127) { // L: 8368
+							var6 -= 256;
+						}
+					} else {
+						var6 = var1.readBits(5); // L: 8371
+						if (var6 > 15) { // L: 8372
+							var6 -= 32;
+						}
+					}
+				} else {
+					var5 = var1.readBits(1); // L: 8376
+					var15.definition = WorldMapLabelSize.getNpcDefinition(var1.readBits(14)); // L: 8377
+					var8 = var1.readBits(1); // L: 8378
+					if (var8 == 1) { // L: 8379
+						Client.field605[++Client.field520 - 1] = var14;
+					}
+
+					if (var0) { // L: 8380
+						var6 = var1.readBits(8); // L: 8381
+						if (var6 > 127) { // L: 8382
+							var6 -= 256;
+						}
+					} else {
+						var6 = var1.readBits(5); // L: 8385
+						if (var6 > 15) { // L: 8386
+							var6 -= 32;
+						}
+					}
+
+					boolean var19 = var1.readBits(1) == 1; // L: 8388
+					if (var19) { // L: 8389
+						var1.readBits(32); // L: 8390
+					}
+
+					if (var0) { // L: 8392
+						var7 = var1.readBits(8); // L: 8393
+						if (var7 > 127) { // L: 8394
+							var7 -= 256;
+						}
+					} else {
+						var7 = var1.readBits(5); // L: 8397
+						if (var7 > 15) { // L: 8398
+							var7 -= 32;
+						}
+					}
+
+					var10 = Client.defaultRotations[var1.readBits(3)]; // L: 8400
+					if (var17) { // L: 8401
+						var15.orientation = var15.rotation = var10;
+					}
+				}
+
+				var15.field1120 = var15.definition.size; // L: 8403
+				var15.field1149 = var15.definition.rotation; // L: 8404
+				if (var15.field1149 == 0) { // L: 8405
+					var15.rotation = 0;
+				}
+
+				var15.walkSequence = var15.definition.walkSequence; // L: 8406
+				var15.walkBackSequence = var15.definition.walkBackSequence; // L: 8407
+				var15.walkLeftSequence = var15.definition.walkLeftSequence; // L: 8408
+				var15.walkRightSequence = var15.definition.walkRightSequence; // L: 8409
+				var15.idleSequence = var15.definition.idleSequence; // L: 8410
+				var15.turnLeftSequence = var15.definition.turnLeftSequence; // L: 8411
+				var15.turnRightSequence = var15.definition.turnRightSequence; // L: 8412
+				var15.method2315(class340.localPlayer.pathX[0] + var6, class340.localPlayer.pathY[0] + var7, var5 == 1); // L: 8413
 			}
 
-			Client.field730 = (short)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 3663
-			if (Client.field730 <= 0) { // L: 3664
-				Client.field730 = 32767;
-			} else if (Client.field730 < Client.field729) { // L: 3665
-				Client.field730 = Client.field729;
+			var1.exportIndex(); // L: 8415
+
+			for (var14 = 0; var14 < Client.field520; ++var14) { // L: 8418
+				var3 = Client.field605[var14]; // L: 8419
+				var15 = Client.npcs[var3]; // L: 8420
+				var5 = var1.readUnsignedByte(); // L: 8421
+				if (class12.field72 && (var5 & 4) != 0) { // L: 8422
+					var6 = var1.readUnsignedByte(); // L: 8423
+					var5 += var6 << 8; // L: 8424
+				}
+
+				if ((var5 & 8) != 0) { // L: 8426
+					var6 = var1.method7401(); // L: 8427
+					var7 = var1.method7403(); // L: 8428
+					if (class12.field72) { // L: 8429
+						var15.field1118 = var1.method7394() == 1; // L: 8430
+					}
+
+					var8 = var15.x - (var6 - class131.baseX - class131.baseX) * 64; // L: 8432
+					var9 = var15.y - (var7 - TileItem.baseY - TileItem.baseY) * 64; // L: 8433
+					if (var8 != 0 || var9 != 0) { // L: 8434
+						var15.field1122 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047;
+					}
+				}
+
+				if ((var5 & 1) != 0) { // L: 8436
+					var6 = var1.method7392(); // L: 8437
+					int var11;
+					int var12;
+					if (var6 > 0) { // L: 8438
+						for (var7 = 0; var7 < var6; ++var7) { // L: 8439
+							var9 = -1; // L: 8441
+							var10 = -1; // L: 8442
+							var11 = -1; // L: 8443
+							var8 = var1.readUShortSmart(); // L: 8444
+							if (var8 == 32767) { // L: 8445
+								var8 = var1.readUShortSmart(); // L: 8446
+								var10 = var1.readUShortSmart(); // L: 8447
+								var9 = var1.readUShortSmart(); // L: 8448
+								var11 = var1.readUShortSmart(); // L: 8449
+							} else if (var8 != 32766) { // L: 8451
+								var10 = var1.readUShortSmart(); // L: 8452
+							} else {
+								var8 = -1; // L: 8454
+							}
+
+							var12 = var1.readUShortSmart(); // L: 8455
+							var15.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); // L: 8456
+						}
+					}
+
+					var7 = var1.method7520(); // L: 8459
+					if (var7 > 0) { // L: 8460
+						for (var8 = 0; var8 < var7; ++var8) { // L: 8461
+							var9 = var1.readUShortSmart(); // L: 8462
+							var10 = var1.readUShortSmart(); // L: 8463
+							if (var10 != 32767) { // L: 8464
+								var11 = var1.readUShortSmart(); // L: 8465
+								var12 = var1.method7392(); // L: 8466
+								int var13 = var10 > 0 ? var1.method7394() : var12; // L: 8467
+								var15.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); // L: 8468
+							} else {
+								var15.removeHealthBar(var9); // L: 8470
+							}
+						}
+					}
+				}
+
+				if ((var5 & 16) != 0) { // L: 8474
+					var15.overheadText = var1.readStringCp1252NullTerminated(); // L: 8475
+					var15.overheadTextCyclesRemaining = 100; // L: 8476
+				}
+
+				if ((var5 & 2) != 0) { // L: 8478
+					var15.spotAnimation = var1.method7403(); // L: 8479
+					var6 = var1.method7412(); // L: 8480
+					var15.field1131 = var6 >> 16; // L: 8481
+					var15.field1130 = (var6 & 65535) + Client.cycle; // L: 8482
+					var15.spotAnimationFrame = 0; // L: 8483
+					var15.spotAnimationFrameCycle = 0; // L: 8484
+					if (var15.field1130 > Client.cycle) { // L: 8485
+						var15.spotAnimationFrame = -1;
+					}
+
+					if (var15.spotAnimation == 65535) { // L: 8486
+						var15.spotAnimation = -1;
+					}
+				}
+
+				if ((var5 & 512) != 0) { // L: 8488
+					var15.field1119 = var1.method7411(); // L: 8489
+				}
+
+				if ((var5 & 64) != 0) { // L: 8491
+					var6 = var1.method7403(); // L: 8492
+					if (var6 == 65535) { // L: 8493
+						var6 = -1;
+					}
+
+					var7 = var1.method7394(); // L: 8494
+					if (var6 == var15.sequence && var6 != -1) { // L: 8495
+						var8 = UserComparator5.SequenceDefinition_get(var6).field2078; // L: 8496
+						if (var8 == 1) { // L: 8497
+							var15.sequenceFrame = 0; // L: 8498
+							var15.sequenceFrameCycle = 0; // L: 8499
+							var15.sequenceDelay = var7; // L: 8500
+							var15.field1126 = 0; // L: 8501
+						}
+
+						if (var8 == 2) { // L: 8503
+							var15.field1126 = 0; // L: 8504
+						}
+					} else if (var6 == -1 || var15.sequence == -1 || UserComparator5.SequenceDefinition_get(var6).field2092 >= UserComparator5.SequenceDefinition_get(var15.sequence).field2092) { // L: 8507
+						var15.sequence = var6; // L: 8508
+						var15.sequenceFrame = 0; // L: 8509
+						var15.sequenceFrameCycle = 0; // L: 8510
+						var15.sequenceDelay = var7; // L: 8511
+						var15.field1126 = 0; // L: 8512
+						var15.field1098 = var15.pathLength; // L: 8513
+					}
+				}
+
+				if (class12.field72 && (var5 & 1024) != 0 || !class12.field72 && (var5 & 4) != 0) { // L: 8517
+					var15.field1132 = var1.method7396(); // L: 8518
+					var15.field1134 = var1.readByte(); // L: 8519
+					var15.field1133 = var1.method7396(); // L: 8520
+					var15.field1135 = var1.readByte(); // L: 8521
+					var15.field1136 = var1.method7403() + Client.cycle; // L: 8522
+					var15.field1157 = var1.readUnsignedShort() + Client.cycle; // L: 8523
+					var15.field1138 = var1.method7403(); // L: 8524
+					var15.pathLength = 1; // L: 8525
+					var15.field1098 = 0; // L: 8526
+					var15.field1132 += var15.pathX[0]; // L: 8527
+					var15.field1134 += var15.pathY[0]; // L: 8528
+					var15.field1133 += var15.pathX[0]; // L: 8529
+					var15.field1135 += var15.pathY[0]; // L: 8530
+				}
+
+				if ((var5 & 128) != 0) { // L: 8532
+					var15.targetIndex = var1.method7401(); // L: 8533
+					if (var15.targetIndex == 65535) { // L: 8534
+						var15.targetIndex = -1;
+					}
+				}
+
+				if ((var5 & 256) != 0) { // L: 8536
+					var15.field1141 = Client.cycle + var1.readUnsignedShort(); // L: 8537
+					var15.field1140 = Client.cycle + var1.method7401(); // L: 8538
+					var15.field1143 = var1.readByte(); // L: 8539
+					var15.field1144 = var1.method7396(); // L: 8540
+					var15.field1095 = var1.method7396(); // L: 8541
+					var15.field1146 = (byte)var1.readUnsignedByte(); // L: 8542
+				}
+
+				if ((var5 & 32) != 0) { // L: 8544
+					var15.definition = WorldMapLabelSize.getNpcDefinition(var1.method7401()); // L: 8545
+					var15.field1120 = var15.definition.size; // L: 8546
+					var15.field1149 = var15.definition.rotation; // L: 8547
+					var15.walkSequence = var15.definition.walkSequence; // L: 8548
+					var15.walkBackSequence = var15.definition.walkBackSequence; // L: 8549
+					var15.walkLeftSequence = var15.definition.walkLeftSequence; // L: 8550
+					var15.walkRightSequence = var15.definition.walkRightSequence; // L: 8551
+					var15.idleSequence = var15.definition.idleSequence; // L: 8552
+					var15.turnLeftSequence = var15.definition.turnLeftSequence; // L: 8553
+					var15.turnRightSequence = var15.definition.turnRightSequence; // L: 8554
+				}
 			}
 
-			return 1; // L: 3666
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3668
-			if (Client.viewportWidget != null) { // L: 3669
-				SpriteMask.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3670
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3671
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3672
-			} else {
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3675
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3676
+			for (var14 = 0; var14 < Client.field597; ++var14) { // L: 8558
+				var3 = Client.field598[var14]; // L: 8559
+				if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 8560
+					Client.npcs[var3].definition = null; // L: 8561
+					Client.npcs[var3] = null; // L: 8562
+				}
 			}
 
-			return 1; // L: 3678
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3680
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3681
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3682
-			return 1; // L: 3683
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3685
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = MouseHandler.method626(Client.field464); // L: 3686
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = MouseHandler.method626(Client.field550); // L: 3687
-			return 1; // L: 3688
-		} else if (var0 == 6220) { // L: 3690
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3691
-			return 1; // L: 3692
-		} else if (var0 == 6221) { // L: 3694
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3695
-			return 1; // L: 3696
-		} else if (var0 == 6222) { // L: 3698
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = GameEngine.canvasWidth; // L: 3699
-			return 1; // L: 3700
-		} else if (var0 == 6223) { // L: 3702
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = KeyHandler.canvasHeight; // L: 3703
-			return 1; // L: 3704
-		} else {
-			return 2; // L: 3706
-		}
-	}
+			if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 8565
+				throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
+			} else {
+				for (var14 = 0; var14 < Client.npcCount; ++var14) { // L: 8566
+					if (Client.npcs[Client.npcIndices[var14]] == null) { // L: 8567
+						throw new RuntimeException(var14 + "," + Client.npcCount); // L: 8568
+					}
+				}
 
-	@ObfuscatedName("ka")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-2002863284"
-	)
-	@Export("Clan_joinChat")
-	static final void Clan_joinChat(String var0) {
-		if (!var0.equals("")) { // L: 11812
-			PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2758, Client.packetWriter.isaacCipher); // L: 11814
-			var1.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var0)); // L: 11815
-			var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11816
-			Client.packetWriter.addNode(var1); // L: 11817
+			}
 		}
-	} // L: 11818
+	} // L: 8571
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
index 431abf816e..a318084e07 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
@@ -1,24 +1,16 @@
 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("ki")
+@ObfuscatedName("kh")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("ky")
-	@ObfuscatedGetter(
-		intValue = 682674069
-	)
-	@Export("Client_plane")
-	static int Client_plane;
-
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lkt;Lkt;I)I",
-		garbageValue = "-289793267"
+		descriptor = "(Lkj;Lkj;B)I",
+		garbageValue = "79"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -32,4 +24,15 @@ public int compare(Object var1, Object var2) {
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 77
 	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lku;Lku;I)V",
+		garbageValue = "-1737768501"
+	)
+	public static void method5725(AbstractArchive var0, AbstractArchive var1) {
+		KitDefinition.KitDefinition_archive = var0; // L: 27
+		KitDefinition.KitDefinition_modelsArchive = var1; // L: 28
+		KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 29
+	} // L: 30
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
index 9de97b95ee..8a2639c756 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
@@ -1,49 +1,27 @@
 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("kp")
+@ObfuscatedName("kk")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("te")
-	@ObfuscatedGetter(
-		longValue = 3905628072379123313L
-	)
-	static long field3758;
-	@ObfuscatedName("bf")
-	@ObfuscatedSignature(
-		descriptor = "Lni;"
-	)
-	@Export("loginType")
-	static LoginType loginType;
-
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lkt;Lkt;B)I",
-		garbageValue = "-67"
+		descriptor = "(Lkj;Lkj;I)I",
+		garbageValue = "-1121383818"
 	)
 	@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 int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47
-	}
-
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 51
 	}
 
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "64"
-	)
-	static void method5485() {
-		ItemContainer.itemContainers = new NodeHashTable(32); // L: 78
-	} // L: 79
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47
+	}
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
index c9dbd1ce64..e1a8130a05 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
@@ -1,72 +1,27 @@
-import java.applet.Applet;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ku")
+@ObfuscatedName("kv")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lkt;Lkt;I)I",
-		garbageValue = "2143976852"
+		descriptor = "(Lkj;Lkj;B)I",
+		garbageValue = "52"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); // L: 28
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 36
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 32
 	}
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V",
-		garbageValue = "1"
-	)
-	public static void method5440(Applet var0, String var1) {
-		class29.field157 = var0; // L: 22
-		if (var1 != null) { // L: 23
-			class29.field158 = var1;
-		}
-
-	} // L: 24
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-879022560"
-	)
-	static int method5439(int var0, Script var1, boolean var2) {
-		Widget var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1267
-		if (var0 == ScriptOpcodes.IF_GETX) { // L: 1268
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.x; // L: 1269
-			return 1; // L: 1270
-		} else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1272
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.y; // L: 1273
-			return 1; // L: 1274
-		} else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1276
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.width; // L: 1277
-			return 1; // L: 1278
-		} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1280
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.height; // L: 1281
-			return 1; // L: 1282
-		} else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1284
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1285
-			return 1; // L: 1286
-		} else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1288
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.parentId; // L: 1289
-			return 1; // L: 1290
-		} else {
-			return 2; // L: 1292
-		}
+	public boolean equals(Object var1) {
+		return super.equals(var1); // L: 36
 	}
 }
diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java
index f6dceb2837..61b74e90c3 100644
--- a/runescape-client/src/main/java/GraphicsDefaults.java
+++ b/runescape-client/src/main/java/GraphicsDefaults.java
@@ -4,115 +4,156 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ms")
+@ObfuscatedName("mh")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("i")
+	@ObfuscatedName("ua")
 	@ObfuscatedGetter(
-		intValue = -739361475
+		intValue = 22213427
+	)
+	@Export("foundItemIdCount")
+	static int foundItemIdCount;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -765662895
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1809731737
+		intValue = -537478073
 	)
-	public int field4008;
-	@ObfuscatedName("s")
+	public int field4163;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -300526741
+		intValue = 580753427
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -992628361
+		intValue = 1919856699
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 73683081
+		intValue = -643030741
 	)
-	public int field4011;
-	@ObfuscatedName("g")
+	public int field4166;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 956702641
+		intValue = -997092261
 	)
-	public int field4012;
-	@ObfuscatedName("e")
+	public int field4173;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1020186077
+		intValue = -2100757521
 	)
-	public int field4013;
-	@ObfuscatedName("p")
+	public int field4169;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 952149899
+		intValue = -1795462849
 	)
-	public int field4014;
-	@ObfuscatedName("j")
+	public int field4168;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1217039673
+		intValue = 1214363223
 	)
-	public int field4010;
-	@ObfuscatedName("b")
+	public int field4170;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1826235811
+		intValue = -377568519
 	)
-	public int field4018;
-	@ObfuscatedName("x")
+	public int field4171;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1004681241
+		intValue = -1238810733
 	)
-	public int field4016;
+	public int field4172;
 
 	public GraphicsDefaults() {
 		this.compass = -1; // L: 7
-		this.field4008 = -1; // L: 8
+		this.field4163 = -1; // L: 8
 		this.mapScenes = -1; // L: 9
 		this.headIconsPk = -1; // L: 10
-		this.field4011 = -1; // L: 11
-		this.field4012 = -1; // L: 12
-		this.field4013 = -1; // L: 13
-		this.field4014 = -1; // L: 14
-		this.field4010 = -1; // L: 15
-		this.field4018 = -1; // L: 16
-		this.field4016 = -1; // L: 17
+		this.field4166 = -1; // L: 11
+		this.field4173 = -1; // L: 12
+		this.field4169 = -1; // L: 13
+		this.field4168 = -1; // L: 14
+		this.field4170 = -1; // L: 15
+		this.field4171 = -1; // L: 16
+		this.field4172 = -1; // L: 17
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;I)V",
-		garbageValue = "-1881093126"
+		descriptor = "(Lku;B)V",
+		garbageValue = "-112"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4002.group); // L: 20
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field4160.group); // L: 20
 		Buffer var3 = new Buffer(var2); // L: 21
 
 		while (true) {
 			int var4 = var3.readUnsignedByte(); // L: 23
 			if (var4 == 0) { // L: 24
-				return; // L: 51
+				return;
 			}
 
 			switch(var4) { // L: 25
 			case 1:
-				var3.readMedium(); // L: 28
-				break;
+				var3.readMedium();
+				break; // L: 43
 			case 2:
-				this.compass = var3.method6946(); // L: 36
-				this.field4008 = var3.method6946(); // L: 37
-				this.mapScenes = var3.method6946(); // L: 38
-				this.headIconsPk = var3.method6946(); // L: 39
-				this.field4011 = var3.method6946(); // L: 40
-				this.field4012 = var3.method6946(); // L: 41
-				this.field4013 = var3.method6946(); // L: 42
-				this.field4014 = var3.method6946(); // L: 43
-				this.field4010 = var3.method6946(); // L: 44
-				this.field4018 = var3.method6946(); // L: 45
-				this.field4016 = var3.method6946(); // L: 46
+				this.compass = var3.method7400(); // L: 28
+				this.field4163 = var3.method7400(); // L: 29
+				this.mapScenes = var3.method7400(); // L: 30
+				this.headIconsPk = var3.method7400(); // L: 31
+				this.field4166 = var3.method7400(); // L: 32
+				this.field4173 = var3.method7400(); // L: 33
+				this.field4169 = var3.method7400(); // L: 34
+				this.field4168 = var3.method7400(); // L: 35
+				this.field4170 = var3.method7400(); // L: 36
+				this.field4171 = var3.method7400(); // L: 37
+				this.field4172 = var3.method7400(); // L: 38
+			}
+		}
+	}
+
+	@ObfuscatedName("p")
+	@Export("base37DecodeLong")
+	public static String base37DecodeLong(long var0) {
+		if (var0 > 0L && var0 < 6582952005840035281L) { // L: 49
+			if (0L == var0 % 37L) { // L: 50
+				return null;
+			} else {
+				int var2 = 0; // L: 51
+
+				for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 52 53 55
+					++var2; // L: 54
+				}
+
+				StringBuilder var5;
+				char var8;
+				for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 57 58 67
+					long var6 = var0; // L: 59
+					var0 /= 37L; // L: 60
+					var8 = class332.base37Table[(int)(var6 - 37L * var0)]; // L: 61
+					if (var8 == '_') { // L: 62
+						int var9 = var5.length() - 1; // L: 63
+						var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 64
+						var8 = 160; // L: 65
+					}
+				}
+
+				var5.reverse(); // L: 69
+				var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 70
+				return var5.toString(); // L: 71
 			}
+		} else {
+			return null;
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java
index e04ccf7b3d..f0edcd1c5f 100644
--- a/runescape-client/src/main/java/GraphicsObject.java
+++ b/runescape-client/src/main/java/GraphicsObject.java
@@ -3,73 +3,74 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bo")
+@ObfuscatedName("bs")
 @Implements("GraphicsObject")
 public class GraphicsObject extends Renderable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("Widget_spritesArchive")
+	static AbstractArchive Widget_spritesArchive;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 193750031
+		intValue = -1199566727
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -198143099
+		intValue = -1643038475
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 2072861117
+		intValue = 575956663
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1279579483
+		intValue = -1504982005
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -817954883
+		intValue = -1721998219
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -2037596073
+		intValue = 826937289
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lfm;"
+		descriptor = "Lgn;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -2011716423
+		intValue = -991958815
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 639704075
+		intValue = 126754465
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("isFinished")
 	boolean isFinished;
 
-	public GraphicsObject()
-	{
-	}
-
 	GraphicsObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		this.frame = 0; // L: 16
 		this.frameCycle = 0; // L: 17
@@ -80,181 +81,121 @@ public GraphicsObject()
 		this.y = var4; // L: 24
 		this.height = var5; // L: 25
 		this.cycleStart = var7 + var6; // L: 26
-		int var8 = BZip2State.SpotAnimationDefinition_get(this.id).sequence; // L: 27
+		int var8 = AccessFile.SpotAnimationDefinition_get(this.id).sequence; // L: 27
 		if (var8 != -1) { // L: 28
 			this.isFinished = false; // L: 29
-			this.sequenceDefinition = MouseHandler.SequenceDefinition_get(var8); // L: 30
+			this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var8); // L: 30
 		} else {
 			this.isFinished = true; // L: 32
 		}
 
 	} // L: 33
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "98"
+		garbageValue = "-41"
 	)
 	@Export("advance")
 	final void advance(int var1) {
 		if (!this.isFinished) { // L: 36
 			this.frameCycle += var1; // L: 37
-
-			while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { // L: 38
-				this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 39
-				++this.frame; // L: 40
-				if (this.frame >= this.sequenceDefinition.frameIds.length) { // L: 41
-					this.isFinished = true; // L: 42
-					break;
+			if (!this.sequenceDefinition.method3690()) { // L: 38
+				while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) {
+					this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame];
+					++this.frame;
+					if (this.frame >= this.sequenceDefinition.frameIds.length) {
+						this.isFinished = true; // L: 43
+						break;
+					}
+				}
+			} else {
+				this.frame += var1;
+				if (this.frame >= this.sequenceDefinition.method3647()) { // L: 50
+					this.isFinished = true;
 				}
 			}
 
 		}
-	} // L: 46
+	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lhl;",
-		garbageValue = "461766541"
+		descriptor = "(I)Lgo;",
+		garbageValue = "202861607"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = BZip2State.SpotAnimationDefinition_get(this.id); // L: 49
+		SpotAnimationDefinition var1 = AccessFile.SpotAnimationDefinition_get(this.id);
 		Model var2;
-		if (!this.isFinished) { // L: 51
+		if (!this.isFinished) { // L: 57
 			var2 = var1.getModel(this.frame);
 		} else {
-			var2 = var1.getModel(-1); // L: 52
+			var2 = var1.getModel(-1);
 		}
 
-		return var2 == null ? null : var2; // L: 53
+		return var2 == null ? null : var2;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-2056514813"
+		descriptor = "(IIIII)V",
+		garbageValue = "1965398967"
 	)
-	static int method1896(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1203
-		if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1204
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var3)); // L: 1205
-			return 1; // L: 1206
-		} else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1208
-			if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1215
-				if (var3.dataText == null) { // L: 1216
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = "";
-				} else {
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1217
-				}
+	@Export("itemContainerSetItem")
+	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
+		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
+		}
 
-				return 1; // L: 1218
-			} else {
-				return 2; // L: 1220
+		if (var4.ids.length <= var1) { // L: 44
+			int[] var5 = new int[var1 + 1]; // L: 45
+			int[] var6 = new int[var1 + 1]; // L: 46
+
+			int var7;
+			for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47
+				var5[var7] = var4.ids[var7]; // L: 48
+				var6[var7] = var4.quantities[var7]; // L: 49
 			}
-		} else {
-			int var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1209
-			--var4; // L: 1210
-			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1211
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1212
-			} else {
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = "";
+
+			for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51
+				var5[var7] = -1; // L: 52
+				var6[var7] = 0; // L: 53
 			}
 
-			return 1; // L: 1213
+			var4.ids = var5; // L: 55
+			var4.quantities = var6; // L: 56
 		}
-	}
 
-	@ObfuscatedName("iz")
+		var4.ids[var1] = var2; // L: 58
+		var4.quantities[var1] = var3; // L: 59
+	} // L: 60
+
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lcx;IIII)V",
-		garbageValue = "1361246201"
+		descriptor = "(B)V",
+		garbageValue = "-76"
 	)
-	@Export("addPlayerToMenu")
-	static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
-		if (HealthBarDefinition.localPlayer != var0) { // L: 9585
-			if (Client.menuOptionsCount < 400) { // L: 9586
-				String var4;
-				int var7;
-				if (var0.skillLevel == 0) { // L: 9588
-					String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9589
-					var7 = var0.combatLevel; // L: 9591
-					int var8 = HealthBarDefinition.localPlayer.combatLevel; // L: 9592
-					int var9 = var8 - var7; // L: 9594
-					String var6;
-					if (var9 < -9) { // L: 9595
-						var6 = MouseHandler.colorStartTag(16711680); // L: 9596
-					} else if (var9 < -6) { // L: 9599
-						var6 = MouseHandler.colorStartTag(16723968); // L: 9600
-					} else if (var9 < -3) { // L: 9603
-						var6 = MouseHandler.colorStartTag(16740352); // L: 9604
-					} else if (var9 < 0) { // L: 9607
-						var6 = MouseHandler.colorStartTag(16756736); // L: 9608
-					} else if (var9 > 9) { // L: 9611
-						var6 = MouseHandler.colorStartTag(65280); // L: 9612
-					} else if (var9 > 6) { // L: 9615
-						var6 = MouseHandler.colorStartTag(4259584); // L: 9616
-					} else if (var9 > 3) { // L: 9619
-						var6 = MouseHandler.colorStartTag(8453888); // L: 9620
-					} else if (var9 > 0) { // L: 9623
-						var6 = MouseHandler.colorStartTag(12648192); // L: 9624
-					} else {
-						var6 = MouseHandler.colorStartTag(16776960); // L: 9627
-					}
-
-					var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9629
-				} else {
-					var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9631
-				}
-
-				int var10;
-				if (Client.isItemSelected == 1) { // L: 9632
-					EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9633
-				} else if (Client.isSpellSelected) { // L: 9636
-					if ((class116.selectedSpellFlags & 8) == 8) { // L: 9637
-						EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9638
-					}
-				} else {
-					for (var10 = 7; var10 >= 0; --var10) { // L: 9643
-						if (Client.playerMenuActions[var10] != null) { // L: 9644
-							short var11 = 0; // L: 9645
-							if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9646
-								if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9647
-									continue;
-								}
-
-								if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > HealthBarDefinition.localPlayer.combatLevel) { // L: 9648
-									var11 = 2000; // L: 9649
-								}
-
-								if (HealthBarDefinition.localPlayer.team != 0 && var0.team != 0) { // L: 9651
-									if (var0.team == HealthBarDefinition.localPlayer.team) { // L: 9652
-										var11 = 2000;
-									} else {
-										var11 = 0; // L: 9653
-									}
-								} else if (AttackOption.field1226 == Client.playerAttackOption && var0.isClanMember()) { // L: 9655
-									var11 = 2000; // L: 9656
-								}
-							} else if (Client.playerOptionsPriorities[var10]) { // L: 9659
-								var11 = 2000;
-							}
+	public static void method1956() {
+		if (NetCache.NetCache_socket != null) { // L: 266
+			NetCache.NetCache_socket.close();
+		}
 
-							boolean var12 = false; // L: 9660
-							var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9661
-							EnumComposition.insertMenuItemNoShift(Client.playerMenuActions[var10], MouseHandler.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9662
-						}
-					}
-				}
+	} // L: 267
 
-				for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9667
-					if (Client.menuOpcodes[var10] == 23) { // L: 9668
-						Client.menuTargets[var10] = MouseHandler.colorStartTag(16777215) + var4; // L: 9669
-						break;
-					}
-				}
-
-			}
+	@ObfuscatedName("kl")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "54739776"
+	)
+	static final void method1955(int var0) {
+		if (class242.loadInterface(var0)) { // L: 12070
+			class328.drawModelComponents(MouseRecorder.Widget_interfaceComponents[var0], -1); // L: 12071
 		}
-	} // L: 9673
+	} // L: 12072
+
+	public GraphicsObject() {
+	}
 }
diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java
index 7758716ffb..6515f2b275 100644
--- a/runescape-client/src/main/java/HealthBar.java
+++ b/runescape-client/src/main/java/HealthBar.java
@@ -1,27 +1,26 @@
-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("ce")
+@ObfuscatedName("cs")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("rt")
-	@ObfuscatedSignature(
-		descriptor = "Lak;"
-	)
-	@Export("pcmPlayer0")
-	static PcmPlayer pcmPlayer0;
 	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -1200843619
+	)
+	static int field1209;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "Lfd;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lkf;"
+		descriptor = "Llr;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
@@ -34,10 +33,10 @@ public class HealthBar extends Node {
 		this.definition = var1; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIB)V",
-		garbageValue = "0"
+		descriptor = "(IIIII)V",
+		garbageValue = "2125258753"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -51,8 +50,8 @@ void put(int var1, int var2, int var3, int var4) {
 				return; // L: 25
 			}
 
-			if (var7.cycle <= var1) {
-				var5 = var7; // L: 27
+			if (var7.cycle <= var1) { // L: 27
+				var5 = var7;
 			}
 		}
 
@@ -70,10 +69,10 @@ void put(int var1, int var2, int var3, int var4) {
 		}
 	} // L: 31 35
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lcd;",
-		garbageValue = "655971331"
+		descriptor = "(II)Lcn;",
+		garbageValue = "849241629"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -95,56 +94,61 @@ HealthBarUpdate get(int var1) {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1027939055"
+		descriptor = "(B)Z",
+		garbageValue = "80"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method5633(); // L: 55
+		return this.updates.method5915(); // L: 55
 	}
 
 	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "45"
+		descriptor = "(I)V",
+		garbageValue = "2114195084"
 	)
-	static void method2242() {
-		Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 61
+	static void method2311() {
+		if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 300
+			if (SecureRandomFuture.clientPreferences.rememberedUsername != null) { // L: 301
+				Login.Login_username = SecureRandomFuture.clientPreferences.rememberedUsername; // L: 302
+				Client.Login_isUsernameRemembered = true; // L: 303
+			} else {
+				Client.Login_isUsernameRemembered = false; // L: 305
+			}
 
-		while (var0.hasNext()) {
-			Message var1 = (Message)var0.next(); // L: 62
-			var1.clearIsFromIgnored(); // L: 64
 		}
+	} // L: 306
 
-	} // L: 67
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(CI)C",
+		garbageValue = "2115145690"
+	)
+	static char method2313(char var0) {
+		return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 61 62
+	}
 
-	@ObfuscatedName("lq")
+	@ObfuscatedName("iq")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ZS)Ljava/lang/String;",
-		garbageValue = "-17378"
+		descriptor = "(I)V",
+		garbageValue = "517043711"
 	)
-	static String method2246(String var0, boolean var1) {
-		String var2 = var1 ? "https://" : "http://"; // L: 11925
-		if (Client.gameBuild == 1) { // L: 11926
-			var0 = var0 + "-wtrc";
-		} else if (Client.gameBuild == 2) { // L: 11927
-			var0 = var0 + "-wtqa";
-		} else if (Client.gameBuild == 3) { // L: 11928
-			var0 = var0 + "-wtwip";
-		} else if (Client.gameBuild == 5) { // L: 11929
-			var0 = var0 + "-wti";
-		} else if (Client.gameBuild == 4) { // L: 11930
-			var0 = "local";
-		}
+	@Export("Widget_runOnTargetLeave")
+	static void Widget_runOnTargetLeave() {
+		if (Client.isSpellSelected) { // L: 9881
+			Widget var0 = class126.getWidgetChild(class20.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9882
+			if (var0 != null && var0.onTargetLeave != null) { // L: 9883
+				ScriptEvent var1 = new ScriptEvent(); // L: 9884
+				var1.widget = var0; // L: 9885
+				var1.args = var0.onTargetLeave; // L: 9886
+				class285.runScriptEvent(var1); // L: 9887
+			}
 
-		String var3 = ""; // L: 11931
-		if (UserComparator3.field1316 != null) { // L: 11932
-			var3 = "/p=" + UserComparator3.field1316;
+			Client.field633 = -1; // L: 9889
+			Client.isSpellSelected = false; // L: 9890
+			SecureRandomCallable.invalidateWidget(var0); // L: 9891
 		}
-
-		String var4 = "runescape.com"; // L: 11933
-		return var2 + var0 + "." + var4 + "/l=" + MouseHandler.clientLanguage + "/a=" + TextureProvider.field2483 + var3 + "/"; // L: 11934
-	}
+	} // L: 9892
 }
diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java
index 874d822c55..08f145d2e0 100644
--- a/runescape-client/src/main/java/HealthBarDefinition.java
+++ b/runescape-client/src/main/java/HealthBarDefinition.java
@@ -7,110 +7,91 @@
 @ObfuscatedName("fd")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("HealthBarDefinition_archive")
-	public static AbstractArchive HealthBarDefinition_archive;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	public static AbstractArchive field1658;
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lku;"
 	)
-	@Export("HealthBarDefinition_cached")
-	static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("a")
+	static AbstractArchive field1802;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
-	static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("ItemDefinition_modelArchive")
-	public static AbstractArchive ItemDefinition_modelArchive;
-	@ObfuscatedName("le")
+	public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lcx;"
+		descriptor = "Liq;"
 	)
-	@Export("localPlayer")
-	static Player localPlayer;
-	@ObfuscatedName("o")
+	public static EvictingDualNodeHashTable field1795;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1062567333
+		intValue = 80054529
 	)
-	public int field1668;
-	@ObfuscatedName("p")
+	public int field1796;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1707673095
+		intValue = -2024143827
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1065530521
+		intValue = -1723644231
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -2120739271
+		intValue = -599583981
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -114651593
+		intValue = -74289
 	)
-	public int field1666;
-	@ObfuscatedName("y")
+	public int field1798;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1513075709
+		intValue = 1294615051
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1064156991
+		intValue = 374618257
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1238239581
+		intValue = -1037854791
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -638487751
+		intValue = 29322481
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1381174805
+		intValue = 702748913
 	)
 	@Export("widthPadding")
 	public int widthPadding;
 
 	static {
-		HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14
-		HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15
+		HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 14
+		field1795 = new EvictingDualNodeHashTable(64); // L: 15
 	}
 
 	HealthBarDefinition() {
 		this.int1 = 255; // L: 19
 		this.int2 = 255; // L: 20
 		this.int3 = -1; // L: 21
-		this.field1666 = 1; // L: 22
+		this.field1798 = 1; // L: 22
 		this.int5 = 70; // L: 23
 		this.frontSpriteID = -1; // L: 24
 		this.backSpriteID = -1; // L: 25
@@ -118,101 +99,111 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0; // L: 27
 	} // L: 29
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;B)V",
-		garbageValue = "36"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "-1574021217"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 43
-			if (var2 == 0) { // L: 44
-				return; // L: 47
+			int var2 = var1.readUnsignedByte(); // L: 48
+			if (var2 == 0) { // L: 49
+				return; // L: 52
 			}
 
-			this.decodeNext(var1, var2); // L: 45
+			this.decodeNext(var1, var2); // L: 50
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;IB)V",
-		garbageValue = "119"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-1746560139"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 50
-			var1.readUnsignedShort(); // L: 51
-		} else if (var2 == 2) { // L: 53
+		if (var2 == 1) { // L: 55
+			var1.readUnsignedShort(); // L: 56
+		} else if (var2 == 2) { // L: 58
 			this.int1 = var1.readUnsignedByte();
-		} else if (var2 == 3) { // L: 54
+		} else if (var2 == 3) { // L: 59
 			this.int2 = var1.readUnsignedByte();
-		} else if (var2 == 4) { // L: 55
+		} else if (var2 == 4) { // L: 60
 			this.int3 = 0;
-		} else if (var2 == 5) { // L: 56
+		} else if (var2 == 5) { // L: 61
 			this.int5 = var1.readUnsignedShort();
-		} else if (var2 == 6) { // L: 57
-			var1.readUnsignedByte(); // L: 58
-		} else if (var2 == 7) { // L: 60
-			this.frontSpriteID = var1.method6946();
-		} else if (var2 == 8) { // L: 61
-			this.backSpriteID = var1.method6946();
-		} else if (var2 == 11) { // L: 62
+		} else if (var2 == 6) { // L: 62
+			var1.readUnsignedByte(); // L: 63
+		} else if (var2 == 7) { // L: 65
+			this.frontSpriteID = var1.method7400();
+		} else if (var2 == 8) { // L: 66
+			this.backSpriteID = var1.method7400();
+		} else if (var2 == 11) { // L: 67
 			this.int3 = var1.readUnsignedShort();
-		} else if (var2 == 14) { // L: 63
+		} else if (var2 == 14) { // L: 68
 			this.width = var1.readUnsignedByte();
-		} else if (var2 == 15) { // L: 64
+		} else if (var2 == 15) { // L: 69
 			this.widthPadding = var1.readUnsignedByte();
 		}
 
-	} // L: 66
+	} // L: 71
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)Low;",
-		garbageValue = "367034534"
+		descriptor = "(I)Lpl;",
+		garbageValue = "-1857525750"
 	)
 	@Export("getFrontSprite")
 	public SpritePixels getFrontSprite() {
-		if (this.frontSpriteID < 0) { // L: 69
+		if (this.frontSpriteID < 0) { // L: 74
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 70
+			SpritePixels var1 = (SpritePixels)field1795.get((long)this.frontSpriteID); // L: 75
 			if (var1 != null) {
-				return var1; // L: 71
+				return var1; // L: 76
 			} else {
-				var1 = WorldMapSection0.SpriteBuffer_getSprite(field1658, this.frontSpriteID, 0); // L: 72
-				if (var1 != null) { // L: 73
-					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
+				var1 = class6.SpriteBuffer_getSprite(field1802, this.frontSpriteID, 0); // L: 77
+				if (var1 != null) {
+					field1795.put(var1, (long)this.frontSpriteID); // L: 78
 				}
 
-				return var1; // L: 75
+				return var1; // L: 80
 			}
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(I)Low;",
-		garbageValue = "1676501490"
+		descriptor = "(I)Lpl;",
+		garbageValue = "-1451649947"
 	)
 	@Export("getBackSprite")
 	public SpritePixels getBackSprite() {
-		if (this.backSpriteID < 0) { // L: 79
+		if (this.backSpriteID < 0) { // L: 84
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 80
-			if (var1 != null) {
-				return var1; // L: 81
+			SpritePixels var1 = (SpritePixels)field1795.get((long)this.backSpriteID); // L: 85
+			if (var1 != null) { // L: 86
+				return var1;
 			} else {
-				var1 = WorldMapSection0.SpriteBuffer_getSprite(field1658, this.backSpriteID, 0); // L: 82
-				if (var1 != null) { // L: 83
-					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
+				var1 = class6.SpriteBuffer_getSprite(field1802, this.backSpriteID, 0); // L: 87
+				if (var1 != null) { // L: 88
+					field1795.put(var1, (long)this.backSpriteID);
 				}
 
-				return var1; // L: 85
+				return var1; // L: 90
 			}
 		}
 	}
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(CB)Z",
+		garbageValue = "127"
+	)
+	@Export("isCharAlphabetic")
+	public static boolean isCharAlphabetic(char var0) {
+		return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 144
+	}
 }
diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java
index 015bfbfb4e..b8b7e86b14 100644
--- a/runescape-client/src/main/java/HealthBarUpdate.java
+++ b/runescape-client/src/main/java/HealthBarUpdate.java
@@ -4,30 +4,36 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cd")
+@ObfuscatedName("cn")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("ed")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive20")
+	static Archive archive20;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -400345829
+		intValue = 4690351
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1402646487
+		intValue = 1083128331
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1279526783
+		intValue = 1681269367
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 313548895
+		intValue = 1073400791
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -39,10 +45,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "2078509011"
+		garbageValue = "1606460707"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -51,23 +57,4 @@ void set(int var1, int var2, int var3, int var4) {
 		this.health2 = var3; // L: 21
 		this.cycleOffset = var4; // L: 22
 	} // L: 23
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;I)V",
-		garbageValue = "1840987704"
-	)
-	public static void method2183(AbstractArchive var0) {
-		VarbitComposition.VarbitDefinition_archive = var0; // L: 28
-	} // L: 29
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "44"
-	)
-	static int method2185(int var0, int var1) {
-		long var2 = (long)((var0 << 16) + var1); // L: 150
-		return class131.NetCache_currentResponse != null && var2 == class131.NetCache_currentResponse.key ? class138.NetCache_responseArchiveBuffer.offset * 99 / (class138.NetCache_responseArchiveBuffer.array.length - class131.NetCache_currentResponse.padding) + 1 : 0; // L: 151 152
-	}
 }
diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java
index 668dafdf0e..424015075e 100644
--- a/runescape-client/src/main/java/HitSplatDefinition.java
+++ b/runescape-client/src/main/java/HitSplatDefinition.java
@@ -4,155 +4,157 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fl")
+@ObfuscatedName("fn")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("HitSplatDefinition_archive")
 	static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
-	static AbstractArchive field1799;
-	@ObfuscatedName("s")
+	static AbstractArchive field1939;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("HitSplatDefinition_fontsArchive")
 	static AbstractArchive HitSplatDefinition_fontsArchive;
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lig;"
-	)
-	@Export("HitSplatDefinition_cached")
-	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
-	public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("g")
+	static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
-	public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("p")
-	@Export("SpriteBuffer_spritePalette")
-	public static int[] SpriteBuffer_spritePalette;
-	@ObfuscatedName("y")
+	static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Liq;"
+	)
+	@Export("HealthBarDefinition_cached")
+	static EvictingDualNodeHashTable HealthBarDefinition_cached;
+	@ObfuscatedName("oe")
 	@ObfuscatedGetter(
-		intValue = -1566126037
+		intValue = 1196014399
+	)
+	static int field1945;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1020787021
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -2057498117
+		intValue = -583114937
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -960185975
+		intValue = -308590223
 	)
-	public int field1805;
-	@ObfuscatedName("l")
+	public int field1934;
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -722283867
+		intValue = 2014586653
 	)
-	int field1809;
-	@ObfuscatedName("u")
+	int field1935;
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1206908659
+		intValue = -2142835759
 	)
-	int field1813;
-	@ObfuscatedName("n")
+	int field1936;
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 289668931
+		intValue = -1151055999
 	)
-	int field1798;
-	@ObfuscatedName("z")
+	int field1937;
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 349750373
+		intValue = -734578061
 	)
-	int field1811;
-	@ObfuscatedName("q")
+	int field1938;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -2034733799
+		intValue = 527762707
 	)
-	public int field1812;
-	@ObfuscatedName("d")
+	public int field1929;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1578977171
+		intValue = -743842931
 	)
-	public int field1807;
-	@ObfuscatedName("r")
+	public int field1940;
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -256974621
+		intValue = -1359104371
 	)
-	public int field1814;
-	@ObfuscatedName("m")
-	String field1815;
-	@ObfuscatedName("c")
+	public int field1943;
+	@ObfuscatedName("q")
+	String field1942;
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1437250481
+		intValue = 1381662827
 	)
-	public int field1816;
-	@ObfuscatedName("f")
+	public int field1946;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -379140099
+		intValue = -1891074319
 	)
-	public int field1820;
-	@ObfuscatedName("h")
+	public int field1944;
+	@ObfuscatedName("i")
 	@Export("transforms")
 	public int[] transforms;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 880580953
+		intValue = 406628061
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 1573055713
+		intValue = 2095157281
 	)
 	@Export("transformVarp")
 	int transformVarp;
 
 	static {
-		HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); // L: 18
-		HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 19
-		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); // L: 20
+		HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 18
+		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(64); // L: 19
+		HealthBarDefinition_cached = new EvictingDualNodeHashTable(20); // L: 20
 	}
 
 	HitSplatDefinition() {
 		this.fontId = -1; // L: 26
 		this.textColor = 16777215; // L: 27
-		this.field1805 = 70; // L: 28
-		this.field1809 = -1; // L: 29
-		this.field1813 = -1; // L: 30
-		this.field1798 = -1; // L: 31
-		this.field1811 = -1; // L: 32
-		this.field1812 = 0; // L: 33
-		this.field1807 = 0; // L: 34
-		this.field1814 = -1; // L: 35
-		this.field1815 = ""; // L: 36
-		this.field1816 = -1; // L: 37
-		this.field1820 = 0; // L: 38
-		this.transformVarbit = -1; // L: 40
-		this.transformVarp = -1; // L: 41
+		this.field1934 = 70;
+		this.field1935 = -1; // L: 29
+		this.field1936 = -1; // L: 30
+		this.field1937 = -1;
+		this.field1938 = -1;
+		this.field1929 = 0;
+		this.field1940 = 0;
+		this.field1943 = -1;
+		this.field1942 = "";
+		this.field1946 = -1;
+		this.field1944 = 0;
+		this.transformVarbit = -1;
+		this.transformVarp = -1;
 	} // L: 43
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "2128528466"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "-73"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -166,41 +168,41 @@ void decode(Buffer var1) {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "-1870837993"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-610372981"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) { // L: 70
-			this.fontId = var1.method6946();
+			this.fontId = var1.method7400();
 		} else if (var2 == 2) { // L: 71
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) { // L: 72
-			this.field1809 = var1.method6946();
+			this.field1935 = var1.method7400();
 		} else if (var2 == 4) { // L: 73
-			this.field1798 = var1.method6946();
+			this.field1937 = var1.method7400();
 		} else if (var2 == 5) { // L: 74
-			this.field1813 = var1.method6946();
+			this.field1936 = var1.method7400();
 		} else if (var2 == 6) { // L: 75
-			this.field1811 = var1.method6946();
+			this.field1938 = var1.method7400();
 		} else if (var2 == 7) { // L: 76
-			this.field1812 = var1.readShort();
+			this.field1929 = var1.readShort();
 		} else if (var2 == 8) { // L: 77
-			this.field1815 = var1.readStringCp1252NullCircumfixed();
+			this.field1942 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) { // L: 78
-			this.field1805 = var1.readUnsignedShort();
+			this.field1934 = var1.readUnsignedShort();
 		} else if (var2 == 10) { // L: 79
-			this.field1807 = var1.readShort();
+			this.field1940 = var1.readShort();
 		} else if (var2 == 11) { // L: 80
-			this.field1814 = 0;
+			this.field1943 = 0;
 		} else if (var2 == 12) { // L: 81
-			this.field1816 = var1.readUnsignedByte();
+			this.field1946 = var1.readUnsignedByte();
 		} else if (var2 == 13) { // L: 82
-			this.field1820 = var1.readShort();
+			this.field1944 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field1814 = var1.readUnsignedShort(); // L: 83
+			this.field1943 = var1.readUnsignedShort(); // L: 83
 		} else if (var2 == 17 || var2 == 18) { // L: 84
 			this.transformVarbit = var1.readUnsignedShort(); // L: 85
 			if (this.transformVarbit == 65535) { // L: 86
@@ -235,16 +237,16 @@ void decodeNext(Buffer var1, int var2) {
 
 	} // L: 103
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lfl;",
-		garbageValue = "-1137405392"
+		descriptor = "(I)Lfn;",
+		garbageValue = "1792198587"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1; // L: 106
 		if (this.transformVarbit != -1) { // L: 107
-			var1 = class119.getVarbit(this.transformVarbit);
+			var1 = class273.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) { // L: 108
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -256,90 +258,90 @@ public final HitSplatDefinition transform() {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? Canvas.method372(var2) : null; // L: 112 113
+		return var2 != -1 ? UserComparator6.method2554(var2) : null; // L: 112 113
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "2122770328"
+		garbageValue = "1610563649"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field1815; // L: 117
+		String var2 = this.field1942;
 
 		while (true) {
-			int var3 = var2.indexOf("%1"); // L: 119
-			if (var3 < 0) { // L: 120
-				return var2; // L: 123
+			int var3 = var2.indexOf("%1");
+			if (var3 < 0) {
+				return var2;
 			}
 
-			var2 = var2.substring(0, var3) + MusicPatchNode2.intToString(var1, false) + var2.substring(var3 + 2); // L: 121
+			var2 = var2.substring(0, var3) + ByteArrayPool.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)Low;",
-		garbageValue = "1867638082"
+		descriptor = "(B)Lpl;",
+		garbageValue = "25"
 	)
-	public SpritePixels method3256() {
-		if (this.field1809 < 0) { // L: 127
+	public SpritePixels method3451() {
+		if (this.field1935 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1809); // L: 128
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1935);
 			if (var1 != null) {
-				return var1; // L: 129
+				return var1;
 			} else {
-				var1 = WorldMapSection0.SpriteBuffer_getSprite(field1799, this.field1809, 0); // L: 130
+				var1 = class6.SpriteBuffer_getSprite(field1939, this.field1935, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1809); // L: 131
+					HitSplatDefinition_cachedFonts.put(var1, (long)this.field1935);
 				}
 
-				return var1; // L: 133
+				return var1;
 			}
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(B)Low;",
-		garbageValue = "-49"
+		descriptor = "(B)Lpl;",
+		garbageValue = "-32"
 	)
-	public SpritePixels method3286() {
-		if (this.field1813 < 0) { // L: 137
+	public SpritePixels method3452() {
+		if (this.field1936 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1813); // L: 138
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1936);
 			if (var1 != null) {
-				return var1; // L: 139
+				return var1;
 			} else {
-				var1 = WorldMapSection0.SpriteBuffer_getSprite(field1799, this.field1813, 0); // L: 140
+				var1 = class6.SpriteBuffer_getSprite(field1939, this.field1936, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1813); // L: 141
+					HitSplatDefinition_cachedFonts.put(var1, (long)this.field1936);
 				}
 
-				return var1; // L: 143
+				return var1;
 			}
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(S)Low;",
-		garbageValue = "16101"
+		descriptor = "(I)Lpl;",
+		garbageValue = "1542636708"
 	)
-	public SpritePixels method3258() {
-		if (this.field1798 < 0) { // L: 147
+	public SpritePixels method3453() {
+		if (this.field1937 < 0) { // L: 147
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1798); // L: 148
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1937);
 			if (var1 != null) {
 				return var1; // L: 149
 			} else {
-				var1 = WorldMapSection0.SpriteBuffer_getSprite(field1799, this.field1798, 0); // L: 150
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1798); // L: 151
+				var1 = class6.SpriteBuffer_getSprite(field1939, this.field1937, 0); // L: 150
+				if (var1 != null) { // L: 151
+					HitSplatDefinition_cachedFonts.put(var1, (long)this.field1937);
 				}
 
 				return var1; // L: 153
@@ -347,22 +349,22 @@ public SpritePixels method3258() {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(B)Low;",
-		garbageValue = "64"
+		descriptor = "(I)Lpl;",
+		garbageValue = "-2015320605"
 	)
-	public SpritePixels method3281() {
-		if (this.field1811 < 0) { // L: 157
+	public SpritePixels method3454() {
+		if (this.field1938 < 0) { // L: 157
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1811); // L: 158
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1938); // L: 158
 			if (var1 != null) {
 				return var1; // L: 159
 			} else {
-				var1 = WorldMapSection0.SpriteBuffer_getSprite(field1799, this.field1811, 0); // L: 160
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1811); // L: 161
+				var1 = class6.SpriteBuffer_getSprite(field1939, this.field1938, 0); // L: 160
+				if (var1 != null) { // L: 161
+					HitSplatDefinition_cachedFonts.put(var1, (long)this.field1938);
 				}
 
 				return var1; // L: 163
@@ -370,25 +372,25 @@ public SpritePixels method3281() {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lle;",
-		garbageValue = "-1825391526"
+		descriptor = "(I)Llx;",
+		garbageValue = "-526352952"
 	)
 	@Export("getFont")
 	public Font getFont() {
 		if (this.fontId == -1) { // L: 167
 			return null;
 		} else {
-			Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 168
+			Font var1 = (Font)HealthBarDefinition_cached.get((long)this.fontId); // L: 168
 			if (var1 != null) { // L: 169
 				return var1;
 			} else {
-				AbstractArchive var3 = field1799; // L: 171
+				AbstractArchive var3 = field1939; // L: 171
 				AbstractArchive var4 = HitSplatDefinition_fontsArchive; // L: 172
 				int var5 = this.fontId; // L: 173
 				Font var2;
-				if (!BuddyRankComparator.method2502(var3, var5, 0)) { // L: 175
+				if (!class147.method3009(var3, var5, 0)) { // L: 175
 					var2 = null; // L: 176
 				} else {
 					byte[] var7 = var4.takeFile(var5, 0); // L: 180
@@ -396,8 +398,8 @@ public Font getFont() {
 					if (var7 == null) { // L: 182
 						var6 = null; // L: 183
 					} else {
-						Font var8 = new Font(var7, class414.SpriteBuffer_xOffsets, class414.SpriteBuffer_yOffsets, UrlRequester.SpriteBuffer_spriteWidths, class414.SpriteBuffer_spriteHeights, SpriteBuffer_spritePalette, class295.SpriteBuffer_pixels); // L: 186
-						PacketBuffer.method6913(); // L: 187
+						Font var8 = new Font(var7, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); // L: 186
+						UserComparator3.method2529(); // L: 187
 						var6 = var8; // L: 188
 					}
 
@@ -405,7 +407,7 @@ public Font getFont() {
 				}
 
 				if (var2 != null) { // L: 193
-					HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
+					HealthBarDefinition_cached.put(var2, (long)this.fontId);
 				}
 
 				return var2; // L: 195
@@ -413,25 +415,112 @@ public Font getFont() {
 		}
 	}
 
-	@ObfuscatedName("kw")
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Liu;Lph;B)Liw;",
+		garbageValue = "4"
+	)
+	@Export("getPacketBufferNode")
+	public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) {
+		PacketBufferNode var2;
+		if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 24
+			var2 = new PacketBufferNode(); // L: 25
+		} else {
+			var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 28
+		}
+
+		var2.clientPacket = var0; // L: 31
+		var2.clientPacketLength = var0.length; // L: 32
+		if (var2.clientPacketLength == -1) {
+			var2.packetBuffer = new PacketBuffer(260); // L: 33
+		} else if (var2.clientPacketLength == -2) { // L: 34
+			var2.packetBuffer = new PacketBuffer(10000);
+		} else if (var2.clientPacketLength <= 18) {
+			var2.packetBuffer = new PacketBuffer(20); // L: 35
+		} else if (var2.clientPacketLength <= 98) { // L: 36
+			var2.packetBuffer = new PacketBuffer(100);
+		} else {
+			var2.packetBuffer = new PacketBuffer(260); // L: 37
+		}
+
+		var2.packetBuffer.setIsaacCipher(var1); // L: 38
+		var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 39
+		var2.index = 0; // L: 40
+		return var2; // L: 41
+	}
+
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "28"
-	)
-	static final void method3267(int var0, int var1) {
-		ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : class115.guestClanChannel; // L: 11828
-		if (var2 != null && var1 >= 0 && var1 < var2.method2809()) { // L: 11829
-			ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 11830
-			if (var3.rank == -1) {
-				String var4 = var3.username.getName(); // L: 11832
-				PacketWriter var5 = Client.packetWriter; // L: 11833
-				PacketBufferNode var6 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2750, var5.isaacCipher); // L: 11834
-				var6.packetBuffer.writeByte(3 + Client.stringCp1252NullTerminatedByteSize(var4)); // L: 11835
-				var6.packetBuffer.writeByte(var0); // L: 11836
-				var6.packetBuffer.writeShort(var1); // L: 11837
-				var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11838
-				var5.addNode(var6); // L: 11839
+		descriptor = "(Ljava/lang/CharSequence;II[BIB)I",
+		garbageValue = "77"
+	)
+	@Export("encodeStringCp1252")
+	public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
+		int var5 = var2 - var1; // L: 115
+
+		for (int var6 = 0; var6 < var5; ++var6) { // L: 116
+			char var7 = var0.charAt(var6 + var1); // L: 117
+			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 118
+				var3[var6 + var4] = (byte)var7;
+			} else if (var7 == 8364) { // L: 119
+				var3[var6 + var4] = -128;
+			} else if (var7 == 8218) { // L: 120
+				var3[var6 + var4] = -126;
+			} else if (var7 == 402) { // L: 121
+				var3[var6 + var4] = -125;
+			} else if (var7 == 8222) { // L: 122
+				var3[var6 + var4] = -124;
+			} else if (var7 == 8230) { // L: 123
+				var3[var6 + var4] = -123;
+			} else if (var7 == 8224) { // L: 124
+				var3[var6 + var4] = -122;
+			} else if (var7 == 8225) { // L: 125
+				var3[var6 + var4] = -121;
+			} else if (var7 == 710) { // L: 126
+				var3[var6 + var4] = -120;
+			} else if (var7 == 8240) { // L: 127
+				var3[var6 + var4] = -119;
+			} else if (var7 == 352) { // L: 128
+				var3[var6 + var4] = -118;
+			} else if (var7 == 8249) { // L: 129
+				var3[var6 + var4] = -117;
+			} else if (var7 == 338) { // L: 130
+				var3[var6 + var4] = -116;
+			} else if (var7 == 381) { // L: 131
+				var3[var6 + var4] = -114;
+			} else if (var7 == 8216) { // L: 132
+				var3[var6 + var4] = -111;
+			} else if (var7 == 8217) { // L: 133
+				var3[var6 + var4] = -110;
+			} else if (var7 == 8220) { // L: 134
+				var3[var6 + var4] = -109;
+			} else if (var7 == 8221) { // L: 135
+				var3[var6 + var4] = -108;
+			} else if (var7 == 8226) { // L: 136
+				var3[var6 + var4] = -107;
+			} else if (var7 == 8211) { // L: 137
+				var3[var6 + var4] = -106;
+			} else if (var7 == 8212) {
+				var3[var6 + var4] = -105; // L: 138
+			} else if (var7 == 732) { // L: 139
+				var3[var6 + var4] = -104;
+			} else if (var7 == 8482) { // L: 140
+				var3[var6 + var4] = -103;
+			} else if (var7 == 353) { // L: 141
+				var3[var6 + var4] = -102;
+			} else if (var7 == 8250) { // L: 142
+				var3[var6 + var4] = -101;
+			} else if (var7 == 339) { // L: 143
+				var3[var6 + var4] = -100;
+			} else if (var7 == 382) { // L: 144
+				var3[var6 + var4] = -98;
+			} else if (var7 == 376) { // L: 145
+				var3[var6 + var4] = -97;
+			} else {
+				var3[var6 + var4] = 63; // L: 146
 			}
 		}
-	} // L: 11831 11840
+
+		return var5; // L: 148
+	}
 }
diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java
index 40b893ecd3..77d33549ed 100644
--- a/runescape-client/src/main/java/HorizontalAlignment.java
+++ b/runescape-client/src/main/java/HorizontalAlignment.java
@@ -1,136 +1,132 @@
-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("fj")
+@ObfuscatedName("fc")
 @Implements("HorizontalAlignment")
 public enum HorizontalAlignment implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lfj;"
+		descriptor = "Lfc;"
 	)
-	field1699(0, 0),
-	@ObfuscatedName("w")
+	field1829(0, 0),
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lfj;"
+		descriptor = "Lfc;"
 	)
 	@Export("HorizontalAlignment_centered")
-	HorizontalAlignment_centered(1, 1),
-	@ObfuscatedName("s")
+	HorizontalAlignment_centered(2, 1),
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lfj;"
+		descriptor = "Lfc;"
 	)
-	field1694(2, 2);
+	field1826(1, 2);
 
-	@ObfuscatedName("ea")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Lcf;"
 	)
-	@Export("archive7")
-	static Archive archive7;
-	@ObfuscatedName("a")
+	@Export("World_request")
+	static UrlRequest World_request;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1219094331
+		intValue = -947111311
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 423871977
+		intValue = -968745241
 	)
 	@Export("id")
 	final int id;
 
 	HorizontalAlignment(int var3, int var4) {
-		this.value = var3; // L: 14
-		this.id = var4; // L: 15
-	} // L: 16
+		this.value = var3; // L: 18
+		this.id = var4; // L: 19
+	} // L: 20
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 19
+		return this.id; // L: 24
 	}
 
-	@ObfuscatedName("i")
-	public static String method3113(long var0) {
-		Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 31
-		int var2 = Calendar.Calendar_calendar.get(7); // L: 32
-		int var3 = Calendar.Calendar_calendar.get(5); // L: 33
-		int var4 = Calendar.Calendar_calendar.get(2); // L: 34
-		int var5 = Calendar.Calendar_calendar.get(1); // L: 35
-		int var6 = Calendar.Calendar_calendar.get(11); // L: 36
-		int var7 = Calendar.Calendar_calendar.get(12); // L: 37
-		int var8 = Calendar.Calendar_calendar.get(13); // L: 38
-		return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; // L: 39
-	}
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-1221922061"
-	)
-	public static boolean method3114(int var0) {
-		return (var0 >> 28 & 1) != 0; // L: 25
-	}
-
-	@ObfuscatedName("gl")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1099417797"
+		descriptor = "(Lpj;B)V",
+		garbageValue = "13"
 	)
-	@Export("setWindowedMode")
-	static void setWindowedMode(int var0) {
-		Client.field687 = 0L; // L: 4556
-		if (var0 >= 2) { // L: 4557
-			Client.isResizable = true;
-		} else {
-			Client.isResizable = false; // L: 4558
+	@Export("updatePlayer")
+	static final void updatePlayer(PacketBuffer var0) {
+		var0.importIndex(); // L: 37
+		int var1 = Client.localPlayerIndex; // L: 38
+		Player var2 = class340.localPlayer = Client.players[var1] = new Player(); // L: 39
+		var2.index = var1; // L: 40
+		int var3 = var0.readBits(30); // L: 41
+		byte var4 = (byte)(var3 >> 28); // L: 42
+		int var5 = var3 >> 14 & 16383; // L: 43
+		int var6 = var3 & 16383; // L: 44
+		var2.pathX[0] = var5 - class131.baseX; // L: 45
+		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46
+		var2.pathY[0] = var6 - TileItem.baseY; // L: 47
+		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48
+		class20.Client_plane = var2.plane = var4; // L: 49
+		if (Players.field1248[var1] != null) { // L: 50
+			var2.read(Players.field1248[var1]);
 		}
 
-		if (class134.getWindowedMode() == 1) { // L: 4559
-			ArchiveLoader.client.setMaxCanvasSize(765, 503); // L: 4560
-		} else {
-			ArchiveLoader.client.setMaxCanvasSize(7680, 2160); // L: 4563
-		}
+		Players.Players_count = 0; // L: 51
+		Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52
+		Players.field1243[var1] = 0; // L: 53
+		Players.Players_emptyIdxCount = 0; // L: 54
 
-		if (Client.gameState >= 25) { // L: 4565
-			Frames.method4481();
+		for (int var7 = 1; var7 < 2048; ++var7) { // L: 55
+			if (var1 != var7) { // L: 56
+				int var8 = var0.readBits(18); // L: 57
+				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.field1243[var7] = 0; // L: 65
+			}
 		}
 
-	} // L: 4566
+		var0.exportIndex(); // L: 67
+	} // L: 68
 
-	@ObfuscatedName("iy")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIII)V",
-		garbageValue = "1045618476"
+		descriptor = "(Ljava/lang/Float;Ljava/lang/Float;I)V",
+		garbageValue = "-2046579641"
 	)
-	@Export("drawWidgets")
-	static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		if (class174.loadInterface(var0)) { // L: 9676
-			NPC.field1207 = null; // L: 9683
-			class28.drawInterface(WorldMapSection1.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9684
-			if (NPC.field1207 != null) { // L: 9685
-				class28.drawInterface(NPC.field1207, -1412584499, var1, var2, var3, var4, Varcs.field1263, class150.field1604, var7); // L: 9686
-				NPC.field1207 = null; // L: 9687
-			}
-
-		} else {
-			if (var7 != -1) { // L: 9677
-				Client.field594[var7] = true;
+	static void method3294(Float var0, Float var1) {
+		if (var0 + class112.field1361 < 1.3333334F) { // L: 314
+			float var2 = var0 - 2.0F; // L: 315
+			float var3 = var0 - 1.0F; // L: 316
+			float var4 = (float)Math.sqrt((double)(var2 * var2 - 4.0F * var3 * var3)); // L: 317
+			float var5 = (var4 + -var2) * 0.5F; // L: 318
+			if (var1 + class112.field1361 > var5) { // L: 319
+				var1 = var5 - class112.field1361; // L: 320
 			} else {
-				for (int var8 = 0; var8 < 100; ++var8) { // L: 9679
-					Client.field594[var8] = true;
+				var5 = 0.5F * (-var2 - var4); // L: 323
+				if (var1 < class112.field1361 + var5) { // L: 324
+					var1 = class112.field1361 + var5; // L: 325
 				}
 			}
-
+		} else {
+			var0 = 1.3333334F - class112.field1361; // L: 330
+			var1 = 0.33333334F - class112.field1361; // L: 331
 		}
-	} // L: 9681 9689
+
+	} // L: 333
 }
diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java
index 6922a0f395..85160a7150 100644
--- a/runescape-client/src/main/java/Huffman.java
+++ b/runescape-client/src/main/java/Huffman.java
@@ -1,18 +1,28 @@
+import java.io.File;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jy")
+@ObfuscatedName("jv")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("i")
+	@ObfuscatedName("m")
+	@Export("JagexCache_locationFile")
+	public static File JagexCache_locationFile;
+	@ObfuscatedName("bl")
+	@ObfuscatedGetter(
+		intValue = 1568185021
+	)
+	static int field3152;
+	@ObfuscatedName("c")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("keys")
 	int[] keys;
 
@@ -41,7 +51,7 @@ public Huffman(byte[] var1) {
 
 					for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25
 						var11 = var3[var10]; // L: 26
-						if (var11 != var8) { // L: 27
+						if (var8 != var11) { // L: 27
 							break;
 						}
 
@@ -99,10 +109,10 @@ public Huffman(byte[] var1) {
 
 	} // L: 60
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([BII[BIB)I",
-		garbageValue = "-41"
+		descriptor = "([BII[BII)I",
+		garbageValue = "1986002175"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -150,10 +160,10 @@ int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
 		return (var7 + 7 >> 3) - var5; // L: 97
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "([BI[BIII)I",
-		garbageValue = "133362978"
+		descriptor = "([BI[BIIB)I",
+		garbageValue = "67"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java
index 9a24286b30..f07b67257e 100644
--- a/runescape-client/src/main/java/IgnoreList.java
+++ b/runescape-client/src/main/java/IgnoreList.java
@@ -1,90 +1,148 @@
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lr")
+@ObfuscatedName("mq")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lni;)V"
+		descriptor = "(Low;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400); // L: 13
 		this.loginType = var1; // L: 14
 	} // L: 15
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lla;",
-		garbageValue = "-450730044"
+		descriptor = "(B)Lmv;",
+		garbageValue = "2"
 	)
 	@Export("newInstance")
 	User newInstance() {
-		return new Ignored(); // L: 18
+		return new Ignored(); // L: 19
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[Lla;",
-		garbageValue = "91"
+		descriptor = "(II)[Lmv;",
+		garbageValue = "-813912346"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
-		return new Ignored[var1]; // L: 22
+		return new Ignored[var1]; // L: 24
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;IB)V",
-		garbageValue = "-32"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-2139408560"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
 		while (true) {
-			if (var1.offset < var2) { // L: 26
-				int var3 = var1.readUnsignedByte(); // L: 27
-				boolean var4 = (var3 & 1) == 1; // L: 28
-				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 29
-				Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 30
-				var1.readStringCp1252NullTerminated(); // L: 31
-				if (var5 != null && var5.hasCleanName()) { // L: 32
-					Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 33
-					if (var4) { // L: 34
-						Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 35
-						if (var8 != null && var8 != var7) { // L: 36
-							if (var7 != null) { // L: 37
-								this.remove(var8); // L: 38
+			if (var1.offset < var2) { // L: 28
+				int var3 = var1.readUnsignedByte(); // L: 29
+				boolean var4 = (var3 & 1) == 1; // L: 30
+				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 31
+				Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 32
+				var1.readStringCp1252NullTerminated(); // L: 33
+				if (var5 != null && var5.hasCleanName()) { // L: 34
+					Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 35
+					if (var4) { // L: 36
+						Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 37
+						if (var8 != null && var8 != var7) { // L: 38
+							if (var7 != null) { // L: 39
+								this.remove(var8); // L: 40
 							} else {
-								var7 = var8; // L: 41
+								var7 = var8; // L: 43
 							}
 						}
 					}
 
-					if (var7 != null) { // L: 45
-						this.changeName(var7, var5, var6); // L: 46
+					if (var7 != null) { // L: 47
+						this.changeName(var7, var5, var6); // L: 48
 						continue;
 					}
 
-					if (this.getSize() < 400) { // L: 48
-						int var9 = this.getSize(); // L: 49
-						var7 = (Ignored)this.addLast(var5, var6); // L: 50
-						var7.id = var9; // L: 51
+					if (this.getSize() < 400) { // L: 50
+						int var9 = this.getSize(); // L: 51
+						var7 = (Ignored)this.addLast(var5, var6); // L: 52
+						var7.id = var9; // L: 53
 					}
 					continue;
 				}
 
-				throw new IllegalStateException(); // L: 54
+				throw new IllegalStateException(); // L: 56
 			}
 
-			return; // L: 55
+			return; // L: 57
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Throwable;B)Ljava/lang/String;",
+		garbageValue = "111"
+	)
+	static String method6267(Throwable var0) throws IOException {
+		String var1;
+		if (var0 instanceof RunException) { // L: 67
+			RunException var2 = (RunException)var0; // L: 68
+			var1 = var2.message + " | "; // L: 69
+			var0 = var2.throwable; // L: 70
+		} else {
+			var1 = ""; // L: 72
+		}
+
+		StringWriter var12 = new StringWriter(); // L: 73
+		PrintWriter var3 = new PrintWriter(var12); // L: 74
+		var0.printStackTrace(var3); // L: 75
+		var3.close(); // L: 76
+		String var4 = var12.toString(); // L: 77
+		BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 78
+		String var6 = var5.readLine(); // L: 79
+
+		while (true) {
+			while (true) {
+				String var7 = var5.readLine(); // L: 81
+				if (var7 == null) { // L: 82
+					var1 = var1 + "| " + var6; // L: 100
+					return var1; // L: 101
+				}
+
+				int var8 = var7.indexOf(40); // L: 83
+				int var9 = var7.indexOf(41, var8 + 1); // L: 84
+				if (var8 >= 0 && var9 >= 0) { // L: 85
+					String var10 = var7.substring(var8 + 1, var9); // L: 86
+					int var11 = var10.indexOf(".java:"); // L: 87
+					if (var11 >= 0) { // L: 88
+						var10 = var10.substring(0, var11) + var10.substring(var11 + 5); // L: 89
+						var1 = var1 + var10 + ' '; // L: 90
+						continue; // L: 91
+					}
+
+					var7 = var7.substring(0, var8); // L: 93
+				}
+
+				var7 = var7.trim(); // L: 95
+				var7 = var7.substring(var7.lastIndexOf(32) + 1); // L: 96
+				var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97
+				var1 = var1 + var7 + ' '; // L: 98
+			}
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java
index 7980b8b260..71d4f6219b 100644
--- a/runescape-client/src/main/java/Ignored.java
+++ b/runescape-client/src/main/java/Ignored.java
@@ -4,12 +4,18 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mm")
+@ObfuscatedName("mi")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("i")
+	@ObfuscatedName("pz")
+	@ObfuscatedSignature(
+		descriptor = "Loo;"
+	)
+	@Export("HitSplatDefinition_cached")
+	static class404 HitSplatDefinition_cached;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -781927569
+		intValue = 1285120553
 	)
 	@Export("id")
 	int id;
@@ -17,20 +23,20 @@ public class Ignored extends User {
 	Ignored() {
 	} // L: 6
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmm;I)I",
-		garbageValue = "867220542"
+		descriptor = "(Lmi;B)I",
+		garbageValue = "109"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id; // L: 9
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;I)I",
-		garbageValue = "-1073614160"
+		descriptor = "(Lmv;I)I",
+		garbageValue = "-1921032172"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -41,22 +47,18 @@ public int compareTo(Object var1) {
 		return this.compareTo_ignored((Ignored)var1); // L: 17
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)[Lom;",
-		garbageValue = "1673389223"
+		descriptor = "(I)J",
+		garbageValue = "-376840192"
 	)
-	@Export("FillMode_values")
-	public static FillMode[] FillMode_values() {
-		return new FillMode[]{FillMode.field4378, FillMode.field4377, FillMode.SOLID}; // L: 15
-	}
+	public static final synchronized long method6459() {
+		long var0 = System.currentTimeMillis(); // L: 14
+		if (var0 < class415.field4466) { // L: 15
+			class415.field4467 += class415.field4466 - var0; // L: 16
+		}
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "-1749194740"
-	)
-	static final boolean method6212(char var0) {
-		return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 28
+		class415.field4466 = var0; // L: 18
+		return var0 + class415.field4467; // L: 19
 	}
 }
diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java
index e58b68cf75..f3f246ad53 100644
--- a/runescape-client/src/main/java/IndexedSprite.java
+++ b/runescape-client/src/main/java/IndexedSprite.java
@@ -2,38 +2,35 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("oe")
+@ObfuscatedName("pa")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("height")
 	public int height;
 
-	IndexedSprite() {
-	} // L: 15
-
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("normalize")
 	public void normalize() {
 		if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18
@@ -54,7 +51,7 @@ public void normalize() {
 		}
 	} // L: 31
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("shiftColors")
 	public void shiftColors(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34
@@ -87,7 +84,7 @@ public void shiftColors(int var1, int var2, int var3) {
 
 	} // L: 49
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset; // L: 52
@@ -133,8 +130,8 @@ public void drawAt(int var1, int var2) {
 		}
 	} // L: 85
 
-	@ObfuscatedName("o")
-	public void method7362(int var1, int var2, int var3, int var4) {
+	@ObfuscatedName("t")
+	public void method7732(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
@@ -195,7 +192,7 @@ public void method7362(int var1, int var2, int var3, int var4) {
 		IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157
 	} // L: 158
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@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
@@ -249,7 +246,7 @@ static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int
 
 	} // L: 113
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@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
diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java
index eb9164a733..f5c1d2eb45 100644
--- a/runescape-client/src/main/java/Instrument.java
+++ b/runescape-client/src/main/java/Instrument.java
@@ -4,112 +4,112 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bg")
+@ObfuscatedName("ba")
 @Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lab;"
+		descriptor = "Lag;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lab;"
+		descriptor = "Lag;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lab;"
+		descriptor = "Lag;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lab;"
+		descriptor = "Lag;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lab;"
+		descriptor = "Lag;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lab;"
+		descriptor = "Lag;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lab;"
+		descriptor = "Lag;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lab;"
+		descriptor = "Lag;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("delayTime")
 	int delayTime;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lay;"
+		descriptor = "Lbd;"
 	)
 	@Export("filter")
 	AudioFilter filter;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lab;"
+		descriptor = "Lag;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("duration")
 	int duration;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("offset")
 	int offset;
 
@@ -146,10 +146,10 @@ public class Instrument {
 		this.offset = 0; // L: 25
 	} // L: 50
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
-		class321.clearIntArray(Instrument_samples, 0, var1); // L: 53
+		class333.clearIntArray(Instrument_samples, 0, var1); // L: 53
 		if (var2 < 10) { // L: 54
 			return Instrument_samples;
 		} else {
@@ -289,6 +289,7 @@ final int[] synthesize(int var1, int var2) {
 						++var14; // L: 139
 					}
 
+					boolean var21 = true; // L: 146
 					var15 = 128; // L: 147
 
 					while (true) {
@@ -353,7 +354,7 @@ final int[] synthesize(int var1, int var2) {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) { // L: 179
@@ -367,9 +368,9 @@ final int evaluateWave(int var1, int var2, int var3) {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	@Export("decode")
 	final void decode(Buffer var1) {
@@ -421,6 +422,6 @@ final void decode(Buffer var1) {
 		this.offset = var1.readUnsignedShort(); // L: 228
 		this.filter = new AudioFilter(); // L: 229
 		this.filterEnvelope = new SoundEnvelope(); // L: 230
-		this.filter.method1082(var1, this.filterEnvelope); // L: 231
+		this.filter.method1089(var1, this.filterEnvelope); // L: 231
 	} // L: 232
 }
diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java
index 9345f5f0be..bddeff669f 100644
--- a/runescape-client/src/main/java/IntHashTable.java
+++ b/runescape-client/src/main/java/IntHashTable.java
@@ -3,10 +3,10 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("pp")
+@ObfuscatedName("pu")
 @Implements("IntHashTable")
 public class IntHashTable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("array")
 	int[] array;
 
@@ -32,10 +32,10 @@ public IntHashTable(int[] var1) {
 
 	} // L: 17
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "4"
+		descriptor = "(IS)I",
+		garbageValue = "-5758"
 	)
 	@Export("get")
 	public int get(int var1) {
diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java
index c3e0f2d706..641f616265 100644
--- a/runescape-client/src/main/java/IntegerNode.java
+++ b/runescape-client/src/main/java/IntegerNode.java
@@ -2,10 +2,10 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("nl")
+@ObfuscatedName("nj")
 @Implements("IntegerNode")
 public class IntegerNode extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("integer")
 	public int integer;
 
diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java
index 16f0e27462..3c962765c2 100644
--- a/runescape-client/src/main/java/InterfaceParent.java
+++ b/runescape-client/src/main/java/InterfaceParent.java
@@ -3,98 +3,104 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("cq")
+@ObfuscatedName("cl")
 @Implements("InterfaceParent")
 public class InterfaceParent extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -323406049
+		intValue = -1940404497
 	)
 	@Export("group")
 	int group;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -951908341
+		intValue = -1832869839
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("s")
-	boolean field1011;
+	@ObfuscatedName("p")
+	boolean field1014;
 
 	InterfaceParent() {
-		this.field1011 = false; // L: 8
+		this.field1014 = false; // L: 8
 	} // L: 10
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZS)I",
-		garbageValue = "16109"
+		descriptor = "(Lku;I)V",
+		garbageValue = "-1043204065"
 	)
-	static int method2079(int var0, Script var1, boolean var2) {
-		Widget var7;
-		if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1224
-			int var4;
-			if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1241
-				var7 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1242
-				var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1243
-				if (var4 >= 1 && var4 <= 10) { // L: 1244
-					class92 var8 = new class92(var4, var7.id, var7.childIndex, var7.itemId); // L: 1247
-					Interpreter.field797.add(var8); // L: 1248
-					return 1; // L: 1249
-				} else {
-					throw new RuntimeException(); // L: 1245
-				}
-			} else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1251
-				class14.Interpreter_intStackSize -= 3; // L: 1252
-				int var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1253
-				var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1254
-				int var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 1255
-				if (var5 >= 1 && var5 <= 10) { // L: 1256
-					class92 var6 = new class92(var5, var3, var4, UserComparator9.getWidget(var3).itemId); // L: 1259
-					Interpreter.field797.add(var6); // L: 1260
-					return 1; // L: 1261
-				} else {
-					throw new RuntimeException(); // L: 1257
-				}
-			} else {
-				return 2; // L: 1263
-			}
-		} else if (Interpreter.field798 >= 10) { // L: 1225
-			throw new RuntimeException(); // L: 1226
+	public static void method2145(AbstractArchive var0) {
+		ParamComposition.ParamDefinition_archive = var0; // L: 21
+	} // L: 22
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lfl;",
+		garbageValue = "-64"
+	)
+	public static FloorUnderlayDefinition method2144(int var0) {
+		FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 25
+		if (var1 != null) { // L: 26
+			return var1;
 		} else {
-			if (var0 >= 2000) { // L: 1229
-				var7 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1230
-			} else {
-				var7 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1232
+			byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 27
+			var1 = new FloorUnderlayDefinition(); // L: 28
+			if (var2 != null) { // L: 29
+				var1.decode(new Buffer(var2), var0);
 			}
 
-			if (var7.onResize == null) { // L: 1233
-				return 0;
-			} else {
-				ScriptEvent var9 = new ScriptEvent(); // L: 1234
-				var9.widget = var7; // L: 1235
-				var9.args = var7.onResize; // L: 1236
-				var9.field1024 = Interpreter.field798 + 1; // L: 1237
-				Client.scriptEvents.addFirst(var9); // L: 1238
-				return 1; // L: 1239
-			}
+			var1.postDecode(); // L: 30
+			FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 31
+			return var1; // L: 32
 		}
 	}
 
-	@ObfuscatedName("jg")
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1442239396"
+	)
+	public static void method2143() {
+		SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 122
+		SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 123
+	} // L: 124
+
+	@ObfuscatedName("kw")
+	static final void method2142(double var0) {
+		Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 12121
+		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 12122
+		VerticalAlignment.method3338(); // L: 12123
+		SecureRandomFuture.clientPreferences.brightness = var0; // L: 12124
+		class127.savePreferences(); // L: 12125
+	} // L: 12126
+
+	@ObfuscatedName("lx")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-1428422935"
+		descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;",
+		garbageValue = "-2059094026"
 	)
-	static boolean method2080(int var0) {
-		for (int var1 = 0; var1 < Client.field695; ++var1) { // L: 11114
-			if (Client.field697[var1] == var0) { // L: 11115
-				return true;
-			}
+	static String method2146(String var0, boolean var1) {
+		String var2 = var1 ? "https://" : "http://"; // L: 12589
+		if (Client.gameBuild == 1) { // L: 12590
+			var0 = var0 + "-wtrc";
+		} else if (Client.gameBuild == 2) { // L: 12591
+			var0 = var0 + "-wtqa";
+		} else if (Client.gameBuild == 3) { // L: 12592
+			var0 = var0 + "-wtwip";
+		} else if (Client.gameBuild == 5) { // L: 12593
+			var0 = var0 + "-wti";
+		} else if (Client.gameBuild == 4) { // L: 12594
+			var0 = "local";
+		}
+
+		String var3 = ""; // L: 12595
+		if (class1.field3 != null) { // L: 12596
+			var3 = "/p=" + class1.field3;
 		}
 
-		return false; // L: 11117
+		String var4 = "runescape.com"; // L: 12597
+		return var2 + var0 + "." + var4 + "/l=" + ScriptFrame.clientLanguage + "/a=" + FriendLoginUpdate.field4096 + var3 + "/"; // L: 12598
 	}
 }
diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java
index 04542dec24..d74076fe1a 100644
--- a/runescape-client/src/main/java/Interpreter.java
+++ b/runescape-client/src/main/java/Interpreter.java
@@ -5,58 +5,63 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bj")
+@ObfuscatedName("bu")
 @Implements("Interpreter")
 public class Interpreter {
-	@ObfuscatedName("p")
+	@ObfuscatedName("tb")
+	@ObfuscatedSignature(
+		descriptor = "Lnn;"
+	)
+	@Export("platformInfo")
+	static PlatformInfo platformInfo;
+	@ObfuscatedName("w")
 	@Export("Interpreter_arrayLengths")
 	static int[] Interpreter_arrayLengths;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("Interpreter_arrays")
 	static int[][] Interpreter_arrays;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("Interpreter_intStack")
 	static int[] Interpreter_intStack;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("Interpreter_stringStack")
 	static String[] Interpreter_stringStack;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 137218349
+		intValue = -866718889
 	)
 	@Export("Interpreter_frameDepth")
 	static int Interpreter_frameDepth;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "[Lbt;"
+		descriptor = "[Lbg;"
 	)
 	@Export("Interpreter_frames")
 	static ScriptFrame[] Interpreter_frames;
-	@ObfuscatedName("r")
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 355212093
+	)
+	static int field812;
+	@ObfuscatedName("l")
 	@Export("Interpreter_calendar")
 	static java.util.Calendar Interpreter_calendar;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("Interpreter_MONTHS")
 	static final String[] Interpreter_MONTHS;
-	@ObfuscatedName("f")
-	static boolean field795;
-	@ObfuscatedName("h")
-	static boolean field791;
-	@ObfuscatedName("v")
-	static ArrayList field797;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("z")
+	static boolean field818;
+	@ObfuscatedName("i")
+	static boolean field816;
+	@ObfuscatedName("y")
+	static ArrayList field817;
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 519063965
-	)
-	static int field798;
-	@ObfuscatedName("am")
-	static final double field801;
-	@ObfuscatedName("cb")
-	@ObfuscatedSignature(
-		descriptor = "Lci;"
+		intValue = -1880353715
 	)
-	@Export("mouseRecorder")
-	static MouseRecorder mouseRecorder;
+	static int field815;
+	@ObfuscatedName("ax")
+	static final double field814;
 
 	static {
 		Interpreter_arrayLengths = new int[5]; // L: 77
@@ -67,51 +72,30 @@ public class Interpreter {
 		Interpreter_frames = new ScriptFrame[50]; // L: 84
 		Interpreter_calendar = java.util.Calendar.getInstance(); // L: 90
 		Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 93
-		field795 = false; // L: 96
-		field791 = false; // L: 97
-		field797 = new ArrayList(); // L: 98
-		field798 = 0; // L: 99
-		field801 = Math.log(2.0D); // L: 103
+		field818 = false; // L: 96
+		field816 = false; // L: 97
+		field817 = new ArrayList(); // L: 98
+		field815 = 0; // L: 99
+		field814 = Math.log(2.0D); // L: 103
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;IIIB)V",
-		garbageValue = "124"
+		descriptor = "(CLlf;B)I",
+		garbageValue = "-56"
 	)
-	@Export("Widget_setKeyRate")
-	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
-		if (var0.field3128 == null) { // L: 999
-			throw new RuntimeException(); // L: 1000
-		} else {
-			var0.field3128[var1] = var2; // L: 1002
-			var0.field3129[var1] = var3; // L: 1003
+	@Export("lowercaseChar")
+	static int lowercaseChar(char var0, Language var1) {
+		int var2 = var0 << 4; // L: 143
+		if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 144
+			var0 = Character.toLowerCase(var0); // L: 145
+			var2 = (var0 << 4) + 1; // L: 146
 		}
-	} // L: 1004
 
-	@ObfuscatedName("fv")
-	@ObfuscatedSignature(
-		descriptor = "(Lfm;IIII)V",
-		garbageValue = "-228411245"
-	)
-	static void method1872(SequenceDefinition var0, int var1, int var2, int var3) {
-		if (Client.soundEffectCount < 50 && class408.clientPreferences.areaSoundEffectsVolume != 0) { // L: 4049
-			if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 4050
-				int var4 = var0.soundEffects[var1]; // L: 4051
-				if (var4 != 0) { // L: 4052
-					int var5 = var4 >> 8; // L: 4053
-					int var6 = var4 >> 4 & 7; // L: 4054
-					int var7 = var4 & 15; // L: 4055
-					Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 4056
-					Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 4057
-					Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 4058
-					Client.soundEffects[Client.soundEffectCount] = null; // L: 4059
-					int var8 = (var2 - 64) / 128; // L: 4060
-					int var9 = (var3 - 64) / 128; // L: 4061
-					Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 4062
-					++Client.soundEffectCount; // L: 4063
-				}
-			}
+		if (var0 == 241 && var1 == Language.Language_ES) { // L: 148
+			var2 = 1762;
 		}
-	} // L: 4064
+
+		return var2; // L: 149
+	}
 }
diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java
index 1de99d9eb7..631636c783 100644
--- a/runescape-client/src/main/java/InvDefinition.java
+++ b/runescape-client/src/main/java/InvDefinition.java
@@ -3,32 +3,25 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ei")
+@ObfuscatedName("fu")
 @Implements("InvDefinition")
 public class InvDefinition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("InvDefinition_archive")
 	public static AbstractArchive InvDefinition_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("InvDefinition_cached")
 	static EvictingDualNodeHashTable InvDefinition_cached;
-	@ObfuscatedName("dv")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive0")
-	static Archive archive0;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1330627969
+		intValue = -1155784087
 	)
 	@Export("size")
 	public int size;
@@ -41,27 +34,27 @@ public class InvDefinition extends DualNode {
 		this.size = 0; // L: 12
 	} // L: 14
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "2084245360"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "607571940"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte();
-			if (var2 == 0) {
-				return;
+			int var2 = var1.readUnsignedByte(); // L: 28
+			if (var2 == 0) { // L: 29
+				return; // L: 32
 			}
 
-			this.decodeNext(var1, var2);
+			this.decodeNext(var1, var2); // L: 30
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "712504177"
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "1"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -71,137 +64,12 @@ void decodeNext(Buffer var1, int var2) {
 
 	} // L: 37
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lfu;",
-		garbageValue = "26"
-	)
-	public static FloorOverlayDefinition method2987(int var0) {
-		FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0);
-			var1 = new FloorOverlayDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2), var0);
-			}
-
-			var1.postDecode(); // L: 31
-			FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lbp;",
-		garbageValue = "92"
-	)
-	@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 = class14.archive12.takeFile(var0, 0); // L: 28
-			if (var2 == null) { // L: 29
-				return null; // L: 30
-			} else {
-				var1 = class87.newScript(var2); // L: 32
-				Script.Script_cached.put(var1, (long)var0); // L: 33
-				return var1; // L: 34
-			}
-		}
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1968764473"
-	)
-	static void method2983() {
-		WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 50
-	} // L: 51
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "([BI)V",
-		garbageValue = "-1702498175"
-	)
-	@Export("ByteArrayPool_release")
-	public static synchronized void ByteArrayPool_release(byte[] var0) {
-		if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field3881) { // L: 116
-			ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 117
-		} else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field3882) { // L: 120
-			ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 121
-		} else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field3883) { // L: 124
-			ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 125
-		} else if (var0.length == 30000 && ByteArrayPool.field3891 < ByteArrayPool.field3884) { // L: 128
-			ByteArrayPool.field3888[++ByteArrayPool.field3891 - 1] = var0; // L: 129
-		} else {
-			if (class260.ByteArrayPool_arrays != null) { // L: 132
-				for (int var1 = 0; var1 < class176.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 133
-					if (var0.length == class176.ByteArrayPool_alternativeSizes[var1] && ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1] < class260.ByteArrayPool_arrays[var1].length) { // L: 134
-						class260.ByteArrayPool_arrays[var1][ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 135
-						return; // L: 136
-					}
-				}
-			}
-
-		}
-	} // L: 118 122 126 130 140
-
-	@ObfuscatedName("az")
+	@ObfuscatedName("ir")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-1900021864"
+		descriptor = "(IB)Z",
+		garbageValue = "2"
 	)
-	static int method2982(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3582
-			class14.Interpreter_intStackSize -= 2; // L: 3583
-			var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3584
-			int var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3585
-			if (!Client.isCameraLocked) { // L: 3586
-				Client.camAngleX = var3; // L: 3587
-				Client.camAngleY = var4; // L: 3588
-			}
-
-			return 1; // L: 3590
-		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3592
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3593
-			return 1; // L: 3594
-		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3596
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3597
-			return 1; // L: 3598
-		} else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3600
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3601
-			if (var3 < 0) { // L: 3602
-				var3 = 0;
-			}
-
-			Client.camFollowHeight = var3; // L: 3603
-			return 1; // L: 3604
-		} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3606
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3607
-			return 1; // L: 3608
-		} else {
-			return 2; // L: 3610
-		}
+	static boolean method3157(int var0) {
+		return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 10084
 	}
-
-	@ObfuscatedName("ln")
-	@ObfuscatedSignature(
-		descriptor = "(IIIZI)V",
-		garbageValue = "-2065208815"
-	)
-	public static void method2986(int var0, int var1, int var2, boolean var3) {
-		PacketBufferNode var4 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2736, Client.packetWriter.isaacCipher); // L: 12003
-		var4.packetBuffer.method6962(var0); // L: 12004
-		var4.packetBuffer.method6962(var1); // L: 12005
-		var4.packetBuffer.method6993(var2); // L: 12006
-		var4.packetBuffer.writeIntME(var3 ? Client.field552 * -2052313535 * -1777671743 : 0); // L: 12007
-		Client.packetWriter.addNode(var4); // L: 12008
-	} // L: 12009
 }
diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java
index 572e58aad0..e60d199c12 100644
--- a/runescape-client/src/main/java/IsaacCipher.java
+++ b/runescape-client/src/main/java/IsaacCipher.java
@@ -4,36 +4,42 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("pw")
+@ObfuscatedName("ph")
 @Implements("IsaacCipher")
 public final class IsaacCipher {
-	@ObfuscatedName("a")
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -1397883931
+	)
+	@Export("Interpreter_intStackSize")
+	static int Interpreter_intStackSize;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1888133689
+		intValue = 660967561
 	)
 	@Export("valuesRemaining")
 	int valuesRemaining;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("results")
 	int[] results;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("mm")
 	int[] mm;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -382351509
+		intValue = -785981999
 	)
 	@Export("aa")
 	int aa;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 674154351
+		intValue = -1229000819
 	)
 	@Export("bb")
 	int bb;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -303333613
+		intValue = 318093059
 	)
 	@Export("cc")
 	int cc;
@@ -46,13 +52,13 @@ public IsaacCipher(int[] var1) {
 			this.results[var2] = var1[var2]; // L: 18
 		}
 
-		this.method7542(); // L: 20
+		this.method7875(); // L: 20
 	} // L: 21
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-2045035341"
+		descriptor = "(B)I",
+		garbageValue = "-100"
 	)
 	@Export("nextInt")
 	public final int nextInt() {
@@ -64,12 +70,12 @@ public final int nextInt() {
 		return this.results[--this.valuesRemaining]; // L: 28
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1844018191"
+		garbageValue = "-935102331"
 	)
-	public final int method7540() {
+	public final int method7874() {
 		if (this.valuesRemaining == 0) { // L: 32
 			this.generateMoreResults(); // L: 33
 			this.valuesRemaining = 256; // L: 34
@@ -78,10 +84,10 @@ public final int method7540() {
 		return this.results[this.valuesRemaining - 1]; // L: 36
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "935170894"
+		garbageValue = "-1893324431"
 	)
 	@Export("generateMoreResults")
 	final void generateMoreResults() {
@@ -101,20 +107,20 @@ final void generateMoreResults() {
 				this.aa ^= this.aa >>> 16; // L: 52
 			}
 
-			this.aa += this.mm[var1 + 128 & 255]; // L: 54
+			this.aa += this.mm[128 + var1 & 255]; // L: 54
 			int var3;
-			this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; // L: 55
+			this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; // L: 55
 			this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56
 		}
 
 	} // L: 58
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-448828417"
+		garbageValue = "1959628125"
 	)
-	final void method7542() {
+	final void method7875() {
 		int var9 = -1640531527; // L: 70
 		int var8 = -1640531527; // L: 71
 		int var7 = -1640531527; // L: 72
@@ -241,4 +247,14 @@ final void method7542() {
 		this.generateMoreResults(); // L: 188
 		this.valuesRemaining = 256; // L: 189
 	} // L: 190
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "-1565959328"
+	)
+	static int method7886(int var0, int var1) {
+		long var2 = (long)((var0 << 16) + var1); // L: 253
+		return class279.NetCache_currentResponse != null && class279.NetCache_currentResponse.key == var2 ? class149.NetCache_responseArchiveBuffer.offset * 99 / (class149.NetCache_responseArchiveBuffer.array.length - class279.NetCache_currentResponse.padding) + 1 : 0; // L: 254 255
+	}
 }
diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java
index 2fefc85073..49d366fcfd 100644
--- a/runescape-client/src/main/java/ItemComposition.java
+++ b/runescape-client/src/main/java/ItemComposition.java
@@ -1,282 +1,302 @@
-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;
 
-@ObfuscatedName("ff")
+@ObfuscatedName("fx")
 @Implements("ItemComposition")
 public class ItemComposition extends DualNode {
-	@ObfuscatedName("b")
+	@ObfuscatedName("si")
+	@ObfuscatedGetter(
+		intValue = -575992025
+	)
+	static int field2012;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("ItemDefinition_archive")
+	public static AbstractArchive ItemDefinition_archive;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("ItemDefinition_modelArchive")
+	public static AbstractArchive ItemDefinition_modelArchive;
+	@ObfuscatedName("w")
+	@Export("ItemDefinition_inMembersWorld")
+	public static boolean ItemDefinition_inMembersWorld;
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("ItemDefinition_cached")
-	static EvictingDualNodeHashTable ItemDefinition_cached;
-	@ObfuscatedName("x")
+	public static EvictingDualNodeHashTable ItemDefinition_cached;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("ItemDefinition_cachedModels")
-	static EvictingDualNodeHashTable ItemDefinition_cachedModels;
-	@ObfuscatedName("y")
+	public static EvictingDualNodeHashTable ItemDefinition_cachedModels;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("ItemDefinition_cachedSprites")
 	public static EvictingDualNodeHashTable ItemDefinition_cachedSprites;
-	@ObfuscatedName("hb")
-	@ObfuscatedGetter(
-		intValue = -1826630813
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "Llx;"
 	)
-	static int field1931;
-	@ObfuscatedName("t")
+	@Export("ItemDefinition_fontPlain11")
+	public static Font ItemDefinition_fontPlain11;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1753723685
+		intValue = 1056452933
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1325108261
+		intValue = 1122356155
 	)
 	@Export("model")
 	int model;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("recolorFrom")
 	public short[] recolorFrom;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("recolorTo")
 	public short[] recolorTo;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("retextureFrom")
 	public short[] retextureFrom;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("retextureTo")
 	public short[] retextureTo;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1547329069
+		intValue = -1612089485
 	)
 	@Export("zoom2d")
 	public int zoom2d;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -644956173
+		intValue = -445824849
 	)
 	@Export("xan2d")
 	public int xan2d;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -212256273
+		intValue = 1767659533
 	)
 	@Export("yan2d")
 	public int yan2d;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1823149965
+		intValue = 547197917
 	)
 	@Export("zan2d")
 	public int zan2d;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 494142303
+		intValue = -542264735
 	)
 	@Export("offsetX2d")
 	public int offsetX2d;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1457656139
+		intValue = 1748492179
 	)
 	@Export("offsetY2d")
 	public int offsetY2d;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 912207585
+		intValue = -1047812369
 	)
 	@Export("isStackable")
 	public int isStackable;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = -1708222131
+		intValue = 326872881
 	)
 	@Export("price")
 	public int price;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@Export("isMembersOnly")
 	public boolean isMembersOnly;
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@Export("groundActions")
 	public String[] groundActions;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@Export("inventoryActions")
 	public String[] inventoryActions;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = 185222303
+		intValue = 585263195
 	)
 	@Export("shiftClickIndex")
 	int shiftClickIndex;
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = 612677957
+		intValue = -1754702929
 	)
 	@Export("maleModel")
 	int maleModel;
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = -1733428819
+		intValue = -1229327453
 	)
 	@Export("maleModel1")
 	int maleModel1;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -1445773573
+		intValue = 1821904571
 	)
 	@Export("maleOffset")
 	int maleOffset;
 	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 2098654815
+		intValue = -566580505
 	)
 	@Export("femaleModel")
 	int femaleModel;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 535363813
+		intValue = 712412985
 	)
 	@Export("femaleModel1")
 	int femaleModel1;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = -1120928283
+		intValue = 1647130303
 	)
 	@Export("femaleOffset")
 	int femaleOffset;
 	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = -1786291667
+		intValue = 1243746565
 	)
 	@Export("maleModel2")
 	int maleModel2;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 1983865871
+		intValue = -406589007
 	)
 	@Export("femaleModel2")
 	int femaleModel2;
-	@ObfuscatedName("an")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = 1571654147
+		intValue = -877542961
 	)
 	@Export("maleHeadModel")
 	int maleHeadModel;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -1283309971
+		intValue = 1959608945
 	)
 	@Export("maleHeadModel2")
 	int maleHeadModel2;
-	@ObfuscatedName("av")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 185358531
+		intValue = 374790397
 	)
 	@Export("femaleHeadModel")
 	int femaleHeadModel;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -1890466531
+		intValue = -536039645
 	)
 	@Export("femaleHeadModel2")
 	int femaleHeadModel2;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ai")
 	@Export("countobj")
 	int[] countobj;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("aq")
 	@Export("countco")
 	int[] countco;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = 777424459
+		intValue = -1722248339
 	)
 	@Export("note")
 	public int note;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = 1728558393
+		intValue = 1407959301
 	)
 	@Export("noteTemplate")
 	public int noteTemplate;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 394985009
+		intValue = 1476022955
 	)
 	@Export("resizeX")
 	int resizeX;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -1569909587
+		intValue = 1443694429
 	)
 	@Export("resizeY")
 	int resizeY;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = -1225424617
+		intValue = -1861562583
 	)
 	@Export("resizeZ")
 	int resizeZ;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bp")
 	@ObfuscatedGetter(
-		intValue = 1533148773
+		intValue = -802891381
 	)
 	@Export("ambient")
 	public int ambient;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bd")
 	@ObfuscatedGetter(
-		intValue = -1062134429
+		intValue = -295235459
 	)
 	@Export("contrast")
 	public int contrast;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = 693327587
+		intValue = 321478069
 	)
 	@Export("team")
 	public int team;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Loz;"
 	)
 	@Export("params")
 	IterableNodeHashTable params;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bg")
 	@Export("isTradable")
 	public boolean isTradable;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = -404111403
+		intValue = -903292985
 	)
 	@Export("unnotedId")
 	int unnotedId;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = 1171307527
+		intValue = 872396697
 	)
 	@Export("notedId")
 	int notedId;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = -593718331
+		intValue = -727274909
 	)
 	@Export("placeholder")
 	public int placeholder;
 	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = -120370631
+		intValue = 1009467285
 	)
 	@Export("placeholderTemplate")
 	public int placeholderTemplate;
@@ -293,21 +313,21 @@ public class ItemComposition extends DualNode {
 		this.xan2d = 0; // L: 40
 		this.yan2d = 0; // L: 41
 		this.zan2d = 0; // L: 42
-		this.offsetX2d = 0;
-		this.offsetY2d = 0;
-		this.isStackable = 0;
-		this.price = 1;
-		this.isMembersOnly = false;
-		this.groundActions = new String[]{null, null, "Take", null, null};
+		this.offsetX2d = 0; // L: 43
+		this.offsetY2d = 0; // L: 44
+		this.isStackable = 0; // L: 45
+		this.price = 1; // L: 46
+		this.isMembersOnly = false; // L: 47
+		this.groundActions = new String[]{null, null, "Take", null, null}; // L: 48
 		this.inventoryActions = new String[]{null, null, null, null, "Drop"}; // L: 49
-		this.shiftClickIndex = -2;
-		this.maleModel = -1;
-		this.maleModel1 = -1;
-		this.maleOffset = 0;
-		this.femaleModel = -1;
+		this.shiftClickIndex = -2; // L: 51
+		this.maleModel = -1; // L: 52
+		this.maleModel1 = -1; // L: 53
+		this.maleOffset = 0; // L: 54
+		this.femaleModel = -1; // L: 55
 		this.femaleModel1 = -1; // L: 56
-		this.femaleOffset = 0;
-		this.maleModel2 = -1;
+		this.femaleOffset = 0; // L: 57
+		this.maleModel2 = -1; // L: 58
 		this.femaleModel2 = -1; // L: 59
 		this.maleHeadModel = -1; // L: 60
 		this.maleHeadModel2 = -1; // L: 61
@@ -328,19 +348,19 @@ public class ItemComposition extends DualNode {
 		this.placeholderTemplate = -1; // L: 79
 	} // L: 81
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-2124402734"
+		garbageValue = "220335721"
 	)
 	@Export("post")
 	void post() {
 	} // L: 121
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-894637983"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "-1454281188"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -354,10 +374,10 @@ void decode(Buffer var1) {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "257539679"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "614260145"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -480,16 +500,16 @@ void decodeNext(Buffer var1, int var2) {
 			} else if (var2 == 149) { // L: 217
 				this.placeholderTemplate = var1.readUnsignedShort();
 			} else if (var2 == 249) { // L: 218
-				this.params = class13.readStringIntParameters(var1, this.params);
+				this.params = Canvas.readStringIntParameters(var1, this.params);
 			}
 		}
 
 	} // L: 220
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lff;Lff;B)V",
-		garbageValue = "-19"
+		descriptor = "(Lfx;Lfx;I)V",
+		garbageValue = "1504318000"
 	)
 	@Export("genCert")
 	void genCert(ItemComposition var1, ItemComposition var2) {
@@ -499,8 +519,8 @@ void genCert(ItemComposition var1, ItemComposition var2) {
 		this.yan2d = var1.yan2d; // L: 226
 		this.zan2d = var1.zan2d; // L: 227
 		this.offsetX2d = var1.offsetX2d; // L: 228
-		this.offsetY2d = var1.offsetY2d;
-		this.recolorFrom = var1.recolorFrom;
+		this.offsetY2d = var1.offsetY2d; // L: 229
+		this.recolorFrom = var1.recolorFrom; // L: 230
 		this.recolorTo = var1.recolorTo; // L: 231
 		this.retextureFrom = var1.retextureFrom; // L: 232
 		this.retextureTo = var1.retextureTo; // L: 233
@@ -510,10 +530,10 @@ void genCert(ItemComposition var1, ItemComposition var2) {
 		this.isStackable = 1; // L: 237
 	} // L: 238
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lff;Lff;I)V",
-		garbageValue = "-2034384868"
+		descriptor = "(Lfx;Lfx;I)V",
+		garbageValue = "941791332"
 	)
 	@Export("genBought")
 	void genBought(ItemComposition var1, ItemComposition var2) {
@@ -554,10 +574,10 @@ void genBought(ItemComposition var1, ItemComposition var2) {
 		this.price = 0; // L: 270
 	} // L: 271
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lff;Lff;I)V",
-		garbageValue = "1014802643"
+		descriptor = "(Lfx;Lfx;B)V",
+		garbageValue = "-22"
 	)
 	@Export("genPlaceholder")
 	void genPlaceholder(ItemComposition var1, ItemComposition var2) {
@@ -579,10 +599,10 @@ void genPlaceholder(ItemComposition var1, ItemComposition var2) {
 		this.isTradable = false; // L: 289
 	} // L: 290
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lgk;",
-		garbageValue = "1329833901"
+		descriptor = "(IB)Lge;",
+		garbageValue = "-89"
 	)
 	@Export("getModelData")
 	public final ModelData getModelData(int var1) {
@@ -597,11 +617,11 @@ public final ModelData getModelData(int var1) {
 			}
 
 			if (var2 != -1) { // L: 298
-				return TaskHandler.ItemDefinition_get(var2).getModelData(1);
+				return UserComparator6.ItemDefinition_get(var2).getModelData(1);
 			}
 		}
 
-		ModelData var4 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, this.model, 0); // L: 300
+		ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 300
 		if (var4 == null) { // L: 301
 			return null;
 		} else {
@@ -625,33 +645,33 @@ public final ModelData getModelData(int var1) {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IS)Lhl;",
-		garbageValue = "-15441"
+		descriptor = "(II)Lgo;",
+		garbageValue = "679337016"
 	)
 	@Export("getModel")
 	public final Model getModel(int var1) {
-		if (this.countobj != null && var1 > 1) { // L: 317
+		if (this.countobj != null && var1 > 1) {
 			int var2 = -1; // L: 318
 
-			for (int var3 = 0; var3 < 10; ++var3) { // L: 319
-				if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 320
+			for (int var3 = 0; var3 < 10; ++var3) {
+				if (var1 >= this.countco[var3] && this.countco[var3] != 0) {
 					var2 = this.countobj[var3];
 				}
 			}
 
-			if (var2 != -1) { // L: 322
-				return TaskHandler.ItemDefinition_get(var2).getModel(1);
+			if (var2 != -1) {
+				return UserComparator6.ItemDefinition_get(var2).getModel(1);
 			}
 		}
 
-		Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 324
-		if (var5 != null) { // L: 325
+		Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id);
+		if (var5 != null) {
 			return var5;
 		} else {
-			ModelData var6 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, this.model, 0); // L: 326
-			if (var6 == null) { // L: 327
+			ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0);
+			if (var6 == null) {
 				return null;
 			} else {
 				if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 328
@@ -660,53 +680,53 @@ public final Model getModel(int var1) {
 
 				int var4;
 				if (this.recolorFrom != null) { // L: 329
-					for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 330
+					for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
 						var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 331
 					}
 				}
 
-				if (this.retextureFrom != null) { // L: 334
+				if (this.retextureFrom != null) {
 					for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 335
-						var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 336
+						var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
 					}
 				}
 
 				var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 339
 				var5.isSingleTile = true; // L: 340
-				ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 341
+				ItemDefinition_cachedModels.put(var5, (long)this.id);
 				return var5; // L: 342
 			}
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lff;",
-		garbageValue = "573530430"
+		descriptor = "(II)Lfx;",
+		garbageValue = "-1267487838"
 	)
 	@Export("getCountObj")
 	public ItemComposition getCountObj(int var1) {
 		if (this.countobj != null && var1 > 1) { // L: 346
 			int var2 = -1; // L: 347
 
-			for (int var3 = 0; var3 < 10; ++var3) { // L: 348
+			for (int var3 = 0; var3 < 10; ++var3) {
 				if (var1 >= this.countco[var3] && this.countco[var3] != 0) {
-					var2 = this.countobj[var3]; // L: 349
+					var2 = this.countobj[var3];
 				}
 			}
 
 			if (var2 != -1) { // L: 351
-				return TaskHandler.ItemDefinition_get(var2);
+				return UserComparator6.ItemDefinition_get(var2);
 			}
 		}
 
 		return this; // L: 353
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)Z",
-		garbageValue = "-1361856849"
+		descriptor = "(ZS)Z",
+		garbageValue = "-26274"
 	)
 	@Export("hasNoValidModel")
 	public final boolean hasNoValidModel(boolean var1) {
@@ -723,15 +743,15 @@ public final boolean hasNoValidModel(boolean var1) {
 			return true;
 		} else {
 			boolean var5 = true; // L: 447
-			if (!HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 448
+			if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 448
 				var5 = false;
 			}
 
-			if (var3 != -1 && !HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 449
+			if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 449
 				var5 = false;
 			}
 
-			if (var4 != -1 && !HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 450
+			if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 450
 				var5 = false;
 			}
 
@@ -739,12 +759,12 @@ public final boolean hasNoValidModel(boolean var1) {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)Lgk;",
-		garbageValue = "114"
+		descriptor = "(ZI)Lge;",
+		garbageValue = "2096791202"
 	)
-	public final ModelData method3397(boolean var1) {
+	public final ModelData method3554(boolean var1) {
 		int var2 = this.maleModel; // L: 455
 		int var3 = this.maleModel1; // L: 456
 		int var4 = this.maleModel2; // L: 457
@@ -757,11 +777,11 @@ public final ModelData method3397(boolean var1) {
 		if (var2 == -1) { // L: 463
 			return null;
 		} else {
-			ModelData var5 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var2, 0); // L: 464
+			ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 464
 			if (var3 != -1) { // L: 465
-				ModelData var6 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var3, 0); // L: 466
+				ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 466
 				if (var4 != -1) { // L: 467
-					ModelData var7 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var4, 0); // L: 468
+					ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); // L: 468
 					ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 469
 					var5 = new ModelData(var8, 3); // L: 470
 				} else {
@@ -795,12 +815,12 @@ public final ModelData method3397(boolean var1) {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)Z",
-		garbageValue = "-1905200886"
+		garbageValue = "-2121620855"
 	)
-	public final boolean method3342(boolean var1) {
+	public final boolean method3555(boolean var1) {
 		int var2 = this.maleHeadModel; // L: 493
 		int var3 = this.maleHeadModel2; // L: 494
 		if (var1) { // L: 495
@@ -812,11 +832,11 @@ public final boolean method3342(boolean var1) {
 			return true;
 		} else {
 			boolean var4 = true; // L: 500
-			if (!HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 501
+			if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 501
 				var4 = false;
 			}
 
-			if (var3 != -1 && !HealthBarDefinition.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 502
+			if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 502
 				var4 = false;
 			}
 
@@ -824,12 +844,12 @@ public final boolean method3342(boolean var1) {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)Lgk;",
-		garbageValue = "92"
+		descriptor = "(ZI)Lge;",
+		garbageValue = "1383399718"
 	)
-	public final ModelData method3409(boolean var1) {
+	public final ModelData method3601(boolean var1) {
 		int var2 = this.maleHeadModel; // L: 507
 		int var3 = this.maleHeadModel2; // L: 508
 		if (var1) { // L: 509
@@ -840,9 +860,9 @@ public final ModelData method3409(boolean var1) {
 		if (var2 == -1) { // L: 513
 			return null;
 		} else {
-			ModelData var4 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var2, 0); // L: 514
+			ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 514
 			if (var3 != -1) { // L: 515
-				ModelData var5 = ModelData.ModelData_get(HealthBarDefinition.ItemDefinition_modelArchive, var3, 0); // L: 516
+				ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 516
 				ModelData[] var6 = new ModelData[]{var4, var5}; // L: 517
 				var4 = new ModelData(var6, 2); // L: 518
 			}
@@ -864,36 +884,36 @@ public final ModelData method3409(boolean var1) {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "722910624"
+		descriptor = "(IIB)I",
+		garbageValue = "124"
 	)
 	@Export("getIntParam")
 	public int getIntParam(int var1, int var2) {
-		return NPC.method2251(this.params, var1, var2); // L: 534
+		return class12.method158(this.params, var1, var2); // L: 534
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "1720337072"
+		garbageValue = "1805428112"
 	)
 	@Export("getStringParam")
 	public String getStringParam(int var1, String var2) {
-		return VarbitComposition.method3205(this.params, var1, var2); // L: 538
+		return Skeleton.method3948(this.params, var1, var2); // L: 538
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-668917541"
+		descriptor = "(B)I",
+		garbageValue = "-18"
 	)
 	@Export("getShiftClickIndex")
 	public int getShiftClickIndex() {
 		if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 542
 			if (this.shiftClickIndex >= 0) { // L: 543
-				return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -1492002977 * 185222303 : -1;
+				return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 585263195 * 2111080403 : -1;
 			} else {
 				return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 544
 			}
@@ -902,118 +922,80 @@ public int getShiftClickIndex() {
 		}
 	}
 
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "87"
-	)
-	boolean method3368() {
-		return this.recolorTo != null; // L: 561
-	}
-
-	@ObfuscatedName("m")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "983299957"
+		garbageValue = "-1174152873"
 	)
-	boolean method3347() {
-		return this.retextureTo != null; // L: 565
+	boolean method3560() {
+		return this.recolorTo != null; // L: 563
 	}
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(II)Len;",
-		garbageValue = "1216305288"
-	)
-	@Export("WorldMapElement_get")
-	public static WorldMapElement WorldMapElement_get(int var0) {
-		return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0);
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "([I[II)V",
-		garbageValue = "1539024101"
-	)
-	public static void method3408(int[] var0, int[] var1) {
-		if (var0 != null && var1 != null) { // L: 43
-			class176.ByteArrayPool_alternativeSizes = var0; // L: 50
-			ByteArrayPool.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 51
-			class260.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 52
-
-			for (int var2 = 0; var2 < class176.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 53
-				class260.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 54
-				ByteArrayPool.field3890.add(var0[var2]); // L: 55
-			}
-
-			Collections.sort(ByteArrayPool.field3890); // L: 57
-		} else {
-			class176.ByteArrayPool_alternativeSizes = null; // L: 44
-			ByteArrayPool.ByteArrayPool_altSizeArrayCounts = null; // L: 45
-			class260.ByteArrayPool_arrays = null; // L: 46
-			class301.method5508(); // L: 47
-		}
-	} // L: 48 58
-
-	@ObfuscatedName("a")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;II)I",
-		garbageValue = "-1491033434"
+		descriptor = "(B)Z",
+		garbageValue = "-16"
 	)
-	public static int method3407(CharSequence var0, int var1) {
-		return AttackOption.method2304(var0, var1, true); // L: 80
+	boolean method3572() {
+		return this.retextureTo != null; // L: 567
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-76865797"
+		descriptor = "(III)Lbr;",
+		garbageValue = "483786104"
 	)
-	public static boolean method3403(int var0) {
-		return var0 >= 0 && var0 < 112 ? KeyHandler.field119[var0] : false; // L: 229 230
+	@Export("Messages_getByChannelAndID")
+	static Message Messages_getByChannelAndID(int var0, int var1) {
+		ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35
+		return var2.getMessage(var1); // L: 36
 	}
 
-	@ObfuscatedName("jm")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-1755655123"
-	)
-	@Export("runIntfCloseListeners")
-	static final void runIntfCloseListeners(int var0, int var1) {
-		if (class174.loadInterface(var0)) { // L: 11121
-			class150.runComponentCloseListeners(WorldMapSection1.Widget_interfaceComponents[var0], var1); // L: 11122
-		}
-	} // L: 11123
-
-	@ObfuscatedName("ja")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1815140573"
-	)
-	static void method3406() {
-		for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11283
-			int var1 = var0.group; // L: 11284
-			if (class174.loadInterface(var1)) { // L: 11285
-				boolean var2 = true; // L: 11286
-				Widget[] var3 = WorldMapSection1.Widget_interfaceComponents[var1]; // L: 11287
-
-				int var4;
-				for (var4 = 0; var4 < var3.length; ++var4) { // L: 11288
-					if (var3[var4] != null) { // L: 11289
-						var2 = var3[var4].isIf3; // L: 11290
-						break;
+		descriptor = "(II)Lgg;",
+		garbageValue = "2138757636"
+	)
+	@Export("getFrames")
+	static Frames getFrames(int var0) {
+		Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 316
+		if (var1 != null) { // L: 317
+			return var1;
+		} else {
+			AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 319
+			AbstractArchive var4 = class118.SequenceDefinition_skeletonsArchive; // L: 320
+			boolean var5 = true; // L: 322
+			int[] var6 = var3.getGroupFileIds(var0); // L: 323
+
+			for (int var7 = 0; var7 < var6.length; ++var7) { // L: 324
+				byte[] var8 = var3.getFile(var0, var6[var7]); // L: 325
+				if (var8 == null) { // L: 326
+					var5 = false; // L: 327
+				} else {
+					int var9 = (var8[0] & 255) << 8 | var8[1] & 255; // L: 330
+					byte[] var10 = var4.getFile(var9, 0); // L: 333
+					if (var10 == null) { // L: 334
+						var5 = false;
 					}
 				}
+			}
 
-				if (!var2) { // L: 11294
-					var4 = (int)var0.key; // L: 11295
-					Widget var5 = UserComparator9.getWidget(var4); // L: 11296
-					if (var5 != null) { // L: 11297
-						class184.invalidateWidget(var5);
-					}
+			Frames var2;
+			if (!var5) { // L: 336
+				var2 = null; // L: 337
+			} else {
+				try {
+					var2 = new Frames(var3, var4, var0, false); // L: 341
+				} catch (Exception var12) { // L: 343
+					var2 = null; // L: 344
 				}
 			}
-		}
 
-	} // L: 11301
+			if (var2 != null) { // L: 348
+				SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0);
+			}
+
+			return var2; // L: 349
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java
index 2d69300f86..c9610d0a28 100644
--- a/runescape-client/src/main/java/ItemContainer.java
+++ b/runescape-client/src/main/java/ItemContainer.java
@@ -1,39 +1,27 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bq")
+@ObfuscatedName("be")
 @Implements("ItemContainer")
 public class ItemContainer extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("itemContainers")
 	static NodeHashTable itemContainers;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 1777464625
-	)
-	@Export("idxCount")
-	public static int idxCount;
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "Lau;"
-	)
-	@Export("pcmPlayerProvider")
-	public static class45 pcmPlayerProvider;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("kq")
 	@ObfuscatedSignature(
-		descriptor = "Lmo;"
+		descriptor = "Lgr;"
 	)
-	static Bounds field998;
-	@ObfuscatedName("w")
+	@Export("textureProvider")
+	static TextureProvider textureProvider;
+	@ObfuscatedName("b")
 	@Export("ids")
 	int[] ids;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("quantities")
 	int[] quantities;
 
@@ -45,19 +33,4 @@ public class ItemContainer extends Node {
 		this.ids = new int[]{-1}; // L: 8
 		this.quantities = new int[]{0}; // L: 9
 	} // L: 11
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)Ljf;",
-		garbageValue = "-13"
-	)
-	@Export("getWidgetChild")
-	public static Widget getWidgetChild(int var0, int var1) {
-		Widget var2 = UserComparator9.getWidget(var0); // L: 209
-		if (var1 == -1) { // L: 210
-			return var2;
-		} else {
-			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 211 212
-		}
-	}
 }
diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java
index bab72562e6..7eeb29cc62 100644
--- a/runescape-client/src/main/java/ItemLayer.java
+++ b/runescape-client/src/main/java/ItemLayer.java
@@ -4,70 +4,54 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gy")
+@ObfuscatedName("gw")
 @Implements("ItemLayer")
 public final class ItemLayer {
-	@ObfuscatedName("dd")
-	@ObfuscatedSignature(
-		descriptor = "Lmp;"
-	)
-	@Export("js5Socket")
-	static AbstractSocket js5Socket;
-	@ObfuscatedName("gc")
-	@ObfuscatedGetter(
-		longValue = 8670349305611552211L
-	)
-	static long field2244;
-	@ObfuscatedName("gt")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1769768495
-	)
-	static int field2243;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -1593426589
+		intValue = -2108404385
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -631100007
+		intValue = 729522117
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -990530771
+		intValue = 1162640969
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lhj;"
-	)
-	@Export("first")
-	Renderable first;
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lhj;"
+		descriptor = "Lgt;"
 	)
 	@Export("second")
 	Renderable second;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lhj;"
+		descriptor = "Lgt;"
+	)
+	@Export("first")
+	Renderable first;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lgt;"
 	)
 	@Export("third")
 	Renderable third;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = -5203954899972942883L
+		longValue = 6218752588747903787L
 	)
 	@Export("tag")
 	long tag;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 581220091
+		intValue = 516323665
 	)
 	@Export("height")
 	int height;
@@ -75,48 +59,278 @@ public final class ItemLayer {
 	ItemLayer() {
 	} // L: 13
 
-	@ObfuscatedName("i")
-	public static boolean method4106(long var0) {
-		boolean var2 = 0L != var0; // L: 44
-		if (var2) { // L: 45
-			boolean var3 = (int)(var0 >>> 16 & 1L) == 1; // L: 48
-			var2 = !var3; // L: 50
+	@ObfuscatedName("gu")
+	@ObfuscatedSignature(
+		descriptor = "(Lcy;II)V",
+		garbageValue = "1978432610"
+	)
+	@Export("updateActorSequence")
+	static final void updateActorSequence(Actor var0, int var1) {
+		int var3;
+		int var4;
+		int var11;
+		if (var0.field1136 >= Client.cycle) { // L: 4624
+			var11 = Math.max(1, var0.field1136 - Client.cycle); // L: 4625
+			var3 = var0.field1120 * 64 + var0.field1132 * 128; // L: 4626
+			var4 = var0.field1120 * 64 + var0.field1134 * 128; // L: 4627
+			var0.x += (var3 - var0.x) / var11; // L: 4628
+			var0.y += (var4 - var0.y) / var11; // L: 4629
+			var0.field1117 = 0; // L: 4630
+			var0.orientation = var0.field1138; // L: 4631
+		} else if (var0.field1157 >= Client.cycle) { // L: 4633
+			class18.method293(var0);
+		} else {
+			var0.movementSequence = var0.idleSequence; // L: 4635
+			if (var0.pathLength == 0) { // L: 4636
+				var0.field1117 = 0; // L: 4637
+			} else {
+				label410: {
+					if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4640
+						SequenceDefinition var2 = UserComparator5.SequenceDefinition_get(var0.sequence); // L: 4641
+						if (var0.field1098 > 0 && var2.field2096 == 0) { // L: 4642
+							++var0.field1117; // L: 4643
+							break label410; // L: 4644
+						}
+
+						if (var0.field1098 <= 0 && var2.field2097 == 0) { // L: 4646
+							++var0.field1117; // L: 4647
+							break label410; // L: 4648
+						}
+					}
+
+					var11 = var0.x; // L: 4651
+					var3 = var0.y; // L: 4652
+					var4 = var0.field1120 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4653
+					int var5 = var0.field1120 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4654
+					if (var11 < var4) { // L: 4655
+						if (var3 < var5) { // L: 4656
+							var0.orientation = 1280;
+						} else if (var3 > var5) { // L: 4657
+							var0.orientation = 1792;
+						} else {
+							var0.orientation = 1536; // L: 4658
+						}
+					} else if (var11 > var4) { // L: 4660
+						if (var3 < var5) { // L: 4661
+							var0.orientation = 768;
+						} else if (var3 > var5) { // L: 4662
+							var0.orientation = 256;
+						} else {
+							var0.orientation = 512; // L: 4663
+						}
+					} else if (var3 < var5) { // L: 4665
+						var0.orientation = 1024;
+					} else if (var3 > var5) { // L: 4666
+						var0.orientation = 0;
+					}
+
+					class185 var6 = var0.field1153[var0.pathLength - 1]; // L: 4667
+					if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 4668
+						int var7 = var0.orientation - var0.rotation & 2047; // L: 4675
+						if (var7 > 1024) { // L: 4676
+							var7 -= 2048;
+						}
+
+						int var8 = var0.walkBackSequence; // L: 4677
+						if (var7 >= -256 && var7 <= 256) { // L: 4678
+							var8 = var0.walkSequence;
+						} else if (var7 >= 256 && var7 < 768) { // L: 4679
+							var8 = var0.walkRightSequence;
+						} else if (var7 >= -768 && var7 <= -256) { // L: 4680
+							var8 = var0.walkLeftSequence;
+						}
+
+						if (var8 == -1) { // L: 4681
+							var8 = var0.walkSequence;
+						}
+
+						var0.movementSequence = var8; // L: 4682
+						int var9 = 4; // L: 4683
+						boolean var10 = true; // L: 4684
+						if (var0 instanceof NPC) { // L: 4685
+							var10 = ((NPC)var0).definition.isClickable;
+						}
+
+						if (var10) { // L: 4686
+							if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1149 != 0) { // L: 4687
+								var9 = 2;
+							}
+
+							if (var0.pathLength > 2) { // L: 4688
+								var9 = 6;
+							}
+
+							if (var0.pathLength > 3) { // L: 4689
+								var9 = 8;
+							}
+
+							if (var0.field1117 > 0 && var0.pathLength > 1) { // L: 4690
+								var9 = 8; // L: 4691
+								--var0.field1117; // L: 4692
+							}
+						} else {
+							if (var0.pathLength > 1) { // L: 4696
+								var9 = 6;
+							}
+
+							if (var0.pathLength > 2) { // L: 4697
+								var9 = 8;
+							}
+
+							if (var0.field1117 > 0 && var0.pathLength > 1) { // L: 4698
+								var9 = 8; // L: 4699
+								--var0.field1117; // L: 4700
+							}
+						}
+
+						if (var6 == class185.field2122) { // L: 4703
+							var9 <<= 1;
+						} else if (var6 == class185.field2120) { // L: 4704
+							var9 >>= 1;
+						}
+
+						if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4705
+							var0.movementSequence = var0.runSequence;
+						}
+
+						if (var11 != var4 || var3 != var5) { // L: 4706
+							if (var11 < var4) { // L: 4707
+								var0.x += var9; // L: 4708
+								if (var0.x > var4) { // L: 4709
+									var0.x = var4;
+								}
+							} else if (var11 > var4) { // L: 4711
+								var0.x -= var9; // L: 4712
+								if (var0.x < var4) { // L: 4713
+									var0.x = var4;
+								}
+							}
+
+							if (var3 < var5) { // L: 4715
+								var0.y += var9; // L: 4716
+								if (var0.y > var5) { // L: 4717
+									var0.y = var5;
+								}
+							} else if (var3 > var5) { // L: 4719
+								var0.y -= var9; // L: 4720
+								if (var0.y < var5) { // L: 4721
+									var0.y = var5;
+								}
+							}
+						}
+
+						if (var4 == var0.x && var5 == var0.y) { // L: 4724
+							--var0.pathLength; // L: 4725
+							if (var0.field1098 > 0) { // L: 4726
+								--var0.field1098;
+							}
+						}
+					} else {
+						var0.x = var4; // L: 4669
+						var0.y = var5; // L: 4670
+						--var0.pathLength; // L: 4671
+						if (var0.field1098 > 0) { // L: 4672
+							--var0.field1098;
+						}
+					}
+				}
+			}
 		}
 
-		return var2; // L: 52
-	}
+		if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4729
+			var0.sequence = -1; // L: 4730
+			var0.spotAnimation = -1; // L: 4731
+			var0.field1136 = 0; // L: 4732
+			var0.field1157 = 0; // L: 4733
+			var0.x = var0.field1120 * 64 + var0.pathX[0] * 128; // L: 4734
+			var0.y = var0.pathY[0] * 128 + var0.field1120 * 64; // L: 4735
+			var0.method2228(); // L: 4736
+		}
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljy;B)V",
-		garbageValue = "22"
-	)
-	public static void method4108(Huffman var0) {
-		class264.huffman = var0; // L: 14
-	} // L: 15
+		if (class340.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4738 4739
+			var0.sequence = -1; // L: 4740
+			var0.spotAnimation = -1; // L: 4741
+			var0.field1136 = 0; // L: 4742
+			var0.field1157 = 0; // L: 4743
+			var0.x = var0.field1120 * 64 + var0.pathX[0] * 128; // L: 4744
+			var0.y = var0.pathY[0] * 128 + var0.field1120 * 64; // L: 4745
+			var0.method2228(); // L: 4746
+		}
 
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "(B)Low;",
-		garbageValue = "1"
-	)
-	static SpritePixels method4107() {
-		SpritePixels var0 = new SpritePixels(); // L: 192
-		var0.width = class414.SpriteBuffer_spriteWidth; // L: 193
-		var0.height = class414.SpriteBuffer_spriteHeight; // L: 194
-		var0.xOffset = class414.SpriteBuffer_xOffsets[0]; // L: 195
-		var0.yOffset = class414.SpriteBuffer_yOffsets[0]; // L: 196
-		var0.subWidth = UrlRequester.SpriteBuffer_spriteWidths[0]; // L: 197
-		var0.subHeight = class414.SpriteBuffer_spriteHeights[0]; // L: 198
-		int var1 = var0.subWidth * var0.subHeight; // L: 199
-		byte[] var2 = class295.SpriteBuffer_pixels[0]; // L: 200
-		var0.pixels = new int[var1]; // L: 201
-
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 202
-			var0.pixels[var3] = HitSplatDefinition.SpriteBuffer_spritePalette[var2[var3] & 255];
+		if (var0.field1149 != 0) { // L: 4750
+			if (var0.targetIndex != -1) { // L: 4751
+				Object var13 = null; // L: 4752
+				if (var0.targetIndex < 32768) { // L: 4753
+					var13 = Client.npcs[var0.targetIndex];
+				} else if (var0.targetIndex >= 32768) { // L: 4754
+					var13 = Client.players[var0.targetIndex - 32768];
+				}
+
+				if (var13 != null) { // L: 4755
+					var3 = var0.x - ((Actor)var13).x; // L: 4756
+					var4 = var0.y - ((Actor)var13).y; // L: 4757
+					if (var3 != 0 || var4 != 0) { // L: 4758
+						var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047;
+					}
+				} else if (var0.false0) { // L: 4760
+					var0.targetIndex = -1; // L: 4761
+					var0.false0 = false; // L: 4762
+				}
+			}
+
+			if (var0.field1122 != -1 && (var0.pathLength == 0 || var0.field1117 > 0)) { // L: 4765
+				var0.orientation = var0.field1122; // L: 4766
+				var0.field1122 = -1; // L: 4767
+			}
+
+			var11 = var0.orientation - var0.rotation & 2047; // L: 4769
+			if (var11 == 0 && var0.false0) { // L: 4770
+				var0.targetIndex = -1; // L: 4771
+				var0.false0 = false; // L: 4772
+			}
+
+			if (var11 != 0) { // L: 4774
+				++var0.field1148; // L: 4775
+				boolean var14;
+				if (var11 > 1024) { // L: 4776
+					var0.rotation -= var0.field1118 ? var11 : var0.field1149 * -771997279 * 1637605985; // L: 4777
+					var14 = true; // L: 4778
+					if (var11 < var0.field1149 || var11 > 2048 - var0.field1149) { // L: 4779
+						var0.rotation = var0.orientation; // L: 4780
+						var14 = false; // L: 4781
+					}
+
+					if (!var0.field1118 && var0.idleSequence == var0.movementSequence && (var0.field1148 > 25 || var14)) { // L: 4783
+						if (var0.turnLeftSequence != -1) { // L: 4784
+							var0.movementSequence = var0.turnLeftSequence;
+						} else {
+							var0.movementSequence = var0.walkSequence; // L: 4785
+						}
+					}
+				} else {
+					var0.rotation += var0.field1118 ? var11 : -771997279 * var0.field1149 * 1637605985; // L: 4789
+					var14 = true; // L: 4790
+					if (var11 < var0.field1149 || var11 > 2048 - var0.field1149) { // L: 4791
+						var0.rotation = var0.orientation; // L: 4792
+						var14 = false; // L: 4793
+					}
+
+					if (!var0.field1118 && var0.movementSequence == var0.idleSequence && (var0.field1148 > 25 || var14)) { // L: 4795
+						if (var0.turnRightSequence != -1) { // L: 4796
+							var0.movementSequence = var0.turnRightSequence;
+						} else {
+							var0.movementSequence = var0.walkSequence; // L: 4797
+						}
+					}
+				}
+
+				var0.rotation &= 2047; // L: 4801
+				var0.field1118 = false; // L: 4802
+			} else {
+				var0.field1148 = 0; // L: 4804
+			}
 		}
 
-		PacketBuffer.method6913(); // L: 203
-		return var0; // L: 204
-	}
+		class363.method6612(var0); // L: 4806
+	} // L: 4807
 }
diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java
index 8d0a013d87..4ab0f6b0f5 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueue.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueue.java
@@ -4,18 +4,18 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lm")
+@ObfuscatedName("ls")
 @Implements("IterableDualNodeQueue")
 public class IterableDualNodeQueue implements Iterable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lnt;"
+		descriptor = "Lnc;"
 	)
 	@Export("sentinel")
 	public DualNode sentinel;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lnt;"
+		descriptor = "Lnc;"
 	)
 	@Export("head")
 	DualNode head;
@@ -26,7 +26,7 @@ public IterableDualNodeQueue() {
 		this.sentinel.nextDual = this.sentinel; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("clear")
 	public void clear() {
 		while (this.sentinel.previousDual != this.sentinel) { // L: 16
@@ -35,9 +35,9 @@ public void clear() {
 
 	} // L: 19
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lnt;)V"
+		descriptor = "(Lnc;)V"
 	)
 	@Export("add")
 	public void add(DualNode var1) {
@@ -51,75 +51,75 @@ public void add(DualNode var1) {
 		var1.previousDual.nextDual = var1; // L: 26
 	} // L: 27
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lnt;"
+		descriptor = "()Lnc;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {
-		DualNode var1 = this.sentinel.previousDual; // L: 38
+		DualNode var1 = this.sentinel.previousDual; // L: 39
 		if (var1 == this.sentinel) {
-			return null; // L: 39
+			return null; // L: 40
 		} else {
-			var1.removeDual(); // L: 40
-			return var1; // L: 41
+			var1.removeDual(); // L: 41
+			return var1; // L: 42
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "()Lnt;"
+		descriptor = "()Lnc;"
 	)
 	@Export("last")
 	public DualNode last() {
-		return this.previousOrLast((DualNode)null); // L: 45
+		return this.previousOrLast((DualNode)null); // L: 46
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lnt;)Lnt;"
+		descriptor = "(Lnc;)Lnc;"
 	)
 	@Export("previousOrLast")
 	DualNode previousOrLast(DualNode var1) {
 		DualNode var2;
-		if (var1 == null) { // L: 50
+		if (var1 == null) { // L: 52
 			var2 = this.sentinel.previousDual;
 		} else {
-			var2 = var1; // L: 51
+			var2 = var1; // L: 53
 		}
 
-		if (var2 == this.sentinel) { // L: 52
-			this.head = null; // L: 53
-			return null; // L: 54
+		if (var2 == this.sentinel) { // L: 54
+			this.head = null; // L: 55
+			return null; // L: 56
 		} else {
-			this.head = var2.previousDual; // L: 56
-			return var2; // L: 57
+			this.head = var2.previousDual; // L: 58
+			return var2; // L: 59
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lnt;"
+		descriptor = "()Lnc;"
 	)
 	@Export("previous")
 	public DualNode previous() {
-		DualNode var1 = this.head; // L: 61
-		if (var1 == this.sentinel) { // L: 62
-			this.head = null; // L: 63
-			return null; // L: 64
+		DualNode var1 = this.head; // L: 64
+		if (var1 == this.sentinel) { // L: 65
+			this.head = null; // L: 66
+			return null; // L: 67
 		} else {
-			this.head = var1.previousDual; // L: 66
-			return var1; // L: 67
+			this.head = var1.previousDual; // L: 69
+			return var1; // L: 70
 		}
 	}
 
 	public Iterator iterator() {
-		return new IterableDualNodeQueueIterator(this); // L: 71
+		return new IterableDualNodeQueueIterator(this); // L: 74
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lnt;Lnt;)V"
+		descriptor = "(Lnc;Lnc;)V"
 	)
 	@Export("DualNodeDeque_addBefore")
 	public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) {
diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
index 0e16ce8b62..37e55413f6 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
@@ -4,30 +4,30 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ld")
+@ObfuscatedName("lo")
 @Implements("IterableDualNodeQueueIterator")
 public class IterableDualNodeQueueIterator implements Iterator {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Llm;"
+		descriptor = "Lls;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lnt;"
+		descriptor = "Lnc;"
 	)
 	@Export("head")
 	DualNode head;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lnt;"
+		descriptor = "Lnc;"
 	)
 	@Export("last")
 	DualNode last;
 
 	@ObfuscatedSignature(
-		descriptor = "(Llm;)V"
+		descriptor = "(Lls;)V"
 	)
 	IterableDualNodeQueueIterator(IterableDualNodeQueue var1) {
 		this.last = null; // L: 9
@@ -37,28 +37,28 @@ public class IterableDualNodeQueueIterator implements Iterator {
 	} // L: 15
 
 	public boolean hasNext() {
-		return this.queue.sentinel != this.head; // L: 29
+		return this.queue.sentinel != this.head; // L: 30
 	}
 
-	public Object next() {
-		DualNode var1 = this.head; // L: 18
-		if (var1 == this.queue.sentinel) { // L: 19
-			var1 = null; // L: 20
-			this.head = null; // L: 21
+	public void remove() {
+		if (this.last == null) { // L: 34
+			throw new IllegalStateException();
 		} else {
-			this.head = var1.previousDual; // L: 23
+			this.last.removeDual(); // L: 35
+			this.last = null; // L: 36
 		}
+	} // L: 37
 
-		this.last = var1; // L: 24
-		return var1; // L: 25
-	}
-
-	public void remove() {
-		if (this.last == null) { // L: 33
-			throw new IllegalStateException();
+	public Object next() {
+		DualNode var1 = this.head; // L: 19
+		if (var1 == this.queue.sentinel) { // L: 20
+			var1 = null; // L: 21
+			this.head = null; // L: 22
 		} else {
-			this.last.removeDual(); // L: 34
-			this.last = null; // L: 35
+			this.head = var1.previousDual; // L: 24
 		}
-	} // L: 36
+
+		this.last = var1; // L: 25
+		return var1; // L: 26
+	}
 }
diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java
index ac04aef003..9806bc04de 100644
--- a/runescape-client/src/main/java/IterableNodeDeque.java
+++ b/runescape-client/src/main/java/IterableNodeDeque.java
@@ -5,20 +5,20 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kf")
+@ObfuscatedName("lr")
 @Implements("IterableNodeDeque")
 public class IterableNodeDeque implements Iterable, Collection {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("sentinel")
 	Node sentinel;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
-	Node field3816;
+	Node field3967;
 
 	public IterableNodeDeque() {
 		this.sentinel = new Node(); // L: 7
@@ -26,7 +26,7 @@ public IterableNodeDeque() {
 		this.sentinel.next = this.sentinel; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("rsClear")
 	public void rsClear() {
 		while (this.sentinel.previous != this.sentinel) { // L: 16
@@ -35,9 +35,9 @@ public void rsClear() {
 
 	} // L: 19
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;)V"
+		descriptor = "(Lnw;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(Node var1) {
@@ -51,9 +51,9 @@ public void addFirst(Node var1) {
 		var1.previous.next = var1; // L: 26
 	} // L: 27
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;)V"
+		descriptor = "(Lnw;)V"
 	)
 	@Export("addLast")
 	public void addLast(Node var1) {
@@ -67,161 +67,161 @@ public void addLast(Node var1) {
 		var1.previous.next = var1; // L: 34
 	} // L: 35
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("last")
 	public Node last() {
-		return this.method5608((Node)null); // L: 46
+		return this.method5912((Node)null); // L: 46
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;)Lns;"
+		descriptor = "(Lnw;)Lnw;"
 	)
-	Node method5608(Node var1) {
+	Node method5912(Node var1) {
 		Node var2;
-		if (var1 == null) { // L: 51
+		if (var1 == null) { // L: 52
 			var2 = this.sentinel.previous;
 		} else {
-			var2 = var1; // L: 52
+			var2 = var1; // L: 53
 		}
 
-		if (var2 == this.sentinel) { // L: 53
-			this.field3816 = null; // L: 54
-			return null; // L: 55
+		if (var2 == this.sentinel) { // L: 54
+			this.field3967 = null; // L: 55
+			return null; // L: 56
 		} else {
-			this.field3816 = var2.previous; // L: 57
-			return var2; // L: 58
+			this.field3967 = var2.previous; // L: 58
+			return var2; // L: 59
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("previous")
 	public Node previous() {
-		Node var1 = this.field3816; // L: 62
-		if (var1 == this.sentinel) { // L: 63
-			this.field3816 = null; // L: 64
-			return null; // L: 65
+		Node var1 = this.field3967; // L: 64
+		if (var1 == this.sentinel) { // L: 65
+			this.field3967 = null; // L: 66
+			return null; // L: 67
 		} else {
-			this.field3816 = var1.previous; // L: 67
-			return var1; // L: 68
+			this.field3967 = var1.previous; // L: 69
+			return var1; // L: 70
 		}
 	}
 
-	@ObfuscatedName("p")
-	int method5610() {
-		int var1 = 0; // L: 72
+	@ObfuscatedName("w")
+	int method5914() {
+		int var1 = 0; // L: 74
 
-		for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76
-			++var1; // L: 75
+		for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 75 76 78
+			++var1; // L: 77
 		}
 
-		return var1; // L: 78
+		return var1; // L: 80
 	}
 
-	@ObfuscatedName("j")
-	public boolean method5633() {
-		return this.sentinel.previous == this.sentinel; // L: 82
+	@ObfuscatedName("n")
+	public boolean method5915() {
+		return this.sentinel.previous == this.sentinel; // L: 84
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "()[Lns;"
+		descriptor = "()[Lnw;"
 	)
-	Node[] method5612() {
-		Node[] var1 = new Node[this.method5610()]; // L: 86
-		int var2 = 0; // L: 87
+	Node[] method5972() {
+		Node[] var1 = new Node[this.method5914()]; // L: 88
+		int var2 = 0; // L: 89
 
-		for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91
-			var1[var2++] = var3; // L: 90
+		for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 90 91 93
+			var1[var2++] = var3; // L: 92
 		}
 
-		return var1; // L: 93
+		return var1; // L: 95
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;)Z"
+		descriptor = "(Lnw;)Z"
 	)
-	boolean method5615(Node var1) {
-		this.addFirst(var1); // L: 127
-		return true; // L: 128
+	boolean method5918(Node var1) {
+		this.addFirst(var1); // L: 135
+		return true; // L: 136
 	}
 
-	public boolean isEmpty() {
-		return this.method5633(); // L: 105
+	public Iterator iterator() {
+		return new IterableNodeDequeDescendingIterator(this); // L: 99
+	}
+
+	public boolean addAll(Collection var1) {
+		throw new RuntimeException(); // L: 151
 	}
 
 	public boolean contains(Object var1) {
-		throw new RuntimeException(); // L: 109
+		throw new RuntimeException(); // L: 114
 	}
 
 	public Object[] toArray() {
-		return this.method5612(); // L: 113
+		return this.method5972(); // L: 119
 	}
 
 	public Object[] toArray(Object[] var1) {
-		int var2 = 0; // L: 117
+		int var2 = 0; // L: 125
 
-		for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 118 119 121
-			var1[var2++] = var3; // L: 120
+		for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 126 127 129
+			var1[var2++] = var3; // L: 128
 		}
 
-		return var1; // L: 123
+		return var1; // L: 131
 	}
 
-	public boolean addAll(Collection var1) {
-		throw new RuntimeException(); // L: 140
+	public boolean remove(Object var1) {
+		throw new RuntimeException(); // L: 141
+	}
+
+	public boolean containsAll(Collection var1) {
+		throw new RuntimeException(); // L: 146
 	}
 
 	public boolean removeAll(Collection var1) {
-		throw new RuntimeException(); // L: 144
+		throw new RuntimeException(); // L: 156
 	}
 
+	public void clear() {
+		this.rsClear(); // L: 166
+	} // L: 167
+
 	public boolean add(Object var1) {
-		return this.method5615((Node)var1); // L: 156
+		return this.method5918((Node)var1); // L: 170
 	}
 
 	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 160
+		return super.equals(var1); // L: 174
 	}
 
 	public int hashCode() {
-		return super.hashCode(); // L: 164
-	}
-
-	public boolean remove(Object var1) {
-		throw new RuntimeException(); // L: 132
-	}
-
-	public int size() {
-		return this.method5610(); // L: 101
-	}
-
-	public boolean containsAll(Collection var1) {
-		throw new RuntimeException(); // L: 136
+		return super.hashCode(); // L: 178
 	}
 
-	public Iterator iterator() {
-		return new IterableNodeDequeDescendingIterator(this); // L: 97
+	public boolean isEmpty() {
+		return this.method5915(); // L: 109
 	}
 
 	public boolean retainAll(Collection var1) {
-		throw new RuntimeException(); // L: 148
+		throw new RuntimeException(); // L: 161
 	}
 
-	public void clear() {
-		this.rsClear(); // L: 152
-	} // L: 153
+	public int size() {
+		return this.method5914(); // L: 104
+	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;Lns;)V"
+		descriptor = "(Lnw;Lnw;)V"
 	)
 	@Export("IterableNodeDeque_addBefore")
 	public static void IterableNodeDeque_addBefore(Node var0, Node var1) {
diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
index 02b45ed9a3..ef5fa8c01a 100644
--- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
+++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
@@ -4,38 +4,38 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kw")
+@ObfuscatedName("lk")
 @Implements("IterableNodeDequeDescendingIterator")
 public class IterableNodeDequeDescendingIterator implements Iterator {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lkf;"
+		descriptor = "Llr;"
 	)
 	@Export("deque")
 	IterableNodeDeque deque;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
-	Node field3813;
-	@ObfuscatedName("s")
+	Node field3964;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("last")
 	Node last;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lkf;)V"
+		descriptor = "(Llr;)V"
 	)
 	IterableNodeDequeDescendingIterator(IterableNodeDeque var1) {
 		this.last = null; // L: 9
 		this.setDeque(var1); // L: 12
 	} // L: 13
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lkf;)V"
+		descriptor = "(Llr;)V"
 	)
 	@Export("setDeque")
 	void setDeque(IterableNodeDeque var1) {
@@ -43,36 +43,36 @@ void setDeque(IterableNodeDeque var1) {
 		this.start(); // L: 17
 	} // L: 18
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("start")
 	void start() {
-		this.field3813 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21
+		this.field3964 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21
 		this.last = null; // L: 22
 	} // L: 23
 
-	public Object next() {
-		Node var1 = this.field3813; // L: 26
-		if (var1 == this.deque.sentinel) { // L: 27
-			var1 = null; // L: 28
-			this.field3813 = null; // L: 29
+	public void remove() {
+		if (this.last == null) { // L: 42
+			throw new IllegalStateException();
 		} else {
-			this.field3813 = var1.previous; // L: 31
+			this.last.remove(); // L: 43
+			this.last = null; // L: 44
 		}
-
-		this.last = var1; // L: 32
-		return var1; // L: 33
-	}
+	} // L: 45
 
 	public boolean hasNext() {
-		return this.deque.sentinel != this.field3813 && this.field3813 != null; // L: 37
+		return this.deque.sentinel != this.field3964 && this.field3964 != null; // L: 38
 	}
 
-	public void remove() {
-		if (this.last == null) { // L: 41
-			throw new IllegalStateException();
+	public Object next() {
+		Node var1 = this.field3964; // L: 27
+		if (var1 == this.deque.sentinel) { // L: 28
+			var1 = null; // L: 29
+			this.field3964 = null; // L: 30
 		} else {
-			this.last.remove(); // L: 42
-			this.last = null; // L: 43
+			this.field3964 = var1.previous; // L: 32
 		}
-	} // L: 44
+
+		this.last = var1; // L: 33
+		return var1; // L: 34
+	}
 }
diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java
index e24de57c3b..d311e3047c 100644
--- a/runescape-client/src/main/java/IterableNodeHashTable.java
+++ b/runescape-client/src/main/java/IterableNodeHashTable.java
@@ -4,31 +4,31 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nf")
+@ObfuscatedName("oz")
 @Implements("IterableNodeHashTable")
 public final class IterableNodeHashTable implements Iterable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("size")
 	int size;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "[Lns;"
+		descriptor = "[Lnw;"
 	)
 	@Export("buckets")
 	Node[] buckets;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("currentGet")
 	Node currentGet;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("current")
 	Node current;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("index")
 	int index;
 
@@ -45,100 +45,100 @@ public IterableNodeHashTable(int var1) {
 
 	} // L: 21
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(J)Lns;"
+		descriptor = "(J)Lnw;"
 	)
 	@Export("get")
 	public Node get(long var1) {
-		Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 24
+		Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 25
 
-		for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 25 26 32
-			if (this.currentGet.key == var1) { // L: 27
-				Node var4 = this.currentGet; // L: 28
-				this.currentGet = this.currentGet.previous; // L: 29
-				return var4; // L: 30
+		for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 26 27 33
+			if (this.currentGet.key == var1) { // L: 28
+				Node var4 = this.currentGet; // L: 29
+				this.currentGet = this.currentGet.previous; // L: 30
+				return var4; // L: 31
 			}
 		}
 
-		this.currentGet = null; // L: 34
-		return null; // L: 35
+		this.currentGet = null; // L: 35
+		return null; // L: 36
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;J)V"
+		descriptor = "(Lnw;J)V"
 	)
 	@Export("put")
 	public void put(Node var1, long var2) {
-		if (var1.next != null) { // L: 39
+		if (var1.next != null) { // L: 40
 			var1.remove();
 		}
 
-		Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 40
-		var1.next = var4.next; // L: 41
-		var1.previous = var4; // L: 42
-		var1.next.previous = var1; // L: 43
-		var1.previous.next = var1; // L: 44
-		var1.key = var2; // L: 45
-	} // L: 46
+		Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 41
+		var1.next = var4.next; // L: 42
+		var1.previous = var4; // L: 43
+		var1.next.previous = var1; // L: 44
+		var1.previous.next = var1; // L: 45
+		var1.key = var2; // L: 46
+	} // L: 47
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("clear")
 	public void clear() {
-		for (int var1 = 0; var1 < this.size; ++var1) { // L: 49
-			Node var2 = this.buckets[var1]; // L: 50
+		for (int var1 = 0; var1 < this.size; ++var1) { // L: 50
+			Node var2 = this.buckets[var1]; // L: 51
 
 			while (true) {
-				Node var3 = var2.previous; // L: 52
-				if (var3 == var2) { // L: 53
+				Node var3 = var2.previous; // L: 53
+				if (var3 == var2) { // L: 54
 					break;
 				}
 
-				var3.remove(); // L: 54
+				var3.remove(); // L: 55
 			}
 		}
 
-		this.currentGet = null; // L: 57
-		this.current = null; // L: 58
-	} // L: 59
+		this.currentGet = null; // L: 58
+		this.current = null; // L: 59
+	} // L: 60
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("first")
 	public Node first() {
-		this.index = 0; // L: 62
-		return this.next(); // L: 63
+		this.index = 0; // L: 63
+		return this.next(); // L: 64
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("next")
 	public Node next() {
 		Node var1;
-		if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 67
-			var1 = this.current; // L: 68
-			this.current = var1.previous; // L: 69
-			return var1; // L: 70
+		if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 69
+			var1 = this.current; // L: 70
+			this.current = var1.previous; // L: 71
+			return var1; // L: 72
 		} else {
 			do {
-				if (this.index >= this.size) { // L: 72
-					return null; // L: 79
+				if (this.index >= this.size) { // L: 74
+					return null; // L: 81
 				}
 
-				var1 = this.buckets[this.index++].previous; // L: 73
-			} while(var1 == this.buckets[this.index - 1]); // L: 74
+				var1 = this.buckets[this.index++].previous; // L: 75
+			} while(var1 == this.buckets[this.index - 1]); // L: 76
 
-			this.current = var1.previous; // L: 75
-			return var1; // L: 76
+			this.current = var1.previous; // L: 77
+			return var1; // L: 78
 		}
 	}
 
 	public Iterator iterator() {
-		return new IterableNodeHashTableIterator(this); // L: 83
+		return new IterableNodeHashTableIterator(this); // L: 86
 	}
 }
diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
index 5577319ede..02ace29613 100644
--- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java
+++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
@@ -4,33 +4,33 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nr")
+@ObfuscatedName("or")
 @Implements("IterableNodeHashTableIterator")
 public class IterableNodeHashTableIterator implements Iterator {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Loz;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("head")
 	Node head;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("index")
 	int index;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("last")
 	Node last;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnf;)V"
+		descriptor = "(Loz;)V"
 	)
 	IterableNodeHashTableIterator(IterableNodeHashTable var1) {
 		this.last = null; // L: 10
@@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator {
 		this.start(); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("start")
 	void start() {
 		this.head = this.hashTable.buckets[0].previous; // L: 18
@@ -48,49 +48,45 @@ void start() {
 
 	public Object next() {
 		Node var1;
-		if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24
-			var1 = this.head; // L: 25
-			this.head = var1.previous; // L: 26
-			this.last = var1; // L: 27
-			return var1; // L: 28
+		if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 25
+			var1 = this.head; // L: 26
+			this.head = var1.previous; // L: 27
+			this.last = var1; // L: 28
+			return var1; // L: 29
 		} else {
 			do {
-				if (this.index >= this.hashTable.size) { // L: 30
-					return null; // L: 38
+				if (this.index >= this.hashTable.size) { // L: 31
+					return null; // L: 39
 				}
 
-				var1 = this.hashTable.buckets[this.index++].previous; // L: 31
-			} while(var1 == this.hashTable.buckets[this.index - 1]); // L: 32
+				var1 = this.hashTable.buckets[this.index++].previous; // L: 32
+			} while(var1 == this.hashTable.buckets[this.index - 1]); // L: 33
 
-			this.head = var1.previous; // L: 33
-			this.last = var1; // L: 34
-			return var1; // L: 35
+			this.head = var1.previous; // L: 34
+			this.last = var1; // L: 35
+			return var1; // L: 36
 		}
 	}
 
 	public boolean hasNext() {
-		if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42
+		if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 43
 			return true;
 		} else {
-			while (this.index < this.hashTable.size) { // L: 43
-				if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44
-					this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45
-					return true; // L: 46
+			while (this.index < this.hashTable.size) { // L: 44
+				if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 45
+					this.head = this.hashTable.buckets[this.index - 1].previous; // L: 46
+					return true; // L: 47
 				}
 
-				this.head = this.hashTable.buckets[this.index - 1]; // L: 49
+				this.head = this.hashTable.buckets[this.index - 1]; // L: 50
 			}
 
-			return false; // L: 52
+			return false; // L: 53
 		}
 	}
 
 	public void remove() {
-		if (this.last == null) { // L: 56
-			throw new IllegalStateException();
-		} else {
-			this.last.remove(); // L: 57
-			this.last = null; // L: 58
-		}
-	} // L: 59
+		this.last.remove(); // L: 58
+		this.last = null; // L: 59
+	} // L: 60
 }
diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java
index d5a66b2e9e..55772cc939 100644
--- a/runescape-client/src/main/java/JagexCache.java
+++ b/runescape-client/src/main/java/JagexCache.java
@@ -1,55 +1,67 @@
-import java.io.File;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("er")
+@ObfuscatedName("ey")
 @Implements("JagexCache")
 public class JagexCache {
-	@ObfuscatedName("tm")
+	@ObfuscatedName("rd")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lar;"
 	)
-	@Export("grandExchangeEvents")
-	static GrandExchangeEvents grandExchangeEvents;
-	@ObfuscatedName("o")
-	@Export("cacheDir")
-	static File cacheDir;
-	@ObfuscatedName("y")
+	@Export("pcmPlayer0")
+	static PcmPlayer pcmPlayer0;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lnw;"
+		descriptor = "Lof;"
 	)
 	@Export("JagexCache_randomDat")
 	public static BufferedFile JagexCache_randomDat;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lnw;"
+		descriptor = "Lof;"
 	)
 	@Export("JagexCache_dat2File")
 	public static BufferedFile JagexCache_dat2File;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lnw;"
+		descriptor = "Lof;"
 	)
 	@Export("JagexCache_idx255File")
 	public static BufferedFile JagexCache_idx255File;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 1050074169
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "[Lof;"
 	)
-	@Export("cacheGamebuild")
-	static int cacheGamebuild;
-	@ObfuscatedName("m")
-	@Export("operatingSystemName")
-	static String operatingSystemName;
-	@ObfuscatedName("fn")
-	static String field1560;
+	@Export("JagexCache_idxFiles")
+	public static BufferedFile[] JagexCache_idxFiles;
+	@ObfuscatedName("l")
+	@Export("formattedOperatingSystemName")
+	public static String formattedOperatingSystemName;
 
 	static {
 		JagexCache_randomDat = null; // L: 22
 		JagexCache_dat2File = null; // L: 23
 		JagexCache_idx255File = null; // L: 24
 	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(II)Ldb;",
+		garbageValue = "2123818799"
+	)
+	static class120 method3064(int var0) {
+		class120 var1 = (class120)SequenceDefinition.field2086.get((long)var0); // L: 362
+		if (var1 != null) { // L: 363
+			return var1;
+		} else {
+			var1 = class112.method2571(SequenceDefinition.SequenceDefinition_animationsArchive, class118.SequenceDefinition_skeletonsArchive, var0, false); // L: 364
+			if (var1 != null) { // L: 365
+				SequenceDefinition.field2086.put(var1, (long)var0);
+			}
+
+			return var1; // L: 366
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java
index 432c265c2d..7e3e751002 100644
--- a/runescape-client/src/main/java/KeyHandler.java
+++ b/runescape-client/src/main/java/KeyHandler.java
@@ -8,106 +8,108 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("f")
+@ObfuscatedName("z")
 @Implements("KeyHandler")
 public final class KeyHandler implements KeyListener, FocusListener {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lz;"
 	)
 	@Export("KeyHandler_instance")
 	public static KeyHandler KeyHandler_instance;
-	@ObfuscatedName("h")
-	@ObfuscatedGetter(
-		intValue = -63939899
-	)
-	@Export("canvasHeight")
-	public static int canvasHeight;
-	@ObfuscatedName("by")
+	@ObfuscatedName("s")
+	@Export("ArchiveDiskActionHandler_thread")
+	static Thread ArchiveDiskActionHandler_thread;
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "[Loe;"
+		descriptor = "Lpa;"
 	)
-	@Export("worldSelectStars")
-	static IndexedSprite[] worldSelectStars;
-	@ObfuscatedName("cl")
+	@Export("options_buttons_0Sprite")
+	static IndexedSprite options_buttons_0Sprite;
+	@ObfuscatedName("co")
 	@Export("KeyHandler_pressedKeys")
 	public static boolean[] KeyHandler_pressedKeys;
+	@ObfuscatedName("cc")
+	public static boolean[] field132;
 	@ObfuscatedName("cs")
-	public static boolean[] field118;
-	@ObfuscatedName("ce")
-	public static boolean[] field119;
-	@ObfuscatedName("cw")
-	public static int[] field120;
-	@ObfuscatedName("cr")
+	public static boolean[] field130;
+	@ObfuscatedName("cj")
+	public static int[] field134;
+	@ObfuscatedName("ca")
 	@ObfuscatedGetter(
-		intValue = 1842279411
+		intValue = -30228915
 	)
-	public static int field133;
-	@ObfuscatedName("cu")
+	public static int field135;
+	@ObfuscatedName("cz")
 	@ObfuscatedGetter(
-		intValue = 1242888699
+		intValue = 1719312863
 	)
-	public static int field122;
-	@ObfuscatedName("cc")
-	static char[] field112;
+	public static int field120;
+	@ObfuscatedName("cw")
+	static char[] field137;
+	@ObfuscatedName("ct")
+	static int[] field131;
+	@ObfuscatedName("ci")
+	public static int[] field139;
 	@ObfuscatedName("ch")
-	static int[] field124;
-	@ObfuscatedName("cz")
-	public static int[] field125;
-	@ObfuscatedName("cv")
 	@ObfuscatedGetter(
-		intValue = -1596071901
+		intValue = -341769643
 	)
-	public static int field110;
+	public static int field140;
+	@ObfuscatedName("cq")
+	public static int[] field141;
 	@ObfuscatedName("cf")
-	public static int[] field127;
-	@ObfuscatedName("cm")
 	@ObfuscatedGetter(
-		intValue = 480310243
+		intValue = 307265495
 	)
-	public static int field135;
-	@ObfuscatedName("co")
+	public static int field142;
+	@ObfuscatedName("cu")
 	@ObfuscatedGetter(
-		intValue = -1155674015
+		intValue = -834396131
 	)
-	public static int field107;
-	@ObfuscatedName("cy")
+	public static int field143;
+	@ObfuscatedName("cx")
 	@ObfuscatedGetter(
-		intValue = 850126411
+		intValue = 601711547
 	)
-	public static int field130;
-	@ObfuscatedName("cb")
+	public static int field144;
+	@ObfuscatedName("cm")
 	@ObfuscatedGetter(
-		intValue = -253664609
+		intValue = 1247090595
 	)
-	public static int field131;
-	@ObfuscatedName("dq")
+	public static int field145;
+	@ObfuscatedName("dm")
 	@ObfuscatedGetter(
-		intValue = -442212747
+		intValue = 589740013
 	)
 	@Export("KeyHandler_idleCycles")
 	public static volatile int KeyHandler_idleCycles;
-	@ObfuscatedName("df")
+	@ObfuscatedName("dr")
 	@Export("KeyHandler_keyCodes")
 	static int[] KeyHandler_keyCodes;
+	@ObfuscatedName("ek")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	static Archive field151;
 
 	static {
 		KeyHandler_instance = new KeyHandler(); // L: 14
 		KeyHandler_pressedKeys = new boolean[112]; // L: 101
-		field118 = new boolean[112]; // L: 102
-		field119 = new boolean[112]; // L: 103
-		field120 = new int[128]; // L: 106
-		field133 = 0; // L: 107
-		field122 = 0; // L: 108
-		field112 = new char[128]; // L: 109
-		field124 = new int[128]; // L: 110
-		field125 = new int[128]; // L: 111
-		field110 = 0; // L: 112
-		field127 = new int[128]; // L: 113
-		field135 = 0; // L: 114
-		field107 = 0; // L: 115
-		field130 = 0; // L: 116
-		field131 = 0; // L: 117
+		field132 = new boolean[112]; // L: 102
+		field130 = new boolean[112]; // L: 103
+		field134 = new int[128]; // L: 106
+		field135 = 0; // L: 107
+		field120 = 0; // L: 108
+		field137 = new char[128]; // L: 109
+		field131 = new int[128]; // L: 110
+		field139 = new int[128]; // L: 111
+		field140 = 0; // L: 112
+		field141 = new int[128]; // L: 113
+		field142 = 0; // L: 114
+		field143 = 0; // L: 115
+		field144 = 0; // L: 116
+		field145 = 0; // L: 117
 		KeyHandler_idleCycles = 0; // L: 118
 		KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; // L: 119
 	}
@@ -116,180 +118,108 @@ public final class KeyHandler implements KeyListener, FocusListener {
 	} // L: 121
 
 	public final synchronized void keyPressed(KeyEvent var1) {
-		if (KeyHandler_instance != null) { // L: 138
-			int var2 = var1.getKeyCode(); // L: 139
-			if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 140
-				var2 = KeyHandler_keyCodes[var2]; // L: 141
-				if ((var2 & 128) != 0) { // L: 142
+		if (KeyHandler_instance != null) { // L: 179
+			int var2 = var1.getKeyCode(); // L: 180
+			if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 181
+				var2 = KeyHandler_keyCodes[var2]; // L: 182
+				if ((var2 & 128) != 0) { // L: 183
 					var2 = -1;
 				}
 			} else {
-				var2 = -1; // L: 144
+				var2 = -1; // L: 185
 			}
 
-			if (field122 >= 0 && var2 >= 0) { // L: 145
-				field120[field122] = var2; // L: 146
-				field122 = field122 + 1 & 127; // L: 147
-				if (field133 == field122) { // L: 148
-					field122 = -1;
+			if (field120 >= 0 && var2 >= 0) { // L: 186
+				field134[field120] = var2; // L: 187
+				field120 = field120 + 1 & 127; // L: 188
+				if (field135 == field120) { // L: 189
+					field120 = -1;
 				}
 			}
 
 			int var3;
-			if (var2 >= 0) { // L: 150
-				var3 = field130 + 1 & 127; // L: 151
-				if (var3 != field107) { // L: 152
-					field124[field130] = var2; // L: 153
-					field112[field130] = 0; // L: 154
-					field130 = var3; // L: 155
+			if (var2 >= 0) { // L: 191
+				var3 = field144 + 1 & 127; // L: 192
+				if (var3 != field143) { // L: 193
+					field131[field144] = var2; // L: 194
+					field137[field144] = 0; // L: 195
+					field144 = var3; // L: 196
 				}
 			}
 
-			var3 = var1.getModifiers(); // L: 158
-			if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 159
-				var1.consume(); // L: 160
+			var3 = var1.getModifiers(); // L: 199
+			if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 200
+				var1.consume(); // L: 201
 			}
 		}
 
-	} // L: 163
-
-	public final void keyTyped(KeyEvent var1) {
-		if (KeyHandler_instance != null) { // L: 180
-			char var2 = var1.getKeyChar(); // L: 181
-			if (var2 != 0 && var2 != '\uffff') { // L: 182
-				boolean var3;
-				if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { // L: 185
-					var3 = true; // L: 186
-				} else {
-					label57: {
-						if (var2 != 0) { // L: 189
-							char[] var4 = class316.cp1252AsciiExtension; // L: 191
-
-							for (int var5 = 0; var5 < var4.length; ++var5) { // L: 192
-								char var6 = var4[var5]; // L: 193
-								if (var6 == var2) { // L: 195
-									var3 = true; // L: 196
-									break label57;
-								}
-							}
-						}
+	} // L: 204
 
-						var3 = false; // L: 203
-					}
-				}
+	public final synchronized void keyReleased(KeyEvent var1) {
+		if (KeyHandler_instance != null) { // L: 207
+			int var2 = var1.getKeyCode(); // L: 208
+			if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 209
+				var2 = KeyHandler_keyCodes[var2] & -129;
+			} else {
+				var2 = -1; // L: 210
+			}
 
-				if (var3) { // L: 205
-					int var7 = field130 + 1 & 127; // L: 206
-					if (var7 != field107) { // L: 207
-						field124[field130] = -1; // L: 208
-						field112[field130] = var2; // L: 209
-						field130 = var7; // L: 210
-					}
+			if (field120 >= 0 && var2 >= 0) { // L: 211
+				field134[field120] = ~var2; // L: 212
+				field120 = field120 + 1 & 127; // L: 213
+				if (field135 == field120) { // L: 214
+					field120 = -1;
 				}
 			}
 		}
 
-		var1.consume(); // L: 215
-	} // L: 216
+		var1.consume(); // L: 217
+	} // L: 218
 
-	public final synchronized void keyReleased(KeyEvent var1) {
-		if (KeyHandler_instance != null) { // L: 166
-			int var2 = var1.getKeyCode(); // L: 167
-			if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 168
-				var2 = KeyHandler_keyCodes[var2] & -129;
-			} else {
-				var2 = -1; // L: 169
-			}
-
-			if (field122 >= 0 && var2 >= 0) { // L: 170
-				field120[field122] = ~var2; // L: 171
-				field122 = field122 + 1 & 127; // L: 172
-				if (field133 == field122) {
-					field122 = -1;
+	public final void keyTyped(KeyEvent var1) {
+		if (KeyHandler_instance != null) { // L: 221
+			char var2 = var1.getKeyChar(); // L: 222
+			if (var2 != 0 && var2 != '\uffff' && class136.method2842(var2)) { // L: 223
+				int var3 = field144 + 1 & 127; // L: 224
+				if (var3 != field143) { // L: 225
+					field131[field144] = -1; // L: 226
+					field137[field144] = var2; // L: 227
+					field144 = var3; // L: 228
 				}
 			}
 		}
 
-		var1.consume(); // L: 176
-	}
+		var1.consume(); // L: 232
+	} // L: 233
 
 	public final void focusGained(FocusEvent var1) {
-	} // L: 249
+	} // L: 266
 
 	public final synchronized void focusLost(FocusEvent var1) {
-		if (KeyHandler_instance != null) { // L: 252
-			field122 = -1; // L: 253
+		if (KeyHandler_instance != null) { // L: 269
+			field120 = -1; // L: 270
 		}
 
-	} // L: 255
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1565672135"
-	)
-	static final void method324(String var0) {
-		StringBuilder var10000 = new StringBuilder();
-		Object var10001 = null; // L: 173
-		var10000 = var10000.append("Please remove ").append(var0);
-		var10001 = null;
-		String var1 = var10000.append(" from your friend list first").toString();
-		class397.addGameMessage(30, "", var1); // L: 175
-	} // L: 177
+	} // L: 272
 
-	@ObfuscatedName("hc")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-180723004"
+		descriptor = "([Ljava/lang/String;[SI)V",
+		garbageValue = "1763095521"
 	)
-	static void method343() {
-		Client.menuOptionsCount = 0; // L: 8054
-		Client.isMenuOpen = false; // L: 8055
-	} // L: 8056
+	public static void method390(String[] var0, short[] var1) {
+		Projectile.sortItemsByName(var0, var1, 0, var0.length - 1); // L: 9
+	} // L: 10
 
-	@ObfuscatedName("lk")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ZI)V",
-		garbageValue = "1258527468"
+		descriptor = "(IIB)I",
+		garbageValue = "51"
 	)
-	@Export("findItemDefinitions")
-	static void findItemDefinitions(String var0, boolean var1) {
-		var0 = var0.toLowerCase(); // L: 11951
-		short[] var2 = new short[16]; // L: 11952
-		int var3 = 0; // L: 11953
-
-		for (int var4 = 0; var4 < class129.ItemDefinition_fileCount; ++var4) { // L: 11954
-			ItemComposition var9 = TaskHandler.ItemDefinition_get(var4); // L: 11955
-			if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11956 11957 11958
-				if (var3 >= 250) { // L: 11959
-					Skeleton.foundItemIdCount = -1; // L: 11960
-					Language.foundItemIds = null; // L: 11961
-					return; // L: 11962
-				}
-
-				if (var3 >= var2.length) { // L: 11964
-					short[] var6 = new short[var2.length * 2]; // L: 11965
-
-					for (int var7 = 0; var7 < var3; ++var7) { // L: 11966
-						var6[var7] = var2[var7];
-					}
-
-					var2 = var6; // L: 11967
-				}
-
-				var2[var3++] = (short)var4; // L: 11969
-			}
-		}
-
-		Language.foundItemIds = var2; // L: 11971
-		ClanSettings.foundItemIndex = 0; // L: 11972
-		Skeleton.foundItemIdCount = var3; // L: 11973
-		String[] var8 = new String[Skeleton.foundItemIdCount]; // L: 11974
-
-		for (int var5 = 0; var5 < Skeleton.foundItemIdCount; ++var5) { // L: 11975
-			var8[var5] = TaskHandler.ItemDefinition_get(var2[var5]).name;
-		}
-
-		class361.method6427(var8, Language.foundItemIds); // L: 11976
-	} // L: 11977
+	static final int method367(int var0, int var1) {
+		int var2 = var1 * 57 + var0; // L: 488
+		var2 ^= var2 << 13; // L: 489
+		int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 490
+		return var3 >> 19 & 255; // L: 491
+	}
 }
diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java
index 2fa4dbe8a2..e3ac6cd77b 100644
--- a/runescape-client/src/main/java/KitDefinition.java
+++ b/runescape-client/src/main/java/KitDefinition.java
@@ -4,52 +4,58 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("es")
+@ObfuscatedName("fh")
 @Implements("KitDefinition")
 public class KitDefinition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("KitDefinition_archive")
-	public static AbstractArchive KitDefinition_archive;
-	@ObfuscatedName("w")
+	static AbstractArchive KitDefinition_archive;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("KitDefinition_modelsArchive")
-	public static AbstractArchive KitDefinition_modelsArchive;
-	@ObfuscatedName("a")
+	static AbstractArchive KitDefinition_modelsArchive;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 448904447
+	)
+	@Export("KitDefinition_fileCount")
+	public static int KitDefinition_fileCount;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("KitDefinition_cached")
 	static EvictingDualNodeHashTable KitDefinition_cached;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -748096763
+		intValue = 1176017283
 	)
 	@Export("bodypartID")
 	public int bodypartID;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("models2")
 	int[] models2;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("recolorFrom")
 	short[] recolorFrom;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("recolorTo")
 	short[] recolorTo;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("retextureFrom")
 	short[] retextureFrom;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("retextureTo")
 	short[] retextureTo;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("models")
 	int[] models;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("nonSelectable")
 	public boolean nonSelectable;
 
@@ -63,225 +69,241 @@ public class KitDefinition extends DualNode {
 		this.nonSelectable = false; // L: 22
 	} // L: 24
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;B)V",
-		garbageValue = "-36"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "-70"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 38
-			if (var2 == 0) { // L: 39
-				return; // L: 42
+			int var2 = var1.readUnsignedByte(); // L: 44
+			if (var2 == 0) { // L: 45
+				return; // L: 48
 			}
 
-			this.decodeNext(var1, var2); // L: 40
+			this.decodeNext(var1, var2); // L: 46
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "2034501365"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "1440995166"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 45
+		if (var2 == 1) { // L: 51
 			this.bodypartID = var1.readUnsignedByte();
 		} else {
 			int var3;
 			int var4;
-			if (var2 == 2) { // L: 46
-				var3 = var1.readUnsignedByte(); // L: 47
-				this.models2 = new int[var3]; // L: 48
+			if (var2 == 2) { // L: 52
+				var3 = var1.readUnsignedByte(); // L: 53
+				this.models2 = new int[var3]; // L: 54
 
-				for (var4 = 0; var4 < var3; ++var4) { // L: 49
+				for (var4 = 0; var4 < var3; ++var4) { // L: 55
 					this.models2[var4] = var1.readUnsignedShort();
 				}
-			} else if (var2 == 3) { // L: 51
+			} else if (var2 == 3) { // L: 57
 				this.nonSelectable = true;
-			} else if (var2 == 40) { // L: 52
-				var3 = var1.readUnsignedByte(); // L: 53
-				this.recolorFrom = new short[var3]; // L: 54
-				this.recolorTo = new short[var3]; // L: 55
-
-				for (var4 = 0; var4 < var3; ++var4) { // L: 56
-					this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 57
-					this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 58
+			} else if (var2 == 40) { // L: 58
+				var3 = var1.readUnsignedByte(); // L: 59
+				this.recolorFrom = new short[var3]; // L: 60
+				this.recolorTo = new short[var3]; // L: 61
+
+				for (var4 = 0; var4 < var3; ++var4) { // L: 62
+					this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63
+					this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64
 				}
-			} else if (var2 == 41) { // L: 61
-				var3 = var1.readUnsignedByte(); // L: 62
-				this.retextureFrom = new short[var3]; // L: 63
-				this.retextureTo = new short[var3]; // L: 64
-
-				for (var4 = 0; var4 < var3; ++var4) { // L: 65
-					this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 66
-					this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 67
+			} else if (var2 == 41) { // L: 67
+				var3 = var1.readUnsignedByte(); // L: 68
+				this.retextureFrom = new short[var3]; // L: 69
+				this.retextureTo = new short[var3]; // L: 70
+
+				for (var4 = 0; var4 < var3; ++var4) { // L: 71
+					this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72
+					this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73
 				}
-			} else if (var2 >= 60 && var2 < 70) { // L: 70
+			} else if (var2 >= 60 && var2 < 70) { // L: 76
 				this.models[var2 - 60] = var1.readUnsignedShort();
 			}
 		}
 
-	} // L: 72
+	} // L: 78
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "-68"
+		garbageValue = "-29"
 	)
 	@Export("ready")
 	public boolean ready() {
-		if (this.models2 == null) {
+		if (this.models2 == null) { // L: 81
 			return true;
 		} else {
-			boolean var1 = true;
+			boolean var1 = true; // L: 82
 
-			for (int var2 = 0; var2 < this.models2.length; ++var2) {
+			for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 83
 				if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) {
 					var1 = false;
 				}
 			}
 
-			return var1;
+			return var1; // L: 84
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgk;",
-		garbageValue = "-84"
+		descriptor = "(I)Lge;",
+		garbageValue = "1561860079"
 	)
 	@Export("getModelData")
 	public ModelData getModelData() {
-		if (this.models2 == null) {
+		if (this.models2 == null) { // L: 88
 			return null;
 		} else {
-			ModelData[] var1 = new ModelData[this.models2.length]; // L: 83
+			ModelData[] var1 = new ModelData[this.models2.length]; // L: 89
 
-			for (int var2 = 0; var2 < this.models2.length; ++var2) {
+			for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90
 				var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0);
 			}
 
 			ModelData var4;
-			if (var1.length == 1) { // L: 86
+			if (var1.length == 1) { // L: 92
 				var4 = var1[0];
 			} else {
-				var4 = new ModelData(var1, var1.length); // L: 87
+				var4 = new ModelData(var1, var1.length); // L: 93
 			}
 
 			int var3;
-			if (this.recolorFrom != null) { // L: 88
-				for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 89
-					var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 90
+			if (this.recolorFrom != null) { // L: 94
+				for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 95
+					var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 96
 				}
 			}
 
-			if (this.retextureFrom != null) { // L: 93
-				for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 94
-					var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 95
+			if (this.retextureFrom != null) { // L: 99
+				for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 100
+					var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 101
 				}
 			}
 
-			return var4; // L: 98
+			return var4; // L: 104
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-978751148"
+		garbageValue = "1736416150"
 	)
-	public boolean method3053() {
-		boolean var1 = true; // L: 102
+	public boolean method3210() {
+		boolean var1 = true; // L: 108
 
-		for (int var2 = 0; var2 < 5; ++var2) { // L: 103
-			if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104
+		for (int var2 = 0; var2 < 5; ++var2) { // L: 109
+			if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 110
 				var1 = false;
 			}
 		}
 
-		return var1; // L: 106
+		return var1; // L: 112
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgk;",
-		garbageValue = "30"
+		descriptor = "(B)Lge;",
+		garbageValue = "49"
 	)
 	@Export("getKitDefinitionModels")
 	public ModelData getKitDefinitionModels() {
-		ModelData[] var1 = new ModelData[5]; // L: 110
-		int var2 = 0; // L: 111
+		ModelData[] var1 = new ModelData[5]; // L: 116
+		int var2 = 0; // L: 117
 
-		for (int var3 = 0; var3 < 5; ++var3) { // L: 112
-			if (this.models[var3] != -1) { // L: 113
+		for (int var3 = 0; var3 < 5; ++var3) { // L: 118
+			if (this.models[var3] != -1) { // L: 119
 				var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0);
 			}
 		}
 
-		ModelData var5 = new ModelData(var1, var2); // L: 115
+		ModelData var5 = new ModelData(var1, var2); // L: 121
 		int var4;
-		if (this.recolorFrom != null) { // L: 116
-			for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 117
-				var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 118
+		if (this.recolorFrom != null) { // L: 122
+			for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 123
+				var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 124
 			}
 		}
 
-		if (this.retextureFrom != null) { // L: 121
-			for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 122
-				var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 123
+		if (this.retextureFrom != null) { // L: 127
+			for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 128
+				var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 129
 			}
 		}
 
-		return var5; // L: 126
+		return var5; // L: 132
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lfe;",
-		garbageValue = "1023192596"
+		descriptor = "(Lj;B)Lm;",
+		garbageValue = "-59"
 	)
-	@Export("getObjectDefinition")
-	public static ObjectComposition getObjectDefinition(int var0) {
-		ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 73
-		if (var1 != null) { // L: 74
-			return var1;
-		} else {
-			byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 75
-			var1 = new ObjectComposition(); // L: 76
-			var1.id = var0; // L: 77
-			if (var2 != null) { // L: 78
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode(); // L: 79
-			if (var1.isSolid) { // L: 80
-				var1.interactType = 0; // L: 81
-				var1.boolean1 = false; // L: 82
-			}
-
-			ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84
-			return var1; // L: 85
+	public static class3 method3238(class6 var0) {
+		switch(var0.field16) { // L: 9
+		case 0:
+			return new class0(); // L: 12
+		default:
+			throw new IllegalArgumentException(); // L: 16
 		}
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "(Lav;B)V",
-		garbageValue = "72"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "445518606"
 	)
-	@Export("PcmStream_disable")
-	static final void PcmStream_disable(PcmStream var0) {
-		var0.active = false; // L: 259
-		if (var0.sound != null) { // L: 260
-			var0.sound.position = 0;
-		}
-
-		for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
-			PcmStream_disable(var1); // L: 261
+	static int method3237(int var0, Script var1, boolean var2) {
+		if (var0 == 7400) { // L: 4460
+			--IsaacCipher.Interpreter_intStackSize; // L: 4461
+			--class13.Interpreter_stringStackSize; // L: 4462
+			return 1; // L: 4463
+		} else if (var0 == 7401) { // L: 4465
+			--IsaacCipher.Interpreter_intStackSize; // L: 4466
+			--class13.Interpreter_stringStackSize; // L: 4467
+			return 1; // L: 4468
+		} else if (var0 == 7402) { // L: 4470
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 4471
+			--class13.Interpreter_stringStackSize; // L: 4472
+			return 1; // L: 4473
+		} else if (var0 == 7403) { // L: 4475
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 4476
+			--class13.Interpreter_stringStackSize; // L: 4477
+			return 1; // L: 4478
+		} else if (var0 == 7404) { // L: 4480
+			--IsaacCipher.Interpreter_intStackSize; // L: 4481
+			--class13.Interpreter_stringStackSize; // L: 4482
+			return 1; // L: 4483
+		} else if (var0 == 7405) { // L: 4485
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 4486
+			return 1; // L: 4487
+		} else if (var0 == 7406) { // L: 4489
+			--IsaacCipher.Interpreter_intStackSize; // L: 4490
+			Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4491
+			return 1; // L: 4492
+		} else if (var0 == 7407) { // L: 4494
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4495
+			return 1; // L: 4496
+		} else if (var0 == 7408) { // L: 4498
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 4499
+			--class13.Interpreter_stringStackSize; // L: 4500
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4501
+			return 1; // L: 4502
+		} else if (var0 == 7409) { // L: 4504
+			--IsaacCipher.Interpreter_intStackSize; // L: 4505
+			return 1; // L: 4506
+		} else {
+			return 2; // L: 4508
 		}
-
-	} // L: 262
+	}
 }
diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java
index ece1a99cee..9a00da499b 100644
--- a/runescape-client/src/main/java/Language.java
+++ b/runescape-client/src/main/java/Language.java
@@ -5,172 +5,525 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kz")
+@ObfuscatedName("lf")
 @Implements("Language")
 public class Language implements MouseWheel {
-	@ObfuscatedName("td")
-	@Export("foundItemIds")
-	static short[] foundItemIds;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lkz;"
+		descriptor = "Llf;"
 	)
 	@Export("Language_EN")
 	public static final Language Language_EN;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lkz;"
+		descriptor = "Llf;"
 	)
 	@Export("Language_DE")
 	static final Language Language_DE;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lkz;"
+		descriptor = "Llf;"
 	)
 	@Export("Language_FR")
 	public static final Language Language_FR;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lkz;"
+		descriptor = "Llf;"
 	)
 	@Export("Language_PT")
 	static final Language Language_PT;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lkz;"
+		descriptor = "Llf;"
 	)
 	@Export("Language_NL")
 	static final Language Language_NL;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lkz;"
+		descriptor = "Llf;"
 	)
 	@Export("Language_ES")
 	public static final Language Language_ES;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lkz;"
+		descriptor = "Llf;"
 	)
 	@Export("Language_ES_MX")
 	static final Language Language_ES_MX;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "[Lkz;"
+		descriptor = "[Llf;"
 	)
 	@Export("Language_valuesOrdered")
 	static final Language[] Language_valuesOrdered;
-	@ObfuscatedName("p")
-	final String field3780;
-	@ObfuscatedName("j")
+	@ObfuscatedName("w")
+	final String field3928;
+	@ObfuscatedName("n")
 	@Export("language")
 	final String language;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1281273687
+		intValue = -2145435699
 	)
 	@Export("id")
 	final int id;
 
 	static {
-		Language_EN = new Language("EN", "en", "English", ModeWhere.field3803, 0, "GB"); // L: 10
-		Language_DE = new Language("DE", "de", "German", ModeWhere.field3803, 1, "DE"); // L: 11
-		Language_FR = new Language("FR", "fr", "French", ModeWhere.field3803, 2, "FR"); // L: 12
-		Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3803, 3, "BR"); // L: 13
-		Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3793, 4, "NL"); // L: 14
-		Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3793, 5, "ES"); // L: 15
-		Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3803, 6, "MX"); // L: 16
-		Language[] var0 = new Language[]{Language_DE, Language_NL, Language_EN, Language_ES, Language_PT, Language_FR, Language_ES_MX}; // L: 25
-		Language_valuesOrdered = new Language[var0.length]; // L: 28
-		Language[] var2 = var0; // L: 30
-
-		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31
-			Language var4 = var2[var3]; // L: 32
-			if (Language_valuesOrdered[var4.id] != null) { // L: 34
-				throw new IllegalStateException(); // L: 35
-			}
-
-			Language_valuesOrdered[var4.id] = var4; // L: 37
+		Language_EN = new Language("EN", "en", "English", ModeWhere.field3948, 0, "GB"); // L: 12
+		Language_DE = new Language("DE", "de", "German", ModeWhere.field3948, 1, "DE"); // L: 13
+		Language_FR = new Language("FR", "fr", "French", ModeWhere.field3948, 2, "FR"); // L: 14
+		Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3948, 3, "BR"); // L: 15
+		Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3939, 4, "NL"); // L: 16
+		Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3939, 5, "ES"); // L: 17
+		Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3948, 6, "MX"); // L: 18
+		Language[] var0 = new Language[]{Language_ES_MX, Language_EN, Language_NL, Language_PT, Language_ES, Language_DE, Language_FR}; // L: 27
+		Language_valuesOrdered = new Language[var0.length]; // L: 30
+		Language[] var2 = var0; // L: 32
+
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 33
+			Language var4 = var2[var3]; // L: 34
+			if (Language_valuesOrdered[var4.id] != null) { // L: 36
+				throw new IllegalStateException(); // L: 37
+			}
+
+			Language_valuesOrdered[var4.id] = var4; // L: 39
 		}
 
-	} // L: 41
+	}
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lks;ILjava/lang/String;)V"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Llq;ILjava/lang/String;)V"
 	)
 	Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) {
-		this.field3780 = var1; // L: 44
-		this.language = var2; // L: 45
-		this.id = var5; // L: 46
-		if (var6 != null) { // L: 47
-			new Locale(var2.substring(0, 2), var6); // L: 48
+		this.field3928 = var1;
+		this.language = var2;
+		this.id = var5; // L: 48
+		if (var6 != null) { // L: 49
+			new Locale(var2.substring(0, 2), var6); // L: 50
 		} else {
-			new Locale(var2.substring(0, 2)); // L: 51
+			new Locale(var2.substring(0, 2)); // L: 53
 		}
 
-	} // L: 53
+	} // L: 55
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-157236574"
+		garbageValue = "1775253348"
 	)
 	@Export("getLanguage")
 	String getLanguage() {
-		return this.language; // L: 56
+		return this.language; // L: 58
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 60
+		return this.id; // L: 63
 	}
 
 	public String toString() {
-		return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 69
+		return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 73
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "2088906583"
+		descriptor = "(II)I",
+		garbageValue = "316979421"
 	)
-	public static int method5533(int var0, int var1) {
-		return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 24
+	public static int method5825(int var0) {
+		var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 42
+		var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 43
+		var0 = var0 + (var0 >>> 4) & 252645135; // L: 44
+		var0 += var0 >>> 8; // L: 45
+		var0 += var0 >>> 16; // L: 46
+		return var0 & 255; // L: 47
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lkz;",
-		garbageValue = "60"
+		descriptor = "(IB)Llf;",
+		garbageValue = "77"
 	)
-	public static Language method5519(int var0) {
-		return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65
+	public static Language method5826(int var0) {
+		return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 67 68
 	}
 
-	@ObfuscatedName("hv")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-88"
+		descriptor = "(I)[I",
+		garbageValue = "2031072564"
 	)
-	static final boolean method5521() {
-		return Client.isMenuOpen; // L: 8105
+	public static int[] method5840() {
+		int[] var0 = new int[KeyHandler.field142]; // L: 259
+
+		for (int var1 = 0; var1 < KeyHandler.field142; ++var1) { // L: 260
+			var0[var1] = KeyHandler.field141[var1]; // L: 261
+		}
+
+		return var0; // L: 263
 	}
 
-	@ObfuscatedName("hi")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "440428579"
+		descriptor = "(Llx;Llx;I)V",
+		garbageValue = "-1459903356"
 	)
-	static final void method5516(int var0, int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8109
-			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: 8110
-				Client.field553[var4] = true;
+	static void method5841(Font var0, Font var1) {
+		Archive var3;
+		int var4;
+		int var5;
+		int var9;
+		int var11;
+		int var13;
+		if (class148.worldSelectBackSprites == null) { // L: 1671
+			var3 = UserComparator6.archive8; // L: 1673
+			var4 = var3.getGroupId("sl_back"); // L: 1675
+			var5 = var3.getFileId(var4, ""); // L: 1676
+			SpritePixels[] var6;
+			if (!class147.method3009(var3, var4, var5)) { // L: 1679
+				var6 = null; // L: 1680
+			} else {
+				SpritePixels[] var8 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 1685
+				var9 = 0;
+
+				while (true) {
+					if (var9 >= class440.SpriteBuffer_spriteCount) {
+						UserComparator3.method2529(); // L: 1699
+						var6 = var8; // L: 1702
+						break;
+					}
+
+					SpritePixels var10 = var8[var9] = new SpritePixels(); // L: 1687
+					var10.width = class432.SpriteBuffer_spriteWidth; // L: 1688
+					var10.height = class432.SpriteBuffer_spriteHeight; // L: 1689
+					var10.xOffset = class141.SpriteBuffer_xOffsets[var9]; // L: 1690
+					var10.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; // L: 1691
+					var10.subWidth = class432.SpriteBuffer_spriteWidths[var9]; // L: 1692
+					var10.subHeight = class330.SpriteBuffer_spriteHeights[var9]; // L: 1693
+					var11 = var10.subHeight * var10.subWidth; // L: 1694
+					byte[] var12 = class369.SpriteBuffer_pixels[var9]; // L: 1695
+					var10.pixels = new int[var11]; // L: 1696
+
+					for (var13 = 0; var13 < var11; ++var13) { // L: 1697
+						var10.pixels[var13] = class432.SpriteBuffer_spritePalette[var12[var13] & 255];
+					}
+
+					++var9; // L: 1686
+				}
+			}
+
+			class148.worldSelectBackSprites = var6; // L: 1706
+		}
+
+		IndexedSprite[] var30;
+		IndexedSprite[] var31;
+		IndexedSprite var32;
+		if (AbstractArchive.worldSelectFlagSprites == null) { // L: 1708
+			var3 = UserComparator6.archive8; // L: 1710
+			var4 = var3.getGroupId("sl_flags"); // L: 1712
+			var5 = var3.getFileId(var4, ""); // L: 1713
+			if (!class147.method3009(var3, var4, var5)) { // L: 1716
+				var30 = null; // L: 1717
+			} else {
+				var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 1722
+
+				for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { // L: 1723
+					var32 = var31[var9] = new IndexedSprite(); // L: 1724
+					var32.width = class432.SpriteBuffer_spriteWidth; // L: 1725
+					var32.height = class432.SpriteBuffer_spriteHeight; // L: 1726
+					var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; // L: 1727
+					var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; // L: 1728
+					var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; // L: 1729
+					var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; // L: 1730
+					var32.palette = class432.SpriteBuffer_spritePalette; // L: 1731
+					var32.pixels = class369.SpriteBuffer_pixels[var9]; // L: 1732
+				}
+
+				UserComparator3.method2529(); // L: 1734
+				var30 = var31; // L: 1737
+			}
+
+			AbstractArchive.worldSelectFlagSprites = var30; // L: 1741
+		}
+
+		if (UserComparator3.worldSelectArrows == null) { // L: 1743
+			var3 = UserComparator6.archive8; // L: 1745
+			var4 = var3.getGroupId("sl_arrows"); // L: 1747
+			var5 = var3.getFileId(var4, ""); // L: 1748
+			if (!class147.method3009(var3, var4, var5)) { // L: 1751
+				var30 = null; // L: 1752
+			} else {
+				var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 1757
+
+				for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { // L: 1758
+					var32 = var31[var9] = new IndexedSprite(); // L: 1759
+					var32.width = class432.SpriteBuffer_spriteWidth; // L: 1760
+					var32.height = class432.SpriteBuffer_spriteHeight; // L: 1761
+					var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; // L: 1762
+					var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; // L: 1763
+					var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; // L: 1764
+					var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; // L: 1765
+					var32.palette = class432.SpriteBuffer_spritePalette; // L: 1766
+					var32.pixels = class369.SpriteBuffer_pixels[var9]; // L: 1767
+				}
+
+				UserComparator3.method2529(); // L: 1769
+				var30 = var31; // L: 1772
+			}
+
+			UserComparator3.worldSelectArrows = var30; // L: 1776
+		}
+
+		if (class112.worldSelectStars == null) { // L: 1778
+			var3 = UserComparator6.archive8; // L: 1780
+			var4 = var3.getGroupId("sl_stars"); // L: 1782
+			var5 = var3.getFileId(var4, ""); // L: 1783
+			if (!class147.method3009(var3, var4, var5)) { // L: 1786
+				var30 = null; // L: 1787
+			} else {
+				var31 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 1792
+
+				for (var9 = 0; var9 < class440.SpriteBuffer_spriteCount; ++var9) { // L: 1793
+					var32 = var31[var9] = new IndexedSprite(); // L: 1794
+					var32.width = class432.SpriteBuffer_spriteWidth; // L: 1795
+					var32.height = class432.SpriteBuffer_spriteHeight; // L: 1796
+					var32.xOffset = class141.SpriteBuffer_xOffsets[var9]; // L: 1797
+					var32.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var9]; // L: 1798
+					var32.subWidth = class432.SpriteBuffer_spriteWidths[var9]; // L: 1799
+					var32.subHeight = class330.SpriteBuffer_spriteHeights[var9]; // L: 1800
+					var32.palette = class432.SpriteBuffer_spritePalette; // L: 1801
+					var32.pixels = class369.SpriteBuffer_pixels[var9]; // L: 1802
+				}
+
+				UserComparator3.method2529(); // L: 1804
+				var30 = var31; // L: 1807
+			}
+
+			class112.worldSelectStars = var30; // L: 1811
+		}
+
+		if (class11.worldSelectLeftSprite == null) { // L: 1813
+			class11.worldSelectLeftSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.archive8, "leftarrow", "");
+		}
+
+		if (UrlRequest.worldSelectRightSprite == null) { // L: 1814
+			UrlRequest.worldSelectRightSprite = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.archive8, "rightarrow", "");
+		}
+
+		Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1815
+		Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1816
+		Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1817
+		var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1818
+		if (class112.worldSelectStars != null) { // L: 1819
+			class112.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1820
+			var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1821
+			class112.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1822
+			var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1823
+		}
+
+		if (UserComparator3.worldSelectArrows != null) { // L: 1825
+			int var22 = Login.xPadding + 280; // L: 1826
+			if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1827
+				UserComparator3.worldSelectArrows[2].drawAt(var22, 4);
+			} else {
+				UserComparator3.worldSelectArrows[0].drawAt(var22, 4); // L: 1828
+			}
+
+			if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1829
+				UserComparator3.worldSelectArrows[3].drawAt(var22 + 15, 4);
+			} else {
+				UserComparator3.worldSelectArrows[1].drawAt(var22 + 15, 4); // L: 1830
+			}
+
+			var0.draw("World", var22 + 32, 17, 16777215, -1); // L: 1831
+			int var23 = Login.xPadding + 390; // L: 1832
+			if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1833
+				UserComparator3.worldSelectArrows[2].drawAt(var23, 4);
+			} else {
+				UserComparator3.worldSelectArrows[0].drawAt(var23, 4); // L: 1834
+			}
+
+			if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1835
+				UserComparator3.worldSelectArrows[3].drawAt(var23 + 15, 4);
+			} else {
+				UserComparator3.worldSelectArrows[1].drawAt(var23 + 15, 4); // L: 1836
+			}
+
+			var0.draw("Players", var23 + 32, 17, 16777215, -1); // L: 1837
+			var4 = Login.xPadding + 500; // L: 1838
+			if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1839
+				UserComparator3.worldSelectArrows[2].drawAt(var4, 4);
+			} else {
+				UserComparator3.worldSelectArrows[0].drawAt(var4, 4); // L: 1840
+			}
+
+			if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1841
+				UserComparator3.worldSelectArrows[3].drawAt(var4 + 15, 4);
+			} else {
+				UserComparator3.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1842
+			}
+
+			var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1843
+			var5 = Login.xPadding + 610; // L: 1844
+			if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1845
+				UserComparator3.worldSelectArrows[2].drawAt(var5, 4);
+			} else {
+				UserComparator3.worldSelectArrows[0].drawAt(var5, 4); // L: 1846
+			}
+
+			if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1847
+				UserComparator3.worldSelectArrows[3].drawAt(var5 + 15, 4);
+			} else {
+				UserComparator3.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1848
+			}
+
+			var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1849
+		}
+
+		Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1851
+		var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1852
+		Login.hoveredWorldIndex = -1; // L: 1853
+		if (class148.worldSelectBackSprites != null) { // L: 1854
+			byte var34 = 88; // L: 1855
+			byte var35 = 19; // L: 1856
+			var4 = 765 / (var34 + 1) - 1; // L: 1857
+			var5 = 480 / (var35 + 1); // L: 1858
+
+			int var24;
+			int var25;
+			do {
+				var24 = var5; // L: 1860
+				var25 = var4; // L: 1861
+				if (var5 * (var4 - 1) >= World.World_count) { // L: 1862
+					--var4;
+				}
+
+				if (var4 * (var5 - 1) >= World.World_count) { // L: 1863
+					--var5;
+				}
+
+				if (var4 * (var5 - 1) >= World.World_count) { // L: 1864
+					--var5;
+				}
+			} while(var5 != var24 || var4 != var25); // L: 1865
+
+			var24 = (765 - var4 * var34) / (var4 + 1); // L: 1867
+			if (var24 > 5) { // L: 1868
+				var24 = 5;
+			}
+
+			var25 = (480 - var35 * var5) / (var5 + 1); // L: 1869
+			if (var25 > 5) { // L: 1870
+				var25 = 5;
+			}
+
+			int var26 = (765 - var34 * var4 - var24 * (var4 - 1)) / 2; // L: 1871
+			var9 = (480 - var35 * var5 - var25 * (var5 - 1)) / 2; // L: 1872
+			int var27 = (var5 + World.World_count - 1) / var5; // L: 1873
+			Login.worldSelectPagesCount = var27 - var4; // L: 1874
+			if (class11.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1875
+				class11.worldSelectLeftSprite.drawAt(8, BoundaryObject.canvasHeight / 2 - class11.worldSelectLeftSprite.subHeight / 2); // L: 1876
+			}
+
+			if (UrlRequest.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1878
+				UrlRequest.worldSelectRightSprite.drawAt(class186.canvasWidth - UrlRequest.worldSelectRightSprite.subWidth - 8, BoundaryObject.canvasHeight / 2 - UrlRequest.worldSelectRightSprite.subHeight / 2); // L: 1879
+			}
+
+			var11 = var9 + 23; // L: 1881
+			int var28 = var26 + Login.xPadding; // L: 1882
+			var13 = 0; // L: 1883
+			boolean var14 = false; // L: 1884
+			int var15 = Login.worldSelectPage; // L: 1885
+
+			int var16;
+			for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1886 1887
+				World var17 = class334.World_worlds[var16]; // L: 1890
+				boolean var18 = true; // L: 1891
+				String var19 = Integer.toString(var17.population); // L: 1892
+				if (var17.population == -1) { // L: 1893
+					var19 = "OFF"; // L: 1894
+					var18 = false; // L: 1895
+				} else if (var17.population > 1980) { // L: 1897
+					var19 = "FULL"; // L: 1898
+					var18 = false; // L: 1899
+				}
+
+				int var21 = 0; // L: 1902
+				byte var20;
+				if (var17.isBeta()) { // L: 1903
+					if (var17.isMembersOnly()) { // L: 1904
+						var20 = 7;
+					} else {
+						var20 = 6; // L: 1905
+					}
+				} else if (var17.isDeadman()) { // L: 1907
+					var21 = 16711680; // L: 1908
+					if (var17.isMembersOnly()) { // L: 1909
+						var20 = 5;
+					} else {
+						var20 = 4; // L: 1910
+					}
+				} else if (var17.method1679()) { // L: 1912
+					if (var17.isMembersOnly()) { // L: 1913
+						var20 = 9;
+					} else {
+						var20 = 8; // L: 1914
+					}
+				} else if (var17.isPvp()) { // L: 1916
+					if (var17.isMembersOnly()) { // L: 1917
+						var20 = 3;
+					} else {
+						var20 = 2; // L: 1918
+					}
+				} else if (var17.isMembersOnly()) { // L: 1921
+					var20 = 1;
+				} else {
+					var20 = 0; // L: 1922
+				}
+
+				if (MouseHandler.MouseHandler_x >= var28 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var28 + var34 && MouseHandler.MouseHandler_y < var11 + var35 && var18) { // L: 1924
+					Login.hoveredWorldIndex = var16; // L: 1925
+					class148.worldSelectBackSprites[var20].drawTransOverlayAt(var28, var11, 128, 16777215); // L: 1926
+					var14 = true; // L: 1927
+				} else {
+					class148.worldSelectBackSprites[var20].drawAt(var28, var11); // L: 1929
+				}
+
+				if (AbstractArchive.worldSelectFlagSprites != null) { // L: 1930
+					AbstractArchive.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var28 + 29, var11);
+				}
+
+				var0.drawCentered(Integer.toString(var17.id), var28 + 15, var35 / 2 + var11 + 5, var21, -1); // L: 1931
+				var1.drawCentered(var19, var28 + 60, var35 / 2 + var11 + 5, 268435455, -1); // L: 1932
+				var11 = var11 + var25 + var35; // L: 1933
+				++var13; // L: 1934
+				if (var13 >= var5) {
+					var11 = var9 + 23; // L: 1935
+					var28 = var28 + var24 + var34; // L: 1936
+					var13 = 0; // L: 1937
+					++var15; // L: 1938
+				}
+			}
+
+			if (var14) { // L: 1941
+				var16 = var1.stringWidth(class334.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1942
+				int var29 = var1.ascent + 8; // L: 1943
+				int var33 = MouseHandler.MouseHandler_y + 25; // L: 1944
+				if (var33 + var29 > 480) { // L: 1945
+					var33 = MouseHandler.MouseHandler_y - 25 - var29; // L: 1946
+				}
+
+				Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var33, var16, var29, 16777120); // L: 1948
+				Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var33, var16, var29, 0); // L: 1949
+				var1.drawCentered(class334.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var33 + var1.ascent + 4, 0, -1); // L: 1950
 			}
 		}
 
-	} // L: 8112
+		class19.rasterProvider.drawFull(0, 0); // L: 1953
+	} // L: 1954
 }
diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java
index 73a6c20390..03c0a70e31 100644
--- a/runescape-client/src/main/java/Link.java
+++ b/runescape-client/src/main/java/Link.java
@@ -3,23 +3,23 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mk")
+@ObfuscatedName("nz")
 @Implements("Link")
 public class Link {
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnz;"
 	)
 	@Export("previous")
 	public Link previous;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnz;"
 	)
 	@Export("next")
 	public Link next;
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("remove")
 	public void remove() {
 		if (this.next != null) { // L: 8
diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java
index f61e6dfbef..c2475ae9aa 100644
--- a/runescape-client/src/main/java/LinkDeque.java
+++ b/runescape-client/src/main/java/LinkDeque.java
@@ -3,18 +3,18 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ky")
+@ObfuscatedName("lc")
 @Implements("LinkDeque")
 public class LinkDeque {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnz;"
 	)
 	@Export("sentinel")
 	Link sentinel;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lmk;"
+		descriptor = "Lnz;"
 	)
 	@Export("current")
 	Link current;
@@ -25,9 +25,9 @@ public LinkDeque() {
 		this.sentinel.next = this.sentinel; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmk;)V"
+		descriptor = "(Lnz;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(Link var1) {
@@ -41,35 +41,35 @@ public void addFirst(Link var1) {
 		var1.previous.next = var1; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "()Lmk;"
+		descriptor = "()Lnz;"
 	)
 	@Export("last")
 	public Link last() {
-		Link var1 = this.sentinel.previous; // L: 23
-		if (var1 == this.sentinel) { // L: 24
-			this.current = null; // L: 25
-			return null; // L: 26
+		Link var1 = this.sentinel.previous; // L: 24
+		if (var1 == this.sentinel) { // L: 25
+			this.current = null; // L: 26
+			return null; // L: 27
 		} else {
-			this.current = var1.previous; // L: 28
-			return var1; // L: 29
+			this.current = var1.previous; // L: 29
+			return var1; // L: 30
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "()Lmk;"
+		descriptor = "()Lnz;"
 	)
 	@Export("previous")
 	public Link previous() {
-		Link var1 = this.current; // L: 33
-		if (var1 == this.sentinel) { // L: 34
-			this.current = null; // L: 35
-			return null; // L: 36
+		Link var1 = this.current; // L: 35
+		if (var1 == this.sentinel) { // L: 36
+			this.current = null; // L: 37
+			return null; // L: 38
 		} else {
-			this.current = var1.previous; // L: 38
-			return var1; // L: 39
+			this.current = var1.previous; // L: 40
+			return var1; // L: 41
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java
index 123966ad1f..43cdb619e7 100644
--- a/runescape-client/src/main/java/Login.java
+++ b/runescape-client/src/main/java/Login.java
@@ -1,3 +1,5 @@
+import java.io.IOException;
+import java.net.Socket;
 import java.text.DecimalFormat;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
@@ -5,178 +7,152 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bc")
+@ObfuscatedName("bx")
 @Implements("Login")
 public class Login {
-	@ObfuscatedName("sx")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1142922893
-	)
-	static int field888;
-	@ObfuscatedName("w")
-	@Export("clearLoginScreen")
-	static boolean clearLoginScreen;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1881631583
+		intValue = 1436584639
 	)
 	@Export("xPadding")
 	static int xPadding;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "[Loe;"
+		descriptor = "[Lpa;"
 	)
 	@Export("runesSprite")
 	static IndexedSprite[] runesSprite;
-	@ObfuscatedName("o")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
+		descriptor = "Lpa;"
 	)
-	@Export("titleboxSprite")
-	static IndexedSprite titleboxSprite;
-	@ObfuscatedName("g")
+	static IndexedSprite field894;
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
+		descriptor = "Lpa;"
 	)
-	@Export("titlebuttonSprite")
-	static IndexedSprite titlebuttonSprite;
-	@ObfuscatedName("e")
+	static IndexedSprite field864;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
+		descriptor = "Lpa;"
 	)
-	static IndexedSprite field854;
-	@ObfuscatedName("t")
+	@Export("logoSprite")
+	static IndexedSprite logoSprite;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
+		descriptor = "[Lpa;"
 	)
-	static IndexedSprite field868;
-	@ObfuscatedName("n")
+	@Export("title_muteSprite")
+	static IndexedSprite[] title_muteSprite;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lcj;"
+		descriptor = "Lpa;"
 	)
-	@Export("loginScreenRunesAnimation")
-	static LoginScreenAnimation loginScreenRunesAnimation;
-	@ObfuscatedName("m")
+	static IndexedSprite field888;
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 797188883
+		intValue = -1895069117
 	)
 	@Export("loginBoxX")
 	static int loginBoxX;
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1992009983
-	)
-	@Export("loginBoxCenter")
-	static int loginBoxCenter;
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = -1093783929
+		intValue = -1313078647
 	)
 	@Export("Login_loadingPercent")
 	static int Login_loadingPercent;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@Export("Login_loadingText")
 	static String Login_loadingText;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -363966187
+		intValue = -1613024797
 	)
-	static int field866;
-	@ObfuscatedName("au")
+	static int field871;
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = 145692399
+		intValue = 1878883127
 	)
-	static int field865;
-	@ObfuscatedName("ao")
+	static int field872;
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = -1403617165
+		intValue = 1993247493
 	)
 	@Export("loginIndex")
 	static int loginIndex;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ak")
 	@Export("Login_response0")
 	static String Login_response0;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ad")
 	@Export("Login_response1")
 	static String Login_response1;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bp")
 	@Export("Login_response2")
 	static String Login_response2;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bd")
 	@Export("Login_response3")
 	static String Login_response3;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("ba")
 	@Export("Login_username")
 	static String Login_username;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bq")
 	@Export("Login_password")
 	static String Login_password;
-	@ObfuscatedName("br")
-	static boolean field873;
-	@ObfuscatedName("bj")
-	static boolean field860;
-	@ObfuscatedName("bu")
-	static boolean field875;
 	@ObfuscatedName("bz")
+	static boolean field880;
+	@ObfuscatedName("bu")
+	static boolean field881;
+	@ObfuscatedName("bb")
+	static boolean field882;
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = 1227235195
+		intValue = -898693427
 	)
 	@Export("currentLoginField")
 	static int currentLoginField;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bn")
 	@Export("worldSelectOpen")
 	static boolean worldSelectOpen;
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cl")
 	@ObfuscatedGetter(
-		intValue = -1790436313
+		intValue = 1090106223
 	)
 	@Export("hoveredWorldIndex")
 	static int hoveredWorldIndex;
-	@ObfuscatedName("ck")
+	@ObfuscatedName("cp")
 	@ObfuscatedGetter(
-		intValue = 1898699407
+		intValue = -1897185599
 	)
 	@Export("worldSelectPage")
 	static int worldSelectPage;
-	@ObfuscatedName("ci")
+	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		intValue = -1924078953
+		intValue = 138220479
 	)
 	@Export("worldSelectPagesCount")
 	static int worldSelectPagesCount;
-	@ObfuscatedName("cn")
-	@ObfuscatedGetter(
-		longValue = 499385346435017525L
-	)
-	static long field876;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cg")
 	@ObfuscatedGetter(
-		longValue = 5345571883375832633L
+		longValue = 4939952729510016701L
 	)
-	static long field884;
-	@ObfuscatedName("cd")
-	static String[] field885;
-	@ObfuscatedName("cj")
-	static String[] field871;
-	@ObfuscatedName("dk")
+	static long field890;
+	@ObfuscatedName("cy")
 	@ObfuscatedGetter(
-		longValue = -5916182875581069641L
-	)
-	static long field889;
-	@ObfuscatedName("gj")
-	@ObfuscatedSignature(
-		descriptor = "Lle;"
+		longValue = 8615875209427169179L
 	)
-	@Export("fontBold12")
-	static Font fontBold12;
+	static long field869;
+	@ObfuscatedName("cn")
+	static String[] field892;
+	@ObfuscatedName("cv")
+	static String[] field893;
 
 	static {
 		xPadding = 0; // L: 39
 		loginBoxX = xPadding + 202; // L: 58
-		Login_loadingPercent = 10;
-		Login_loadingText = "";
-		field866 = -1; // L: 79
-		field865 = 1; // L: 82
+		Login_loadingPercent = 10; // L: 60
+		Login_loadingText = ""; // L: 61
+		field871 = -1; // L: 79
+		field872 = 1; // L: 82
 		loginIndex = 0; // L: 86
 		Login_response0 = ""; // L: 87
 		Login_response1 = ""; // L: 88
@@ -184,71 +160,70 @@ public class Login {
 		Login_response3 = ""; // L: 90
 		Login_username = ""; // L: 91
 		Login_password = ""; // L: 92
-		field873 = false; // L: 99
-		field860 = false;
-		field875 = true;
-		currentLoginField = 0;
-		worldSelectOpen = false;
+		field880 = false; // L: 99
+		field881 = false; // L: 100
+		field882 = true; // L: 103
+		currentLoginField = 0; // L: 104
+		worldSelectOpen = false; // L: 108
 		hoveredWorldIndex = -1; // L: 116
 		worldSelectPage = 0; // L: 117
 		worldSelectPagesCount = 0; // L: 118
 		new DecimalFormat("##0.00"); // L: 121
-		new class111();
-		field876 = -1L; // L: 129
-		field884 = -1L; // L: 130
-		field885 = new String[]{"title.jpg"}; // L: 133
-		field871 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"};
+		new class118();
+		field890 = -1L; // L: 129
+		field869 = -1L; // L: 130
+		field892 = new String[]{"title.jpg"}; // L: 133
+		field893 = new String[]{"logo", "logo_deadman_mode", "logo_seasonal_mode", "titlebox", "titlebutton", "titlebutton_large", "play_now_text", "titlebutton_wide42,1", "runes", "title_mute", "options_radio_buttons,0", "options_radio_buttons,2", "options_radio_buttons,4", "options_radio_buttons,6", "sl_back", "sl_flags", "sl_arrows", "sl_stars", "sl_button"};
 	} // L: 136
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)[Lcr;",
-		garbageValue = "814491633"
+		descriptor = "(S)[Ldx;",
+		garbageValue = "160"
 	)
-	static AttackOption[] method1950() {
-		return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick, AttackOption.field1228, AttackOption.field1226}; // L: 12072
+	static class116[] method1994() {
+		return new class116[]{class116.field1421, class116.field1415, class116.field1416, class116.field1423, class116.field1418, class116.field1419}; // L: 25
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "485926741"
-	)
-	@Export("savePreferences")
-	static void savePreferences() {
-		AccessFile var0 = null; // L: 100
-
-		try {
-			var0 = DevicePcmPlayerProvider.getPreferencesFile("", RouteStrategy.field1986.name, true); // L: 102
-			Buffer var1 = class408.clientPreferences.toBuffer(); // L: 103
-			var0.write(var1.array, 0, var1.offset); // L: 104
-		} catch (Exception var3) { // L: 106
-		}
-
-		try {
-			if (var0 != null) { // L: 108
-				var0.closeSync(true); // L: 109
-			}
-		} catch (Exception var2) { // L: 112
+		descriptor = "(IIII)I",
+		garbageValue = "-721408272"
+	)
+	static int method1993(int var0, int var1, int var2) {
+		if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { // L: 456
+			return 0;
+		} else {
+			return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; // L: 457
 		}
+	}
 
-	} // L: 113
-
-	@ObfuscatedName("a")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-126"
-	)
-	static void method1952() {
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 59
-			if (ArchiveDiskActionHandler.field3662 == 0) { // L: 60
-				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 61
-				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 62
-				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 63
-				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 64
+		descriptor = "(III)I",
+		garbageValue = "675537632"
+	)
+	static final int method1995(int var0, int var1) {
+		if (var0 == -1) { // L: 495
+			return 12345678;
+		} else {
+			var1 = (var0 & 127) * var1 / 128; // L: 496
+			if (var1 < 2) { // L: 497
+				var1 = 2;
+			} else if (var1 > 126) { // L: 498
+				var1 = 126;
 			}
 
-			ArchiveDiskActionHandler.field3662 = 600; // L: 66
+			return (var0 & 65408) + var1; // L: 499
 		}
-	} // L: 68
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/net/Socket;IIB)Lmd;",
+		garbageValue = "-5"
+	)
+	public static AbstractSocket method1965(Socket var0, int var1, int var2) throws IOException {
+		return new BufferedNetSocket(var0, var1, var2); // L: 10
+	}
 }
diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java
index 4b8a434981..777952f6d9 100644
--- a/runescape-client/src/main/java/LoginPacket.java
+++ b/runescape-client/src/main/java/LoginPacket.java
@@ -4,67 +4,68 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("im")
+@ObfuscatedName("ir")
 @Implements("LoginPacket")
-public class LoginPacket implements class238 {
-	@ObfuscatedName("i")
+public class LoginPacket implements class251 {
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lim;"
+		descriptor = "Lir;"
 	)
-	public static final LoginPacket field2901;
-	@ObfuscatedName("w")
+	public static final LoginPacket field3032;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lim;"
+		descriptor = "Lir;"
 	)
-	static final LoginPacket field2897;
-	@ObfuscatedName("s")
+	static final LoginPacket field3031;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lim;"
+		descriptor = "Lir;"
 	)
-	public static final LoginPacket field2896;
-	@ObfuscatedName("a")
+	public static final LoginPacket field3038;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lim;"
+		descriptor = "Lir;"
 	)
-	public static final LoginPacket field2894;
-	@ObfuscatedName("o")
+	public static final LoginPacket field3037;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lim;"
+		descriptor = "Lir;"
 	)
-	public static final LoginPacket field2900;
-	@ObfuscatedName("g")
+	public static final LoginPacket field3034;
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lim;"
+		descriptor = "Lir;"
 	)
-	static final LoginPacket field2899;
-	@ObfuscatedName("p")
+	static final LoginPacket field3035;
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "[Lim;"
+		descriptor = "[Lir;"
 	)
 	@Export("LoginPacket_indexedValues")
 	static final LoginPacket[] LoginPacket_indexedValues;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -152367843
+		intValue = -1815606843
 	)
 	@Export("id")
 	public final int id;
 
 	static {
-		field2901 = new LoginPacket(14, 0); // L: 5
-		field2897 = new LoginPacket(15, 4); // L: 6
-		field2896 = new LoginPacket(16, -2); // L: 7
-		field2894 = new LoginPacket(18, -2); // L: 8
-		field2900 = new LoginPacket(19, -2); // L: 9
-		field2899 = new LoginPacket(27, 0); // L: 10
+		field3032 = new LoginPacket(14, 0); // L: 5
+		field3031 = new LoginPacket(15, 4); // L: 6
+		field3038 = new LoginPacket(16, -2); // L: 7
+		field3037 = new LoginPacket(18, -2); // L: 8
+		field3034 = new LoginPacket(19, -2); // L: 9
+		field3035 = new LoginPacket(27, 0); // L: 10
 		LoginPacket_indexedValues = new LoginPacket[32]; // L: 12
-		LoginPacket[] var0 = class240.method4711(); // L: 15
+		LoginPacket[] var0 = new LoginPacket[]{field3031, field3037, field3038, field3034, field3032, field3035}; // L: 17
+		LoginPacket[] var1 = var0; // L: 19
 
-		for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16
-			LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17
+		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 20
+			LoginPacket_indexedValues[var1[var2].id] = var1[var2]; // L: 21
 		}
 
-	} // L: 19
+	} // L: 23
 
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
@@ -74,40 +75,20 @@ public class LoginPacket implements class238 {
 		this.id = var1; // L: 26
 	} // L: 27
 
-	@ObfuscatedName("jf")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;IIB)V",
-		garbageValue = "8"
+		descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
+		garbageValue = "100"
 	)
-	@Export("alignWidgetPosition")
-	static void alignWidgetPosition(Widget var0, int var1, int var2) {
-		if (var0.xAlignment == 0) { // L: 10279
-			var0.x = var0.rawX;
-		} else if (var0.xAlignment == 1) { // L: 10280
-			var0.x = var0.rawX + (var1 - var0.width) / 2;
-		} else if (var0.xAlignment == 2) { // L: 10281
-			var0.x = var1 - var0.width - var0.rawX;
-		} else if (var0.xAlignment == 3) { // L: 10282
-			var0.x = var0.rawX * var1 >> 14;
-		} else if (var0.xAlignment == 4) { // L: 10283
-			var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2;
-		} else {
-			var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10284
-		}
+	public static String method5019(CharSequence var0) {
+		int var2 = var0.length(); // L: 176
+		char[] var3 = new char[var2]; // L: 178
 
-		if (var0.yAlignment == 0) { // L: 10285
-			var0.y = var0.rawY;
-		} else if (var0.yAlignment == 1) { // L: 10286
-			var0.y = (var2 - var0.height) / 2 + var0.rawY;
-		} else if (var0.yAlignment == 2) { // L: 10287
-			var0.y = var2 - var0.height - var0.rawY;
-		} else if (var0.yAlignment == 3) {
-			var0.y = var2 * var0.rawY >> 14; // L: 10288
-		} else if (var0.yAlignment == 4) { // L: 10289
-			var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2;
-		} else {
-			var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10290
+		for (int var4 = 0; var4 < var2; ++var4) { // L: 179
+			var3[var4] = '*';
 		}
 
-	} // L: 10291
+		String var1 = new String(var3); // L: 180
+		return var1; // L: 182
+	}
 }
diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java
index 938be49734..0cdd7ce0a9 100644
--- a/runescape-client/src/main/java/LoginScreenAnimation.java
+++ b/runescape-client/src/main/java/LoginScreenAnimation.java
@@ -4,217 +4,214 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cj")
+@ObfuscatedName("cv")
 @Implements("LoginScreenAnimation")
 public class LoginScreenAnimation {
-	@ObfuscatedName("ew")
+	@ObfuscatedName("hs")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Lpl;"
 	)
-	@Export("archive13")
-	static Archive archive13;
-	@ObfuscatedName("hq")
-	@Export("regions")
-	static int[] regions;
-	@ObfuscatedName("i")
+	@Export("compass")
+	static SpritePixels compass;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "[Loe;"
+		descriptor = "[Lpa;"
 	)
 	@Export("sprites")
 	IndexedSprite[] sprites;
-	@ObfuscatedName("e")
-	int[] field1160;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
+	int[] field1177;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 61106321
+		intValue = -296977857
 	)
-	int field1158;
-	@ObfuscatedName("j")
-	int[] field1159;
-	@ObfuscatedName("b")
-	int[] field1175;
-	@ObfuscatedName("x")
+	int field1182;
+	@ObfuscatedName("n")
+	int[] field1170;
+	@ObfuscatedName("r")
 	int[] field1171;
-	@ObfuscatedName("y")
-	int[] field1162;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
+	int[] field1174;
+	@ObfuscatedName("v")
+	int[] field1173;
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1713557939
+		intValue = 625554107
 	)
-	int field1163;
-	@ObfuscatedName("t")
+	int field1175;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1441778183
+		intValue = 1584674653
 	)
-	int field1164;
-	@ObfuscatedName("l")
-	int[] field1157;
+	int field1169;
+	@ObfuscatedName("g")
+	int[] field1176;
+	@ObfuscatedName("e")
+	int[] field1183;
+	@ObfuscatedName("a")
+	int[] field1178;
 	@ObfuscatedName("u")
-	int[] field1161;
-	@ObfuscatedName("n")
-	int[] field1166;
-	@ObfuscatedName("z")
-	int[] field1168;
-	@ObfuscatedName("q")
+	int[] field1179;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1420414455
+		intValue = 1049118119
 	)
-	int field1169;
-	@ObfuscatedName("d")
+	int field1168;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1836018091
+		intValue = 2026399881
 	)
-	int field1170;
-	@ObfuscatedName("r")
+	int field1181;
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1971523537
+		intValue = -176413191
 	)
-	int field1172;
+	int field1164;
 
 	@ObfuscatedSignature(
-		descriptor = "([Loe;)V"
+		descriptor = "([Lpa;)V"
 	)
 	LoginScreenAnimation(IndexedSprite[] var1) {
-		this.field1160 = new int[256];
-		this.field1158 = 0; // L: 14
-		this.field1163 = 0;
-		this.field1164 = 0;
-		this.field1169 = 0; // L: 25
-		this.field1170 = 0; // L: 26
-		this.field1172 = 0; // L: 27
+		this.field1177 = new int[256]; // L: 13
+		this.field1182 = 0; // L: 14
+		this.field1175 = 0; // L: 19
+		this.field1169 = 0; // L: 20
+		this.field1168 = 0; // L: 25
+		this.field1181 = 0; // L: 26
+		this.field1164 = 0; // L: 27
 		this.sprites = var1; // L: 30
 		this.initColors(); // L: 31
 	} // L: 32
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1711937490"
+		garbageValue = "-1897879869"
 	)
 	@Export("initColors")
 	void initColors() {
-		this.field1175 = new int[256]; // L: 35
+		this.field1171 = new int[256]; // L: 35
 
 		int var1;
 		for (var1 = 0; var1 < 64; ++var1) { // L: 36
-			this.field1175[var1] = var1 * 262144;
+			this.field1171[var1] = var1 * 262144;
 		}
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1175[var1 + 64] = var1 * 1024 + 16711680;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 37
+			this.field1171[var1 + 64] = var1 * 1024 + 16711680;
 		}
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1175[var1 + 128] = var1 * 4 + 16776960;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 38
+			this.field1171[var1 + 128] = var1 * 4 + 16776960;
 		}
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1175[var1 + 192] = 16777215;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 39
+			this.field1171[var1 + 192] = 16777215;
 		}
 
-		this.field1171 = new int[256];
+		this.field1174 = new int[256]; // L: 40
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1171[var1] = var1 * 1024;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 41
+			this.field1174[var1] = var1 * 1024;
 		}
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1171[var1 + 64] = var1 * 4 + 65280;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 42
+			this.field1174[var1 + 64] = var1 * 4 + 65280;
 		}
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1171[var1 + 128] = var1 * 262144 + 65535;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 43
+			this.field1174[var1 + 128] = var1 * 262144 + 65535;
 		}
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1171[var1 + 192] = 16777215;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 44
+			this.field1174[var1 + 192] = 16777215;
 		}
 
-		this.field1162 = new int[256];
+		this.field1173 = new int[256]; // L: 45
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1162[var1] = var1 * 4;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 46
+			this.field1173[var1] = var1 * 4;
 		}
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1162[var1 + 64] = var1 * 262144 + 255;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 47
+			this.field1173[var1 + 64] = var1 * 262144 + 255;
 		}
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1162[var1 + 128] = var1 * 1024 + 16711935;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 48
+			this.field1173[var1 + 128] = var1 * 1024 + 16711935;
 		}
 
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1162[var1 + 192] = 16777215;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 49
+			this.field1173[var1 + 192] = 16777215;
 		}
 
-		this.field1159 = new int[256];
-		this.field1169 = 0;
-		this.field1166 = new int[32768];
-		this.field1168 = new int[32768];
-		this.method2189((IndexedSprite)null);
-		this.field1157 = new int[32768];
-		this.field1161 = new int[32768];
-	}
+		this.field1170 = new int[256]; // L: 50
+		this.field1168 = 0; // L: 51
+		this.field1178 = new int[32768]; // L: 52
+		this.field1179 = new int[32768]; // L: 53
+		this.method2260((IndexedSprite)null); // L: 54
+		this.field1176 = new int[32768]; // L: 55
+		this.field1183 = new int[32768]; // L: 56
+	} // L: 57
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "-6"
+		garbageValue = "0"
 	)
-	void method2193() {
-		this.field1175 = null;
-		this.field1171 = null;
-		this.field1162 = null;
-		this.field1159 = null;
-		this.field1166 = null;
-		this.field1168 = null;
-		this.field1157 = null; // L: 66
-		this.field1161 = null;
-		this.field1169 = 0;
-		this.field1170 = 0; // L: 69
+	void method2280() {
+		this.field1171 = null; // L: 60
+		this.field1174 = null; // L: 61
+		this.field1173 = null; // L: 62
+		this.field1170 = null; // L: 63
+		this.field1178 = null; // L: 64
+		this.field1179 = null; // L: 65
+		this.field1176 = null; // L: 66
+		this.field1183 = null; // L: 67
+		this.field1168 = 0; // L: 68
+		this.field1181 = 0; // L: 69
 	} // L: 70
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "1838202264"
+		descriptor = "(IIB)V",
+		garbageValue = "0"
 	)
 	@Export("draw")
 	void draw(int var1, int var2) {
-		if (this.field1157 == null) { // L: 73
+		if (this.field1176 == null) { // L: 73
 			this.initColors(); // L: 74
 		}
 
-		if (this.field1172 == 0) { // L: 76
-			this.field1172 = var2; // L: 77
+		if (this.field1164 == 0) { // L: 76
+			this.field1164 = var2; // L: 77
 		}
 
-		int var3 = var2 - this.field1172; // L: 79
+		int var3 = var2 - this.field1164; // L: 79
 		if (var3 >= 256) { // L: 80
 			var3 = 0;
 		}
 
-		this.field1172 = var2; // L: 81
+		this.field1164 = var2; // L: 81
 		if (var3 > 0) { // L: 82
-			this.method2190(var3); // L: 83
+			this.method2255(var3); // L: 83
 		}
 
-		this.method2192(var1); // L: 85
+		this.method2257(var1); // L: 85
 	} // L: 86
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-2115412398"
+		garbageValue = "-399944521"
 	)
-	final void method2190(int var1) {
-		this.field1169 += 128 * var1; // L: 89
+	final void method2255(int var1) {
+		this.field1168 += var1 * 128; // L: 89
 		int var2;
-		if (this.field1169 > this.field1166.length) { // L: 90
-			this.field1169 -= this.field1166.length; // L: 91
+		if (this.field1168 > this.field1178.length) { // L: 90
+			this.field1168 -= this.field1178.length; // L: 91
 			var2 = (int)(Math.random() * 12.0D); // L: 92
-			this.method2189(this.sprites[var2]); // L: 93
+			this.method2260(this.sprites[var2]); // L: 93
 		}
 
 		var2 = 0; // L: 95
@@ -223,12 +220,12 @@ final void method2190(int var1) {
 
 		int var6;
 		for (int var5 = 0; var5 < var4; ++var5) { // L: 98
-			var6 = this.field1157[var3 + var2] - this.field1166[var2 + this.field1169 & this.field1166.length - 1] * var1 / 6; // L: 99
+			var6 = this.field1176[var3 + var2] - this.field1178[var2 + this.field1168 & this.field1178.length - 1] * var1 / 6; // L: 99
 			if (var6 < 0) { // L: 100
 				var6 = 0;
 			}
 
-			this.field1157[var2++] = var6; // L: 101
+			this.field1176[var2++] = var6; // L: 101
 		}
 
 		byte var15 = 10; // L: 103
@@ -242,42 +239,42 @@ final void method2190(int var1) {
 			for (int var9 = 0; var9 < 128; ++var9) { // L: 107
 				var10 = (int)(Math.random() * 100.0D); // L: 108
 				if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109
-					this.field1157[var8 + var9] = 255;
+					this.field1176[var9 + var8] = 255;
 				} else {
-					this.field1157[var8 + var9] = 0; // L: 110
+					this.field1176[var9 + var8] = 0; // L: 110
 				}
 			}
 		}
 
-		if (this.field1163 > 0) { // L: 113
-			this.field1163 -= var1 * 4;
+		if (this.field1175 > 0) { // L: 113
+			this.field1175 -= var1 * 4;
 		}
 
-		if (this.field1164 > 0) { // L: 114
-			this.field1164 -= var1 * 4;
+		if (this.field1169 > 0) { // L: 114
+			this.field1169 -= var1 * 4;
 		}
 
-		if (this.field1163 == 0 && this.field1164 == 0) { // L: 115
+		if (this.field1175 == 0 && this.field1169 == 0) { // L: 115
 			var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116
 			if (var7 == 0) { // L: 117
-				this.field1163 = 1024;
+				this.field1175 = 1024;
 			}
 
 			if (var7 == 1) { // L: 118
-				this.field1164 = 1024;
+				this.field1169 = 1024;
 			}
 		}
 
 		for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120
-			this.field1160[var7] = this.field1160[var7 + var1];
+			this.field1177[var7] = this.field1177[var7 + var1];
 		}
 
 		for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121
-			this.field1160[var7] = (int)(Math.sin((double)this.field1158 / 14.0D) * 16.0D + Math.sin((double)this.field1158 / 15.0D) * 14.0D + Math.sin((double)this.field1158 / 16.0D) * 12.0D); // L: 122
-			++this.field1158; // L: 123
+			this.field1177[var7] = (int)(Math.sin((double)this.field1182 / 14.0D) * 16.0D + Math.sin((double)this.field1182 / 15.0D) * 14.0D + Math.sin((double)this.field1182 / 16.0D) * 12.0D); // L: 122
+			++this.field1182; // L: 123
 		}
 
-		this.field1170 += var1; // L: 125
+		this.field1181 += var1;
 		var7 = ((Client.cycle & 1) + var1) / 2; // L: 126
 		if (var7 > 0) { // L: 127
 			short var16 = 128; // L: 128
@@ -287,13 +284,13 @@ final void method2190(int var1) {
 			int var11;
 			int var12;
 			int var13;
-			for (var11 = 0; var11 < this.field1170 * 100; ++var11) { // L: 131
+			for (var11 = 0; var11 < this.field1181 * 100; ++var11) { // L: 131
 				var12 = (int)(Math.random() * (double)var10) + var17; // L: 132
 				var13 = (int)(Math.random() * (double)var16) + var16; // L: 133
-				this.field1157[var12 + (var13 << 7)] = 192; // L: 134
+				this.field1176[var12 + (var13 << 7)] = 192; // L: 134
 			}
 
-			this.field1170 = 0; // L: 136
+			this.field1181 = 0; // L: 136
 
 			int var14;
 			for (var11 = 0; var11 < 256; ++var11) { // L: 137
@@ -301,16 +298,16 @@ final void method2190(int var1) {
 				var13 = var11 * 128; // L: 139
 
 				for (var14 = -var7; var14 < 128; ++var14) { // L: 140
-					if (var14 + var7 < 128) { // L: 141
-						var12 += this.field1157[var13 + var14 + var7];
+					if (var7 + var14 < 128) { // L: 141
+						var12 += this.field1176[var7 + var14 + var13];
 					}
 
 					if (var14 - (var7 + 1) >= 0) { // L: 142
-						var12 -= this.field1157[var13 + var14 - (var7 + 1)];
+						var12 -= this.field1176[var14 + var13 - (var7 + 1)];
 					}
 
 					if (var14 >= 0) { // L: 143
-						this.field1161[var14 + var13] = var12 / (var7 * 2 + 1);
+						this.field1183[var14 + var13] = var12 / (var7 * 2 + 1);
 					}
 				}
 			}
@@ -321,15 +318,15 @@ final void method2190(int var1) {
 				for (var13 = -var7; var13 < 256; ++var13) { // L: 148
 					var14 = var13 * 128; // L: 149
 					if (var13 + var7 < 256) { // L: 150
-						var12 += this.field1161[var7 * 128 + var14 + var11];
+						var12 += this.field1183[var14 + var11 + var7 * 128];
 					}
 
 					if (var13 - (var7 + 1) >= 0) { // L: 151
-						var12 -= this.field1161[var11 + var14 - (var7 + 1) * 128];
+						var12 -= this.field1183[var11 + var14 - (var7 + 1) * 128];
 					}
 
-					if (var13 >= 0) { // L: 152
-						this.field1157[var11 + var14] = var12 / (var7 * 2 + 1);
+					if (var13 >= 0) {
+						this.field1176[var11 + var14] = var12 / (var7 * 2 + 1); // L: 152
 					}
 				}
 			}
@@ -337,66 +334,66 @@ final void method2190(int var1) {
 
 	} // L: 156
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)I",
-		garbageValue = "1812147314"
+		descriptor = "(IIIB)I",
+		garbageValue = "0"
 	)
-	final int method2221(int var1, int var2, int var3) {
+	final int method2256(int var1, int var2, int var3) {
 		int var4 = 256 - var3; // L: 159
 		return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; // L: 160
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1372694811"
+		descriptor = "(IB)V",
+		garbageValue = "88"
 	)
-	final void method2192(int var1) {
-		int var2 = this.field1159.length; // L: 164
-		if (this.field1163 > 0) { // L: 165
-			this.method2195(this.field1163, this.field1171); // L: 166
-		} else if (this.field1164 > 0) { // L: 168
-			this.method2195(this.field1164, this.field1162); // L: 169
+	final void method2257(int var1) {
+		int var2 = this.field1170.length; // L: 164
+		if (this.field1175 > 0) { // L: 165
+			this.method2258(this.field1175, this.field1174); // L: 166
+		} else if (this.field1169 > 0) { // L: 168
+			this.method2258(this.field1169, this.field1173); // L: 169
 		} else {
 			for (int var3 = 0; var3 < var2; ++var3) { // L: 172
-				this.field1159[var3] = this.field1175[var3];
+				this.field1170[var3] = this.field1171[var3];
 			}
 		}
 
-		this.method2194(var1); // L: 174
+		this.method2276(var1); // L: 174
 	} // L: 175
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I[II)V",
-		garbageValue = "-668681605"
+		garbageValue = "-1795149133"
 	)
-	final void method2195(int var1, int[] var2) {
-		int var3 = this.field1159.length; // L: 178
+	final void method2258(int var1, int[] var2) {
+		int var3 = this.field1170.length; // L: 178
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 179
 			if (var1 > 768) { // L: 180
-				this.field1159[var4] = this.method2221(this.field1175[var4], var2[var4], 1024 - var1);
+				this.field1170[var4] = this.method2256(this.field1171[var4], var2[var4], 1024 - var1);
 			} else if (var1 > 256) {
-				this.field1159[var4] = var2[var4]; // L: 181
+				this.field1170[var4] = var2[var4]; // L: 181
 			} else {
-				this.field1159[var4] = this.method2221(var2[var4], this.field1175[var4], 256 - var1); // L: 182
+				this.field1170[var4] = this.method2256(var2[var4], this.field1171[var4], 256 - var1); // L: 182
 			}
 		}
 
 	} // L: 184
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1898388799"
+		garbageValue = "2135286460"
 	)
-	final void method2194(int var1) {
+	final void method2276(int var1) {
 		int var2 = 0; // L: 187
 
 		for (int var3 = 1; var3 < 255; ++var3) { // L: 188
-			int var4 = (256 - var3) * this.field1160[var3] / 256; // L: 189
+			int var4 = (256 - var3) * this.field1177[var3] / 256; // L: 189
 			int var5 = var4 + var1; // L: 190
 			int var6 = 0; // L: 191
 			int var7 = 128; // L: 192
@@ -405,22 +402,22 @@ final void method2194(int var1) {
 				var5 = 0; // L: 195
 			}
 
-			if (var5 + 128 >= Canvas.rasterProvider.width) { // L: 197
-				var7 = Canvas.rasterProvider.width - var5; // L: 198
+			if (var5 + 128 >= class19.rasterProvider.width) { // L: 197
+				var7 = class19.rasterProvider.width - var5; // L: 198
 			}
 
-			int var8 = var5 + (var3 + 8) * Canvas.rasterProvider.width; // L: 200
+			int var8 = var5 + (var3 + 8) * class19.rasterProvider.width; // L: 200
 			var2 += var6; // L: 201
 
 			for (int var9 = var6; var9 < var7; ++var9) { // L: 202
-				int var10 = this.field1157[var2++]; // L: 203
+				int var10 = this.field1176[var2++]; // L: 203
 				int var11 = var8 % Rasterizer2D.Rasterizer2D_width; // L: 204
 				if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 205
 					int var12 = var10; // L: 206
 					int var13 = 256 - var10; // L: 207
-					var10 = this.field1159[var10]; // L: 208
-					int var14 = Canvas.rasterProvider.pixels[var8]; // L: 209
-					Canvas.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; // L: 210
+					var10 = this.field1170[var10]; // L: 208
+					int var14 = class19.rasterProvider.pixels[var8]; // L: 209
+					class19.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; // L: 210
 				} else {
 					++var8; // L: 212
 				}
@@ -431,21 +428,21 @@ final void method2194(int var1) {
 
 	} // L: 216
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Loe;I)V",
-		garbageValue = "-1097319599"
+		descriptor = "(Lpa;I)V",
+		garbageValue = "-2061300946"
 	)
-	final void method2189(IndexedSprite var1) {
+	final void method2260(IndexedSprite var1) {
 		int var2;
-		for (var2 = 0; var2 < this.field1166.length; ++var2) { // L: 219
-			this.field1166[var2] = 0;
+		for (var2 = 0; var2 < this.field1178.length; ++var2) { // L: 219
+			this.field1178[var2] = 0;
 		}
 
 		int var3;
 		for (var2 = 0; var2 < 5000; ++var2) { // L: 220
 			var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221
-			this.field1166[var3] = (int)(Math.random() * 256.0D); // L: 222
+			this.field1178[var3] = (int)(Math.random() * 256.0D); // L: 222
 		}
 
 		int var4;
@@ -454,13 +451,13 @@ final void method2189(IndexedSprite var1) {
 			for (var3 = 1; var3 < 255; ++var3) { // L: 225
 				for (var4 = 1; var4 < 127; ++var4) { // L: 226
 					var5 = var4 + (var3 << 7); // L: 227
-					this.field1168[var5] = (this.field1166[var5 - 128] + this.field1166[var5 + 1] + this.field1166[var5 + 128] + this.field1166[var5 - 1]) / 4; // L: 228
+					this.field1179[var5] = (this.field1178[var5 + 1] + this.field1178[var5 - 128] + this.field1178[var5 + 128] + this.field1178[var5 - 1]) / 4; // L: 228
 				}
 			}
 
-			int[] var8 = this.field1166; // L: 231
-			this.field1166 = this.field1168; // L: 232
-			this.field1168 = var8; // L: 233
+			int[] var8 = this.field1178; // L: 231
+			this.field1178 = this.field1179; // L: 232
+			this.field1179 = var8; // L: 233
 		}
 
 		if (var1 != null) { // L: 235
@@ -472,7 +469,7 @@ final void method2189(IndexedSprite var1) {
 						var5 = var4 + var1.xOffset + 16; // L: 240
 						int var6 = var3 + var1.yOffset + 16; // L: 241
 						int var7 = var5 + (var6 << 7); // L: 242
-						this.field1166[var7] = 0; // L: 243
+						this.field1178[var7] = 0; // L: 243
 					}
 				}
 			}
@@ -480,84 +477,59 @@ final void method2189(IndexedSprite var1) {
 
 	} // L: 248
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)I",
-		garbageValue = "-30"
+		descriptor = "(I)[Ldh;",
+		garbageValue = "1954568677"
 	)
-	static int method2218(int var0, int var1, int var2) {
-		if (var2 > 179) { // L: 15
-			var1 /= 2;
-		}
-
-		if (var2 > 192) { // L: 16
-			var1 /= 2;
-		}
-
-		if (var2 > 217) { // L: 17
-			var1 /= 2;
-		}
-
-		if (var2 > 243) { // L: 18
-			var1 /= 2;
-		}
-
-		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 19
-		return var3; // L: 20
+	static class114[] method2251() {
+		return new class114[]{class114.field1390, class114.field1383, class114.field1384, class114.field1391, class114.field1386}; // L: 125
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("fq")
 	@ObfuscatedSignature(
-		descriptor = "(Loj;I)V",
-		garbageValue = "1922464614"
+		descriptor = "(I)V",
+		garbageValue = "-50914132"
 	)
-	@Export("updatePlayer")
-	static final void updatePlayer(PacketBuffer var0) {
-		var0.importIndex(); // L: 37
-		int var1 = Client.localPlayerIndex; // L: 38
-		Player var2 = HealthBarDefinition.localPlayer = Client.players[var1] = new Player(); // L: 39
-		var2.index = var1; // L: 40
-		int var3 = var0.readBits(30); // L: 41
-		byte var4 = (byte)(var3 >> 28); // L: 42
-		int var5 = var3 >> 14 & 16383; // L: 43
-		int var6 = var3 & 16383; // L: 44
-		var2.pathX[0] = var5 - class19.baseX; // L: 45
-		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46
-		var2.pathY[0] = var6 - DefaultsGroup.baseY; // L: 47
-		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48
-		GrandExchangeOfferTotalQuantityComparator.Client_plane = var2.plane = var4; // L: 49
-		if (Players.field1242[var1] != null) { // L: 50
-			var2.read(Players.field1242[var1]);
-		}
-
-		Players.Players_count = 0; // L: 51
-		Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52
-		Players.field1244[var1] = 0; // L: 53
-		Players.Players_emptyIdxCount = 0; // L: 54
-
-		for (int var7 = 1; var7 < 2048; ++var7) { // L: 55
-			if (var7 != var1) { // L: 56
-				int var8 = var0.readBits(18); // L: 57
-				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.field1244[var7] = 0; // L: 65
-			}
-		}
-
-		var0.exportIndex(); // L: 67
-	} // L: 68
-
-	@ObfuscatedName("i")
+	@Export("logOut")
+	static final void logOut() {
+		Client.packetWriter.close(); // L: 3544
+		UrlRequest.method2496(); // L: 3545
+		class7.scene.clear(); // L: 3546
+
+		for (int var0 = 0; var0 < 4; ++var0) { // L: 3547
+			Client.collisionMaps[var0].clear();
+		}
+
+		System.gc(); // L: 3548
+		class260.musicPlayerStatus = 1; // L: 3550
+		class124.musicTrackArchive = null; // L: 3551
+		VarcInt.musicTrackGroupId = -1; // L: 3552
+		class260.musicTrackFileId = -1; // L: 3553
+		ChatChannel.musicTrackVolume = 0; // L: 3554
+		DynamicObject.musicTrackBoolean = false; // L: 3555
+		class260.pcmSampleLength = 2; // L: 3556
+		Client.currentTrackGroupId = -1; // L: 3558
+		Client.field743 = false; // L: 3559
+		GrandExchangeEvent.method5760(); // L: 3560
+		VertexNormal.updateGameState(10); // L: 3561
+	} // L: 3562
+
+	@ObfuscatedName("fp")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-2058131323"
+		descriptor = "(IIIS)V",
+		garbageValue = "768"
 	)
-	public static int method2220(int var0, int var1) {
-		return (var0 << 8) + var1; // L: 13
-	}
+	@Export("queueSoundEffect")
+	static void queueSoundEffect(int var0, int var1, int var2) {
+		if (SecureRandomFuture.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 4330
+			Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 4331
+			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 4332
+			Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 4333
+			Client.soundEffects[Client.soundEffectCount] = null; // L: 4334
+			Client.soundLocations[Client.soundEffectCount] = 0; // L: 4335
+			++Client.soundEffectCount; // L: 4336
+		}
+
+	} // L: 4338
 }
diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java
index bf425a1547..8a29695933 100644
--- a/runescape-client/src/main/java/LoginType.java
+++ b/runescape-client/src/main/java/LoginType.java
@@ -4,721 +4,95 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ni")
+@ObfuscatedName("ow")
 @Implements("LoginType")
 public class LoginType {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
 	@Export("oldscape")
 	public static final LoginType oldscape;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
-	static final LoginType field4224;
-	@ObfuscatedName("s")
+	static final LoginType field4397;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
-	static final LoginType field4232;
-	@ObfuscatedName("a")
+	static final LoginType field4402;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
-	static final LoginType field4226;
-	@ObfuscatedName("o")
+	static final LoginType field4399;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
-	static final LoginType field4227;
-	@ObfuscatedName("g")
+	static final LoginType field4401;
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
-	static final LoginType field4228;
-	@ObfuscatedName("e")
+	static final LoginType field4407;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
-	static final LoginType field4233;
-	@ObfuscatedName("p")
+	static final LoginType field4403;
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
-	static final LoginType field4230;
-	@ObfuscatedName("j")
+	static final LoginType field4404;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lni;"
+		descriptor = "Low;"
 	)
-	public static final LoginType field4231;
-	@ObfuscatedName("b")
+	public static final LoginType field4405;
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "Lpa;"
+	)
+	@Export("options_buttons_2Sprite")
+	static IndexedSprite options_buttons_2Sprite;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 454299659
+		intValue = 1619896025
 	)
-	final int field4229;
-	@ObfuscatedName("x")
-	final String field4223;
+	final int field4406;
+	@ObfuscatedName("o")
+	final String field4400;
 
 	static {
-		oldscape = new LoginType(0, 0, "", ""); // L: 5
-		field4224 = new LoginType(8, 1, "", ""); // L: 6
-		field4232 = new LoginType(7, 2, "", ""); // L: 7
-		field4226 = new LoginType(4, 3, "", ""); // L: 8
-		field4227 = new LoginType(1, 4, "", ""); // L: 9
-		field4228 = new LoginType(2, 5, "", ""); // L: 10
-		field4233 = new LoginType(6, 6, "", ""); // L: 11
-		field4230 = new LoginType(5, 7, "", ""); // L: 12
-		field4231 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4224, field4232, field4227, field4226}); // L: 13
+		oldscape = new LoginType(6, 0, "", ""); // L: 5
+		field4397 = new LoginType(1, 1, "", ""); // L: 6
+		field4402 = new LoginType(8, 2, "", ""); // L: 7
+		field4399 = new LoginType(7, 3, "", ""); // L: 8
+		field4401 = new LoginType(4, 4, "", ""); // L: 9
+		field4407 = new LoginType(5, 5, "", ""); // L: 10
+		field4403 = new LoginType(2, 6, "", ""); // L: 11
+		field4404 = new LoginType(0, 7, "", ""); // L: 12
+		field4405 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4397, field4402, field4401, field4399}); // L: 13
 	}
 
 	LoginType(int var1, int var2, String var3, String var4) {
-		this.field4229 = var1; // L: 18
-		this.field4223 = var4; // L: 19
+		this.field4406 = var1; // L: 18
+		this.field4400 = var4; // L: 19
 	} // L: 20
 
 	@ObfuscatedSignature(
-		descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lni;)V"
+		descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Low;)V"
 	)
 	LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) {
-		this.field4229 = var1; // L: 23
-		this.field4223 = var4; // L: 24
+		this.field4406 = var1; // L: 23
+		this.field4400 = var4; // L: 24
 	} // L: 25
 
 	public String toString() {
-		return this.field4223; // L: 28
+		return this.field4400; // L: 29
 	}
-
-	@ObfuscatedName("gy")
-	@ObfuscatedSignature(
-		descriptor = "(Lct;IIIIII)V",
-		garbageValue = "205467401"
-	)
-	@Export("drawActor2d")
-	static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
-		if (var0 != null && var0.isVisible()) { // L: 5132
-			if (var0 instanceof NPC) { // L: 5133
-				NPCComposition var6 = ((NPC)var0).definition; // L: 5134
-				if (var6.transforms != null) { // L: 5135
-					var6 = var6.transform();
-				}
-
-				if (var6 == null) { // L: 5136
-					return;
-				}
-			}
-
-			int var76 = Players.Players_count; // L: 5138
-			int[] var7 = Players.Players_indices; // L: 5139
-			byte var8 = 0; // L: 5140
-			Player var10;
-			int var92;
-			if (var1 < var76 && var0.playerCycle == Client.cycle) { // L: 5141
-				var10 = (Player)var0; // L: 5143
-				boolean var9;
-				if (Client.drawPlayerNames == 0) { // L: 5145
-					var9 = false; // L: 5146
-				} else {
-					boolean var11;
-					if (var10 != HealthBarDefinition.localPlayer) { // L: 5149
-						var11 = (Client.drawPlayerNames & 4) != 0; // L: 5152
-						boolean var12 = var11; // L: 5154
-						if (!var11) { // L: 5155
-							boolean var13 = (Client.drawPlayerNames & 1) != 0; // L: 5158
-							var12 = var13 && var10.isFriend(); // L: 5160
-						}
-
-						var9 = var12 || Message.method1147() && var10.isFriendsChatMember(); // L: 5162
-					} else {
-						var11 = (Client.drawPlayerNames & 8) != 0; // L: 5167
-						var9 = var11; // L: 5169
-					}
-				}
-
-				if (var9) { // L: 5172
-					Player var77 = (Player)var0; // L: 5173
-					if (var1 < var76) { // L: 5174
-						var92 = var0.defaultHeight + 15; // L: 5175
-						DefaultsGroup.worldToScreen(var0.x, var0.y, var92); // L: 5177
-						AbstractFont var78 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 5179
-						byte var14 = 9; // L: 5180
-						var78.drawCentered(var77.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var14, 16777215, 0); // L: 5181
-						var8 = 18; // L: 5182
-					}
-				}
-			}
-
-			int var89 = -2; // L: 5186
-			int var17;
-			int var23;
-			int var24;
-			int var79;
-			if (!var0.healthBars.method5633()) { // L: 5187
-				var79 = var0.defaultHeight + 15; // L: 5188
-				DefaultsGroup.worldToScreen(var0.x, var0.y, var79); // L: 5190
-
-				for (HealthBar var95 = (HealthBar)var0.healthBars.last(); var95 != null; var95 = (HealthBar)var0.healthBars.previous()) { // L: 5192
-					HealthBarUpdate var81 = var95.get(Client.cycle); // L: 5193
-					if (var81 == null) { // L: 5194
-						if (var95.isEmpty()) { // L: 5252
-							var95.remove();
-						}
-					} else {
-						HealthBarDefinition var96 = var95.definition; // L: 5195
-						SpritePixels var82 = var96.getBackSprite(); // L: 5196
-						SpritePixels var83 = var96.getFrontSprite(); // L: 5197
-						var17 = 0; // L: 5199
-						int var84;
-						if (var82 != null && var83 != null) { // L: 5200
-							if (var96.widthPadding * 2 < var83.subWidth) { // L: 5201
-								var17 = var96.widthPadding;
-							}
-
-							var84 = var83.subWidth - var17 * 2; // L: 5202
-						} else {
-							var84 = var96.width; // L: 5204
-						}
-
-						int var18 = 255; // L: 5205
-						boolean var85 = true; // L: 5206
-						int var86 = Client.cycle - var81.cycle; // L: 5207
-						int var87 = var84 * var81.health2 / var96.width; // L: 5208
-						int var88;
-						int var98;
-						if (var81.cycleOffset > var86) { // L: 5209
-							var88 = var96.field1666 == 0 ? 0 : var96.field1666 * (var86 / var96.field1666); // L: 5210
-							var23 = var84 * var81.health / var96.width; // L: 5211
-							var98 = var88 * (var87 - var23) / var81.cycleOffset + var23; // L: 5212
-						} else {
-							var98 = var87; // L: 5215
-							var88 = var81.cycleOffset + var96.int5 - var86; // L: 5216
-							if (var96.int3 >= 0) { // L: 5217
-								var18 = (var88 << 8) / (var96.int5 - var96.int3);
-							}
-						}
-
-						if (var81.health2 > 0 && var98 < 1) { // L: 5219
-							var98 = 1;
-						}
-
-						if (var82 != null && var83 != null) { // L: 5220
-							if (var98 == var84) { // L: 5221
-								var98 += var17 * 2;
-							} else {
-								var98 += var17; // L: 5222
-							}
-
-							var88 = var82.subHeight; // L: 5223
-							var89 += var88; // L: 5224
-							var23 = var2 + Client.viewportTempX - (var84 >> 1); // L: 5225
-							var24 = var3 + Client.viewportTempY - var89; // L: 5226
-							var23 -= var17; // L: 5227
-							if (var18 >= 0 && var18 < 255) { // L: 5228
-								var82.drawTransAt(var23, var24, var18); // L: 5229
-								Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var98, var24 + var88); // L: 5230
-								var83.drawTransAt(var23, var24, var18); // L: 5231
-							} else {
-								var82.drawTransBgAt(var23, var24); // L: 5234
-								Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var98 + var23, var88 + var24); // L: 5235
-								var83.drawTransBgAt(var23, var24); // L: 5236
-							}
-
-							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 5238
-							var89 += 2; // L: 5239
-						} else {
-							var89 += 5; // L: 5242
-							if (Client.viewportTempX > -1) { // L: 5243
-								var88 = var2 + Client.viewportTempX - (var84 >> 1); // L: 5244
-								var23 = var3 + Client.viewportTempY - var89; // L: 5245
-								Rasterizer2D.Rasterizer2D_fillRectangle(var88, var23, var98, 5, 65280); // L: 5246
-								Rasterizer2D.Rasterizer2D_fillRectangle(var88 + var98, var23, var84 - var98, 5, 16711680); // L: 5247
-							}
-
-							var89 += 2; // L: 5249
-						}
-					}
-				}
-			}
-
-			if (var89 == -2) { // L: 5255
-				var89 += 7;
-			}
-
-			var89 += var8; // L: 5256
-			int var91;
-			if (var1 < var76) { // L: 5257
-				var10 = (Player)var0; // L: 5258
-				if (var10.isHidden) { // L: 5259
-					return;
-				}
-
-				if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 5260
-					var91 = var0.defaultHeight + 15; // L: 5261
-					DefaultsGroup.worldToScreen(var0.x, var0.y, var91); // L: 5263
-					if (Client.viewportTempX > -1) { // L: 5265
-						if (var10.headIconPk != -1) { // L: 5266
-							var89 += 25; // L: 5267
-							Client.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 5268
-						}
-
-						if (var10.headIconPrayer != -1) { // L: 5270
-							var89 += 25; // L: 5271
-							ServerPacket.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 5272
-						}
-					}
-				}
-
-				if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 5276
-					var91 = var0.defaultHeight + 15; // L: 5277
-					DefaultsGroup.worldToScreen(var0.x, var0.y, var91); // L: 5279
-					if (Client.viewportTempX > -1) { // L: 5281
-						var89 += DevicePcmPlayerProvider.headIconHintSprites[1].subHeight; // L: 5282
-						DevicePcmPlayerProvider.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); // L: 5283
-					}
-				}
-			} else {
-				NPCComposition var90 = ((NPC)var0).definition; // L: 5288
-				if (var90.transforms != null) { // L: 5289
-					var90 = var90.transform();
-				}
-
-				if (var90.headIconPrayer >= 0 && var90.headIconPrayer < ServerPacket.headIconPrayerSprites.length) { // L: 5290
-					var91 = var0.defaultHeight + 15; // L: 5291
-					DefaultsGroup.worldToScreen(var0.x, var0.y, var91); // L: 5293
-					if (Client.viewportTempX > -1) { // L: 5295
-						ServerPacket.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 5296
-					}
-				}
-
-				if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 5299
-					var91 = var0.defaultHeight + 15; // L: 5300
-					DefaultsGroup.worldToScreen(var0.x, var0.y, var91); // L: 5302
-					if (Client.viewportTempX > -1) { // L: 5304
-						DevicePcmPlayerProvider.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
-					}
-				}
-			}
-
-			if (var0.overheadText != null && (var1 >= var76 || !var0.field1099 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5307 5308
-				var79 = var0.defaultHeight; // L: 5309
-				DefaultsGroup.worldToScreen(var0.x, var0.y, var79); // L: 5311
-				if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5313
-					Client.overheadTextXOffsets[Client.overheadTextCount] = Login.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5314
-					Client.overheadTextAscents[Client.overheadTextCount] = Login.fontBold12.ascent; // L: 5315
-					Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5316
-					Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5317
-					Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5318
-					Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5319
-					Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5320
-					Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5321
-					++Client.overheadTextCount; // L: 5322
-				}
-			}
-
-			for (var79 = 0; var79 < 4; ++var79) { // L: 5326
-				var91 = var0.hitSplatCycles[var79]; // L: 5327
-				var92 = var0.hitSplatTypes[var79]; // L: 5328
-				HitSplatDefinition var97 = null; // L: 5329
-				int var93 = 0; // L: 5330
-				if (var92 >= 0) { // L: 5331
-					if (var91 <= Client.cycle) { // L: 5332
-						continue;
-					}
-
-					var97 = Canvas.method372(var0.hitSplatTypes[var79]); // L: 5333
-					var93 = var97.field1805; // L: 5334
-					if (var97 != null && var97.transforms != null) { // L: 5335
-						var97 = var97.transform(); // L: 5336
-						if (var97 == null) { // L: 5337
-							var0.hitSplatCycles[var79] = -1; // L: 5338
-							continue; // L: 5339
-						}
-					}
-				} else if (var91 < 0) { // L: 5343
-					continue;
-				}
-
-				int var15 = var0.hitSplatTypes2[var79]; // L: 5344
-				HitSplatDefinition var16 = null; // L: 5345
-				if (var15 >= 0) { // L: 5346
-					var16 = Canvas.method372(var15); // L: 5347
-					if (var16 != null && var16.transforms != null) { // L: 5348
-						var16 = var16.transform();
-					}
-				}
-
-				if (var91 - var93 <= Client.cycle) { // L: 5350
-					if (var97 == null) { // L: 5351
-						var0.hitSplatCycles[var79] = -1; // L: 5352
-					} else {
-						var17 = var0.defaultHeight / 2; // L: 5355
-						DefaultsGroup.worldToScreen(var0.x, var0.y, var17); // L: 5357
-						if (Client.viewportTempX > -1) { // L: 5359
-							if (var79 == 1) { // L: 5361
-								Client.viewportTempY -= 20; // L: 5362
-							}
-
-							if (var79 == 2) { // L: 5364
-								Client.viewportTempX -= 15; // L: 5365
-								Client.viewportTempY -= 10; // L: 5366
-							}
-
-							if (var79 == 3) { // L: 5368
-								Client.viewportTempX += 15; // L: 5369
-								Client.viewportTempY -= 10; // L: 5370
-							}
-
-							SpritePixels var19 = null; // L: 5372
-							SpritePixels var20 = null; // L: 5373
-							SpritePixels var21 = null; // L: 5374
-							SpritePixels var22 = null; // L: 5375
-							var23 = 0; // L: 5376
-							var24 = 0; // L: 5377
-							int var25 = 0; // L: 5378
-							int var26 = 0; // L: 5379
-							int var27 = 0; // L: 5380
-							int var28 = 0; // L: 5381
-							int var29 = 0; // L: 5382
-							int var30 = 0; // L: 5383
-							SpritePixels var31 = null; // L: 5384
-							SpritePixels var32 = null; // L: 5385
-							SpritePixels var33 = null; // L: 5386
-							SpritePixels var34 = null; // L: 5387
-							int var35 = 0; // L: 5388
-							int var36 = 0; // L: 5389
-							int var37 = 0; // L: 5390
-							int var38 = 0; // L: 5391
-							int var39 = 0; // L: 5392
-							int var40 = 0; // L: 5393
-							int var41 = 0; // L: 5394
-							int var42 = 0; // L: 5395
-							int var43 = 0; // L: 5396
-							var19 = var97.method3256(); // L: 5397
-							int var44;
-							if (var19 != null) { // L: 5398
-								var23 = var19.subWidth; // L: 5399
-								var44 = var19.subHeight; // L: 5400
-								if (var44 > var43) { // L: 5401
-									var43 = var44;
-								}
-
-								var27 = var19.xOffset; // L: 5402
-							}
-
-							var20 = var97.method3286(); // L: 5404
-							if (var20 != null) { // L: 5405
-								var24 = var20.subWidth; // L: 5406
-								var44 = var20.subHeight; // L: 5407
-								if (var44 > var43) { // L: 5408
-									var43 = var44;
-								}
-
-								var28 = var20.xOffset; // L: 5409
-							}
-
-							var21 = var97.method3258(); // L: 5411
-							if (var21 != null) { // L: 5412
-								var25 = var21.subWidth; // L: 5413
-								var44 = var21.subHeight; // L: 5414
-								if (var44 > var43) { // L: 5415
-									var43 = var44;
-								}
-
-								var29 = var21.xOffset; // L: 5416
-							}
-
-							var22 = var97.method3281(); // L: 5418
-							if (var22 != null) { // L: 5419
-								var26 = var22.subWidth; // L: 5420
-								var44 = var22.subHeight; // L: 5421
-								if (var44 > var43) { // L: 5422
-									var43 = var44;
-								}
-
-								var30 = var22.xOffset; // L: 5423
-							}
-
-							if (var16 != null) { // L: 5425
-								var31 = var16.method3256(); // L: 5426
-								if (var31 != null) { // L: 5427
-									var35 = var31.subWidth; // L: 5428
-									var44 = var31.subHeight; // L: 5429
-									if (var44 > var43) { // L: 5430
-										var43 = var44;
-									}
-
-									var39 = var31.xOffset; // L: 5431
-								}
-
-								var32 = var16.method3286(); // L: 5433
-								if (var32 != null) { // L: 5434
-									var36 = var32.subWidth; // L: 5435
-									var44 = var32.subHeight; // L: 5436
-									if (var44 > var43) { // L: 5437
-										var43 = var44;
-									}
-
-									var40 = var32.xOffset; // L: 5438
-								}
-
-								var33 = var16.method3258(); // L: 5440
-								if (var33 != null) { // L: 5441
-									var37 = var33.subWidth; // L: 5442
-									var44 = var33.subHeight; // L: 5443
-									if (var44 > var43) { // L: 5444
-										var43 = var44;
-									}
-
-									var41 = var33.xOffset; // L: 5445
-								}
-
-								var34 = var16.method3281(); // L: 5447
-								if (var34 != null) { // L: 5448
-									var38 = var34.subWidth; // L: 5449
-									var44 = var34.subHeight; // L: 5450
-									if (var44 > var43) { // L: 5451
-										var43 = var44;
-									}
-
-									var42 = var34.xOffset; // L: 5452
-								}
-							}
-
-							Font var80 = var97.getFont(); // L: 5457
-							if (var80 == null) { // L: 5458
-								var80 = FriendLoginUpdate.fontPlain11;
-							}
-
-							Font var45;
-							if (var16 != null) { // L: 5459
-								var45 = var16.getFont(); // L: 5460
-								if (var45 == null) { // L: 5461
-									var45 = FriendLoginUpdate.fontPlain11;
-								}
-							} else {
-								var45 = FriendLoginUpdate.fontPlain11; // L: 5463
-							}
-
-							String var46 = null; // L: 5464
-							String var47 = null; // L: 5465
-							boolean var48 = false; // L: 5466
-							int var49 = 0; // L: 5467
-							var46 = var97.getString(var0.hitSplatValues[var79]); // L: 5468
-							int var94 = var80.stringWidth(var46); // L: 5469
-							if (var16 != null) { // L: 5470
-								var47 = var16.getString(var0.hitSplatValues2[var79]); // L: 5471
-								var49 = var45.stringWidth(var47); // L: 5472
-							}
-
-							int var50 = 0; // L: 5474
-							int var51 = 0; // L: 5475
-							if (var24 > 0) { // L: 5476
-								if (var21 == null && var22 == null) { // L: 5477
-									var50 = 1; // L: 5478
-								} else {
-									var50 = var94 / var24 + 1;
-								}
-							}
-
-							if (var16 != null && var36 > 0) { // L: 5480 5481
-								if (var33 == null && var34 == null) { // L: 5482
-									var51 = 1; // L: 5483
-								} else {
-									var51 = var49 / var36 + 1;
-								}
-							}
-
-							int var52 = 0; // L: 5486
-							int var53 = var52; // L: 5487
-							if (var23 > 0) { // L: 5488
-								var52 += var23;
-							}
-
-							var52 += 2; // L: 5489
-							int var54 = var52; // L: 5490
-							if (var25 > 0) { // L: 5491
-								var52 += var25;
-							}
-
-							int var55 = var52; // L: 5492
-							int var56 = var52; // L: 5493
-							int var57;
-							if (var24 > 0) { // L: 5494
-								var57 = var50 * var24; // L: 5495
-								var52 += var57; // L: 5496
-								var56 += (var57 - var94) / 2; // L: 5497
-							} else {
-								var52 += var94; // L: 5500
-							}
-
-							var57 = var52; // L: 5502
-							if (var26 > 0) { // L: 5503
-								var52 += var26;
-							}
-
-							int var58 = 0; // L: 5504
-							int var59 = 0; // L: 5505
-							int var60 = 0; // L: 5506
-							int var61 = 0; // L: 5507
-							int var62 = 0; // L: 5508
-							int var63;
-							if (var16 != null) { // L: 5509
-								var52 += 2; // L: 5510
-								var58 = var52; // L: 5511
-								if (var35 > 0) { // L: 5512
-									var52 += var35;
-								}
-
-								var52 += 2; // L: 5513
-								var59 = var52; // L: 5514
-								if (var37 > 0) { // L: 5515
-									var52 += var37;
-								}
-
-								var60 = var52; // L: 5516
-								var62 = var52; // L: 5517
-								if (var36 > 0) { // L: 5518
-									var63 = var36 * var51; // L: 5519
-									var52 += var63; // L: 5520
-									var62 += (var63 - var49) / 2; // L: 5521
-								} else {
-									var52 += var49; // L: 5524
-								}
-
-								var61 = var52; // L: 5526
-								if (var38 > 0) { // L: 5527
-									var52 += var38;
-								}
-							}
-
-							var63 = var0.hitSplatCycles[var79] - Client.cycle; // L: 5529
-							int var64 = var97.field1812 - var63 * var97.field1812 / var97.field1805; // L: 5530
-							int var65 = var63 * var97.field1807 / var97.field1805 + -var97.field1807; // L: 5531
-							int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); // L: 5532
-							int var67 = var3 + Client.viewportTempY - 12 + var65; // L: 5533
-							int var68 = var67; // L: 5534
-							int var69 = var43 + var67; // L: 5535
-							int var70 = var67 + var97.field1820 + 15; // L: 5536
-							int var71 = var70 - var80.maxAscent; // L: 5537
-							int var72 = var70 + var80.maxDescent; // L: 5538
-							if (var71 < var67) { // L: 5539
-								var68 = var71;
-							}
-
-							if (var72 > var69) { // L: 5540
-								var69 = var72;
-							}
-
-							int var73 = 0; // L: 5541
-							int var74;
-							int var75;
-							if (var16 != null) { // L: 5542
-								var73 = var67 + var16.field1820 + 15; // L: 5543
-								var74 = var73 - var45.maxAscent; // L: 5544
-								var75 = var73 + var45.maxDescent; // L: 5545
-								if (var74 < var68) { // L: 5546
-									;
-								}
-
-								if (var75 > var69) { // L: 5547
-									;
-								}
-							}
-
-							var74 = 255; // L: 5549
-							if (var97.field1814 >= 0) { // L: 5550
-								var74 = (var63 << 8) / (var97.field1805 - var97.field1814);
-							}
-
-							if (var74 >= 0 && var74 < 255) { // L: 5551
-								if (var19 != null) { // L: 5552
-									var19.drawTransAt(var53 + var66 - var27, var67, var74);
-								}
-
-								if (var21 != null) { // L: 5553
-									var21.drawTransAt(var54 + var66 - var29, var67, var74);
-								}
-
-								if (var20 != null) { // L: 5554
-									for (var75 = 0; var75 < var50; ++var75) { // L: 5555
-										var20.drawTransAt(var75 * var24 + (var55 + var66 - var28), var67, var74); // L: 5556
-									}
-								}
-
-								if (var22 != null) { // L: 5559
-									var22.drawTransAt(var66 + var57 - var30, var67, var74);
-								}
-
-								var80.drawAlpha(var46, var66 + var56, var70, var97.textColor, 0, var74); // L: 5560
-								if (var16 != null) { // L: 5561
-									if (var31 != null) { // L: 5562
-										var31.drawTransAt(var66 + var58 - var39, var67, var74);
-									}
-
-									if (var33 != null) { // L: 5563
-										var33.drawTransAt(var66 + var59 - var41, var67, var74);
-									}
-
-									if (var32 != null) { // L: 5564
-										for (var75 = 0; var75 < var51; ++var75) { // L: 5565
-											var32.drawTransAt(var75 * var36 + (var66 + var60 - var40), var67, var74); // L: 5566
-										}
-									}
-
-									if (var34 != null) { // L: 5569
-										var34.drawTransAt(var61 + var66 - var42, var67, var74);
-									}
-
-									var45.drawAlpha(var47, var66 + var62, var73, var16.textColor, 0, var74); // L: 5570
-								}
-							} else {
-								if (var19 != null) { // L: 5574
-									var19.drawTransBgAt(var53 + var66 - var27, var67);
-								}
-
-								if (var21 != null) { // L: 5575
-									var21.drawTransBgAt(var54 + var66 - var29, var67);
-								}
-
-								if (var20 != null) { // L: 5576
-									for (var75 = 0; var75 < var50; ++var75) { // L: 5577
-										var20.drawTransBgAt(var24 * var75 + (var55 + var66 - var28), var67); // L: 5578
-									}
-								}
-
-								if (var22 != null) { // L: 5581
-									var22.drawTransBgAt(var66 + var57 - var30, var67);
-								}
-
-								var80.draw(var46, var56 + var66, var70, var97.textColor | -16777216, 0); // L: 5582
-								if (var16 != null) { // L: 5583
-									if (var31 != null) { // L: 5584
-										var31.drawTransBgAt(var58 + var66 - var39, var67);
-									}
-
-									if (var33 != null) { // L: 5585
-										var33.drawTransBgAt(var59 + var66 - var41, var67);
-									}
-
-									if (var32 != null) { // L: 5586
-										for (var75 = 0; var75 < var51; ++var75) { // L: 5587
-											var32.drawTransBgAt(var36 * var75 + (var66 + var60 - var40), var67); // L: 5588
-										}
-									}
-
-									if (var34 != null) { // L: 5591
-										var34.drawTransBgAt(var66 + var61 - var42, var67);
-									}
-
-									var45.draw(var47, var62 + var66, var73, var16.textColor | -16777216, 0); // L: 5592
-								}
-							}
-						}
-					}
-				}
-			}
-
-		}
-	} // L: 5597
 }
diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java
index e44440c84a..14a202e6e6 100644
--- a/runescape-client/src/main/java/MenuAction.java
+++ b/runescape-client/src/main/java/MenuAction.java
@@ -1,71 +1,103 @@
-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("bu")
+@ObfuscatedName("bb")
 @Implements("MenuAction")
 public class MenuAction {
-	@ObfuscatedName("gm")
-	@ObfuscatedSignature(
-		descriptor = "Lnu;"
-	)
-	@Export("WorldMapElement_fonts")
-	static Fonts WorldMapElement_fonts;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1877540813
+		intValue = 120335157
 	)
 	@Export("param0")
 	int param0;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -319901543
+		intValue = 175747701
 	)
 	@Export("param1")
 	int param1;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -2124872737
+		intValue = 1628688501
 	)
 	@Export("opcode")
 	int opcode;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1182228171
+		intValue = 1421448927
 	)
 	@Export("identifier")
 	int identifier;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("action")
 	String action;
 
 	MenuAction() {
-	} // L: 12091
+	} // L: 12768
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1427914294"
+	)
+	public static void method1961() {
+		synchronized(MouseHandler.MouseHandler_instance) { // L: 58
+			MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 59
+			MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile;
+			MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 61
+			MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 62
+			MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 63
+			MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 64
+			MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 65
+			MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 66
+			MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 67
+		}
+	} // L: 69
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(IB)J",
+		garbageValue = "33"
+	)
+	public static long method1960(int var0) {
+		return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 60
+	}
 
-	@ObfuscatedName("hj")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "-780302169"
+		descriptor = "(IIII)V",
+		garbageValue = "-1808275608"
 	)
-	static final void method1912(boolean var0) {
-		class14.playPcmPlayers(); // L: 5878
-		++Client.packetWriter.pendingWrites; // L: 5879
-		if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5880
-			Client.packetWriter.pendingWrites = 0; // L: 5881
-			if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5882
-				PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2726, Client.packetWriter.isaacCipher); // L: 5884
-				Client.packetWriter.addNode(var1); // L: 5885
+	static final void method1959(int var0, int var1, int var2) {
+		int var3;
+		for (var3 = 0; var3 < 8; ++var3) { // L: 111
+			for (int var4 = 0; var4 < 8; ++var4) { // L: 112
+				Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0;
+			}
+		}
+
+		if (var1 > 0) { // L: 114
+			for (var3 = 1; var3 < 8; ++var3) { // L: 115
+				Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2];
+			}
+		}
 
-				try {
-					Client.packetWriter.flush(); // L: 5887
-				} catch (IOException var3) { // L: 5889
-					Client.hadNetworkError = true; // L: 5890
-				}
+		if (var2 > 0) { // L: 117
+			for (var3 = 1; var3 < 8; ++var3) { // L: 118
+				Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1];
 			}
+		}
 
+		if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 120
+			Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2];
+		} else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 121
+			Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1];
+		} else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 122
+			Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1];
 		}
-	} // L: 5893
+
+	} // L: 123
 }
diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java
index 8b55a3d204..85b22d65f3 100644
--- a/runescape-client/src/main/java/Message.java
+++ b/runescape-client/src/main/java/Message.java
@@ -4,64 +4,52 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bf")
+@ObfuscatedName("br")
 @Implements("Message")
 public class Message extends DualNode {
-	@ObfuscatedName("ev")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive17")
-	static Archive archive17;
-	@ObfuscatedName("pg")
-	@ObfuscatedSignature(
-		descriptor = "Lch;"
-	)
-	@Export("varcs")
-	static Varcs varcs;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1439385015
+		intValue = 20750645
 	)
 	@Export("count")
 	int count;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1007637791
+		intValue = -1521210849
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1516763961
+		intValue = 2033042895
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("sender")
 	String sender;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lpb;"
+		descriptor = "Lpo;"
 	)
 	@Export("senderUsername")
 	Username senderUsername;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("isFromFriend0")
 	TriBool isFromFriend0;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("isFromIgnored0")
 	TriBool isFromIgnored0;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("prefix")
 	String prefix;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("text")
 	String text;
 
@@ -71,168 +59,158 @@ public class Message extends DualNode {
 		this.set(var1, var2, var3, var4); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "-2078367400"
+		garbageValue = "-707456994"
 	)
 	@Export("set")
 	void set(int var1, String var2, String var3, String var4) {
-		this.count = WorldMapDecorationType.method5193(); // L: 23
-		this.cycle = Client.cycle; // L: 24
-		this.type = var1; // L: 25
-		this.sender = var2; // L: 26
-		this.fillSenderUsername(); // L: 27
-		this.prefix = var3; // L: 28
-		this.text = var4; // L: 29
-		this.clearIsFromFriend(); // L: 30
-		this.clearIsFromIgnored(); // L: 31
-	} // L: 32
+		int var5 = ++Messages.Messages_count - 1; // L: 25
+		this.count = var5; // L: 27
+		this.cycle = Client.cycle; // L: 28
+		this.type = var1; // L: 29
+		this.sender = var2; // L: 30
+		this.fillSenderUsername(); // L: 31
+		this.prefix = var3; // L: 32
+		this.text = var4; // L: 33
+		this.clearIsFromFriend(); // L: 34
+		this.clearIsFromIgnored(); // L: 35
+	} // L: 36
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1556257738"
+		garbageValue = "1704976906"
 	)
 	@Export("clearIsFromFriend")
 	void clearIsFromFriend() {
-		this.isFromFriend0 = TriBool.TriBool_unknown; // L: 35
-	} // L: 36
+		this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39
+	} // L: 40
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "-16"
+		garbageValue = "69"
 	)
 	@Export("isFromFriend")
 	final boolean isFromFriend() {
-		if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 39
-			this.fillIsFromFriend(); // L: 40
+		if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43
+			this.fillIsFromFriend(); // L: 44
 		}
 
-		return this.isFromFriend0 == TriBool.TriBool_true; // L: 42
+		return this.isFromFriend0 == TriBool.TriBool_true; // L: 46
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-788455751"
+		descriptor = "(B)V",
+		garbageValue = "108"
 	)
 	@Export("fillIsFromFriend")
 	void fillIsFromFriend() {
-		this.isFromFriend0 = class112.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 46
-	} // L: 47
+		this.isFromFriend0 = GameEngine.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50
+	} // L: 51
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1428904972"
+		descriptor = "(B)V",
+		garbageValue = "15"
 	)
 	@Export("clearIsFromIgnored")
 	void clearIsFromIgnored() {
-		this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 50
-	} // L: 51
+		this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54
+	} // L: 55
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "16"
+		descriptor = "(I)Z",
+		garbageValue = "1173025660"
 	)
 	@Export("isFromIgnored")
 	final boolean isFromIgnored() {
-		if (this.isFromIgnored0 == TriBool.TriBool_unknown) { // L: 54
-			this.fillIsFromIgnored();
+		if (this.isFromIgnored0 == TriBool.TriBool_unknown) { // L: 58
+			this.fillIsFromIgnored(); // L: 59
 		}
 
-		return this.isFromIgnored0 == TriBool.TriBool_true; // L: 57
+		return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1115298616"
+		descriptor = "(B)V",
+		garbageValue = "-35"
 	)
 	@Export("fillIsFromIgnored")
 	void fillIsFromIgnored() {
-		this.isFromIgnored0 = class112.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 61
-	} // L: 62
+		this.isFromIgnored0 = GameEngine.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65
+	} // L: 66
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1849939202"
+		garbageValue = "719777600"
 	)
 	@Export("fillSenderUsername")
 	final void fillSenderUsername() {
-		if (this.sender != null) { // L: 65
-			this.senderUsername = new Username(WallDecoration.method4643(this.sender), GrandExchangeOfferUnitPriceComparator.loginType);
+		if (this.sender != null) { // L: 69
+			this.senderUsername = new Username(AbstractWorldMapData.method4791(this.sender), class194.loginType);
 		} else {
-			this.senderUsername = null; // L: 66
+			this.senderUsername = null; // L: 70
 		}
 
-	} // L: 67
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;IB)Z",
-		garbageValue = "45"
-	)
-	static boolean method1143(String var0, int var1) {
-		return Occluder.method4485(var0, var1, "openjs"); // L: 55
-	}
+	} // L: 71
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("in")
 	@ObfuscatedSignature(
-		descriptor = "(CII)Ljava/lang/String;",
-		garbageValue = "51397423"
-	)
-	static String method1149(char var0, int var1) {
-		char[] var2 = new char[var1]; // L: 195
-
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 196
-			var2[var3] = var0;
+		descriptor = "(I)V",
+		garbageValue = "1989735073"
+	)
+	static final void method1115() {
+		boolean var0 = false; // L: 10008
+
+		while (!var0) { // L: 10009
+			var0 = true; // L: 10010
+
+			for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 10011
+				if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 10012
+					String var2 = Client.menuTargets[var1]; // L: 10013
+					Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 10014
+					Client.menuTargets[var1 + 1] = var2; // L: 10015
+					String var3 = Client.menuActions[var1]; // L: 10016
+					Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 10017
+					Client.menuActions[var1 + 1] = var3; // L: 10018
+					int var4 = Client.menuOpcodes[var1]; // L: 10019
+					Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 10020
+					Client.menuOpcodes[var1 + 1] = var4; // L: 10021
+					var4 = Client.menuArguments1[var1]; // L: 10022
+					Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 10023
+					Client.menuArguments1[var1 + 1] = var4; // L: 10024
+					var4 = Client.menuArguments2[var1]; // L: 10025
+					Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 10026
+					Client.menuArguments2[var1 + 1] = var4; // L: 10027
+					var4 = Client.menuIdentifiers[var1]; // L: 10028
+					Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 10029
+					Client.menuIdentifiers[var1 + 1] = var4; // L: 10030
+					boolean var5 = Client.menuShiftClick[var1]; // L: 10031
+					Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 10032
+					Client.menuShiftClick[var1 + 1] = var5; // L: 10033
+					var0 = false; // L: 10034
+				}
+			}
 		}
 
-		return new String(var2); // L: 197
-	}
+	} // L: 10038
 
-	@ObfuscatedName("gw")
+	@ObfuscatedName("kf")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1843523550"
+		descriptor = "(III)V",
+		garbageValue = "1320031067"
 	)
-	static boolean method1147() {
-		return (Client.drawPlayerNames & 2) != 0; // L: 5128
-	}
-
-	@ObfuscatedName("hn")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-404550822"
-	)
-	static final void method1146() {
-		int var0 = SecureRandomCallable.menuX; // L: 8084
-		int var1 = Frames.menuY; // L: 8085
-		int var2 = ObjectComposition.menuWidth; // L: 8086
-		int var3 = StudioGame.menuHeight; // L: 8087
-		int var4 = 6116423; // L: 8088
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 8089
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 8090
-		Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 8091
-		Login.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 8092
-		int var5 = MouseHandler.MouseHandler_x; // L: 8093
-		int var6 = MouseHandler.MouseHandler_y; // L: 8094
-
-		for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 8095
-			int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; // L: 8096
-			int var9 = 16777215; // L: 8097
-			if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 8098
-				var9 = 16776960;
-			}
-
-			Login.fontBold12.draw(class392.method6873(var7), var0 + 3, var8, var9, 0); // L: 8099
+	@Export("runIntfCloseListeners")
+	static final void runIntfCloseListeners(int var0, int var1) {
+		if (class242.loadInterface(var0)) { // L: 11879
+			Canvas.runComponentCloseListeners(MouseRecorder.Widget_interfaceComponents[var0], var1); // L: 11880
 		}
-
-		Language.method5516(SecureRandomCallable.menuX, Frames.menuY, ObjectComposition.menuWidth, StudioGame.menuHeight); // L: 8101
-	} // L: 8102
+	} // L: 11881
 }
diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java
index 5c449175ce..795b23b5c8 100644
--- a/runescape-client/src/main/java/Messages.java
+++ b/runescape-client/src/main/java/Messages.java
@@ -6,42 +6,51 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cz")
+@ObfuscatedName("ci")
 @Implements("Messages")
 public class Messages {
-	@ObfuscatedName("i")
+	@ObfuscatedName("um")
+	@ObfuscatedSignature(
+		descriptor = "Llw;"
+	)
+	public static class312 field1273;
+	@ObfuscatedName("c")
 	@Export("Messages_channels")
 	static final Map Messages_channels;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Loz;"
 	)
 	@Export("Messages_hashTable")
 	static final IterableNodeHashTable Messages_hashTable;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Llm;"
+		descriptor = "Lls;"
 	)
 	@Export("Messages_queue")
 	static final IterableDualNodeQueue Messages_queue;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1495629097
+		intValue = 1900201555
 	)
 	@Export("Messages_count")
 	static int Messages_count;
-	@ObfuscatedName("ek")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Ljm;"
 	)
-	@Export("archive6")
-	static Archive archive6;
-	@ObfuscatedName("eb")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+	@Export("scriptActiveWidget")
+	static Widget scriptActiveWidget;
+	@ObfuscatedName("ge")
+	@ObfuscatedGetter(
+		longValue = -3704126848335008397L
 	)
-	@Export("archive18")
-	static Archive archive18;
+	static long field1272;
+	@ObfuscatedName("gd")
+	@ObfuscatedGetter(
+		intValue = -1932714305
+	)
+	static int field1277;
 
 	static {
 		Messages_channels = new HashMap(); // L: 9
@@ -49,36 +58,4 @@ public class Messages {
 		Messages_queue = new IterableDualNodeQueue(); // L: 11
 		Messages_count = 0; // L: 12
 	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIB)I",
-		garbageValue = "24"
-	)
-	static final int method2376(int var0, int var1, int var2, int var3) {
-		int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 552
-		return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 553
-	}
-
-	@ObfuscatedName("je")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "-56186501"
-	)
-	@Export("setTapToDrop")
-	static void setTapToDrop(boolean var0) {
-		Client.tapToDrop = var0; // L: 10610
-	} // L: 10611
-
-	@ObfuscatedName("js")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIB)V",
-		garbageValue = "-63"
-	)
-	@Export("updateRootInterface")
-	static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (class174.loadInterface(var0)) { // L: 10622
-			ClanChannel.updateInterface(WorldMapSection1.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10623
-		}
-	} // L: 10624
 }
diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java
index 074608bece..a72033cfab 100644
--- a/runescape-client/src/main/java/MidiFileReader.java
+++ b/runescape-client/src/main/java/MidiFileReader.java
@@ -3,38 +3,38 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iz")
+@ObfuscatedName("jl")
 @Implements("MidiFileReader")
 public class MidiFileReader {
-	@ObfuscatedName("b")
-	static final byte[] field2963;
-	@ObfuscatedName("i")
+	@ObfuscatedName("r")
+	static final byte[] field3106;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lop;"
+		descriptor = "Lpi;"
 	)
 	@Export("buffer")
 	Buffer buffer;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("division")
 	int division;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("trackStarts")
 	int[] trackStarts;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("trackPositions")
 	int[] trackPositions;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("trackLengths")
 	int[] trackLengths;
-	@ObfuscatedName("g")
-	int[] field2964;
-	@ObfuscatedName("e")
-	int field2967;
+	@ObfuscatedName("s")
+	int[] field3100;
 	@ObfuscatedName("j")
-	long field2965;
+	int field3103;
+	@ObfuscatedName("n")
+	long field3098;
 
 	static {
-		field2963 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17
+		field3106 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17
 	}
 
 	MidiFileReader(byte[] var1) {
@@ -46,14 +46,14 @@ public class MidiFileReader {
 		this.buffer = new Buffer((byte[])null); // L: 8
 	} // L: 23
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("parse")
 	void parse(byte[] var1) {
 		this.buffer.array = var1; // L: 30
 		this.buffer.offset = 10; // L: 33
 		int var2 = this.buffer.readUnsignedShort(); // L: 34
 		this.division = this.buffer.readUnsignedShort(); // L: 36
-		this.field2967 = 500000; // L: 37
+		this.field3103 = 500000; // L: 37
 		this.trackStarts = new int[var2]; // L: 38
 
 		Buffer var10000;
@@ -70,7 +70,7 @@ void parse(byte[] var1) {
 			var10000 = this.buffer; // L: 46
 		}
 
-		this.field2965 = 0L; // L: 48
+		this.field3098 = 0L; // L: 48
 		this.trackPositions = new int[var2]; // L: 49
 
 		for (var3 = 0; var3 < var2; ++var3) { // L: 50
@@ -78,50 +78,50 @@ void parse(byte[] var1) {
 		}
 
 		this.trackLengths = new int[var2]; // L: 51
-		this.field2964 = new int[var2]; // L: 52
+		this.field3100 = new int[var2]; // L: 52
 	} // L: 53
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("clear")
 	void clear() {
 		this.buffer.array = null; // L: 56
 		this.trackStarts = null; // L: 57
 		this.trackPositions = null; // L: 58
 		this.trackLengths = null; // L: 59
-		this.field2964 = null; // L: 60
+		this.field3100 = null; // L: 60
 	} // L: 61
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("isReady")
 	boolean isReady() {
 		return this.buffer.array != null; // L: 64
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("trackCount")
 	int trackCount() {
 		return this.trackPositions.length; // L: 68
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("gotoTrack")
 	void gotoTrack(int var1) {
 		this.buffer.offset = this.trackPositions[var1]; // L: 72
 	} // L: 73
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("markTrackPosition")
 	void markTrackPosition(int var1) {
 		this.trackPositions[var1] = this.buffer.offset; // L: 76
 	} // L: 77
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("setTrackDone")
 	void setTrackDone() {
 		this.buffer.offset = -1; // L: 80
 	} // L: 81
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("readTrackLength")
 	void readTrackLength(int var1) {
 		int var2 = this.buffer.readVarInt(); // L: 84
@@ -129,36 +129,36 @@ void readTrackLength(int var1) {
 		var10000[var1] += var2; // L: 85
 	} // L: 86
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("readMessage")
 	int readMessage(int var1) {
 		int var2 = this.readMessage0(var1); // L: 89
 		return var2; // L: 90
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("readMessage0")
 	int readMessage0(int var1) {
 		byte var2 = this.buffer.array[this.buffer.offset]; // L: 94
 		int var5;
 		if (var2 < 0) { // L: 95
 			var5 = var2 & 255; // L: 96
-			this.field2964[var1] = var5; // L: 97
+			this.field3100[var1] = var5; // L: 97
 			++this.buffer.offset; // L: 98
 		} else {
-			var5 = this.field2964[var1]; // L: 101
+			var5 = this.field3100[var1]; // L: 101
 		}
 
 		if (var5 != 240 && var5 != 247) { // L: 103
-			return this.method4891(var1, var5); // L: 116
+			return this.method5208(var1, var5); // L: 116
 		} else {
 			int var3 = this.buffer.readVarInt(); // L: 104
 			if (var5 == 247 && var3 > 0) { // L: 105
 				int var4 = this.buffer.array[this.buffer.offset] & 255; // L: 106
 				if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { // L: 107
 					++this.buffer.offset; // L: 108
-					this.field2964[var1] = var4; // L: 109
-					return this.method4891(var1, var4); // L: 110
+					this.field3100[var1] = var4; // L: 109
+					return this.method5208(var1, var4); // L: 110
 				}
 			}
 
@@ -168,8 +168,8 @@ int readMessage0(int var1) {
 		}
 	}
 
-	@ObfuscatedName("x")
-	int method4891(int var1, int var2) {
+	@ObfuscatedName("o")
+	int method5208(int var1, int var2) {
 		int var4;
 		if (var2 == 255) { // L: 120
 			int var7 = this.buffer.readUnsignedByte(); // L: 121
@@ -183,8 +183,8 @@ int method4891(int var1, int var2) {
 				int var5 = this.buffer.readMedium(); // L: 128
 				var4 -= 3; // L: 129
 				int var6 = this.trackLengths[var1]; // L: 130
-				this.field2965 += (long)var6 * (long)(this.field2967 - var5); // L: 131
-				this.field2967 = var5; // L: 132
+				this.field3098 += (long)var6 * (long)(this.field3103 - var5); // L: 131
+				this.field3103 = var5; // L: 132
 				var10000 = this.buffer; // L: 133
 				var10000.offset += var4;
 				return 2; // L: 134
@@ -194,7 +194,7 @@ int method4891(int var1, int var2) {
 				return 3; // L: 137
 			}
 		} else {
-			byte var3 = field2963[var2 - 128]; // L: 139
+			byte var3 = field3106[var2 - 128]; // L: 139
 			var4 = var2; // L: 140
 			if (var3 >= 1) { // L: 141
 				var4 = var2 | this.buffer.readUnsignedByte() << 8;
@@ -208,12 +208,12 @@ int method4891(int var1, int var2) {
 		}
 	}
 
-	@ObfuscatedName("y")
-	long method4934(int var1) {
-		return this.field2965 + (long)var1 * (long)this.field2967; // L: 147
+	@ObfuscatedName("v")
+	long method5202(int var1) {
+		return this.field3098 + (long)var1 * (long)this.field3103; // L: 147
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("getPrioritizedTrack")
 	int getPrioritizedTrack() {
 		int var1 = this.trackPositions.length; // L: 151
@@ -230,7 +230,7 @@ int getPrioritizedTrack() {
 		return var2; // L: 161
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("isDone")
 	boolean isDone() {
 		int var1 = this.trackPositions.length; // L: 165
@@ -244,15 +244,15 @@ boolean isDone() {
 		return true; // L: 167
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("reset")
 	void reset(long var1) {
-		this.field2965 = var1; // L: 171
+		this.field3098 = var1; // L: 171
 		int var3 = this.trackPositions.length; // L: 172
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 173
 			this.trackLengths[var4] = 0; // L: 174
-			this.field2964[var4] = 0; // L: 175
+			this.field3100[var4] = 0; // L: 175
 			this.buffer.offset = this.trackStarts[var4]; // L: 176
 			this.readTrackLength(var4); // L: 177
 			this.trackPositions[var4] = this.buffer.offset; // L: 178
diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java
index 8387db9d8b..332c70f6fc 100644
--- a/runescape-client/src/main/java/MidiPcmStream.java
+++ b/runescape-client/src/main/java/MidiPcmStream.java
@@ -4,155 +4,161 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("io")
+@ObfuscatedName("jp")
 @Implements("MidiPcmStream")
 public class MidiPcmStream extends PcmStream {
-	@ObfuscatedName("i")
+	@ObfuscatedName("ix")
+	@ObfuscatedGetter(
+		intValue = 1972992415
+	)
+	@Export("selectedItemWidget")
+	static int selectedItemWidget;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("musicPatches")
 	NodeHashTable musicPatches;
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1803205059
+		intValue = -1989200593
 	)
-	int field2930;
-	@ObfuscatedName("a")
+	int field3069;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -567401845
+		intValue = 1925725407
 	)
-	int field2931;
-	@ObfuscatedName("o")
-	int[] field2956;
-	@ObfuscatedName("g")
-	int[] field2933;
-	@ObfuscatedName("e")
-	int[] field2934;
-	@ObfuscatedName("p")
-	int[] field2941;
+	int field3075;
+	@ObfuscatedName("m")
+	int[] field3071;
+	@ObfuscatedName("t")
+	int[] field3089;
+	@ObfuscatedName("s")
+	int[] field3076;
 	@ObfuscatedName("j")
-	int[] field2936;
-	@ObfuscatedName("b")
-	int[] field2937;
-	@ObfuscatedName("x")
-	int[] field2938;
-	@ObfuscatedName("y")
-	int[] field2939;
-	@ObfuscatedName("k")
-	int[] field2940;
-	@ObfuscatedName("d")
-	int[] field2944;
+	int[] field3092;
+	@ObfuscatedName("n")
+	int[] field3095;
 	@ObfuscatedName("r")
-	int[] field2942;
-	@ObfuscatedName("m")
-	int[] field2943;
-	@ObfuscatedName("c")
-	int[] field2932;
-	@ObfuscatedName("f")
-	int[] field2945;
-	@ObfuscatedName("h")
-	int[] field2946;
+	int[] field3096;
+	@ObfuscatedName("o")
+	int[] field3077;
 	@ObfuscatedName("v")
+	int[] field3078;
+	@ObfuscatedName("d")
+	int[] field3079;
+	@ObfuscatedName("f")
+	int[] field3081;
+	@ObfuscatedName("l")
+	int[] field3082;
+	@ObfuscatedName("q")
+	int[] field3091;
+	@ObfuscatedName("x")
+	int[] field3084;
+	@ObfuscatedName("z")
+	int[] field3085;
+	@ObfuscatedName("i")
+	int[] field3086;
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "[[Liu;"
+		descriptor = "[[Ljq;"
 	)
-	MusicPatchNode[][] field2952;
-	@ObfuscatedName("ag")
+	MusicPatchNode[][] field3087;
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "[[Liu;"
+		descriptor = "[[Ljq;"
 	)
-	MusicPatchNode[][] field2949;
-	@ObfuscatedName("ae")
+	MusicPatchNode[][] field3088;
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "Liz;"
+		descriptor = "Ljl;"
 	)
 	@Export("midiFile")
 	MidiFileReader midiFile;
-	@ObfuscatedName("aq")
-	boolean field2950;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ab")
+	boolean field3072;
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -825600901
+		intValue = -18186103
 	)
 	@Export("track")
 	int track;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = -1277249171
+		intValue = 1268165937
 	)
 	@Export("trackLength")
 	int trackLength;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		longValue = -2626160015081860905L
+		longValue = 6776460792524866117L
 	)
-	long field2953;
-	@ObfuscatedName("ah")
+	long field3093;
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		longValue = 8598063187503057895L
+		longValue = 7641976143722110143L
 	)
-	long field2954;
-	@ObfuscatedName("as")
+	long field3094;
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "Lij;"
+		descriptor = "Ljw;"
 	)
 	@Export("patchStream")
 	MusicPatchPcmStream patchStream;
 
 	public MidiPcmStream() {
-		this.field2930 = 256; // L: 14
-		this.field2931 = 1000000; // L: 15
-		this.field2956 = new int[16]; // L: 16
-		this.field2933 = new int[16]; // L: 17
-		this.field2934 = new int[16]; // L: 18
-		this.field2941 = new int[16]; // L: 19
-		this.field2936 = new int[16]; // L: 20
-		this.field2937 = new int[16]; // L: 21
-		this.field2938 = new int[16]; // L: 22
-		this.field2939 = new int[16]; // L: 23
-		this.field2940 = new int[16]; // L: 24
-		this.field2944 = new int[16]; // L: 28
-		this.field2942 = new int[16]; // L: 29
-		this.field2943 = new int[16]; // L: 30
-		this.field2932 = new int[16]; // L: 31
-		this.field2945 = new int[16]; // L: 32
-		this.field2946 = new int[16]; // L: 33
-		this.field2952 = new MusicPatchNode[16][128]; // L: 34
-		this.field2949 = new MusicPatchNode[16][128]; // L: 35
+		this.field3069 = 256; // L: 14
+		this.field3075 = 1000000; // L: 15
+		this.field3071 = new int[16]; // L: 16
+		this.field3089 = new int[16]; // L: 17
+		this.field3076 = new int[16]; // L: 18
+		this.field3092 = new int[16]; // L: 19
+		this.field3095 = new int[16]; // L: 20
+		this.field3096 = new int[16]; // L: 21
+		this.field3077 = new int[16]; // L: 22
+		this.field3078 = new int[16]; // L: 23
+		this.field3079 = new int[16]; // L: 24
+		this.field3081 = new int[16]; // L: 28
+		this.field3082 = new int[16]; // L: 29
+		this.field3091 = new int[16]; // L: 30
+		this.field3084 = new int[16]; // L: 31
+		this.field3085 = new int[16]; // L: 32
+		this.field3086 = new int[16]; // L: 33
+		this.field3087 = new MusicPatchNode[16][128]; // L: 34
+		this.field3088 = new MusicPatchNode[16][128]; // L: 35
 		this.midiFile = new MidiFileReader(); // L: 36
 		this.patchStream = new MusicPatchPcmStream(this); // L: 42
 		this.musicPatches = new NodeHashTable(128); // L: 45
-		this.method4773(); // L: 46
+		this.method5091(); // L: 46
 	} // L: 47
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "649793377"
+		garbageValue = "-906124112"
 	)
 	@Export("setPcmStreamVolume")
 	public synchronized void setPcmStreamVolume(int var1) {
-		this.field2930 = var1; // L: 50
+		this.field3069 = var1; // L: 50
 	} // L: 51
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "26"
+		descriptor = "(I)I",
+		garbageValue = "600611451"
 	)
-	int method4754() {
-		return this.field2930; // L: 54
+	int method5073() {
+		return this.field3069; // L: 54
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Liv;Lko;Lad;IB)Z",
-		garbageValue = "84"
+		descriptor = "(Ljk;Lku;Laa;II)Z",
+		garbageValue = "-256912575"
 	)
 	@Export("loadMusicTrack")
 	public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) {
-		var1.method4981(); // L: 58
+		var1.method5280(); // L: 58
 		boolean var5 = true; // L: 59
 		int[] var6 = null; // L: 60
 		if (var4 > 0) { // L: 61
@@ -180,7 +186,7 @@ public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2
 				this.musicPatches.put(var10, (long)var8); // L: 80
 			}
 
-			if (!var9.method4945(var3, var7.byteArray, var6)) { // L: 82
+			if (!var9.method5253(var3, var7.byteArray, var6)) { // L: 82
 				var5 = false;
 			}
 		}
@@ -192,10 +198,10 @@ public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2
 		return var5; // L: 85
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "8"
+		descriptor = "(I)V",
+		garbageValue = "1865600049"
 	)
 	@Export("clearAll")
 	public synchronized void clearAll() {
@@ -205,78 +211,78 @@ public synchronized void clearAll() {
 
 	} // L: 90
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "0"
+		descriptor = "(I)V",
+		garbageValue = "-1487279179"
 	)
 	@Export("removeAll")
 	synchronized void removeAll() {
-		for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) {
-			var1.remove(); // L: 93
+		for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93
+			var1.remove();
 		}
 
 	} // L: 94
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("firstSubStream")
 	protected synchronized PcmStream firstSubStream() {
 		return this.patchStream; // L: 469
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("nextSubStream")
 	protected synchronized PcmStream nextSubStream() {
 		return null; // L: 473
 	}
 
-	@ObfuscatedName("p")
-	protected synchronized int vmethod4958() {
+	@ObfuscatedName("w")
+	protected synchronized int vmethod5260() {
 		return 0; // L: 477
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("fill")
 	protected synchronized void fill(int[] var1, int var2, int var3) {
 		if (this.midiFile.isReady()) { // L: 481
-			int var4 = this.midiFile.division * this.field2931 / UserComparator2.field4359; // L: 482
+			int var4 = this.midiFile.division * this.field3075 / class339.field4058; // L: 482
 
 			do {
-				long var5 = this.field2953 + (long)var4 * (long)var3; // L: 484
-				if (this.field2954 - var5 >= 0L) { // L: 485
-					this.field2953 = var5; // L: 486
+				long var5 = this.field3093 + (long)var4 * (long)var3; // L: 484
+				if (this.field3094 - var5 >= 0L) { // L: 485
+					this.field3093 = var5; // L: 486
 					break;
 				}
 
-				int var7 = (int)((this.field2954 - this.field2953 + (long)var4 - 1L) / (long)var4); // L: 489
-				this.field2953 += (long)var7 * (long)var4; // L: 490
+				int var7 = (int)(((long)var4 + (this.field3094 - this.field3093) - 1L) / (long)var4); // L: 489
+				this.field3093 += (long)var4 * (long)var7; // L: 490
 				this.patchStream.fill(var1, var2, var7); // L: 491
 				var2 += var7; // L: 492
 				var3 -= var7; // L: 493
-				this.method4758(); // L: 494
+				this.method5104(); // L: 494
 			} while(this.midiFile.isReady()); // L: 495
 		}
 
 		this.patchStream.fill(var1, var2, var3); // L: 498
 	} // L: 499
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Liv;ZI)V",
-		garbageValue = "-323229472"
+		descriptor = "(Ljk;ZI)V",
+		garbageValue = "328855214"
 	)
 	@Export("setMusicTrack")
 	public synchronized void setMusicTrack(MusicTrack var1, boolean var2) {
 		this.clear(); // L: 97
 		this.midiFile.parse(var1.midi); // L: 98
-		this.field2950 = var2; // L: 99
-		this.field2953 = 0L; // L: 100
+		this.field3072 = var2; // L: 99
+		this.field3093 = 0L; // L: 100
 		int var3 = this.midiFile.trackCount(); // L: 101
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 102
@@ -287,248 +293,248 @@ public synchronized void setMusicTrack(MusicTrack var1, boolean var2) {
 
 		this.track = this.midiFile.getPrioritizedTrack(); // L: 107
 		this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108
-		this.field2954 = this.midiFile.method4934(this.trackLength); // L: 109
+		this.field3094 = this.midiFile.method5202(this.trackLength); // L: 109
 	} // L: 110
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("skip")
 	protected synchronized void skip(int var1) {
 		if (this.midiFile.isReady()) { // L: 502
-			int var2 = this.midiFile.division * this.field2931 / UserComparator2.field4359; // L: 503
+			int var2 = this.midiFile.division * this.field3075 / class339.field4058; // L: 503
 
 			do {
-				long var3 = (long)var1 * (long)var2 + this.field2953; // L: 505
-				if (this.field2954 - var3 >= 0L) { // L: 506
-					this.field2953 = var3; // L: 507
+				long var3 = this.field3093 + (long)var1 * (long)var2; // L: 505
+				if (this.field3094 - var3 >= 0L) { // L: 506
+					this.field3093 = var3; // L: 507
 					break;
 				}
 
-				int var5 = (int)(((long)var2 + (this.field2954 - this.field2953) - 1L) / (long)var2); // L: 510
-				this.field2953 += (long)var5 * (long)var2; // L: 511
+				int var5 = (int)(((long)var2 + (this.field3094 - this.field3093) - 1L) / (long)var2); // L: 510
+				this.field3093 += (long)var5 * (long)var2; // L: 511
 				this.patchStream.skip(var5); // L: 512
 				var1 -= var5; // L: 513
-				this.method4758(); // L: 514
+				this.method5104(); // L: 514
 			} while(this.midiFile.isReady()); // L: 515
 		}
 
 		this.patchStream.skip(var1); // L: 518
 	} // L: 519
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "8"
+		garbageValue = "49"
 	)
 	@Export("clear")
 	public synchronized void clear() {
 		this.midiFile.clear(); // L: 113
-		this.method4773(); // L: 114
+		this.method5091(); // L: 114
 	} // L: 115
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-131350281"
+		garbageValue = "154735720"
 	)
 	@Export("isReady")
-	public synchronized boolean isReady() {
+	synchronized boolean isReady() {
 		return this.midiFile.isReady(); // L: 118
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-2025298930"
+		garbageValue = "-1583384688"
 	)
-	public synchronized void method4761(int var1, int var2) {
-		this.method4826(var1, var2); // L: 122
+	public synchronized void method5079(int var1, int var2) {
+		this.method5080(var1, var2); // L: 122
 	} // L: 123
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(IIB)V",
-		garbageValue = "-59"
+		garbageValue = "3"
 	)
-	void method4826(int var1, int var2) {
-		this.field2941[var1] = var2; // L: 126
-		this.field2937[var1] = var2 & -128; // L: 127
-		this.method4863(var1, var2); // L: 128
+	void method5080(int var1, int var2) {
+		this.field3092[var1] = var2; // L: 126
+		this.field3096[var1] = var2 & -128; // L: 127
+		this.method5081(var1, var2); // L: 128
 	} // L: 129
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "-70"
+		descriptor = "(III)V",
+		garbageValue = "-1761005899"
 	)
-	void method4863(int var1, int var2) {
-		if (var2 != this.field2936[var1]) { // L: 132
-			this.field2936[var1] = var2; // L: 133
+	void method5081(int var1, int var2) {
+		if (var2 != this.field3095[var1]) { // L: 132
+			this.field3095[var1] = var2; // L: 133
 
 			for (int var3 = 0; var3 < 128; ++var3) { // L: 134
-				this.field2949[var1][var3] = null;
+				this.field3088[var1][var3] = null;
 			}
 		}
 
 	} // L: 136
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)V",
-		garbageValue = "0"
+		descriptor = "(IIII)V",
+		garbageValue = "-1972733350"
 	)
-	void method4764(int var1, int var2, int var3) {
-		this.method4847(var1, var2, 64); // L: 139
-		if ((this.field2944[var1] & 2) != 0) { // L: 140
+	void method5163(int var1, int var2, int var3) {
+		this.method5084(var1, var2, 64); // L: 139
+		if ((this.field3081[var1] & 2) != 0) { // L: 140
 			for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 141
-				if (var4.field2996 == var1 && var4.field2999 < 0) { // L: 142
-					this.field2952[var1][var4.field2990] = null; // L: 143
-					this.field2952[var1][var2] = var4; // L: 144
-					int var8 = (var4.field2998 * var4.field2997 >> 12) + var4.field2993; // L: 145
-					var4.field2993 += var2 - var4.field2990 << 8; // L: 146
-					var4.field2997 = var8 - var4.field2993; // L: 147
-					var4.field2998 = 4096; // L: 148
-					var4.field2990 = var2; // L: 149
+				if (var4.field3149 == var1 && var4.field3142 < 0) { // L: 142
+					this.field3087[var1][var4.field3133] = null; // L: 143
+					this.field3087[var1][var2] = var4; // L: 144
+					int var8 = (var4.field3137 * var4.field3138 >> 12) + var4.field3136; // L: 145
+					var4.field3136 += var2 - var4.field3133 << 8; // L: 146
+					var4.field3137 = var8 - var4.field3136; // L: 147
+					var4.field3138 = 4096; // L: 148
+					var4.field3133 = var2; // L: 149
 					return; // L: 150
 				}
 			}
 		}
 
-		MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2936[var1]); // L: 154
+		MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field3095[var1]); // L: 154
 		if (var9 != null) { // L: 155
 			RawSound var5 = var9.rawSounds[var2]; // L: 156
 			if (var5 != null) { // L: 157
 				MusicPatchNode var6 = new MusicPatchNode(); // L: 158
-				var6.field2996 = var1; // L: 159
+				var6.field3149 = var1; // L: 159
 				var6.patch = var9; // L: 160
 				var6.rawSound = var5; // L: 161
-				var6.field2988 = var9.field2976[var2]; // L: 162
-				var6.field2989 = var9.field2977[var2]; // L: 163
-				var6.field2990 = var2; // L: 164
-				var6.field2991 = var3 * var3 * var9.field2974[var2] * var9.field2973 + 1024 >> 11; // L: 165
-				var6.field2992 = var9.field2971[var2] & 255; // L: 166
-				var6.field2993 = (var2 << 8) - (var9.field2972[var2] & 32767); // L: 167
-				var6.field2986 = 0; // L: 168
-				var6.field3004 = 0; // L: 169
-				var6.field2994 = 0; // L: 170
-				var6.field2999 = -1; // L: 171
-				var6.field3000 = 0; // L: 172
-				if (this.field2932[var1] == 0) { // L: 173
-					var6.stream = RawPcmStream.method817(var5, this.method4778(var6), this.method4779(var6), this.method4780(var6)); // L: 174
+				var6.field3131 = var9.field3117[var2]; // L: 162
+				var6.field3128 = var9.field3119[var2]; // L: 163
+				var6.field3133 = var2; // L: 164
+				var6.field3132 = var3 * var3 * var9.field3111[var2] * var9.field3114 + 1024 >> 11; // L: 165
+				var6.field3147 = var9.field3115[var2] & 255; // L: 166
+				var6.field3136 = (var2 << 8) - (var9.field3113[var2] & 32767); // L: 167
+				var6.field3139 = 0; // L: 168
+				var6.field3140 = 0; // L: 169
+				var6.field3141 = 0; // L: 170
+				var6.field3142 = -1; // L: 171
+				var6.field3143 = 0; // L: 172
+				if (this.field3084[var1] == 0) { // L: 173
+					var6.stream = RawPcmStream.method943(var5, this.method5170(var6), this.method5097(var6), this.method5098(var6)); // L: 174
 				} else {
-					var6.stream = RawPcmStream.method817(var5, this.method4778(var6), 0, this.method4780(var6)); // L: 177
-					this.method4765(var6, var9.field2972[var2] < 0); // L: 178
+					var6.stream = RawPcmStream.method943(var5, this.method5170(var6), 0, this.method5098(var6)); // L: 177
+					this.method5083(var6, var9.field3113[var2] < 0); // L: 178
 				}
 
-				if (var9.field2972[var2] < 0) { // L: 180
+				if (var9.field3113[var2] < 0) { // L: 180
 					var6.stream.setNumLoops(-1);
 				}
 
-				if (var6.field2989 >= 0) { // L: 181
-					MusicPatchNode var7 = this.field2949[var1][var6.field2989]; // L: 182
-					if (var7 != null && var7.field2999 < 0) { // L: 183
-						this.field2952[var1][var7.field2990] = null; // L: 184
-						var7.field2999 = 0; // L: 185
+				if (var6.field3128 >= 0) { // L: 181
+					MusicPatchNode var7 = this.field3088[var1][var6.field3128]; // L: 182
+					if (var7 != null && var7.field3142 < 0) { // L: 183
+						this.field3087[var1][var7.field3133] = null; // L: 184
+						var7.field3142 = 0; // L: 185
 					}
 
-					this.field2949[var1][var6.field2989] = var6; // L: 187
+					this.field3088[var1][var6.field3128] = var6; // L: 187
 				}
 
 				this.patchStream.queue.addFirst(var6); // L: 189
-				this.field2952[var1][var2] = var6; // L: 190
+				this.field3087[var1][var2] = var6; // L: 190
 			}
 		}
 	} // L: 191
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(Liu;ZI)V",
-		garbageValue = "1139290365"
+		descriptor = "(Ljq;ZI)V",
+		garbageValue = "1432160102"
 	)
-	void method4765(MusicPatchNode var1, boolean var2) {
+	void method5083(MusicPatchNode var1, boolean var2) {
 		int var3 = var1.rawSound.samples.length; // L: 194
 		int var4;
-		if (var2 && var1.rawSound.field238) { // L: 196
+		if (var2 && var1.rawSound.field265) { // L: 196
 			int var5 = var3 + var3 - var1.rawSound.start; // L: 197
-			var4 = (int)((long)this.field2932[var1.field2996] * (long)var5 >> 6); // L: 198
+			var4 = (int)((long)this.field3084[var1.field3149] * (long)var5 >> 6); // L: 198
 			var3 <<= 8; // L: 199
-			if (var4 >= var3) { // L: 200
-				var4 = var3 + var3 - 1 - var4; // L: 201
-				var1.stream.method922(); // L: 202
+			if (var4 >= var3) {
+				var4 = var3 + var3 - 1 - var4;
+				var1.stream.method925();
 			}
 		} else {
-			var4 = (int)((long)var3 * (long)this.field2932[var1.field2996] >> 6); // L: 206
+			var4 = (int)((long)var3 * (long)this.field3084[var1.field3149] >> 6); // L: 206
 		}
 
-		var1.stream.method825(var4); // L: 208
+		var1.stream.method848(var4); // L: 208
 	} // L: 209
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "1890191910"
+		descriptor = "(IIIB)V",
+		garbageValue = "97"
 	)
-	void method4847(int var1, int var2, int var3) {
-		MusicPatchNode var4 = this.field2952[var1][var2]; // L: 212
+	void method5084(int var1, int var2, int var3) {
+		MusicPatchNode var4 = this.field3087[var1][var2]; // L: 212
 		if (var4 != null) { // L: 213
-			this.field2952[var1][var2] = null; // L: 214
-			if ((this.field2944[var1] & 2) != 0) { // L: 215
+			this.field3087[var1][var2] = null; // L: 214
+			if ((this.field3081[var1] & 2) != 0) { // L: 215
 				for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216
-					if (var4.field2996 == var5.field2996 && var5.field2999 < 0 && var4 != var5) { // L: 217
-						var4.field2999 = 0; // L: 218
+					if (var5.field3149 == var4.field3149 && var5.field3142 < 0 && var5 != var4) { // L: 217
+						var4.field3142 = 0; // L: 218
 						break; // L: 219
 					}
 				}
 			} else {
-				var4.field2999 = 0; // L: 224
+				var4.field3142 = 0; // L: 224
 			}
 
 		}
 	} // L: 226
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "-1181683312"
+		garbageValue = "1104599593"
 	)
-	void method4853(int var1, int var2, int var3) {
+	void method5085(int var1, int var2, int var3) {
 	} // L: 228
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "825528878"
+		garbageValue = "-875274554"
 	)
-	void method4768(int var1, int var2) {
+	void method5086(int var1, int var2) {
 	} // L: 229
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(IIB)V",
-		garbageValue = "21"
+		garbageValue = "0"
 	)
-	void method4769(int var1, int var2) {
-		this.field2938[var1] = var2; // L: 232
+	void method5087(int var1, int var2) {
+		this.field3077[var1] = var2; // L: 232
 	} // L: 233
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1217191884"
+		garbageValue = "1499512267"
 	)
-	void method4770(int var1) {
+	void method5088(int var1) {
 		for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236
-			if (var1 < 0 || var2.field2996 == var1) { // L: 237
+			if (var1 < 0 || var2.field3149 == var1) { // L: 237
 				if (var2.stream != null) { // L: 238
-					var2.stream.method830(UserComparator2.field4359 / 100); // L: 239
-					if (var2.stream.method834()) { // L: 240
+					var2.stream.method954(class339.field4058 / 100); // L: 239
+					if (var2.stream.method857()) { // L: 240
 						this.patchStream.mixer.addSubStream(var2.stream);
 					}
 
-					var2.method4992(); // L: 241
+					var2.method5292(); // L: 241
 				}
 
-				if (var2.field2999 < 0) { // L: 243
-					this.field2952[var2.field2996][var2.field2990] = null;
+				if (var2.field3142 < 0) { // L: 243
+					this.field3087[var2.field3149][var2.field3133] = null;
 				}
 
 				var2.remove(); // L: 244
@@ -537,107 +543,107 @@ void method4770(int var1) {
 
 	} // L: 247
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "87"
+		descriptor = "(II)V",
+		garbageValue = "171384389"
 	)
-	void method4771(int var1) {
+	void method5089(int var1) {
 		if (var1 >= 0) { // L: 250
-			this.field2956[var1] = 12800; // L: 254
-			this.field2933[var1] = 8192; // L: 255
-			this.field2934[var1] = 16383; // L: 256
-			this.field2938[var1] = 8192; // L: 257
-			this.field2939[var1] = 0; // L: 258
-			this.field2940[var1] = 8192; // L: 259
-			this.method4774(var1); // L: 260
-			this.method4775(var1); // L: 261
-			this.field2944[var1] = 0; // L: 262
-			this.field2942[var1] = 32767; // L: 263
-			this.field2943[var1] = 256; // L: 264
-			this.field2932[var1] = 0; // L: 265
-			this.method4777(var1, 8192); // L: 266
+			this.field3071[var1] = 12800; // L: 254
+			this.field3089[var1] = 8192; // L: 255
+			this.field3076[var1] = 16383; // L: 256
+			this.field3077[var1] = 8192; // L: 257
+			this.field3078[var1] = 0; // L: 258
+			this.field3079[var1] = 8192; // L: 259
+			this.method5092(var1); // L: 260
+			this.method5093(var1); // L: 261
+			this.field3081[var1] = 0; // L: 262
+			this.field3082[var1] = 32767; // L: 263
+			this.field3091[var1] = 256; // L: 264
+			this.field3084[var1] = 0; // L: 265
+			this.method5095(var1, 8192); // L: 266
 		} else {
 			for (var1 = 0; var1 < 16; ++var1) { // L: 251
-				this.method4771(var1);
+				this.method5089(var1);
 			}
 
 		}
 	} // L: 252 267
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "94"
+		garbageValue = "38"
 	)
-	void method4772(int var1) {
+	void method5129(int var1) {
 		for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270
-			if ((var1 < 0 || var2.field2996 == var1) && var2.field2999 < 0) { // L: 271 272
-				this.field2952[var2.field2996][var2.field2990] = null; // L: 273
-				var2.field2999 = 0; // L: 274
+			if ((var1 < 0 || var2.field3149 == var1) && var2.field3142 < 0) { // L: 271 272
+				this.field3087[var2.field3149][var2.field3133] = null; // L: 273
+				var2.field3142 = 0; // L: 274
 			}
 		}
 
 	} // L: 278
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "53312168"
+		descriptor = "(B)V",
+		garbageValue = "63"
 	)
-	void method4773() {
-		this.method4770(-1); // L: 281
-		this.method4771(-1); // L: 282
+	void method5091() {
+		this.method5088(-1); // L: 281
+		this.method5089(-1); // L: 282
 
 		int var1;
 		for (var1 = 0; var1 < 16; ++var1) { // L: 283
-			this.field2936[var1] = this.field2941[var1];
+			this.field3095[var1] = this.field3092[var1];
 		}
 
 		for (var1 = 0; var1 < 16; ++var1) { // L: 284
-			this.field2937[var1] = this.field2941[var1] & -128;
+			this.field3096[var1] = this.field3092[var1] & -128;
 		}
 
 	} // L: 285
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "453228054"
+		descriptor = "(IB)V",
+		garbageValue = "-21"
 	)
-	void method4774(int var1) {
-		if ((this.field2944[var1] & 2) != 0) { // L: 288
+	void method5092(int var1) {
+		if ((this.field3081[var1] & 2) != 0) { // L: 288
 			for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 289
-				if (var2.field2996 == var1 && this.field2952[var1][var2.field2990] == null && var2.field2999 < 0) { // L: 290 291
-					var2.field2999 = 0;
+				if (var2.field3149 == var1 && this.field3087[var1][var2.field3133] == null && var2.field3142 < 0) { // L: 290 291
+					var2.field3142 = 0;
 				}
 			}
 		}
 
 	} // L: 295
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-2001136983"
+		descriptor = "(IS)V",
+		garbageValue = "16256"
 	)
-	void method4775(int var1) {
-		if ((this.field2944[var1] & 4) != 0) { // L: 298
+	void method5093(int var1) {
+		if ((this.field3081[var1] & 4) != 0) { // L: 298
 			for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 299
-				if (var2.field2996 == var1) { // L: 300
-					var2.field3003 = 0;
+				if (var2.field3149 == var1) { // L: 300
+					var2.field3135 = 0;
 				}
 			}
 		}
 
 	} // L: 303
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "1"
+		descriptor = "(II)V",
+		garbageValue = "2130755368"
 	)
-	void method4776(int var1) {
+	void method5094(int var1) {
 		int var2 = var1 & 240; // L: 306
 		int var3;
 		int var4;
@@ -646,289 +652,289 @@ void method4776(int var1) {
 			var3 = var1 & 15; // L: 308
 			var4 = var1 >> 8 & 127; // L: 309
 			var5 = var1 >> 16 & 127; // L: 310
-			this.method4847(var3, var4, var5); // L: 311
+			this.method5084(var3, var4, var5); // L: 311
 		} else if (var2 == 144) { // L: 314
 			var3 = var1 & 15; // L: 315
 			var4 = var1 >> 8 & 127; // L: 316
 			var5 = var1 >> 16 & 127; // L: 317
 			if (var5 > 0) { // L: 318
-				this.method4764(var3, var4, var5);
+				this.method5163(var3, var4, var5);
 			} else {
-				this.method4847(var3, var4, 64); // L: 319
+				this.method5084(var3, var4, 64); // L: 319
 			}
 
 		} else if (var2 == 160) { // L: 322
 			var3 = var1 & 15; // L: 323
 			var4 = var1 >> 8 & 127; // L: 324
 			var5 = var1 >> 16 & 127; // L: 325
-			this.method4853(var3, var4, var5); // L: 326
+			this.method5085(var3, var4, var5); // L: 326
 		} else if (var2 == 176) { // L: 329
 			var3 = var1 & 15; // L: 330
 			var4 = var1 >> 8 & 127; // L: 331
 			var5 = var1 >> 16 & 127; // L: 332
 			if (var4 == 0) { // L: 333
-				this.field2937[var3] = (var5 << 14) + (this.field2937[var3] & -2080769);
+				this.field3096[var3] = (var5 << 14) + (this.field3096[var3] & -2080769);
 			}
 
 			if (var4 == 32) { // L: 334
-				this.field2937[var3] = (var5 << 7) + (this.field2937[var3] & -16257);
+				this.field3096[var3] = (var5 << 7) + (this.field3096[var3] & -16257);
 			}
 
 			if (var4 == 1) { // L: 335
-				this.field2939[var3] = (var5 << 7) + (this.field2939[var3] & -16257);
+				this.field3078[var3] = (var5 << 7) + (this.field3078[var3] & -16257);
 			}
 
 			if (var4 == 33) { // L: 336
-				this.field2939[var3] = var5 + (this.field2939[var3] & -128);
+				this.field3078[var3] = var5 + (this.field3078[var3] & -128);
 			}
 
 			if (var4 == 5) { // L: 337
-				this.field2940[var3] = (var5 << 7) + (this.field2940[var3] & -16257);
+				this.field3079[var3] = (var5 << 7) + (this.field3079[var3] & -16257);
 			}
 
 			if (var4 == 37) { // L: 338
-				this.field2940[var3] = var5 + (this.field2940[var3] & -128);
+				this.field3079[var3] = var5 + (this.field3079[var3] & -128);
 			}
 
 			if (var4 == 7) { // L: 339
-				this.field2956[var3] = (var5 << 7) + (this.field2956[var3] & -16257);
+				this.field3071[var3] = (var5 << 7) + (this.field3071[var3] & -16257);
 			}
 
 			if (var4 == 39) { // L: 340
-				this.field2956[var3] = var5 + (this.field2956[var3] & -128);
+				this.field3071[var3] = var5 + (this.field3071[var3] & -128);
 			}
 
 			if (var4 == 10) { // L: 341
-				this.field2933[var3] = (var5 << 7) + (this.field2933[var3] & -16257);
+				this.field3089[var3] = (var5 << 7) + (this.field3089[var3] & -16257);
 			}
 
 			if (var4 == 42) { // L: 342
-				this.field2933[var3] = var5 + (this.field2933[var3] & -128);
+				this.field3089[var3] = var5 + (this.field3089[var3] & -128);
 			}
 
 			if (var4 == 11) { // L: 343
-				this.field2934[var3] = (var5 << 7) + (this.field2934[var3] & -16257);
+				this.field3076[var3] = (var5 << 7) + (this.field3076[var3] & -16257);
 			}
 
 			if (var4 == 43) { // L: 344
-				this.field2934[var3] = var5 + (this.field2934[var3] & -128);
+				this.field3076[var3] = var5 + (this.field3076[var3] & -128);
 			}
 
 			int[] var10000;
 			if (var4 == 64) { // L: 345
 				if (var5 >= 64) { // L: 346
-					var10000 = this.field2944;
+					var10000 = this.field3081;
 					var10000[var3] |= 1;
 				} else {
-					var10000 = this.field2944; // L: 347
+					var10000 = this.field3081; // L: 347
 					var10000[var3] &= -2;
 				}
 			}
 
 			if (var4 == 65) { // L: 349
 				if (var5 >= 64) { // L: 350
-					var10000 = this.field2944;
+					var10000 = this.field3081;
 					var10000[var3] |= 2;
 				} else {
-					this.method4774(var3); // L: 352
-					var10000 = this.field2944; // L: 353
+					this.method5092(var3); // L: 352
+					var10000 = this.field3081; // L: 353
 					var10000[var3] &= -3;
 				}
 			}
 
 			if (var4 == 99) { // L: 356
-				this.field2942[var3] = (var5 << 7) + (this.field2942[var3] & 127);
+				this.field3082[var3] = (var5 << 7) + (this.field3082[var3] & 127);
 			}
 
 			if (var4 == 98) { // L: 357
-				this.field2942[var3] = (this.field2942[var3] & 16256) + var5;
+				this.field3082[var3] = (this.field3082[var3] & 16256) + var5;
 			}
 
 			if (var4 == 101) { // L: 358
-				this.field2942[var3] = (var5 << 7) + (this.field2942[var3] & 127) + 16384;
+				this.field3082[var3] = (var5 << 7) + (this.field3082[var3] & 127) + 16384;
 			}
 
 			if (var4 == 100) { // L: 359
-				this.field2942[var3] = (this.field2942[var3] & 16256) + var5 + 16384;
+				this.field3082[var3] = (this.field3082[var3] & 16256) + var5 + 16384;
 			}
 
 			if (var4 == 120) { // L: 360
-				this.method4770(var3);
+				this.method5088(var3);
 			}
 
 			if (var4 == 121) { // L: 361
-				this.method4771(var3);
+				this.method5089(var3);
 			}
 
 			if (var4 == 123) { // L: 362
-				this.method4772(var3);
+				this.method5129(var3);
 			}
 
 			int var6;
 			if (var4 == 6) { // L: 363
-				var6 = this.field2942[var3]; // L: 364
+				var6 = this.field3082[var3]; // L: 364
 				if (var6 == 16384) { // L: 365
-					this.field2943[var3] = (var5 << 7) + (this.field2943[var3] & -16257);
+					this.field3091[var3] = (var5 << 7) + (this.field3091[var3] & -16257);
 				}
 			}
 
 			if (var4 == 38) { // L: 367
-				var6 = this.field2942[var3]; // L: 368
+				var6 = this.field3082[var3]; // L: 368
 				if (var6 == 16384) { // L: 369
-					this.field2943[var3] = var5 + (this.field2943[var3] & -128);
+					this.field3091[var3] = var5 + (this.field3091[var3] & -128);
 				}
 			}
 
 			if (var4 == 16) { // L: 371
-				this.field2932[var3] = (var5 << 7) + (this.field2932[var3] & -16257);
+				this.field3084[var3] = (var5 << 7) + (this.field3084[var3] & -16257);
 			}
 
 			if (var4 == 48) { // L: 372
-				this.field2932[var3] = var5 + (this.field2932[var3] & -128);
+				this.field3084[var3] = var5 + (this.field3084[var3] & -128);
 			}
 
 			if (var4 == 81) { // L: 373
 				if (var5 >= 64) { // L: 374
-					var10000 = this.field2944;
+					var10000 = this.field3081;
 					var10000[var3] |= 4;
 				} else {
-					this.method4775(var3); // L: 376
-					var10000 = this.field2944; // L: 377
+					this.method5093(var3); // L: 376
+					var10000 = this.field3081; // L: 377
 					var10000[var3] &= -5;
 				}
 			}
 
 			if (var4 == 17) {
-				this.method4777(var3, (var5 << 7) + (this.field2945[var3] & -16257)); // L: 380
+				this.method5095(var3, (var5 << 7) + (this.field3085[var3] & -16257)); // L: 380
 			}
 
 			if (var4 == 49) { // L: 381
-				this.method4777(var3, var5 + (this.field2945[var3] & -128));
+				this.method5095(var3, var5 + (this.field3085[var3] & -128));
 			}
 
 		} else if (var2 == 192) { // L: 384
 			var3 = var1 & 15; // L: 385
 			var4 = var1 >> 8 & 127; // L: 386
-			this.method4863(var3, var4 + this.field2937[var3]); // L: 387
+			this.method5081(var3, var4 + this.field3096[var3]); // L: 387
 		} else if (var2 == 208) { // L: 390
 			var3 = var1 & 15; // L: 391
 			var4 = var1 >> 8 & 127; // L: 392
-			this.method4768(var3, var4); // L: 393
+			this.method5086(var3, var4); // L: 393
 		} else if (var2 == 224) { // L: 396
 			var3 = var1 & 15; // L: 397
 			var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 398
-			this.method4769(var3, var4); // L: 399
+			this.method5087(var3, var4); // L: 399
 		} else {
 			var2 = var1 & 255; // L: 402
 			if (var2 == 255) { // L: 403
-				this.method4773(); // L: 404
+				this.method5091(); // L: 404
 			}
 		}
 	} // L: 312 320 327 382 388 394 400 405 407
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-1520019758"
+		descriptor = "(IIB)V",
+		garbageValue = "1"
 	)
-	void method4777(int var1, int var2) {
-		this.field2945[var1] = var2; // L: 410
-		this.field2946[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411
+	void method5095(int var1, int var2) {
+		this.field3085[var1] = var2; // L: 410
+		this.field3086[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 411
 	} // L: 412
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "(Liu;B)I",
-		garbageValue = "0"
+		descriptor = "(Ljq;B)I",
+		garbageValue = "-119"
 	)
-	int method4778(MusicPatchNode var1) {
-		int var2 = (var1.field2998 * var1.field2997 >> 12) + var1.field2993; // L: 415
-		var2 += (this.field2938[var1.field2996] - 8192) * this.field2943[var1.field2996] >> 12; // L: 416
-		MusicPatchNode2 var3 = var1.field2988; // L: 417
+	int method5170(MusicPatchNode var1) {
+		int var2 = (var1.field3138 * var1.field3137 >> 12) + var1.field3136; // L: 415
+		var2 += (this.field3077[var1.field3149] - 8192) * this.field3091[var1.field3149] >> 12; // L: 416
+		MusicPatchNode2 var3 = var1.field3131; // L: 417
 		int var4;
-		if (var3.field2911 > 0 && (var3.field2917 > 0 || this.field2939[var1.field2996] > 0)) { // L: 418
-			var4 = var3.field2917 << 2; // L: 419
-			int var5 = var3.field2919 << 1; // L: 420
-			if (var1.field3001 < var5) { // L: 421
-				var4 = var4 * var1.field3001 / var5;
+		if (var3.field3059 > 0 && (var3.field3058 > 0 || this.field3078[var1.field3149] > 0)) { // L: 418
+			var4 = var3.field3058 << 2; // L: 419
+			int var5 = var3.field3060 << 1; // L: 420
+			if (var1.field3144 < var5) { // L: 421
+				var4 = var4 * var1.field3144 / var5;
 			}
 
-			var4 += this.field2939[var1.field2996] >> 7; // L: 422
-			double var6 = Math.sin(0.01227184630308513D * (double)(var1.field3002 & 511)); // L: 423
+			var4 += this.field3078[var1.field3149] >> 7; // L: 422
+			double var6 = Math.sin((double)(var1.field3145 & 511) * 0.01227184630308513D); // L: 423
 			var2 += (int)(var6 * (double)var4); // L: 424
 		}
 
-		var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)UserComparator2.field4359 + 0.5D); // L: 426
+		var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)class339.field4058 + 0.5D); // L: 426
 		return var4 < 1 ? 1 : var4; // L: 427
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "(Liu;B)I",
-		garbageValue = "4"
+		descriptor = "(Ljq;I)I",
+		garbageValue = "1173638767"
 	)
-	int method4779(MusicPatchNode var1) {
-		MusicPatchNode2 var2 = var1.field2988; // L: 431
-		int var3 = this.field2934[var1.field2996] * this.field2956[var1.field2996] + 4096 >> 13; // L: 432
+	int method5097(MusicPatchNode var1) {
+		MusicPatchNode2 var2 = var1.field3131; // L: 431
+		int var3 = this.field3071[var1.field3149] * this.field3076[var1.field3149] + 4096 >> 13; // L: 432
 		var3 = var3 * var3 + 16384 >> 15; // L: 433
-		var3 = var3 * var1.field2991 + 16384 >> 15; // L: 434
-		var3 = var3 * this.field2930 + 128 >> 8; // L: 435
-		if (var2.field2913 > 0) { // L: 436
-			var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2913 * (double)var1.field2986 * 1.953125E-5D) + 0.5D); // L: 437
+		var3 = var3 * var1.field3132 + 16384 >> 15; // L: 434
+		var3 = var3 * this.field3069 + 128 >> 8; // L: 435
+		if (var2.field3052 > 0) { // L: 436
+			var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field3052 * 1.953125E-5D * (double)var1.field3139) + 0.5D); // L: 437
 		}
 
 		int var4;
 		int var5;
 		int var6;
 		int var7;
-		if (var2.field2916 != null) { // L: 439
-			var4 = var1.field3004; // L: 440
-			var5 = var2.field2916[var1.field2994 + 1]; // L: 441
-			if (var1.field2994 < var2.field2916.length - 2) { // L: 442
-				var6 = (var2.field2916[var1.field2994] & 255) << 8; // L: 443
-				var7 = (var2.field2916[var1.field2994 + 2] & 255) << 8; // L: 444
-				var5 += (var4 - var6) * (var2.field2916[var1.field2994 + 3] - var5) / (var7 - var6); // L: 445
+		if (var2.field3056 != null) { // L: 439
+			var4 = var1.field3140; // L: 440
+			var5 = var2.field3056[var1.field3141 + 1]; // L: 441
+			if (var1.field3141 < var2.field3056.length - 2) { // L: 442
+				var6 = (var2.field3056[var1.field3141] & 255) << 8; // L: 443
+				var7 = (var2.field3056[var1.field3141 + 2] & 255) << 8; // L: 444
+				var5 += (var2.field3056[var1.field3141 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445
 			}
 
-			var3 = var3 * var5 + 32 >> 6; // L: 447
+			var3 = var5 * var3 + 32 >> 6; // L: 447
 		}
 
-		if (var1.field2999 > 0 && var2.field2914 != null) { // L: 449
-			var4 = var1.field2999; // L: 450
-			var5 = var2.field2914[var1.field3000 + 1]; // L: 451
-			if (var1.field3000 < var2.field2914.length - 2) { // L: 452
-				var6 = (var2.field2914[var1.field3000] & 255) << 8; // L: 453
-				var7 = (var2.field2914[var1.field3000 + 2] & 255) << 8; // L: 454
-				var5 += (var2.field2914[var1.field3000 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455
+		if (var1.field3142 > 0 && var2.field3054 != null) { // L: 449
+			var4 = var1.field3142; // L: 450
+			var5 = var2.field3054[var1.field3143 + 1]; // L: 451
+			if (var1.field3143 < var2.field3054.length - 2) { // L: 452
+				var6 = (var2.field3054[var1.field3143] & 255) << 8; // L: 453
+				var7 = (var2.field3054[var1.field3143 + 2] & 255) << 8; // L: 454
+				var5 += (var2.field3054[var1.field3143 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455
 			}
 
-			var3 = var5 * var3 + 32 >> 6; // L: 457
+			var3 = var3 * var5 + 32 >> 6; // L: 457
 		}
 
 		return var3; // L: 459
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "(Liu;I)I",
-		garbageValue = "702321980"
+		descriptor = "(Ljq;I)I",
+		garbageValue = "1815861721"
 	)
-	int method4780(MusicPatchNode var1) {
-		int var2 = this.field2933[var1.field2996]; // L: 463
-		return var2 < 8192 ? var2 * var1.field2992 + 32 >> 6 : 16384 - ((128 - var1.field2992) * (16384 - var2) + 32 >> 6); // L: 464 465
+	int method5098(MusicPatchNode var1) {
+		int var2 = this.field3089[var1.field3149]; // L: 463
+		return var2 < 8192 ? var2 * var1.field3147 + 32 >> 6 : 16384 - ((128 - var1.field3147) * (16384 - var2) + 32 >> 6); // L: 464 465
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "-86"
+		garbageValue = "100"
 	)
-	void method4758() {
+	void method5104() {
 		int var1 = this.track; // L: 522
 		int var2 = this.trackLength; // L: 523
 
 		long var3;
-		for (var3 = this.field2954; var2 == this.trackLength; var3 = this.midiFile.method4934(var2)) { // L: 524 525 547
+		for (var3 = this.field3094; var2 == this.trackLength; var3 = this.midiFile.method5202(var2)) { // L: 524 525 547
 			while (var2 == this.midiFile.trackLengths[var1]) { // L: 526
 				this.midiFile.gotoTrack(var1); // L: 527
 				int var5 = this.midiFile.readMessage(var1); // L: 528
@@ -936,8 +942,8 @@ void method4758() {
 					this.midiFile.setTrackDone(); // L: 530
 					this.midiFile.markTrackPosition(var1); // L: 531
 					if (this.midiFile.isDone()) { // L: 532
-						if (!this.field2950 || var2 == 0) { // L: 533
-							this.method4773(); // L: 537
+						if (!this.field3072 || var2 == 0) { // L: 533
+							this.method5091(); // L: 537
 							this.midiFile.clear(); // L: 538
 							return; // L: 539
 						}
@@ -948,7 +954,7 @@ void method4758() {
 				}
 
 				if ((var5 & 128) != 0) { // L: 541
-					this.method4776(var5);
+					this.method5094(var5);
 				}
 
 				this.midiFile.readTrackLength(var1); // L: 542
@@ -961,20 +967,20 @@ void method4758() {
 
 		this.track = var1; // L: 549
 		this.trackLength = var2; // L: 550
-		this.field2954 = var3; // L: 551
+		this.field3094 = var3; // L: 551
 	} // L: 552
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "(Liu;I)Z",
-		garbageValue = "-1636960835"
+		descriptor = "(Ljq;I)Z",
+		garbageValue = "-1286504674"
 	)
-	boolean method4787(MusicPatchNode var1) {
+	boolean method5105(MusicPatchNode var1) {
 		if (var1.stream == null) { // L: 555
-			if (var1.field2999 >= 0) { // L: 556
+			if (var1.field3142 >= 0) { // L: 556
 				var1.remove(); // L: 557
-				if (var1.field2989 > 0 && var1 == this.field2949[var1.field2996][var1.field2989]) { // L: 558
-					this.field2949[var1.field2996][var1.field2989] = null; // L: 559
+				if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { // L: 558
+					this.field3088[var1.field3149][var1.field3128] = null; // L: 559
 				}
 			}
 
@@ -984,135 +990,118 @@ boolean method4787(MusicPatchNode var1) {
 		}
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "(Liu;[IIII)Z",
-		garbageValue = "-47865740"
+		descriptor = "(Ljq;[IIIB)Z",
+		garbageValue = "-28"
 	)
-	boolean method4788(MusicPatchNode var1, int[] var2, int var3, int var4) {
-		var1.field2995 = UserComparator2.field4359 / 100; // L: 568
-		if (var1.field2999 < 0 || var1.stream != null && !var1.stream.method833()) { // L: 569
-			int var5 = var1.field2998; // L: 577
+	boolean method5106(MusicPatchNode var1, int[] var2, int var3, int var4) {
+		var1.field3134 = class339.field4058 / 100; // L: 568
+		if (var1.field3142 < 0 || var1.stream != null && !var1.stream.method854()) { // L: 569
+			int var5 = var1.field3138; // L: 577
 			if (var5 > 0) { // L: 578
-				var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2940[var1.field2996]) + 0.5D); // L: 579
+				var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field3079[var1.field3149] * 4.921259842519685E-4D) + 0.5D); // L: 579
 				if (var5 < 0) { // L: 580
 					var5 = 0;
 				}
 
-				var1.field2998 = var5; // L: 581
+				var1.field3138 = var5; // L: 581
 			}
 
-			var1.stream.method912(this.method4778(var1)); // L: 583
-			MusicPatchNode2 var6 = var1.field2988; // L: 584
+			var1.stream.method963(this.method5170(var1)); // L: 583
+			MusicPatchNode2 var6 = var1.field3131; // L: 584
 			boolean var7 = false; // L: 585
-			++var1.field3001; // L: 586
-			var1.field3002 += var6.field2911; // L: 587
-			double var8 = 5.086263020833333E-6D * (double)((var1.field2990 - 60 << 8) + (var1.field2997 * var1.field2998 >> 12)); // L: 588
-			if (var6.field2913 > 0) { // L: 589
-				if (var6.field2912 > 0) { // L: 590
-					var1.field2986 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2912 * var8) + 0.5D);
+			++var1.field3144; // L: 586
+			var1.field3145 += var6.field3059; // L: 587
+			double var8 = 5.086263020833333E-6D * (double)((var1.field3133 - 60 << 8) + (var1.field3137 * var1.field3138 >> 12)); // L: 588
+			if (var6.field3052 > 0) { // L: 589
+				if (var6.field3057 > 0) { // L: 590
+					var1.field3139 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3057) + 0.5D);
 				} else {
-					var1.field2986 += 128; // L: 591
+					var1.field3139 += 128; // L: 591
 				}
 			}
 
-			if (var6.field2916 != null) { // L: 593
-				if (var6.field2918 > 0) { // L: 594
-					var1.field3004 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2918) + 0.5D);
+			if (var6.field3056 != null) { // L: 593
+				if (var6.field3055 > 0) { // L: 594
+					var1.field3140 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3055) + 0.5D);
 				} else {
-					var1.field3004 += 128; // L: 595
+					var1.field3140 += 128; // L: 595
 				}
 
-				while (var1.field2994 < var6.field2916.length - 2 && var1.field3004 > (var6.field2916[var1.field2994 + 2] & 255) << 8) { // L: 596
-					var1.field2994 += 2;
+				while (var1.field3141 < var6.field3056.length - 2 && var1.field3140 > (var6.field3056[var1.field3141 + 2] & 255) << 8) { // L: 596
+					var1.field3141 += 2;
 				}
 
-				if (var6.field2916.length - 2 == var1.field2994 && var6.field2916[var1.field2994 + 1] == 0) { // L: 597
+				if (var6.field3056.length - 2 == var1.field3141 && var6.field3056[var1.field3141 + 1] == 0) { // L: 597
 					var7 = true;
 				}
 			}
 
-			if (var1.field2999 >= 0 && var6.field2914 != null && (this.field2944[var1.field2996] & 1) == 0 && (var1.field2989 < 0 || var1 != this.field2949[var1.field2996][var1.field2989])) { // L: 599 600
-				if (var6.field2915 > 0) { // L: 601
-					var1.field2999 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2915) + 0.5D);
+			if (var1.field3142 >= 0 && var6.field3054 != null && (this.field3081[var1.field3149] & 1) == 0 && (var1.field3128 < 0 || var1 != this.field3088[var1.field3149][var1.field3128])) { // L: 599 600
+				if (var6.field3053 > 0) { // L: 601
+					var1.field3142 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field3053) + 0.5D);
 				} else {
-					var1.field2999 += 128; // L: 602
+					var1.field3142 += 128; // L: 602
 				}
 
-				while (var1.field3000 < var6.field2914.length - 2 && var1.field2999 > (var6.field2914[var1.field3000 + 2] & 255) << 8) { // L: 603
-					var1.field3000 += 2;
+				while (var1.field3143 < var6.field3054.length - 2 && var1.field3142 > (var6.field3054[var1.field3143 + 2] & 255) << 8) { // L: 603
+					var1.field3143 += 2;
 				}
 
-				if (var6.field2914.length - 2 == var1.field3000) { // L: 604
+				if (var6.field3054.length - 2 == var1.field3143) { // L: 604
 					var7 = true;
 				}
 			}
 
 			if (var7) { // L: 607
-				var1.stream.method830(var1.field2995); // L: 608
+				var1.stream.method954(var1.field3134); // L: 608
 				if (var2 != null) { // L: 609
 					var1.stream.fill(var2, var3, var4);
 				} else {
 					var1.stream.skip(var4); // L: 610
 				}
 
-				if (var1.stream.method834()) { // L: 611
+				if (var1.stream.method857()) { // L: 611
 					this.patchStream.mixer.addSubStream(var1.stream);
 				}
 
-				var1.method4992(); // L: 612
-				if (var1.field2999 >= 0) { // L: 613
+				var1.method5292(); // L: 612
+				if (var1.field3142 >= 0) { // L: 613
 					var1.remove(); // L: 614
-					if (var1.field2989 > 0 && var1 == this.field2949[var1.field2996][var1.field2989]) { // L: 615
-						this.field2949[var1.field2996][var1.field2989] = null; // L: 616
+					if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { // L: 615
+						this.field3088[var1.field3149][var1.field3128] = null; // L: 616
 					}
 				}
 
 				return true; // L: 619
 			} else {
-				var1.stream.method829(var1.field2995, this.method4779(var1), this.method4780(var1)); // L: 621
+				var1.stream.method932(var1.field3134, this.method5097(var1), this.method5098(var1)); // L: 621
 				return false; // L: 622
 			}
 		} else {
-			var1.method4992(); // L: 570
+			var1.method5292(); // L: 570
 			var1.remove(); // L: 571
-			if (var1.field2989 > 0 && var1 == this.field2949[var1.field2996][var1.field2989]) { // L: 572
-				this.field2949[var1.field2996][var1.field2989] = null; // L: 573
+			if (var1.field3128 > 0 && var1 == this.field3088[var1.field3149][var1.field3128]) { // L: 572
+				this.field3088[var1.field3149][var1.field3128] = null; // L: 573
 			}
 
 			return true; // L: 575
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lbw;B)V",
-		garbageValue = "97"
+		descriptor = "([FIFI)F",
+		garbageValue = "-941170538"
 	)
-	@Export("changeWorld")
-	static void changeWorld(World var0) {
-		if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1586
-			Client.isMembersWorld = var0.isMembersOnly(); // L: 1587
-			FriendSystem.method1755(var0.isMembersOnly()); // L: 1588
-		}
+	static float method5196(float[] var0, int var1, float var2) {
+		float var3 = var0[var1]; // L: 200
 
-		if (var0.properties != Client.worldProperties) { // L: 1590
-			Archive var1 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 1591
-			int var2 = var0.properties; // L: 1592
-			if ((var2 & 536870912) != 0) { // L: 1594
-				class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 1595
-			} else if ((var2 & 1073741824) != 0) { // L: 1597
-				class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 1598
-			} else {
-				class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 1601
-			}
+		for (int var4 = var1 - 1; var4 >= 0; --var4) { // L: 201
+			var3 = var0[var4] + var2 * var3; // L: 202
 		}
 
-		WorldMapIcon_0.worldHost = var0.host; // L: 1605
-		Client.worldId = var0.id; // L: 1606
-		Client.worldProperties = var0.properties; // L: 1607
-		ApproximateRouteStrategy.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1608
-		ParamComposition.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1609
-		ScriptEvent.currentPort = ApproximateRouteStrategy.worldPort; // L: 1610
-	} // L: 1611
+		return var3; // L: 204
+	}
 }
diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java
index 7fe16ce26e..29b26baaa5 100644
--- a/runescape-client/src/main/java/MilliClock.java
+++ b/runescape-client/src/main/java/MilliClock.java
@@ -1,238 +1,129 @@
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-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("eo")
+@ObfuscatedName("ft")
 @Implements("MilliClock")
 public class MilliClock extends Clock {
-	@ObfuscatedName("i")
-	long[] field1581;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
+	long[] field1718;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1278293949
+		intValue = -1638196517
 	)
-	int field1585;
-	@ObfuscatedName("s")
+	int field1719;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1723820895
+		intValue = -91104037
 	)
-	int field1583;
-	@ObfuscatedName("a")
+	int field1716;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = -2827552193639050909L
+		longValue = 1696569632045813077L
 	)
-	long field1584;
-	@ObfuscatedName("o")
+	long field1717;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1430749655
+		intValue = -2107971493
 	)
-	int field1582;
-	@ObfuscatedName("g")
+	int field1714;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1845625337
+		intValue = -465084751
 	)
-	int field1586;
+	int field1715;
 
 	public MilliClock() {
-		this.field1581 = new long[10]; // L: 7
-		this.field1585 = 256; // L: 15
-		this.field1583 = 1; // L: 16
-		this.field1582 = 0; // L: 17
-		this.field1584 = class111.method2516(); // L: 18
+		this.field1718 = new long[10]; // L: 7
+		this.field1719 = 256; // L: 15
+		this.field1716 = 1; // L: 16
+		this.field1714 = 0; // L: 17
+		this.field1717 = Ignored.method6459(); // L: 18
 
 		for (int var1 = 0; var1 < 10; ++var1) { // L: 19
-			this.field1581[var1] = this.field1584; // L: 20
+			this.field1718[var1] = this.field1717; // L: 20
 		}
 
 	} // L: 22
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1421350581"
+		descriptor = "(B)V",
+		garbageValue = "18"
 	)
 	@Export("mark")
 	public void mark() {
 		for (int var1 = 0; var1 < 10; ++var1) { // L: 25
-			this.field1581[var1] = 0L; // L: 26
+			this.field1718[var1] = 0L; // L: 26
 		}
 
 	} // L: 28
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "1121035205"
+		garbageValue = "293215312"
 	)
 	@Export("wait")
 	public int wait(int var1, int var2) {
-		int var3 = this.field1585; // L: 31
-		int var4 = this.field1583; // L: 32
-		this.field1585 = 300;
-		this.field1583 = 1;
-		this.field1584 = class111.method2516(); // L: 35
-		if (this.field1581[this.field1586] == 0L) {
-			this.field1585 = var3; // L: 37
-			this.field1583 = var4; // L: 38
-		} else if (this.field1584 > this.field1581[this.field1586]) {
-			this.field1585 = (int)((long)(var1 * 2560) / (this.field1584 - this.field1581[this.field1586]));
+		int var3 = this.field1719; // L: 31
+		int var4 = this.field1716; // L: 32
+		this.field1719 = 300; // L: 33
+		this.field1716 = 1; // L: 34
+		this.field1717 = Ignored.method6459(); // L: 35
+		if (0L == this.field1718[this.field1715]) { // L: 36
+			this.field1719 = var3; // L: 37
+			this.field1716 = var4; // L: 38
+		} else if (this.field1717 > this.field1718[this.field1715]) { // L: 40
+			this.field1719 = (int)((long)(var1 * 2560) / (this.field1717 - this.field1718[this.field1715]));
 		}
 
-		if (this.field1585 < 25) {
-			this.field1585 = 25;
+		if (this.field1719 < 25) { // L: 41
+			this.field1719 = 25;
 		}
 
-		if (this.field1585 > 256) {
-			this.field1585 = 256; // L: 43
-			this.field1583 = (int)((long)var1 - (this.field1584 - this.field1581[this.field1586]) / 10L);
+		if (this.field1719 > 256) { // L: 42
+			this.field1719 = 256; // L: 43
+			this.field1716 = (int)((long)var1 - (this.field1717 - this.field1718[this.field1715]) / 10L); // L: 44
 		}
 
-		if (this.field1583 > var1) {
-			this.field1583 = var1;
+		if (this.field1716 > var1) { // L: 46
+			this.field1716 = var1;
 		}
 
-		this.field1581[this.field1586] = this.field1584;
-		this.field1586 = (this.field1586 + 1) % 10;
+		this.field1718[this.field1715] = this.field1717; // L: 47
+		this.field1715 = (this.field1715 + 1) % 10; // L: 48
 		int var5;
-		if (this.field1583 > 1) {
-			for (var5 = 0; var5 < 10; ++var5) {
-				if (0L != this.field1581[var5]) {
-					this.field1581[var5] += (long)this.field1583;
+		if (this.field1716 > 1) { // L: 49
+			for (var5 = 0; var5 < 10; ++var5) { // L: 50
+				if (0L != this.field1718[var5]) { // L: 51
+					this.field1718[var5] += (long)this.field1716;
 				}
 			}
 		}
 
-		if (this.field1583 < var2) {
-			this.field1583 = var2;
+		if (this.field1716 < var2) { // L: 54
+			this.field1716 = var2;
 		}
 
-		FloorUnderlayDefinition.method3190((long)this.field1583);
+		Bounds.method6608((long)this.field1716); // L: 55
 
-		for (var5 = 0; this.field1582 < 256; this.field1582 += this.field1585) {
-			++var5;
+		for (var5 = 0; this.field1714 < 256; this.field1714 += this.field1719) { // L: 56 57 59
+			++var5; // L: 58
 		}
 
-		this.field1582 &= 255;
-		return var5;
+		this.field1714 &= 255; // L: 61
+		return var5; // L: 62
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("hl")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V",
-		garbageValue = "1919228175"
+		descriptor = "(I)Z",
+		garbageValue = "322688664"
 	)
-	@Export("RunException_sendStackTrace")
-	public static void RunException_sendStackTrace(String var0, Throwable var1) {
-		if (var1 != null) {
-			var1.printStackTrace();
-		} else {
-			try {
-				String var2 = ""; // L: 33
-				if (var1 != null) { // L: 34
-					Throwable var4 = var1; // L: 36
-					String var5;
-					if (var1 instanceof RunException) { // L: 39
-						RunException var6 = (RunException)var1; // L: 40
-						var5 = var6.message + " | "; // L: 41
-						var4 = var6.throwable; // L: 42
-					} else {
-						var5 = ""; // L: 44
-					}
-
-					StringWriter var18 = new StringWriter(); // L: 45
-					PrintWriter var7 = new PrintWriter(var18); // L: 46
-					var4.printStackTrace(var7); // L: 47
-					var7.close(); // L: 48
-					String var8 = var18.toString(); // L: 49
-					BufferedReader var9 = new BufferedReader(new StringReader(var8)); // L: 50
-					String var10 = var9.readLine(); // L: 51
-
-					label62:
-					while (true) {
-						while (true) {
-							String var11 = var9.readLine(); // L: 53
-							if (var11 == null) { // L: 54
-								var5 = var5 + "| " + var10; // L: 72
-								var2 = var5; // L: 75
-								break label62;
-							}
-
-							int var12 = var11.indexOf(40); // L: 55
-							int var13 = var11.indexOf(41, var12 + 1); // L: 56
-							if (var12 >= 0 && var13 >= 0) { // L: 57
-								String var14 = var11.substring(var12 + 1, var13); // L: 58
-								int var15 = var14.indexOf(".java:"); // L: 59
-								if (var15 >= 0) { // L: 60
-									var14 = var14.substring(0, var15) + var14.substring(var15 + 5); // L: 61
-									var5 = var5 + var14 + ' '; // L: 62
-									continue; // L: 63
-								}
-
-								var11 = var11.substring(0, var12); // L: 65
-							}
-
-							var11 = var11.trim(); // L: 67
-							var11 = var11.substring(var11.lastIndexOf(32) + 1); // L: 68
-							var11 = var11.substring(var11.lastIndexOf(9) + 1); // L: 69
-							var5 = var5 + var11 + ' '; // L: 70
-						}
-					}
-				}
-
-				if (var0 != null) { // L: 77
-					if (var1 != null) { // L: 78
-						var2 = var2 + " | ";
-					}
-
-					var2 = var2 + var0; // L: 79
-				}
-
-				System.out.println("Error: " + var2); // L: 81
-				var2 = var2.replace(':', '.'); // L: 82
-				var2 = var2.replace('@', '_'); // L: 83
-				var2 = var2.replace('&', '_'); // L: 84
-				var2 = var2.replace('#', '_'); // L: 85
-				if (RunException.RunException_applet == null) { // L: 86
-					return;
-				}
-
-				URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + GrandExchangeOfferAgeComparator.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); // L: 87
-				DataInputStream var17 = new DataInputStream(var3.openStream()); // L: 88
-				var17.read(); // L: 89
-				var17.close(); // L: 90
-			} catch (Exception var16) { // L: 92
-			}
-
-		}
-	} // L: 93
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;B)Ljava/lang/String;",
-		garbageValue = "-102"
-	)
-	public static String method2955(Buffer var0) {
-		return AbstractWorldMapData.method3956(var0, 32767); // L: 64
+	static boolean method3121() {
+		return (Client.drawPlayerNames & 4) != 0; // L: 5584
 	}
-
-	@ObfuscatedName("li")
-	@ObfuscatedSignature(
-		descriptor = "([BII)V",
-		garbageValue = "-32506034"
-	)
-	static void method2954(byte[] var0, int var1) {
-		if (Client.randomDatData == null) { // L: 11980
-			Client.randomDatData = new byte[24];
-		}
-
-		class321.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 11981
-	} // L: 11982
 }
diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java
index 120da48377..1a80a4943b 100644
--- a/runescape-client/src/main/java/ModeWhere.java
+++ b/runescape-client/src/main/java/ModeWhere.java
@@ -1,4 +1,3 @@
-import java.awt.Component;
 import java.util.HashSet;
 import java.util.Set;
 import net.runelite.mapping.Export;
@@ -7,182 +6,159 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ks")
+@ObfuscatedName("lq")
 @Implements("ModeWhere")
 public enum ModeWhere implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3803("", 0, new class301[]{class301.field3769}),
-	@ObfuscatedName("w")
+	field3948("", 0, new class313[]{class313.field3915}),
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3791("", 1, new class301[]{class301.field3770, class301.field3769}),
-	@ObfuscatedName("s")
+	field3940("", 1, new class313[]{class313.field3917, class313.field3915}),
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3792("", 2, new class301[]{class301.field3770, class301.field3767, class301.field3769}),
-	@ObfuscatedName("a")
+	field3938("", 2, new class313[]{class313.field3917, class313.field3916, class313.field3915}),
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3793("", 3, new class301[]{class301.field3770}),
-	@ObfuscatedName("o")
+	field3939("", 3, new class313[]{class313.field3917}),
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3794("", 4),
-	@ObfuscatedName("g")
+	field3955("", 4),
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3796("", 5, new class301[]{class301.field3770, class301.field3769}),
-	@ObfuscatedName("e")
+	field3941("", 5, new class313[]{class313.field3917, class313.field3915}),
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3807("", 6, new class301[]{class301.field3769}),
-	@ObfuscatedName("p")
+	field3943("", 6, new class313[]{class313.field3915}),
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3790("", 8, new class301[]{class301.field3770, class301.field3769}),
-	@ObfuscatedName("j")
+	field3937("", 8, new class313[]{class313.field3917, class313.field3915}),
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3798("", 9, new class301[]{class301.field3770, class301.field3767}),
-	@ObfuscatedName("b")
+	field3944("", 9, new class313[]{class313.field3917, class313.field3916}),
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3799("", 10, new class301[]{class301.field3770}),
-	@ObfuscatedName("x")
+	field3945("", 10, new class313[]{class313.field3917}),
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3800("", 11, new class301[]{class301.field3770}),
-	@ObfuscatedName("y")
+	field3947("", 11, new class313[]{class313.field3917}),
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3801("", 12, new class301[]{class301.field3770, class301.field3769}),
-	@ObfuscatedName("k")
+	field3942("", 12, new class313[]{class313.field3917, class313.field3915}),
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lks;"
+		descriptor = "Llq;"
 	)
-	field3802("", 13, new class301[]{class301.field3770});
+	field3936("", 13, new class313[]{class313.field3917});
 
-	@ObfuscatedName("hs")
-	@Export("regionLandArchives")
-	static byte[][] regionLandArchives;
-	@ObfuscatedName("t")
+	@ObfuscatedName("sl")
+	@ObfuscatedGetter(
+		intValue = -1096965871
+	)
+	static int field3951;
+	@ObfuscatedName("cr")
+	public static char field3954;
+	@ObfuscatedName("ms")
 	@ObfuscatedGetter(
-		intValue = -1276405955
+		intValue = -936877643
+	)
+	@Export("menuX")
+	static int menuX;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -91884081
 	)
 	@Export("id")
 	final int id;
-	@ObfuscatedName("l")
-	final Set field3804;
-
-	static {
-		method5536(); // L: 28
-	} // L: 29
+	@ObfuscatedName("g")
+	final Set field3950;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I[Lkq;)V"
+		descriptor = "(Ljava/lang/String;I[Llp;)V"
 	)
-	ModeWhere(String var3, int var4, class301[] var5) {
-		this.field3804 = new HashSet();
-		this.id = var4; // L: 43
-		class301[] var6 = var5; // L: 45
+	ModeWhere(String var3, int var4, class313[] var5) {
+		this.field3950 = new HashSet();
+		this.id = var4; // L: 39
+		class313[] var6 = var5; // L: 41
 
-		for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46
-			class301 var8 = var6[var7]; // L: 47
-			this.field3804.add(var8); // L: 48
+		for (int var7 = 0; var7 < var6.length; ++var7) { // L: 42
+			class313 var8 = var6[var7]; // L: 43
+			this.field3950.add(var8); // L: 44
 		}
 
-	} // L: 51
+	} // L: 47
 
 	ModeWhere(String var3, int var4) {
-		this.field3804 = new HashSet(); // L: 32
-		this.id = var4;
-	}
+		this.field3950 = new HashSet(); // L: 32
+		this.id = var4; // L: 35
+	} // L: 36
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id;
+		return this.id; // L: 51
 	}
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/awt/Component;B)V",
-		garbageValue = "84"
-	)
-	static void method5543(Component var0) {
-		var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 37
-		var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38
-		var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 39
-		MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 40
-	} // L: 41
+	@ObfuscatedName("ht")
+	@ObfuscatedSignature(
+		descriptor = "(IIIB)V",
+		garbageValue = "14"
+	)
+	@Export("worldToScreen")
+	static final void worldToScreen(int var0, int var1, int var2) {
+		if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 6049
+			int var3 = FaceNormal.getTileHeight(var0, var1, class20.Client_plane) - var2; // L: 6054
+			var0 -= UserComparator7.cameraX; // L: 6055
+			var3 -= AbstractByteArrayCopier.cameraY; // L: 6056
+			var1 -= UserComparator10.cameraZ; // L: 6057
+			int var4 = Rasterizer3D.Rasterizer3D_sine[UserComparator7.cameraPitch]; // L: 6058
+			int var5 = Rasterizer3D.Rasterizer3D_cosine[UserComparator7.cameraPitch]; // L: 6059
+			int var6 = Rasterizer3D.Rasterizer3D_sine[class379.cameraYaw]; // L: 6060
+			int var7 = Rasterizer3D.Rasterizer3D_cosine[class379.cameraYaw]; // L: 6061
+			int var8 = var6 * var1 + var0 * var7 >> 16; // L: 6062
+			var1 = var7 * var1 - var0 * var6 >> 16; // L: 6063
+			var0 = var8; // L: 6064
+			var8 = var5 * var3 - var4 * var1 >> 16; // L: 6065
+			var1 = var5 * var1 + var4 * var3 >> 16; // L: 6066
+			if (var1 >= 50) { // L: 6068
+				Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 6069
+				Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 6070
+			} else {
+				Client.viewportTempX = -1; // L: 6073
+				Client.viewportTempY = -1; // L: 6074
+			}
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(B)[Lks;",
-		garbageValue = "-88"
-	)
-	static ModeWhere[] method5536() {
-		return new ModeWhere[]{field3802, field3803, field3801, field3790, field3792, field3796, field3791, field3807, field3793, field3799, field3794, field3798, field3800}; // L: 35
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "95"
-	)
-	public static void method5542() {
-		synchronized(MouseHandler.MouseHandler_instance) { // L: 52
-			MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 53
-			MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 54
-			MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 55
-			MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 56
-			MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 57
-			MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 58
-			MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 59
-			MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 60
-			MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 61
-		}
-	} // L: 63
-
-	@ObfuscatedName("fo")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1212689938"
-	)
-	@Export("playSong")
-	static void playSong(int var0) {
-		if (var0 == -1 && !Client.field710) { // L: 4078
-			WorldMapCacheName.method4027(); // L: 4079
-		} else if (var0 != -1 && var0 != Client.currentTrackGroupId && class408.clientPreferences.musicVolume != 0 && !Client.field710) { // L: 4081
-			Archive var1 = Messages.archive6; // L: 4082
-			int var2 = class408.clientPreferences.musicVolume; // L: 4083
-			class247.musicPlayerStatus = 1; // L: 4085
-			class128.musicTrackArchive = var1; // L: 4086
-			FillMode.musicTrackGroupId = var0; // L: 4087
-			ArchiveDiskActionHandler.musicTrackFileId = 0; // L: 4088
-			class247.musicTrackVolume = var2; // L: 4089
-			SecureRandomCallable.musicTrackBoolean = false; // L: 4090
-			class247.pcmSampleLength = 2; // L: 4091
+		} else {
+			Client.viewportTempX = -1; // L: 6050
+			Client.viewportTempY = -1; // L: 6051
 		}
-
-		Client.currentTrackGroupId = var0; // L: 4094
-	} // L: 4095
+	} // L: 6052 6076
 }
diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java
index b24c385b94..dfa254bf08 100644
--- a/runescape-client/src/main/java/Model.java
+++ b/runescape-client/src/main/java/Model.java
@@ -3,413 +3,441 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hl")
+@ObfuscatedName("go")
 @Implements("Model")
 public class Model extends Renderable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lgo;"
 	)
 	@Export("Model_sharedSequenceModel")
 	static Model Model_sharedSequenceModel;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("Model_sharedSequenceModelFaceAlphas")
 	static byte[] Model_sharedSequenceModelFaceAlphas;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lgo;"
 	)
 	@Export("Model_sharedSpotAnimationModel")
 	static Model Model_sharedSpotAnimationModel;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("Model_sharedSpotAnimationModelFaceAlphas")
 	static byte[] Model_sharedSpotAnimationModelFaceAlphas;
-	@ObfuscatedName("ar")
-	static boolean[] field2554;
-	@ObfuscatedName("ad")
-	static boolean[] field2548;
-	@ObfuscatedName("an")
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Lno;"
+	)
+	static class366 field2452;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lno;"
+	)
+	static class366 field2424;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Lno;"
+	)
+	static class366 field2419;
+	@ObfuscatedName("at")
+	static boolean[] field2463;
+	@ObfuscatedName("ai")
+	static boolean[] field2476;
+	@ObfuscatedName("aq")
 	@Export("modelViewportXs")
 	static int[] modelViewportXs;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aw")
 	@Export("modelViewportYs")
 	static int[] modelViewportYs;
-	@ObfuscatedName("av")
-	static int[] field2551;
-	@ObfuscatedName("ap")
-	static int[] field2574;
-	@ObfuscatedName("au")
-	static int[] field2547;
-	@ObfuscatedName("aj")
-	static int[] field2575;
-	@ObfuscatedName("aw")
-	static int[] field2556;
-	@ObfuscatedName("ao")
-	static int[][] field2557;
-	@ObfuscatedName("aa")
-	static int[] field2558;
 	@ObfuscatedName("ay")
-	static int[][] field2559;
+	static int[] field2497;
+	@ObfuscatedName("ae")
+	static int[] field2468;
+	@ObfuscatedName("ak")
+	static int[] field2469;
+	@ObfuscatedName("ad")
+	static int[] field2470;
+	@ObfuscatedName("bd")
+	static int[] field2422;
+	@ObfuscatedName("ba")
+	static int[][] field2477;
+	@ObfuscatedName("bq")
+	static int[] field2496;
 	@ObfuscatedName("bg")
-	static int[] field2560;
+	static int[][] field2475;
+	@ObfuscatedName("br")
+	static int[] field2432;
+	@ObfuscatedName("bi")
+	static int[] field2434;
+	@ObfuscatedName("bm")
+	static int[] field2478;
+	@ObfuscatedName("bw")
+	static int[] field2467;
 	@ObfuscatedName("bl")
-	static int[] field2561;
-	@ObfuscatedName("bx")
-	static int[] field2528;
-	@ObfuscatedName("bd")
-	static int[] field2563;
-	@ObfuscatedName("bt")
-	static int[] field2564;
-	@ObfuscatedName("bf")
-	static int[] field2521;
-	@ObfuscatedName("bs")
+	static int[] field2480;
+	@ObfuscatedName("bz")
+	static int[] field2453;
+	@ObfuscatedName("bu")
 	@Export("Model_transformTempX")
 	static int Model_transformTempX;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bs")
 	@Export("Model_transformTempY")
 	static int Model_transformTempY;
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bv")
 	@Export("Model_transformTempZ")
 	static int Model_transformTempZ;
-	@ObfuscatedName("bm")
-	static boolean field2576;
-	@ObfuscatedName("bo")
-	@Export("Model_sine")
-	static int[] Model_sine;
-	@ObfuscatedName("bv")
-	@Export("Model_cosine")
-	static int[] Model_cosine;
-	@ObfuscatedName("bu")
-	static int[] field2540;
-	@ObfuscatedName("bz")
-	static int[] field2508;
-	@ObfuscatedName("o")
+	@ObfuscatedName("bb")
+	static boolean field2492;
+	@ObfuscatedName("bt")
+	static int[] field2465;
+	@ObfuscatedName("bh")
+	static int[] field2489;
+	@ObfuscatedName("bn")
+	static int[] field2490;
+	@ObfuscatedName("bj")
+	static int[] field2491;
+	@ObfuscatedName("w")
 	@Export("verticesCount")
 	int verticesCount;
-	@ObfuscatedName("g")
+	@ObfuscatedName("n")
 	@Export("verticesX")
 	int[] verticesX;
-	@ObfuscatedName("e")
+	@ObfuscatedName("r")
 	@Export("verticesY")
 	int[] verticesY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@Export("verticesZ")
 	int[] verticesZ;
-	@ObfuscatedName("j")
+	@ObfuscatedName("v")
 	@Export("indicesCount")
 	int indicesCount;
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@Export("indices1")
 	int[] indices1;
-	@ObfuscatedName("x")
+	@ObfuscatedName("h")
 	@Export("indices2")
 	int[] indices2;
-	@ObfuscatedName("y")
+	@ObfuscatedName("g")
 	@Export("indices3")
 	int[] indices3;
-	@ObfuscatedName("k")
+	@ObfuscatedName("e")
 	@Export("faceColors1")
 	int[] faceColors1;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("faceColors2")
 	int[] faceColors2;
-	@ObfuscatedName("l")
+	@ObfuscatedName("u")
 	@Export("faceColors3")
 	int[] faceColors3;
-	@ObfuscatedName("u")
+	@ObfuscatedName("k")
 	@Export("faceRenderPriorities")
 	byte[] faceRenderPriorities;
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@Export("faceAlphas")
 	byte[] faceAlphas;
-	@ObfuscatedName("z")
-	byte[] field2566;
+	@ObfuscatedName("l")
+	byte[] field2439;
 	@ObfuscatedName("q")
 	@Export("faceTextures")
 	short[] faceTextures;
-	@ObfuscatedName("d")
-	byte field2527;
-	@ObfuscatedName("r")
-	int field2522;
-	@ObfuscatedName("m")
-	int[] field2529;
-	@ObfuscatedName("c")
-	int[] field2530;
-	@ObfuscatedName("f")
-	int[] field2538;
-	@ObfuscatedName("h")
+	@ObfuscatedName("x")
+	byte field2444;
+	@ObfuscatedName("z")
+	int field2442;
+	@ObfuscatedName("i")
+	int[] field2443;
+	@ObfuscatedName("y")
+	int[] field2471;
+	@ObfuscatedName("ah")
+	int[] field2445;
+	@ObfuscatedName("ao")
 	@Export("vertexLabels")
 	int[][] vertexLabels;
-	@ObfuscatedName("v")
+	@ObfuscatedName("ab")
 	@Export("faceLabelsAlpha")
 	int[][] faceLabelsAlpha;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("an")
+	int[][] field2448;
+	@ObfuscatedName("ax")
+	int[][] field2449;
+	@ObfuscatedName("am")
 	@Export("isSingleTile")
 	public boolean isSingleTile;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("az")
 	@Export("boundsType")
 	int boundsType;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("au")
 	@Export("bottomY")
 	int bottomY;
-	@ObfuscatedName("al")
+	@ObfuscatedName("av")
 	@Export("xzRadius")
 	int xzRadius;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ap")
 	@Export("diameter")
 	int diameter;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ac")
 	@Export("radius")
 	int radius;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("aj")
 	@Export("xMid")
 	int xMid;
-	@ObfuscatedName("as")
+	@ObfuscatedName("af")
 	@Export("yMid")
 	int yMid;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ar")
 	@Export("zMid")
 	int zMid;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ag")
 	@Export("xMidOffset")
 	int xMidOffset;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("al")
 	@Export("yMidOffset")
 	int yMidOffset;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aa")
 	@Export("zMidOffset")
 	int zMidOffset;
+	@ObfuscatedName("bo")
+	public byte field2494;
+	@ObfuscatedName("bf")
+	public byte field2495;
+	@ObfuscatedName("be")
+	public byte field2479;
+	@ObfuscatedName("ce")
+	public byte field2474;
 
 	static {
-		Model_sharedSequenceModel = new Model(); // L: 6
-		Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 7
-		Model_sharedSpotAnimationModel = new Model(); // L: 8
-		Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 9
-		field2554 = new boolean[6500]; // L: 45
-		field2548 = new boolean[6500]; // L: 46
-		modelViewportXs = new int[6500]; // L: 47
-		modelViewportYs = new int[6500]; // L: 48
-		field2551 = new int[6500]; // L: 49
-		field2574 = new int[6500]; // L: 50
-		field2547 = new int[6500]; // L: 51
-		field2575 = new int[6500]; // L: 52
-		field2556 = new int[1600]; // L: 54
-		field2557 = new int[1600][512]; // L: 55
-		field2558 = new int[12]; // L: 56
-		field2559 = new int[12][2000]; // L: 57
-		field2560 = new int[2000]; // L: 58
-		field2561 = new int[2000]; // L: 59
-		field2528 = new int[12]; // L: 60
-		field2563 = new int[10]; // L: 61
-		field2564 = new int[10]; // L: 62
-		field2521 = new int[10]; // L: 63
-		field2576 = true; // L: 67
-		Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 70
-		Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 71
-		field2540 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72
-		field2508 = Rasterizer3D.field2347; // L: 73
+		Model_sharedSequenceModel = new Model(); // L: 11
+		Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 12
+		Model_sharedSpotAnimationModel = new Model(); // L: 13
+		Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 14
+		field2452 = new class366(); // L: 15
+		field2424 = new class366(); // L: 16
+		field2419 = new class366(); // L: 17
+		field2463 = new boolean[6500]; // L: 55
+		field2476 = new boolean[6500]; // L: 56
+		modelViewportXs = new int[6500]; // L: 57
+		modelViewportYs = new int[6500]; // L: 58
+		field2497 = new int[6500]; // L: 59
+		field2468 = new int[6500]; // L: 60
+		field2469 = new int[6500]; // L: 61
+		field2470 = new int[6500]; // L: 62
+		field2422 = new int[1600]; // L: 64
+		field2477 = new int[1600][512]; // L: 65
+		field2496 = new int[12]; // L: 66
+		field2475 = new int[12][2000]; // L: 67
+		field2432 = new int[2000]; // L: 68
+		field2434 = new int[2000]; // L: 69
+		field2478 = new int[12]; // L: 70
+		field2467 = new int[10]; // L: 71
+		field2480 = new int[10]; // L: 72
+		field2453 = new int[10]; // L: 73
+		field2492 = true; // L: 77
+		field2465 = Rasterizer3D.Rasterizer3D_sine; // L: 80
+		field2489 = Rasterizer3D.Rasterizer3D_cosine; // L: 81
+		field2490 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 82
+		field2491 = Rasterizer3D.field2271; // L: 83
 	}
 
 	Model() {
 		this.verticesCount = 0;
 		this.indicesCount = 0;
-		this.field2527 = 0;
-		this.field2522 = 0;
+		this.field2444 = 0;
+		this.field2442 = 0;
 		this.isSingleTile = false;
 		this.xMidOffset = -1;
 		this.yMidOffset = -1;
 		this.zMidOffset = -1;
-	} // L: 77
+	} // L: 91
 
 	@ObfuscatedSignature(
-		descriptor = "([Lhl;I)V"
+		descriptor = "([Lgo;I)V"
 	)
 	public Model(Model[] var1, int var2) {
-		this.verticesCount = 0; // L: 10
-		this.indicesCount = 0; // L: 14
-		this.field2527 = 0; // L: 25
-		this.field2522 = 0; // L: 26
-		this.isSingleTile = false; // L: 32
-		this.xMidOffset = -1; // L: 41
-		this.yMidOffset = -1; // L: 42
-		this.zMidOffset = -1; // L: 43
-		boolean var3 = false; // L: 80
-		boolean var4 = false; // L: 81
-		boolean var5 = false; // L: 82
-		boolean var6 = false; // L: 83
-		this.verticesCount = 0; // L: 84
-		this.indicesCount = 0; // L: 85
-		this.field2522 = 0; // L: 86
-		this.field2527 = -1; // L: 87
+		this.verticesCount = 0; // L: 18
+		this.indicesCount = 0; // L: 22
+		this.field2444 = 0; // L: 33
+		this.field2442 = 0; // L: 34
+		this.isSingleTile = false; // L: 42
+		this.xMidOffset = -1; // L: 51
+		this.yMidOffset = -1; // L: 52
+		this.zMidOffset = -1; // L: 53
+		boolean var3 = false; // L: 94
+		boolean var4 = false; // L: 95
+		boolean var5 = false; // L: 96
+		boolean var6 = false; // L: 97
+		this.verticesCount = 0; // L: 98
+		this.indicesCount = 0; // L: 99
+		this.field2442 = 0; // L: 100
+		this.field2444 = -1; // L: 101
 
 		int var7;
 		Model var8;
-		for (var7 = 0; var7 < var2; ++var7) { // L: 88
-			var8 = var1[var7]; // L: 89
-			if (var8 != null) { // L: 90
-				this.verticesCount += var8.verticesCount; // L: 91
-				this.indicesCount += var8.indicesCount; // L: 92
-				this.field2522 += var8.field2522; // L: 93
-				if (var8.faceRenderPriorities != null) { // L: 94
+		for (var7 = 0; var7 < var2; ++var7) { // L: 102
+			var8 = var1[var7]; // L: 103
+			if (var8 != null) { // L: 104
+				this.verticesCount += var8.verticesCount; // L: 105
+				this.indicesCount += var8.indicesCount; // L: 106
+				this.field2442 += var8.field2442; // L: 107
+				if (var8.faceRenderPriorities != null) { // L: 108
 					var3 = true;
 				} else {
-					if (this.field2527 == -1) { // L: 96
-						this.field2527 = var8.field2527;
+					if (this.field2444 == -1) { // L: 110
+						this.field2444 = var8.field2444;
 					}
 
-					if (this.field2527 != var8.field2527) { // L: 97
+					if (this.field2444 != var8.field2444) { // L: 111
 						var3 = true;
 					}
 				}
 
-				var4 |= var8.faceAlphas != null; // L: 99
-				var5 |= var8.faceTextures != null; // L: 100
-				var6 |= var8.field2566 != null; // L: 101
+				var4 |= var8.faceAlphas != null; // L: 113
+				var5 |= var8.faceTextures != null; // L: 114
+				var6 |= var8.field2439 != null; // L: 115
 			}
 		}
 
-		this.verticesX = new int[this.verticesCount]; // L: 104
-		this.verticesY = new int[this.verticesCount]; // L: 105
-		this.verticesZ = new int[this.verticesCount]; // L: 106
-		this.indices1 = new int[this.indicesCount]; // L: 107
-		this.indices2 = new int[this.indicesCount]; // L: 108
-		this.indices3 = new int[this.indicesCount]; // L: 109
-		this.faceColors1 = new int[this.indicesCount]; // L: 110
-		this.faceColors2 = new int[this.indicesCount]; // L: 111
-		this.faceColors3 = new int[this.indicesCount]; // L: 112
-		if (var3) { // L: 113
+		this.verticesX = new int[this.verticesCount]; // L: 118
+		this.verticesY = new int[this.verticesCount]; // L: 119
+		this.verticesZ = new int[this.verticesCount]; // L: 120
+		this.indices1 = new int[this.indicesCount]; // L: 121
+		this.indices2 = new int[this.indicesCount]; // L: 122
+		this.indices3 = new int[this.indicesCount]; // L: 123
+		this.faceColors1 = new int[this.indicesCount]; // L: 124
+		this.faceColors2 = new int[this.indicesCount]; // L: 125
+		this.faceColors3 = new int[this.indicesCount]; // L: 126
+		if (var3) { // L: 127
 			this.faceRenderPriorities = new byte[this.indicesCount];
 		}
 
-		if (var4) { // L: 114
+		if (var4) { // L: 128
 			this.faceAlphas = new byte[this.indicesCount];
 		}
 
-		if (var5) { // L: 115
+		if (var5) { // L: 129
 			this.faceTextures = new short[this.indicesCount];
 		}
 
-		if (var6) { // L: 116
-			this.field2566 = new byte[this.indicesCount];
+		if (var6) { // L: 130
+			this.field2439 = new byte[this.indicesCount];
 		}
 
-		if (this.field2522 > 0) { // L: 117
-			this.field2529 = new int[this.field2522]; // L: 118
-			this.field2530 = new int[this.field2522]; // L: 119
-			this.field2538 = new int[this.field2522]; // L: 120
+		if (this.field2442 > 0) { // L: 131
+			this.field2443 = new int[this.field2442]; // L: 132
+			this.field2471 = new int[this.field2442]; // L: 133
+			this.field2445 = new int[this.field2442]; // L: 134
 		}
 
-		this.verticesCount = 0; // L: 122
-		this.indicesCount = 0; // L: 123
-		this.field2522 = 0; // L: 124
+		this.verticesCount = 0; // L: 136
+		this.indicesCount = 0; // L: 137
+		this.field2442 = 0; // L: 138
 
-		for (var7 = 0; var7 < var2; ++var7) { // L: 125
-			var8 = var1[var7]; // L: 126
-			if (var8 != null) { // L: 127
+		for (var7 = 0; var7 < var2; ++var7) { // L: 139
+			var8 = var1[var7]; // L: 140
+			if (var8 != null) { // L: 141
 				int var9;
-				for (var9 = 0; var9 < var8.indicesCount; ++var9) { // L: 128
-					this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; // L: 129
-					this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; // L: 130
-					this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; // L: 131
-					this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; // L: 132
-					this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; // L: 133
-					this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; // L: 134
-					if (var3) { // L: 135
-						if (var8.faceRenderPriorities != null) { // L: 136
+				for (var9 = 0; var9 < var8.indicesCount; ++var9) { // L: 142
+					this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; // L: 143
+					this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; // L: 144
+					this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; // L: 145
+					this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; // L: 146
+					this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; // L: 147
+					this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; // L: 148
+					if (var3) { // L: 149
+						if (var8.faceRenderPriorities != null) { // L: 150
 							this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9];
 						} else {
-							this.faceRenderPriorities[this.indicesCount] = var8.field2527; // L: 137
+							this.faceRenderPriorities[this.indicesCount] = var8.field2444; // L: 151
 						}
 					}
 
-					if (var4 && var8.faceAlphas != null) { // L: 139 140
+					if (var4 && var8.faceAlphas != null) { // L: 153 154
 						this.faceAlphas[this.indicesCount] = var8.faceAlphas[var9];
 					}
 
-					if (var5) { // L: 142
-						if (var8.faceTextures != null) { // L: 143
+					if (var5) { // L: 156
+						if (var8.faceTextures != null) { // L: 157
 							this.faceTextures[this.indicesCount] = var8.faceTextures[var9];
 						} else {
-							this.faceTextures[this.indicesCount] = -1; // L: 144
+							this.faceTextures[this.indicesCount] = -1; // L: 158
 						}
 					}
 
-					if (var6) { // L: 146
-						if (var8.field2566 != null && var8.field2566[var9] != -1) { // L: 147
-							this.field2566[this.indicesCount] = (byte)(this.field2522 + var8.field2566[var9]);
+					if (var6) { // L: 160
+						if (var8.field2439 != null && var8.field2439[var9] != -1) { // L: 161
+							this.field2439[this.indicesCount] = (byte)(this.field2442 + var8.field2439[var9]);
 						} else {
-							this.field2566[this.indicesCount] = -1; // L: 148
+							this.field2439[this.indicesCount] = -1; // L: 162
 						}
 					}
 
-					++this.indicesCount; // L: 150
+					++this.indicesCount; // L: 164
 				}
 
-				for (var9 = 0; var9 < var8.field2522; ++var9) { // L: 152
-					this.field2529[this.field2522] = this.verticesCount + var8.field2529[var9]; // L: 153
-					this.field2530[this.field2522] = this.verticesCount + var8.field2530[var9]; // L: 154
-					this.field2538[this.field2522] = this.verticesCount + var8.field2538[var9]; // L: 155
-					++this.field2522; // L: 156
+				for (var9 = 0; var9 < var8.field2442; ++var9) { // L: 166
+					this.field2443[this.field2442] = this.verticesCount + var8.field2443[var9]; // L: 167
+					this.field2471[this.field2442] = this.verticesCount + var8.field2471[var9]; // L: 168
+					this.field2445[this.field2442] = this.verticesCount + var8.field2445[var9]; // L: 169
+					++this.field2442; // L: 170
 				}
 
-				for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 158
-					this.verticesX[this.verticesCount] = var8.verticesX[var9]; // L: 159
-					this.verticesY[this.verticesCount] = var8.verticesY[var9]; // L: 160
-					this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; // L: 161
-					++this.verticesCount; // L: 162
+				for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 172
+					this.verticesX[this.verticesCount] = var8.verticesX[var9]; // L: 173
+					this.verticesY[this.verticesCount] = var8.verticesY[var9]; // L: 174
+					this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; // L: 175
+					++this.verticesCount; // L: 176
 				}
 			}
 		}
 
-	} // L: 166
+	} // L: 180
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([[IIIIZI)Lhl;"
+		descriptor = "([[IIIIZI)Lgo;"
 	)
 	@Export("contourGround")
 	public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
-		this.calculateBoundsCylinder(); // L: 169
-		int var7 = var2 - this.xzRadius; // L: 170
-		int var8 = var2 + this.xzRadius; // L: 171
-		int var9 = var4 - this.xzRadius; // L: 172
-		int var10 = var4 + this.xzRadius; // L: 173
-		if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 174
-			var7 >>= 7; // L: 175
-			var8 = var8 + 127 >> 7; // L: 176
-			var9 >>= 7; // L: 177
-			var10 = var10 + 127 >> 7; // L: 178
-			if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 179
+		this.calculateBoundsCylinder(); // L: 183
+		int var7 = var2 - this.xzRadius; // L: 184
+		int var8 = var2 + this.xzRadius; // L: 185
+		int var9 = var4 - this.xzRadius; // L: 186
+		int var10 = var4 + this.xzRadius; // L: 187
+		if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 188
+			var7 >>= 7; // L: 189
+			var8 = var8 + 127 >> 7; // L: 190
+			var9 >>= 7; // L: 191
+			var10 = var10 + 127 >> 7; // L: 192
+			if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 193
 				return this;
 			} else {
 				Model var11;
-				if (var5) { // L: 181
-					var11 = new Model(); // L: 182
-					var11.verticesCount = this.verticesCount; // L: 183
-					var11.indicesCount = this.indicesCount; // L: 184
-					var11.field2522 = this.field2522; // L: 185
-					var11.verticesX = this.verticesX; // L: 186
-					var11.verticesZ = this.verticesZ; // L: 187
-					var11.indices1 = this.indices1; // L: 188
-					var11.indices2 = this.indices2; // L: 189
-					var11.indices3 = this.indices3; // L: 190
-					var11.faceColors1 = this.faceColors1; // L: 191
-					var11.faceColors2 = this.faceColors2; // L: 192
-					var11.faceColors3 = this.faceColors3; // L: 193
-					var11.faceRenderPriorities = this.faceRenderPriorities; // L: 194
-					var11.faceAlphas = this.faceAlphas; // L: 195
-					var11.field2566 = this.field2566; // L: 196
-					var11.faceTextures = this.faceTextures; // L: 197
-					var11.field2527 = this.field2527; // L: 198
-					var11.field2529 = this.field2529; // L: 199
-					var11.field2530 = this.field2530; // L: 200
-					var11.field2538 = this.field2538; // L: 201
-					var11.vertexLabels = this.vertexLabels; // L: 202
-					var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 203
-					var11.isSingleTile = this.isSingleTile; // L: 204
-					var11.verticesY = new int[var11.verticesCount]; // L: 205
+				if (var5) { // L: 195
+					var11 = new Model(); // L: 196
+					var11.verticesCount = this.verticesCount; // L: 197
+					var11.indicesCount = this.indicesCount; // L: 198
+					var11.field2442 = this.field2442; // L: 199
+					var11.verticesX = this.verticesX; // L: 200
+					var11.verticesZ = this.verticesZ; // L: 201
+					var11.indices1 = this.indices1; // L: 202
+					var11.indices2 = this.indices2; // L: 203
+					var11.indices3 = this.indices3; // L: 204
+					var11.faceColors1 = this.faceColors1; // L: 205
+					var11.faceColors2 = this.faceColors2; // L: 206
+					var11.faceColors3 = this.faceColors3; // L: 207
+					var11.faceRenderPriorities = this.faceRenderPriorities; // L: 208
+					var11.faceAlphas = this.faceAlphas; // L: 209
+					var11.field2439 = this.field2439; // L: 210
+					var11.faceTextures = this.faceTextures; // L: 211
+					var11.field2444 = this.field2444; // L: 212
+					var11.field2443 = this.field2443; // L: 213
+					var11.field2471 = this.field2471; // L: 214
+					var11.field2445 = this.field2445; // L: 215
+					var11.vertexLabels = this.vertexLabels; // L: 216
+					var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 217
+					var11.isSingleTile = this.isSingleTile; // L: 218
+					var11.verticesY = new int[var11.verticesCount]; // L: 219
 				} else {
-					var11 = this; // L: 208
+					var11 = this; // L: 222
 				}
 
 				int var12;
@@ -422,495 +450,616 @@ public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean v
 				int var19;
 				int var20;
 				int var21;
-				if (var6 == 0) { // L: 210
-					for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 211
-						var13 = var2 + this.verticesX[var12]; // L: 212
-						var14 = var4 + this.verticesZ[var12]; // L: 213
-						var15 = var13 & 127; // L: 214
-						var16 = var14 & 127; // L: 215
-						var17 = var13 >> 7; // L: 216
-						var18 = var14 >> 7; // L: 217
-						var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 218
-						var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 219
-						var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 220
-						var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 221
+				if (var6 == 0) { // L: 224
+					for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 225
+						var13 = var2 + this.verticesX[var12]; // L: 226
+						var14 = var4 + this.verticesZ[var12]; // L: 227
+						var15 = var13 & 127; // L: 228
+						var16 = var14 & 127; // L: 229
+						var17 = var13 >> 7; // L: 230
+						var18 = var14 >> 7; // L: 231
+						var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 232
+						var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 233
+						var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 234
+						var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 235
 					}
 				} else {
-					for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 225
-						var13 = (-this.verticesY[var12] << 16) / super.height; // L: 226
-						if (var13 < var6) { // L: 227
-							var14 = var2 + this.verticesX[var12]; // L: 228
-							var15 = var4 + this.verticesZ[var12]; // L: 229
-							var16 = var14 & 127; // L: 230
-							var17 = var15 & 127; // L: 231
-							var18 = var14 >> 7; // L: 232
-							var19 = var15 >> 7; // L: 233
-							var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 234
-							var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 235
-							int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 236
-							var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 237
+					for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 239
+						var13 = (-this.verticesY[var12] << 16) / super.height; // L: 240
+						if (var13 < var6) { // L: 241
+							var14 = var2 + this.verticesX[var12]; // L: 242
+							var15 = var4 + this.verticesZ[var12]; // L: 243
+							var16 = var14 & 127; // L: 244
+							var17 = var15 & 127; // L: 245
+							var18 = var14 >> 7; // L: 246
+							var19 = var15 >> 7; // L: 247
+							var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 248
+							var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 249
+							int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 250
+							var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 251
 						}
 					}
 				}
 
-				var11.resetBounds(); // L: 241
-				return var11; // L: 242
+				var11.resetBounds(); // L: 255
+				return var11; // L: 256
 			}
 		} else {
 			return this;
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Z)Lhl;"
+		descriptor = "(Z)Lgo;"
 	)
 	@Export("toSharedSequenceModel")
 	public Model toSharedSequenceModel(boolean var1) {
-		if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { // L: 246
+		if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { // L: 260
 			Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100];
 		}
 
-		return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 247
+		return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 261
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Z)Lhl;"
+		descriptor = "(Z)Lgo;"
 	)
 	@Export("toSharedSpotAnimationModel")
 	public Model toSharedSpotAnimationModel(boolean var1) {
-		if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { // L: 251
+		if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { // L: 265
 			Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100];
 		}
 
-		return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 252
+		return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 266
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(ZLhl;[B)Lhl;"
+		descriptor = "(ZLgo;[B)Lgo;"
 	)
 	@Export("buildSharedModel")
 	Model buildSharedModel(boolean var1, Model var2, byte[] var3) {
-		var2.verticesCount = this.verticesCount; // L: 256
-		var2.indicesCount = this.indicesCount; // L: 257
-		var2.field2522 = this.field2522; // L: 258
-		if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 259
-			var2.verticesX = new int[this.verticesCount + 100]; // L: 260
-			var2.verticesY = new int[this.verticesCount + 100]; // L: 261
-			var2.verticesZ = new int[this.verticesCount + 100]; // L: 262
+		var2.verticesCount = this.verticesCount; // L: 270
+		var2.indicesCount = this.indicesCount; // L: 271
+		var2.field2442 = this.field2442; // L: 272
+		if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 273
+			var2.verticesX = new int[this.verticesCount + 100]; // L: 274
+			var2.verticesY = new int[this.verticesCount + 100]; // L: 275
+			var2.verticesZ = new int[this.verticesCount + 100]; // L: 276
 		}
 
 		int var4;
-		for (var4 = 0; var4 < this.verticesCount; ++var4) { // L: 264
-			var2.verticesX[var4] = this.verticesX[var4]; // L: 265
-			var2.verticesY[var4] = this.verticesY[var4]; // L: 266
-			var2.verticesZ[var4] = this.verticesZ[var4]; // L: 267
+		for (var4 = 0; var4 < this.verticesCount; ++var4) { // L: 278
+			var2.verticesX[var4] = this.verticesX[var4]; // L: 279
+			var2.verticesY[var4] = this.verticesY[var4]; // L: 280
+			var2.verticesZ[var4] = this.verticesZ[var4]; // L: 281
 		}
 
-		if (var1) { // L: 269
+		if (var1) { // L: 283
 			var2.faceAlphas = this.faceAlphas;
 		} else {
-			var2.faceAlphas = var3; // L: 271
-			if (this.faceAlphas == null) { // L: 272
-				for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 273
+			var2.faceAlphas = var3; // L: 285
+			if (this.faceAlphas == null) { // L: 286
+				for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 287
 					var2.faceAlphas[var4] = 0;
 				}
 			} else {
-				for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 276
+				for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 290
 					var2.faceAlphas[var4] = this.faceAlphas[var4];
 				}
 			}
 		}
 
-		var2.indices1 = this.indices1; // L: 279
-		var2.indices2 = this.indices2; // L: 280
-		var2.indices3 = this.indices3; // L: 281
-		var2.faceColors1 = this.faceColors1; // L: 282
-		var2.faceColors2 = this.faceColors2; // L: 283
-		var2.faceColors3 = this.faceColors3; // L: 284
-		var2.faceRenderPriorities = this.faceRenderPriorities; // L: 285
-		var2.field2566 = this.field2566; // L: 286
-		var2.faceTextures = this.faceTextures; // L: 287
-		var2.field2527 = this.field2527; // L: 288
-		var2.field2529 = this.field2529; // L: 289
-		var2.field2530 = this.field2530; // L: 290
-		var2.field2538 = this.field2538; // L: 291
-		var2.vertexLabels = this.vertexLabels; // L: 292
-		var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 293
-		var2.isSingleTile = this.isSingleTile; // L: 294
-		var2.resetBounds(); // L: 295
-		return var2; // L: 296
+		var2.indices1 = this.indices1; // L: 293
+		var2.indices2 = this.indices2; // L: 294
+		var2.indices3 = this.indices3; // L: 295
+		var2.faceColors1 = this.faceColors1; // L: 296
+		var2.faceColors2 = this.faceColors2; // L: 297
+		var2.faceColors3 = this.faceColors3; // L: 298
+		var2.faceRenderPriorities = this.faceRenderPriorities; // L: 299
+		var2.field2439 = this.field2439; // L: 300
+		var2.faceTextures = this.faceTextures; // L: 301
+		var2.field2444 = this.field2444; // L: 302
+		var2.field2443 = this.field2443; // L: 303
+		var2.field2471 = this.field2471; // L: 304
+		var2.field2445 = this.field2445; // L: 305
+		var2.vertexLabels = this.vertexLabels; // L: 306
+		var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 307
+		var2.field2448 = this.field2448; // L: 308
+		var2.field2449 = this.field2449; // L: 309
+		var2.isSingleTile = this.isSingleTile; // L: 310
+		var2.resetBounds(); // L: 311
+		var2.field2474 = 0; // L: 312
+		return var2; // L: 313
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("calculateBoundingBox")
 	void calculateBoundingBox(int var1) {
-		if (this.xMidOffset == -1) { // L: 300
-			int var2 = 0; // L: 301
-			int var3 = 0; // L: 302
-			int var4 = 0; // L: 303
-			int var5 = 0; // L: 304
-			int var6 = 0; // L: 305
-			int var7 = 0; // L: 306
-			int var8 = Model_cosine[var1]; // L: 307
-			int var9 = Model_sine[var1]; // L: 308
-
-			for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 309
-				int var11 = Rasterizer3D.method4220(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310
-				int var12 = this.verticesY[var10]; // L: 311
-				int var13 = Rasterizer3D.method4243(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312
-				if (var11 < var2) { // L: 313
+		if (this.xMidOffset == -1) { // L: 317
+			int var2 = 0; // L: 318
+			int var3 = 0; // L: 319
+			int var4 = 0; // L: 320
+			int var5 = 0; // L: 321
+			int var6 = 0; // L: 322
+			int var7 = 0; // L: 323
+			int var8 = field2489[var1]; // L: 324
+			int var9 = field2465[var1]; // L: 325
+
+			for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 326
+				int var11 = Rasterizer3D.method3847(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 327
+				int var12 = this.verticesY[var10]; // L: 328
+				int var13 = Rasterizer3D.method3864(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 329
+				if (var11 < var2) { // L: 330
 					var2 = var11;
 				}
 
-				if (var11 > var5) { // L: 314
+				if (var11 > var5) { // L: 331
 					var5 = var11;
 				}
 
-				if (var12 < var3) { // L: 315
+				if (var12 < var3) { // L: 332
 					var3 = var12;
 				}
 
-				if (var12 > var6) { // L: 316
+				if (var12 > var6) { // L: 333
 					var6 = var12;
 				}
 
-				if (var13 < var4) { // L: 317
+				if (var13 < var4) { // L: 334
 					var4 = var13;
 				}
 
-				if (var13 > var7) { // L: 318
+				if (var13 > var7) { // L: 335
 					var7 = var13;
 				}
 			}
 
-			this.xMid = (var5 + var2) / 2; // L: 320
-			this.yMid = (var6 + var3) / 2; // L: 321
-			this.zMid = (var7 + var4) / 2; // L: 322
-			this.xMidOffset = (var5 - var2 + 1) / 2; // L: 323
-			this.yMidOffset = (var6 - var3 + 1) / 2; // L: 324
-			this.zMidOffset = (var7 - var4 + 1) / 2; // L: 325
-			if (this.xMidOffset < 32) { // L: 327
+			this.xMid = (var5 + var2) / 2; // L: 337
+			this.yMid = (var6 + var3) / 2; // L: 338
+			this.zMid = (var7 + var4) / 2; // L: 339
+			this.xMidOffset = (var5 - var2 + 1) / 2; // L: 340
+			this.yMidOffset = (var6 - var3 + 1) / 2; // L: 341
+			this.zMidOffset = (var7 - var4 + 1) / 2; // L: 342
+			boolean var14 = true; // L: 343
+			if (this.xMidOffset < 32) { // L: 344
 				this.xMidOffset = 32;
 			}
 
-			if (this.zMidOffset < 32) { // L: 328
+			if (this.zMidOffset < 32) { // L: 345
 				this.zMidOffset = 32;
 			}
 
-			if (this.isSingleTile) { // L: 329
-				this.xMidOffset += 8; // L: 331
-				this.zMidOffset += 8; // L: 332
+			if (this.isSingleTile) { // L: 346
+				boolean var15 = true; // L: 347
+				this.xMidOffset += 8; // L: 348
+				this.zMidOffset += 8; // L: 349
 			}
 
 		}
-	} // L: 334
+	} // L: 351
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("calculateBoundsCylinder")
 	public void calculateBoundsCylinder() {
-		if (this.boundsType != 1) { // L: 337
-			this.boundsType = 1; // L: 338
-			super.height = 0; // L: 339
-			this.bottomY = 0; // L: 340
-			this.xzRadius = 0; // L: 341
-
-			for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 342
-				int var2 = this.verticesX[var1]; // L: 343
-				int var3 = this.verticesY[var1]; // L: 344
-				int var4 = this.verticesZ[var1]; // L: 345
-				if (-var3 > super.height) { // L: 346
+		if (this.boundsType != 1) { // L: 354
+			this.boundsType = 1; // L: 355
+			super.height = 0; // L: 356
+			this.bottomY = 0; // L: 357
+			this.xzRadius = 0; // L: 358
+
+			for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 359
+				int var2 = this.verticesX[var1]; // L: 360
+				int var3 = this.verticesY[var1]; // L: 361
+				int var4 = this.verticesZ[var1]; // L: 362
+				if (-var3 > super.height) { // L: 363
 					super.height = -var3;
 				}
 
-				if (var3 > this.bottomY) { // L: 347
+				if (var3 > this.bottomY) { // L: 364
 					this.bottomY = var3;
 				}
 
-				int var5 = var2 * var2 + var4 * var4; // L: 348
-				if (var5 > this.xzRadius) { // L: 349
+				int var5 = var2 * var2 + var4 * var4; // L: 365
+				if (var5 > this.xzRadius) { // L: 366
 					this.xzRadius = var5;
 				}
 			}
 
-			this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 351
-			this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); // L: 352
-			this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); // L: 353
+			this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 368
+			this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); // L: 369
+			this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); // L: 370
 		}
-	} // L: 354
+	} // L: 371
 
-	@ObfuscatedName("y")
-	void method4534() {
-		if (this.boundsType != 2) { // L: 357
-			this.boundsType = 2; // L: 358
-			this.xzRadius = 0; // L: 359
-
-			for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 360
-				int var2 = this.verticesX[var1]; // L: 361
-				int var3 = this.verticesY[var1]; // L: 362
-				int var4 = this.verticesZ[var1]; // L: 363
-				int var5 = var2 * var2 + var4 * var4 + var3 * var3; // L: 364
-				if (var5 > this.xzRadius) { // L: 365
+	@ObfuscatedName("v")
+	void method4194() {
+		if (this.boundsType != 2) { // L: 374
+			this.boundsType = 2; // L: 375
+			this.xzRadius = 0; // L: 376
+
+			for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 377
+				int var2 = this.verticesX[var1]; // L: 378
+				int var3 = this.verticesY[var1]; // L: 379
+				int var4 = this.verticesZ[var1]; // L: 380
+				int var5 = var2 * var2 + var4 * var4 + var3 * var3; // L: 381
+				if (var5 > this.xzRadius) { // L: 382
 					this.xzRadius = var5;
 				}
 			}
 
-			this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 367
-			this.radius = this.xzRadius; // L: 368
-			this.diameter = this.xzRadius + this.xzRadius; // L: 369
+			this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 384
+			this.radius = this.xzRadius; // L: 385
+			this.diameter = this.xzRadius + this.xzRadius; // L: 386
 		}
-	} // L: 370
+	} // L: 387
 
-	@ObfuscatedName("k")
-	public int method4536() {
-		this.calculateBoundsCylinder(); // L: 373
-		return this.xzRadius; // L: 374
+	@ObfuscatedName("d")
+	public int method4222() {
+		this.calculateBoundsCylinder(); // L: 390
+		return this.xzRadius; // L: 391
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("resetBounds")
-	void resetBounds() {
-		this.boundsType = 0; // L: 378
-		this.xMidOffset = -1; // L: 379
-	} // L: 380
+	public void resetBounds() {
+		this.boundsType = 0; // L: 395
+		this.xMidOffset = -1; // L: 396
+	} // L: 397
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(Lho;I)V"
+		descriptor = "(Lgg;I)V"
 	)
 	@Export("animate")
 	public void animate(Frames var1, int var2) {
-		if (this.vertexLabels != null) { // L: 383
-			if (var2 != -1) { // L: 384
-				Animation var3 = var1.frames[var2]; // L: 385
-				Skeleton var4 = var3.skeleton; // L: 386
-				Model_transformTempX = 0; // L: 387
-				Model_transformTempY = 0; // L: 388
-				Model_transformTempZ = 0; // L: 389
-
-				for (int var5 = 0; var5 < var3.transformCount; ++var5) { // L: 390
-					int var6 = var3.transformSkeletonLabels[var5]; // L: 391
-					this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); // L: 392
+		if (this.vertexLabels != null) { // L: 400
+			if (var2 != -1) { // L: 401
+				Animation var3 = var1.frames[var2]; // L: 402
+				Skeleton var4 = var3.skeleton; // L: 403
+				Model_transformTempX = 0; // L: 404
+				Model_transformTempY = 0; // L: 405
+				Model_transformTempZ = 0; // L: 406
+
+				for (int var5 = 0; var5 < var3.transformCount; ++var5) { // L: 407
+					int var6 = var3.transformSkeletonLabels[var5]; // L: 408
+					this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); // L: 409
 				}
 
-				this.resetBounds(); // L: 394
+				this.resetBounds(); // L: 411
 			}
 		}
-	} // L: 395
+	} // L: 412
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Ldb;I)V"
+	)
+	public void method4271(class120 var1, int var2) {
+		Skeleton var3 = var1.field1457; // L: 415
+		class194 var4 = var3.method3943(); // L: 416
+		if (var4 != null) { // L: 417
+			var3.method3943().method3939(var1, var2); // L: 418
+			this.method4200(var3.method3943(), var1.method2694()); // L: 419
+		}
+
+		if (var1.method2695()) { // L: 421
+			this.method4199(var1, var2); // L: 422
+		}
+
+		this.resetBounds(); // L: 424
+	} // L: 425
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(Ldb;I)V"
+	)
+	void method4199(class120 var1, int var2) {
+		Skeleton var3 = var1.field1457; // L: 428
+
+		for (int var4 = 0; var4 < var3.count; ++var4) { // L: 429
+			int var5 = var3.transformTypes[var4]; // L: 430
+			if (var5 == 5 && var1.field1453 != null && var1.field1453[var4] != null && var1.field1453[var4][0] != null && this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 431 432
+				class115 var6 = var1.field1453[var4][0]; // L: 433
+				int[] var7 = var3.labels[var4]; // L: 434
+				int var8 = var7.length; // L: 435
+
+				for (int var9 = 0; var9 < var8; ++var9) { // L: 436
+					int var10 = var7[var9]; // L: 437
+					if (var10 < this.faceLabelsAlpha.length) { // L: 438
+						int[] var11 = this.faceLabelsAlpha[var10]; // L: 439
+
+						for (int var12 = 0; var12 < var11.length; ++var12) { // L: 440
+							int var13 = var11[var12]; // L: 441
+							int var14 = (int)((float)(this.faceAlphas[var13] & 255) + var6.method2632(var2) * 255.0F); // L: 442
+							if (var14 < 0) { // L: 443
+								var14 = 0;
+							} else if (var14 > 255) { // L: 444
+								var14 = 255;
+							}
+
+							this.faceAlphas[var13] = (byte)var14; // L: 445
+						}
+					}
+				}
+			}
+		}
+
+	} // L: 452
 
 	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(Lho;ILho;I[I)V"
+		descriptor = "(Lgq;I)V"
+	)
+	void method4200(class194 var1, int var2) {
+		this.method4218(var1, var2); // L: 456
+	} // L: 458
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "(Lgg;ILgg;I[I)V"
 	)
 	@Export("animate2")
 	public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) {
-		if (var2 != -1) { // L: 398
-			if (var5 != null && var4 != -1) { // L: 399
-				Animation var6 = var1.frames[var2]; // L: 403
-				Animation var7 = var3.frames[var4]; // L: 404
-				Skeleton var8 = var6.skeleton; // L: 405
-				Model_transformTempX = 0; // L: 406
-				Model_transformTempY = 0; // L: 407
-				Model_transformTempZ = 0; // L: 408
-				byte var9 = 0; // L: 409
-				int var13 = var9 + 1; // L: 410
+		if (var2 != -1) { // L: 461
+			if (var5 != null && var4 != -1) { // L: 462
+				Animation var6 = var1.frames[var2]; // L: 466
+				Animation var7 = var3.frames[var4]; // L: 467
+				Skeleton var8 = var6.skeleton; // L: 468
+				Model_transformTempX = 0; // L: 469
+				Model_transformTempY = 0; // L: 470
+				Model_transformTempZ = 0; // L: 471
+				byte var9 = 0; // L: 472
+				int var13 = var9 + 1; // L: 473
 				int var10 = var5[var9];
 
 				int var11;
 				int var12;
-				for (var11 = 0; var11 < var6.transformCount; ++var11) { // L: 411
-					for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 412 413
+				for (var11 = 0; var11 < var6.transformCount; ++var11) { // L: 474
+					for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 475 476
 					}
 
-					if (var12 != var10 || var8.transformTypes[var12] == 0) { // L: 414
+					if (var12 != var10 || var8.transformTypes[var12] == 0) { // L: 477
 						this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]);
 					}
 				}
 
-				Model_transformTempX = 0; // L: 416
-				Model_transformTempY = 0; // L: 417
-				Model_transformTempZ = 0; // L: 418
-				var9 = 0; // L: 419
-				var13 = var9 + 1; // L: 420
+				Model_transformTempX = 0; // L: 479
+				Model_transformTempY = 0; // L: 480
+				Model_transformTempZ = 0; // L: 481
+				var9 = 0; // L: 482
+				var13 = var9 + 1; // L: 483
 				var10 = var5[var9];
 
-				for (var11 = 0; var11 < var7.transformCount; ++var11) { // L: 421
-					for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 422 423
+				for (var11 = 0; var11 < var7.transformCount; ++var11) { // L: 484
+					for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 485 486
 					}
 
-					if (var12 == var10 || var8.transformTypes[var12] == 0) { // L: 424
+					if (var12 == var10 || var8.transformTypes[var12] == 0) { // L: 487
 						this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]);
 					}
 				}
 
-				this.resetBounds(); // L: 426
+				this.resetBounds(); // L: 489
 			} else {
-				this.animate(var1, var2); // L: 400
+				this.animate(var1, var2); // L: 463
 			}
 		}
-	} // L: 401 427
+	} // L: 464 490
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ldb;I[ZZ)V"
+	)
+	public void method4202(class120 var1, int var2, boolean[] var3, boolean var4) {
+		Skeleton var5 = var1.field1457; // L: 493
+		class194 var6 = var5.method3943(); // L: 494
+		if (var6 != null) { // L: 495
+			var6.method3940(var1, var2, var3, var4); // L: 496
+			this.method4200(var6, var1.method2694()); // L: 497
+		}
+
+		if (var1.method2695()) { // L: 499
+			this.method4199(var1, var2); // L: 500
+		}
+
+	} // L: 502
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		descriptor = "(Lgg;I[IZ)V"
+	)
+	public void method4203(Frames var1, int var2, int[] var3, boolean var4) {
+		if (var3 == null) { // L: 505
+			this.animate(var1, var2); // L: 506
+		} else {
+			Animation var5 = var1.frames[var2]; // L: 509
+			Skeleton var6 = var5.skeleton; // L: 510
+			byte var7 = 0; // L: 511
+			int var11 = var7 + 1; // L: 512
+			int var8 = var3[var7];
+			Model_transformTempX = 0; // L: 513
+			Model_transformTempY = 0; // L: 514
+			Model_transformTempZ = 0; // L: 515
+
+			for (int var9 = 0; var9 < var5.transformCount; ++var9) { // L: 516
+				int var10;
+				for (var10 = var5.transformSkeletonLabels[var9]; var10 > var8; var8 = var3[var11++]) { // L: 517 518
+				}
+
+				if (var4) { // L: 519
+					if (var10 == var8 || var6.transformTypes[var10] == 0) { // L: 520
+						this.transform(var6.transformTypes[var10], var6.labels[var10], var5.transformXs[var9], var5.transformYs[var9], var5.transformZs[var9]);
+					}
+				} else if (var10 != var8 || var6.transformTypes[var10] == 0) {
+					this.transform(var6.transformTypes[var10], var6.labels[var10], var5.transformXs[var9], var5.transformYs[var9], var5.transformZs[var9]); // L: 523
+				}
+			}
+
+		}
+	} // L: 507 526
+
+	@ObfuscatedName("q")
 	@Export("transform")
 	void transform(int var1, int[] var2, int var3, int var4, int var5) {
-		int var6 = var2.length; // L: 430
+		int var6 = var2.length; // L: 529
 		int var7;
 		int var8;
 		int var11;
 		int var12;
-		if (var1 == 0) { // L: 431
-			var7 = 0; // L: 432
-			Model_transformTempX = 0; // L: 433
-			Model_transformTempY = 0; // L: 434
-			Model_transformTempZ = 0; // L: 435
-
-			for (var8 = 0; var8 < var6; ++var8) { // L: 436
-				int var18 = var2[var8]; // L: 437
-				if (var18 < this.vertexLabels.length) { // L: 438
-					int[] var19 = this.vertexLabels[var18]; // L: 439
-
-					for (var11 = 0; var11 < var19.length; ++var11) { // L: 440
-						var12 = var19[var11]; // L: 441
-						Model_transformTempX += this.verticesX[var12]; // L: 442
-						Model_transformTempY += this.verticesY[var12]; // L: 443
-						Model_transformTempZ += this.verticesZ[var12]; // L: 444
-						++var7; // L: 445
+		if (var1 == 0) { // L: 530
+			var7 = 0; // L: 531
+			Model_transformTempX = 0; // L: 532
+			Model_transformTempY = 0; // L: 533
+			Model_transformTempZ = 0; // L: 534
+
+			for (var8 = 0; var8 < var6; ++var8) { // L: 535
+				int var18 = var2[var8]; // L: 536
+				if (var18 < this.vertexLabels.length) { // L: 537
+					int[] var19 = this.vertexLabels[var18]; // L: 538
+
+					for (var11 = 0; var11 < var19.length; ++var11) { // L: 539
+						var12 = var19[var11]; // L: 540
+						Model_transformTempX += this.verticesX[var12]; // L: 541
+						Model_transformTempY += this.verticesY[var12]; // L: 542
+						Model_transformTempZ += this.verticesZ[var12]; // L: 543
+						++var7; // L: 544
 					}
 				}
 			}
 
-			if (var7 > 0) { // L: 449
-				Model_transformTempX = var3 + Model_transformTempX / var7; // L: 450
-				Model_transformTempY = var4 + Model_transformTempY / var7; // L: 451
-				Model_transformTempZ = var5 + Model_transformTempZ / var7; // L: 452
+			if (var7 > 0) { // L: 548
+				Model_transformTempX = var3 + Model_transformTempX / var7; // L: 549
+				Model_transformTempY = var4 + Model_transformTempY / var7; // L: 550
+				Model_transformTempZ = var5 + Model_transformTempZ / var7; // L: 551
 			} else {
-				Model_transformTempX = var3; // L: 455
-				Model_transformTempY = var4; // L: 456
-				Model_transformTempZ = var5; // L: 457
+				Model_transformTempX = var3; // L: 554
+				Model_transformTempY = var4; // L: 555
+				Model_transformTempZ = var5; // L: 556
 			}
 
 		} else {
 			int[] var9;
 			int var10;
 			int[] var10000;
-			if (var1 == 1) { // L: 461
-				for (var7 = 0; var7 < var6; ++var7) { // L: 462
-					var8 = var2[var7]; // L: 463
-					if (var8 < this.vertexLabels.length) { // L: 464
-						var9 = this.vertexLabels[var8]; // L: 465
-
-						for (var10 = 0; var10 < var9.length; ++var10) { // L: 466
-							var11 = var9[var10]; // L: 467
-							var10000 = this.verticesX; // L: 468
+			if (var1 == 1) { // L: 560
+				for (var7 = 0; var7 < var6; ++var7) { // L: 561
+					var8 = var2[var7]; // L: 562
+					if (var8 < this.vertexLabels.length) { // L: 563
+						var9 = this.vertexLabels[var8]; // L: 564
+
+						for (var10 = 0; var10 < var9.length; ++var10) { // L: 565
+							var11 = var9[var10]; // L: 566
+							var10000 = this.verticesX; // L: 567
 							var10000[var11] += var3;
-							var10000 = this.verticesY; // L: 469
+							var10000 = this.verticesY; // L: 568
 							var10000[var11] += var4;
-							var10000 = this.verticesZ; // L: 470
+							var10000 = this.verticesZ; // L: 569
 							var10000[var11] += var5;
 						}
 					}
 				}
 
-			} else if (var1 == 2) { // L: 476
-				for (var7 = 0; var7 < var6; ++var7) { // L: 477
-					var8 = var2[var7]; // L: 478
-					if (var8 < this.vertexLabels.length) { // L: 479
-						var9 = this.vertexLabels[var8]; // L: 480
+			} else if (var1 == 2) { // L: 575
+				for (var7 = 0; var7 < var6; ++var7) { // L: 576
+					var8 = var2[var7]; // L: 577
+					if (var8 < this.vertexLabels.length) { // L: 578
+						var9 = this.vertexLabels[var8]; // L: 579
 
-						for (var10 = 0; var10 < var9.length; ++var10) { // L: 481
-							var11 = var9[var10]; // L: 482
-							var10000 = this.verticesX; // L: 483
+						for (var10 = 0; var10 < var9.length; ++var10) { // L: 580
+							var11 = var9[var10]; // L: 581
+							var10000 = this.verticesX; // L: 582
 							var10000[var11] -= Model_transformTempX;
-							var10000 = this.verticesY; // L: 484
+							var10000 = this.verticesY; // L: 583
 							var10000[var11] -= Model_transformTempY;
-							var10000 = this.verticesZ; // L: 485
+							var10000 = this.verticesZ; // L: 584
 							var10000[var11] -= Model_transformTempZ;
-							var12 = (var3 & 255) * 8; // L: 486
-							int var13 = (var4 & 255) * 8; // L: 487
-							int var14 = (var5 & 255) * 8; // L: 488
+							var12 = (var3 & 255) * 8; // L: 585
+							int var13 = (var4 & 255) * 8; // L: 586
+							int var14 = (var5 & 255) * 8; // L: 587
 							int var15;
 							int var16;
 							int var17;
-							if (var14 != 0) { // L: 489
-								var15 = Model_sine[var14]; // L: 490
-								var16 = Model_cosine[var14]; // L: 491
-								var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; // L: 492
-								this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; // L: 493
-								this.verticesX[var11] = var17; // L: 494
+							if (var14 != 0) { // L: 588
+								var15 = field2465[var14]; // L: 589
+								var16 = field2489[var14]; // L: 590
+								var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; // L: 591
+								this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; // L: 592
+								this.verticesX[var11] = var17; // L: 593
 							}
 
-							if (var12 != 0) { // L: 496
-								var15 = Model_sine[var12]; // L: 497
-								var16 = Model_cosine[var12]; // L: 498
-								var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; // L: 499
-								this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; // L: 500
-								this.verticesY[var11] = var17; // L: 501
+							if (var12 != 0) { // L: 595
+								var15 = field2465[var12]; // L: 596
+								var16 = field2489[var12]; // L: 597
+								var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; // L: 598
+								this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; // L: 599
+								this.verticesY[var11] = var17; // L: 600
 							}
 
-							if (var13 != 0) { // L: 503
-								var15 = Model_sine[var13]; // L: 504
-								var16 = Model_cosine[var13]; // L: 505
-								var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; // L: 506
-								this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; // L: 507
-								this.verticesX[var11] = var17; // L: 508
+							if (var13 != 0) { // L: 602
+								var15 = field2465[var13]; // L: 603
+								var16 = field2489[var13]; // L: 604
+								var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; // L: 605
+								this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; // L: 606
+								this.verticesX[var11] = var17; // L: 607
 							}
 
-							var10000 = this.verticesX; // L: 510
+							var10000 = this.verticesX; // L: 609
 							var10000[var11] += Model_transformTempX;
-							var10000 = this.verticesY; // L: 511
+							var10000 = this.verticesY; // L: 610
 							var10000[var11] += Model_transformTempY;
-							var10000 = this.verticesZ; // L: 512
+							var10000 = this.verticesZ; // L: 611
 							var10000[var11] += Model_transformTempZ;
 						}
 					}
 				}
 
-			} else if (var1 == 3) { // L: 518
-				for (var7 = 0; var7 < var6; ++var7) { // L: 519
-					var8 = var2[var7]; // L: 520
-					if (var8 < this.vertexLabels.length) { // L: 521
-						var9 = this.vertexLabels[var8]; // L: 522
+			} else if (var1 == 3) { // L: 617
+				for (var7 = 0; var7 < var6; ++var7) { // L: 618
+					var8 = var2[var7]; // L: 619
+					if (var8 < this.vertexLabels.length) { // L: 620
+						var9 = this.vertexLabels[var8]; // L: 621
 
-						for (var10 = 0; var10 < var9.length; ++var10) { // L: 523
-							var11 = var9[var10]; // L: 524
-							var10000 = this.verticesX; // L: 525
+						for (var10 = 0; var10 < var9.length; ++var10) { // L: 622
+							var11 = var9[var10]; // L: 623
+							var10000 = this.verticesX; // L: 624
 							var10000[var11] -= Model_transformTempX;
-							var10000 = this.verticesY; // L: 526
+							var10000 = this.verticesY; // L: 625
 							var10000[var11] -= Model_transformTempY;
-							var10000 = this.verticesZ; // L: 527
+							var10000 = this.verticesZ; // L: 626
 							var10000[var11] -= Model_transformTempZ;
-							this.verticesX[var11] = var3 * this.verticesX[var11] / 128; // L: 528
-							this.verticesY[var11] = var4 * this.verticesY[var11] / 128; // L: 529
-							this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; // L: 530
-							var10000 = this.verticesX; // L: 531
+							this.verticesX[var11] = var3 * this.verticesX[var11] / 128; // L: 627
+							this.verticesY[var11] = var4 * this.verticesY[var11] / 128; // L: 628
+							this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; // L: 629
+							var10000 = this.verticesX; // L: 630
 							var10000[var11] += Model_transformTempX;
-							var10000 = this.verticesY; // L: 532
+							var10000 = this.verticesY; // L: 631
 							var10000[var11] += Model_transformTempY;
-							var10000 = this.verticesZ; // L: 533
+							var10000 = this.verticesZ; // L: 632
 							var10000[var11] += Model_transformTempZ;
 						}
 					}
 				}
 
-			} else if (var1 == 5) { // L: 539
-				if (this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 540
-					for (var7 = 0; var7 < var6; ++var7) { // L: 541
-						var8 = var2[var7]; // L: 542
-						if (var8 < this.faceLabelsAlpha.length) { // L: 543
-							var9 = this.faceLabelsAlpha[var8]; // L: 544
-
-							for (var10 = 0; var10 < var9.length; ++var10) { // L: 545
-								var11 = var9[var10]; // L: 546
-								var12 = (this.faceAlphas[var11] & 255) + var3 * 8; // L: 547
-								if (var12 < 0) { // L: 548
+			} else if (var1 == 5) { // L: 638
+				if (this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 639
+					for (var7 = 0; var7 < var6; ++var7) { // L: 640
+						var8 = var2[var7]; // L: 641
+						if (var8 < this.faceLabelsAlpha.length) { // L: 642
+							var9 = this.faceLabelsAlpha[var8]; // L: 643
+
+							for (var10 = 0; var10 < var9.length; ++var10) { // L: 644
+								var11 = var9[var10]; // L: 645
+								var12 = (this.faceAlphas[var11] & 255) + var3 * 8; // L: 646
+								if (var12 < 0) { // L: 647
 									var12 = 0;
-								} else if (var12 > 255) { // L: 549
+								} else if (var12 > 255) { // L: 648
 									var12 = 255;
 								}
 
-								this.faceAlphas[var11] = (byte)var12; // L: 550
+								this.faceAlphas[var11] = (byte)var12; // L: 649
 							}
 						}
 					}
@@ -918,223 +1067,223 @@ void transform(int var1, int[] var2, int var3, int var4, int var5) {
 
 			}
 		}
-	} // L: 459 474 516 537 555 557
+	} // L: 558 573 615 636 654 656
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("x")
 	@Export("rotateY90Ccw")
 	public void rotateY90Ccw() {
-		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 560
-			int var2 = this.verticesX[var1]; // L: 561
-			this.verticesX[var1] = this.verticesZ[var1]; // L: 562
-			this.verticesZ[var1] = -var2; // L: 563
+		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 659
+			int var2 = this.verticesX[var1]; // L: 660
+			this.verticesX[var1] = this.verticesZ[var1]; // L: 661
+			this.verticesZ[var1] = -var2; // L: 662
 		}
 
-		this.resetBounds(); // L: 565
-	} // L: 566
+		this.resetBounds(); // L: 664
+	} // L: 665
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("z")
 	@Export("rotateY180")
 	public void rotateY180() {
-		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569
-			this.verticesX[var1] = -this.verticesX[var1]; // L: 570
-			this.verticesZ[var1] = -this.verticesZ[var1]; // L: 571
+		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 668
+			this.verticesX[var1] = -this.verticesX[var1]; // L: 669
+			this.verticesZ[var1] = -this.verticesZ[var1]; // L: 670
 		}
 
-		this.resetBounds(); // L: 573
-	} // L: 574
+		this.resetBounds(); // L: 672
+	} // L: 673
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("i")
 	@Export("rotateY270Ccw")
 	public void rotateY270Ccw() {
-		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577
-			int var2 = this.verticesZ[var1]; // L: 578
-			this.verticesZ[var1] = this.verticesX[var1]; // L: 579
-			this.verticesX[var1] = -var2; // L: 580
+		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 676
+			int var2 = this.verticesZ[var1]; // L: 677
+			this.verticesZ[var1] = this.verticesX[var1]; // L: 678
+			this.verticesX[var1] = -var2; // L: 679
 		}
 
-		this.resetBounds(); // L: 582
-	} // L: 583
+		this.resetBounds(); // L: 681
+	} // L: 682
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@Export("rotateZ")
 	public void rotateZ(int var1) {
-		int var2 = Model_sine[var1]; // L: 586
-		int var3 = Model_cosine[var1]; // L: 587
+		int var2 = field2465[var1]; // L: 685
+		int var3 = field2489[var1]; // L: 686
 
-		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 588
-			int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; // L: 589
-			this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; // L: 590
-			this.verticesY[var4] = var5; // L: 591
+		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 687
+			int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; // L: 688
+			this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; // L: 689
+			this.verticesY[var4] = var5; // L: 690
 		}
 
-		this.resetBounds(); // L: 593
-	} // L: 594
+		this.resetBounds(); // L: 692
+	} // L: 693
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("ah")
 	@Export("offsetBy")
 	public void offsetBy(int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597
-			int[] var10000 = this.verticesX; // L: 598
+		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 696
+			int[] var10000 = this.verticesX; // L: 697
 			var10000[var4] += var1;
-			var10000 = this.verticesY; // L: 599
+			var10000 = this.verticesY; // L: 698
 			var10000[var4] += var2;
-			var10000 = this.verticesZ; // L: 600
+			var10000 = this.verticesZ; // L: 699
 			var10000[var4] += var3;
 		}
 
-		this.resetBounds(); // L: 602
-	} // L: 603
+		this.resetBounds(); // L: 701
+	} // L: 702
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("ao")
 	@Export("scale")
 	public void scale(int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606
-			this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 607
-			this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 608
-			this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 609
+		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 705
+			this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 706
+			this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 707
+			this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 708
 		}
 
-		this.resetBounds(); // L: 611
-	} // L: 612
+		this.resetBounds(); // L: 710
+	} // L: 711
 
-	@ObfuscatedName("f")
-	public final void method4539(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		field2556[0] = -1; // L: 615
-		if (this.boundsType != 2 && this.boundsType != 1) { // L: 616
-			this.method4534();
+	@ObfuscatedName("ab")
+	public final void method4241(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+		field2422[0] = -1; // L: 714
+		if (this.boundsType != 2 && this.boundsType != 1) { // L: 715
+			this.method4194();
 		}
 
-		int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 617
-		int var9 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 618
-		int var10 = Model_sine[var1]; // L: 619
-		int var11 = Model_cosine[var1]; // L: 620
-		int var12 = Model_sine[var2]; // L: 621
-		int var13 = Model_cosine[var2]; // L: 622
-		int var14 = Model_sine[var3]; // L: 623
-		int var15 = Model_cosine[var3]; // L: 624
-		int var16 = Model_sine[var4]; // L: 625
-		int var17 = Model_cosine[var4]; // L: 626
-		int var18 = var16 * var6 + var17 * var7 >> 16; // L: 627
-
-		for (int var19 = 0; var19 < this.verticesCount; ++var19) { // L: 628
-			int var20 = this.verticesX[var19]; // L: 629
-			int var21 = this.verticesY[var19]; // L: 630
-			int var22 = this.verticesZ[var19]; // L: 631
+		int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 716
+		int var9 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 717
+		int var10 = field2465[var1]; // L: 718
+		int var11 = field2489[var1]; // L: 719
+		int var12 = field2465[var2]; // L: 720
+		int var13 = field2489[var2]; // L: 721
+		int var14 = field2465[var3]; // L: 722
+		int var15 = field2489[var3]; // L: 723
+		int var16 = field2465[var4]; // L: 724
+		int var17 = field2489[var4]; // L: 725
+		int var18 = var16 * var6 + var17 * var7 >> 16; // L: 726
+
+		for (int var19 = 0; var19 < this.verticesCount; ++var19) { // L: 727
+			int var20 = this.verticesX[var19]; // L: 728
+			int var21 = this.verticesY[var19]; // L: 729
+			int var22 = this.verticesZ[var19]; // L: 730
 			int var23;
-			if (var3 != 0) { // L: 632
-				var23 = var21 * var14 + var20 * var15 >> 16; // L: 633
-				var21 = var21 * var15 - var20 * var14 >> 16; // L: 634
-				var20 = var23; // L: 635
+			if (var3 != 0) { // L: 731
+				var23 = var21 * var14 + var20 * var15 >> 16; // L: 732
+				var21 = var21 * var15 - var20 * var14 >> 16; // L: 733
+				var20 = var23; // L: 734
 			}
 
-			if (var1 != 0) { // L: 637
-				var23 = var21 * var11 - var22 * var10 >> 16; // L: 638
-				var22 = var21 * var10 + var22 * var11 >> 16; // L: 639
-				var21 = var23; // L: 640
+			if (var1 != 0) { // L: 736
+				var23 = var21 * var11 - var22 * var10 >> 16; // L: 737
+				var22 = var21 * var10 + var22 * var11 >> 16; // L: 738
+				var21 = var23; // L: 739
 			}
 
-			if (var2 != 0) { // L: 642
-				var23 = var22 * var12 + var20 * var13 >> 16; // L: 643
-				var22 = var22 * var13 - var20 * var12 >> 16; // L: 644
-				var20 = var23; // L: 645
+			if (var2 != 0) { // L: 741
+				var23 = var22 * var12 + var20 * var13 >> 16; // L: 742
+				var22 = var22 * var13 - var20 * var12 >> 16; // L: 743
+				var20 = var23; // L: 744
 			}
 
-			var20 += var5; // L: 647
-			var21 += var6; // L: 648
-			var22 += var7; // L: 649
-			var23 = var21 * var17 - var22 * var16 >> 16; // L: 650
-			var22 = var21 * var16 + var22 * var17 >> 16; // L: 651
-			field2551[var19] = var22 - var18; // L: 653
-			modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 654
-			modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 655
-			if (this.field2522 > 0) { // L: 656
-				field2574[var19] = var20; // L: 657
-				field2547[var19] = var23; // L: 658
-				field2575[var19] = var22; // L: 659
+			var20 += var5; // L: 746
+			var21 += var6; // L: 747
+			var22 += var7; // L: 748
+			var23 = var21 * var17 - var22 * var16 >> 16; // L: 749
+			var22 = var21 * var16 + var22 * var17 >> 16; // L: 750
+			field2497[var19] = var22 - var18; // L: 752
+			modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 753
+			modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 754
+			if (this.field2442 > 0) { // L: 755
+				field2468[var19] = var20; // L: 756
+				field2469[var19] = var23; // L: 757
+				field2470[var19] = var22; // L: 758
 			}
 		}
 
 		try {
-			this.draw0(false, false, false, 0L); // L: 663
-		} catch (Exception var25) { // L: 665
+			this.draw0(false, false, false, 0L); // L: 762
+		} catch (Exception var25) { // L: 764
 		}
 
-	} // L: 666
+	} // L: 765
 
-	@ObfuscatedName("h")
-	public final void method4525(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		field2556[0] = -1; // L: 669
-		if (this.boundsType != 2 && this.boundsType != 1) { // L: 670
-			this.method4534();
+	@ObfuscatedName("an")
+	public final void method4211(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+		field2422[0] = -1; // L: 768
+		if (this.boundsType != 2 && this.boundsType != 1) { // L: 769
+			this.method4194();
 		}
 
-		int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 671
-		int var10 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 672
-		int var11 = Model_sine[var1]; // L: 673
-		int var12 = Model_cosine[var1]; // L: 674
-		int var13 = Model_sine[var2]; // L: 675
-		int var14 = Model_cosine[var2]; // L: 676
-		int var15 = Model_sine[var3]; // L: 677
-		int var16 = Model_cosine[var3]; // L: 678
-		int var17 = Model_sine[var4]; // L: 679
-		int var18 = Model_cosine[var4]; // L: 680
-		int var19 = var17 * var6 + var18 * var7 >> 16; // L: 681
-
-		for (int var20 = 0; var20 < this.verticesCount; ++var20) { // L: 682
-			int var21 = this.verticesX[var20]; // L: 683
-			int var22 = this.verticesY[var20]; // L: 684
-			int var23 = this.verticesZ[var20]; // L: 685
+		int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 770
+		int var10 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 771
+		int var11 = field2465[var1]; // L: 772
+		int var12 = field2489[var1]; // L: 773
+		int var13 = field2465[var2]; // L: 774
+		int var14 = field2489[var2]; // L: 775
+		int var15 = field2465[var3]; // L: 776
+		int var16 = field2489[var3]; // L: 777
+		int var17 = field2465[var4]; // L: 778
+		int var18 = field2489[var4]; // L: 779
+		int var19 = var17 * var6 + var18 * var7 >> 16; // L: 780
+
+		for (int var20 = 0; var20 < this.verticesCount; ++var20) { // L: 781
+			int var21 = this.verticesX[var20]; // L: 782
+			int var22 = this.verticesY[var20]; // L: 783
+			int var23 = this.verticesZ[var20]; // L: 784
 			int var24;
-			if (var3 != 0) { // L: 686
-				var24 = var22 * var15 + var21 * var16 >> 16; // L: 687
-				var22 = var22 * var16 - var21 * var15 >> 16; // L: 688
-				var21 = var24; // L: 689
+			if (var3 != 0) { // L: 785
+				var24 = var22 * var15 + var21 * var16 >> 16; // L: 786
+				var22 = var22 * var16 - var21 * var15 >> 16; // L: 787
+				var21 = var24; // L: 788
 			}
 
-			if (var1 != 0) { // L: 691
-				var24 = var22 * var12 - var23 * var11 >> 16; // L: 692
-				var23 = var22 * var11 + var23 * var12 >> 16; // L: 693
-				var22 = var24; // L: 694
+			if (var1 != 0) { // L: 790
+				var24 = var22 * var12 - var23 * var11 >> 16; // L: 791
+				var23 = var22 * var11 + var23 * var12 >> 16; // L: 792
+				var22 = var24; // L: 793
 			}
 
-			if (var2 != 0) { // L: 696
-				var24 = var23 * var13 + var21 * var14 >> 16; // L: 697
-				var23 = var23 * var14 - var21 * var13 >> 16; // L: 698
-				var21 = var24; // L: 699
+			if (var2 != 0) { // L: 795
+				var24 = var23 * var13 + var21 * var14 >> 16; // L: 796
+				var23 = var23 * var14 - var21 * var13 >> 16; // L: 797
+				var21 = var24; // L: 798
 			}
 
-			var21 += var5; // L: 701
-			var22 += var6; // L: 702
-			var23 += var7; // L: 703
-			var24 = var22 * var18 - var23 * var17 >> 16; // L: 704
-			var23 = var22 * var17 + var23 * var18 >> 16; // L: 705
-			field2551[var20] = var23 - var19; // L: 707
-			modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 708
-			modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 709
-			if (this.field2522 > 0) { // L: 710
-				field2574[var20] = var21; // L: 711
-				field2547[var20] = var24; // L: 712
-				field2575[var20] = var23; // L: 713
+			var21 += var5; // L: 800
+			var22 += var6; // L: 801
+			var23 += var7; // L: 802
+			var24 = var22 * var18 - var23 * var17 >> 16; // L: 803
+			var23 = var22 * var17 + var23 * var18 >> 16; // L: 804
+			field2497[var20] = var23 - var19; // L: 806
+			modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 807
+			modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 808
+			if (this.field2442 > 0) { // L: 809
+				field2468[var20] = var21; // L: 810
+				field2469[var20] = var24; // L: 811
+				field2470[var20] = var23; // L: 812
 			}
 		}
 
 		try {
-			this.draw0(false, false, false, 0L); // L: 717
-		} catch (Exception var26) { // L: 719
+			this.draw0(false, false, false, 0L); // L: 816
+		} catch (Exception var26) { // L: 818
 		}
 
-	} // L: 720
+	} // L: 819
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("ax")
 	@Export("draw0")
 	final void draw0(boolean var1, boolean var2, boolean var3, long var4) {
-		if (this.diameter < 1600) { // L: 922
+		if (this.diameter < 1600) { // L: 1022
 			int var6;
-			for (var6 = 0; var6 < this.diameter; ++var6) { // L: 923
-				field2556[var6] = 0;
+			for (var6 = 0; var6 < this.diameter; ++var6) { // L: 1023
+				field2422[var6] = 0;
 			}
 
-			var6 = var3 ? 20 : 5; // L: 924
+			var6 = var3 ? 20 : 5; // L: 1024
 
 			int var7;
 			int var8;
@@ -1146,652 +1295,723 @@ final void draw0(boolean var1, boolean var2, boolean var3, long var4) {
 			int var16;
 			int var18;
 			int var28;
-			for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 925
-				if (this.faceColors3[var7] != -2) { // L: 926
-					var8 = this.indices1[var7]; // L: 927
-					var9 = this.indices2[var7]; // L: 928
-					var10 = this.indices3[var7]; // L: 929
-					var11 = modelViewportXs[var8]; // L: 930
-					var12 = modelViewportXs[var9]; // L: 931
-					var28 = modelViewportXs[var10]; // L: 932
+			for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 1025
+				if (this.faceColors3[var7] != -2) { // L: 1026
+					var8 = this.indices1[var7]; // L: 1027
+					var9 = this.indices2[var7]; // L: 1028
+					var10 = this.indices3[var7]; // L: 1029
+					var11 = modelViewportXs[var8]; // L: 1030
+					var12 = modelViewportXs[var9]; // L: 1031
+					var28 = modelViewportXs[var10]; // L: 1032
 					int var29;
 					int var30;
-					if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 933
-						if (var2) { // L: 959
-							var15 = modelViewportYs[var8]; // L: 961
-							var16 = modelViewportYs[var9]; // L: 962
-							var30 = modelViewportYs[var10]; // L: 963
-							var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 965
+					if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 1033
+						if (var2) { // L: 1059
+							var15 = modelViewportYs[var8]; // L: 1061
+							var16 = modelViewportYs[var9]; // L: 1062
+							var29 = modelViewportYs[var10]; // L: 1063
+							var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 1065
 							boolean var34;
-							if (var18 < var15 && var18 < var16 && var18 < var30) { // L: 966
-								var34 = false; // L: 967
+							if (var18 < var15 && var18 < var16 && var18 < var29) { // L: 1066
+								var34 = false; // L: 1067
 							} else {
-								var18 = ViewportMouse.ViewportMouse_y - var6; // L: 970
-								if (var18 > var15 && var18 > var16 && var18 > var30) { // L: 971
-									var34 = false; // L: 972
+								var18 = ViewportMouse.ViewportMouse_y - var6; // L: 1070
+								if (var18 > var15 && var18 > var16 && var18 > var29) { // L: 1071
+									var34 = false; // L: 1072
 								} else {
-									var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 975
-									if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 976
-										var34 = false; // L: 977
+									var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 1075
+									if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 1076
+										var34 = false; // L: 1077
 									} else {
-										var18 = ViewportMouse.ViewportMouse_x - var6; // L: 980
-										if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 981
-											var34 = false; // L: 982
+										var18 = ViewportMouse.ViewportMouse_x - var6; // L: 1080
+										if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 1081
+											var34 = false; // L: 1082
 										} else {
-											var34 = true; // L: 985
+											var34 = true; // L: 1085
 										}
 									}
 								}
 							}
 
-							if (var34) { // L: 987
-								ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 990
-								var2 = false; // L: 992
+							if (var34) { // L: 1087
+								ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 1090
+								var2 = false; // L: 1092
 							}
 						}
 
-						if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 995
-							field2548[var7] = false; // L: 996
-							if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 997
-								field2554[var7] = false; // L: 998
+						if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 1095
+							field2476[var7] = false; // L: 1096
+							if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1097
+								field2463[var7] = false; // L: 1098
 							} else {
-								field2554[var7] = true;
+								field2463[var7] = true;
 							}
 
-							var29 = (field2551[var8] + field2551[var9] + field2551[var10]) / 3 + this.radius; // L: 999
-							field2557[var29][field2556[var29]++] = var7; // L: 1000
+							var30 = (field2497[var8] + field2497[var9] + field2497[var10]) / 3 + this.radius; // L: 1099
+							field2477[var30][field2422[var30]++] = var7; // L: 1100
 						}
 					} else {
-						var29 = field2574[var8]; // L: 934
-						var15 = field2574[var9]; // L: 935
-						var16 = field2574[var10]; // L: 936
-						var30 = field2547[var8]; // L: 937
-						var18 = field2547[var9]; // L: 938
-						int var19 = field2547[var10]; // L: 939
-						int var20 = field2575[var8]; // L: 940
-						int var21 = field2575[var9]; // L: 941
-						int var22 = field2575[var10]; // L: 942
-						var29 -= var15; // L: 943
-						var16 -= var15; // L: 944
-						var30 -= var18; // L: 945
-						var19 -= var18; // L: 946
-						var20 -= var21; // L: 947
-						var22 -= var21; // L: 948
-						int var23 = var30 * var22 - var20 * var19; // L: 949
-						int var24 = var20 * var16 - var29 * var22; // L: 950
-						int var25 = var29 * var19 - var30 * var16; // L: 951
-						if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 952
-							field2548[var7] = true; // L: 953
-							int var26 = (field2551[var8] + field2551[var9] + field2551[var10]) / 3 + this.radius; // L: 954
-							field2557[var26][field2556[var26]++] = var7; // L: 955
+						var30 = field2468[var8]; // L: 1034
+						var15 = field2468[var9]; // L: 1035
+						var16 = field2468[var10]; // L: 1036
+						var29 = field2469[var8]; // L: 1037
+						var18 = field2469[var9]; // L: 1038
+						int var19 = field2469[var10]; // L: 1039
+						int var20 = field2470[var8]; // L: 1040
+						int var21 = field2470[var9]; // L: 1041
+						int var22 = field2470[var10]; // L: 1042
+						var30 -= var15; // L: 1043
+						var16 -= var15; // L: 1044
+						var29 -= var18; // L: 1045
+						var19 -= var18; // L: 1046
+						var20 -= var21; // L: 1047
+						var22 -= var21; // L: 1048
+						int var23 = var29 * var22 - var20 * var19; // L: 1049
+						int var24 = var20 * var16 - var30 * var22; // L: 1050
+						int var25 = var30 * var19 - var29 * var16; // L: 1051
+						if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 1052
+							field2476[var7] = true; // L: 1053
+							int var26 = (field2497[var8] + field2497[var9] + field2497[var10]) / 3 + this.radius; // L: 1054
+							field2477[var26][field2422[var26]++] = var7; // L: 1055
 						}
 					}
 				}
 			}
 
 			int[] var27;
-			if (this.faceRenderPriorities == null) { // L: 1004
-				for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1005
-					var8 = field2556[var7]; // L: 1006
-					if (var8 > 0) { // L: 1007
-						var27 = field2557[var7]; // L: 1008
+			if (this.faceRenderPriorities == null) { // L: 1104
+				for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1105
+					var8 = field2422[var7]; // L: 1106
+					if (var8 > 0) { // L: 1107
+						var27 = field2477[var7]; // L: 1108
 
-						for (var10 = 0; var10 < var8; ++var10) { // L: 1009
+						for (var10 = 0; var10 < var8; ++var10) { // L: 1109
 							this.drawFace(var27[var10]);
 						}
 					}
 				}
 
 			} else {
-				for (var7 = 0; var7 < 12; ++var7) { // L: 1014
-					field2558[var7] = 0; // L: 1015
-					field2528[var7] = 0; // L: 1016
+				for (var7 = 0; var7 < 12; ++var7) { // L: 1114
+					field2496[var7] = 0; // L: 1115
+					field2478[var7] = 0; // L: 1116
 				}
 
-				for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1018
-					var8 = field2556[var7]; // L: 1019
-					if (var8 > 0) { // L: 1020
-						var27 = field2557[var7]; // L: 1021
-
-						for (var10 = 0; var10 < var8; ++var10) { // L: 1022
-							var11 = var27[var10]; // L: 1023
-							byte var33 = this.faceRenderPriorities[var11]; // L: 1024
-							var28 = field2558[var33]++; // L: 1025
-							field2559[var33][var28] = var11; // L: 1026
-							if (var33 < 10) { // L: 1027
-								int[] var10000 = field2528;
+				for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 1118
+					var8 = field2422[var7]; // L: 1119
+					if (var8 > 0) { // L: 1120
+						var27 = field2477[var7]; // L: 1121
+
+						for (var10 = 0; var10 < var8; ++var10) { // L: 1122
+							var11 = var27[var10]; // L: 1123
+							byte var33 = this.faceRenderPriorities[var11]; // L: 1124
+							var28 = field2496[var33]++; // L: 1125
+							field2475[var33][var28] = var11; // L: 1126
+							if (var33 < 10) { // L: 1127
+								int[] var10000 = field2478;
 								var10000[var33] += var7;
-							} else if (var33 == 10) { // L: 1028
-								field2560[var28] = var7;
+							} else if (var33 == 10) { // L: 1128
+								field2432[var28] = var7;
 							} else {
-								field2561[var28] = var7; // L: 1029
+								field2434[var28] = var7; // L: 1129
 							}
 						}
 					}
 				}
 
-				var7 = 0; // L: 1033
-				if (field2558[1] > 0 || field2558[2] > 0) { // L: 1034
-					var7 = (field2528[1] + field2528[2]) / (field2558[1] + field2558[2]);
+				var7 = 0; // L: 1133
+				if (field2496[1] > 0 || field2496[2] > 0) { // L: 1134
+					var7 = (field2478[1] + field2478[2]) / (field2496[1] + field2496[2]);
 				}
 
-				var8 = 0; // L: 1035
-				if (field2558[3] > 0 || field2558[4] > 0) { // L: 1036
-					var8 = (field2528[3] + field2528[4]) / (field2558[3] + field2558[4]);
+				var8 = 0; // L: 1135
+				if (field2496[3] > 0 || field2496[4] > 0) { // L: 1136
+					var8 = (field2478[3] + field2478[4]) / (field2496[3] + field2496[4]);
 				}
 
-				var9 = 0; // L: 1037
-				if (field2558[6] > 0 || field2558[8] > 0) { // L: 1038
-					var9 = (field2528[8] + field2528[6]) / (field2558[8] + field2558[6]);
+				var9 = 0; // L: 1137
+				if (field2496[6] > 0 || field2496[8] > 0) { // L: 1138
+					var9 = (field2478[8] + field2478[6]) / (field2496[8] + field2496[6]);
 				}
 
-				var11 = 0; // L: 1040
-				var12 = field2558[10]; // L: 1041
-				int[] var13 = field2559[10]; // L: 1042
-				int[] var14 = field2560; // L: 1043
-				if (var11 == var12) { // L: 1044
-					var11 = 0; // L: 1045
-					var12 = field2558[11]; // L: 1046
-					var13 = field2559[11]; // L: 1047
-					var14 = field2561; // L: 1048
+				var11 = 0; // L: 1140
+				var12 = field2496[10]; // L: 1141
+				int[] var13 = field2475[10]; // L: 1142
+				int[] var14 = field2432; // L: 1143
+				if (var11 == var12) { // L: 1144
+					var11 = 0; // L: 1145
+					var12 = field2496[11]; // L: 1146
+					var13 = field2475[11]; // L: 1147
+					var14 = field2434; // L: 1148
 				}
 
-				if (var11 < var12) { // L: 1050
+				if (var11 < var12) { // L: 1150
 					var10 = var14[var11];
 				} else {
-					var10 = -1000; // L: 1051
+					var10 = -1000; // L: 1151
 				}
 
-				for (var15 = 0; var15 < 10; ++var15) { // L: 1052
-					while (var15 == 0 && var10 > var7) { // L: 1053
-						this.drawFace(var13[var11++]); // L: 1054
-						if (var11 == var12 && var13 != field2559[11]) { // L: 1055
-							var11 = 0; // L: 1056
-							var12 = field2558[11]; // L: 1057
-							var13 = field2559[11]; // L: 1058
-							var14 = field2561; // L: 1059
+				for (var15 = 0; var15 < 10; ++var15) { // L: 1152
+					while (var15 == 0 && var10 > var7) { // L: 1153
+						this.drawFace(var13[var11++]); // L: 1154
+						if (var11 == var12 && var13 != field2475[11]) { // L: 1155
+							var11 = 0; // L: 1156
+							var12 = field2496[11]; // L: 1157
+							var13 = field2475[11]; // L: 1158
+							var14 = field2434; // L: 1159
 						}
 
-						if (var11 < var12) { // L: 1061
+						if (var11 < var12) { // L: 1161
 							var10 = var14[var11];
 						} else {
-							var10 = -1000; // L: 1062
+							var10 = -1000; // L: 1162
 						}
 					}
 
-					while (var15 == 3 && var10 > var8) { // L: 1064
-						this.drawFace(var13[var11++]); // L: 1065
-						if (var11 == var12 && var13 != field2559[11]) { // L: 1066
-							var11 = 0; // L: 1067
-							var12 = field2558[11]; // L: 1068
-							var13 = field2559[11]; // L: 1069
-							var14 = field2561; // L: 1070
+					while (var15 == 3 && var10 > var8) { // L: 1164
+						this.drawFace(var13[var11++]); // L: 1165
+						if (var11 == var12 && var13 != field2475[11]) { // L: 1166
+							var11 = 0; // L: 1167
+							var12 = field2496[11]; // L: 1168
+							var13 = field2475[11]; // L: 1169
+							var14 = field2434; // L: 1170
 						}
 
-						if (var11 < var12) { // L: 1072
+						if (var11 < var12) { // L: 1172
 							var10 = var14[var11];
 						} else {
-							var10 = -1000; // L: 1073
+							var10 = -1000; // L: 1173
 						}
 					}
 
-					while (var15 == 5 && var10 > var9) { // L: 1075
-						this.drawFace(var13[var11++]); // L: 1076
-						if (var11 == var12 && var13 != field2559[11]) { // L: 1077
-							var11 = 0; // L: 1078
-							var12 = field2558[11]; // L: 1079
-							var13 = field2559[11]; // L: 1080
-							var14 = field2561; // L: 1081
+					while (var15 == 5 && var10 > var9) { // L: 1175
+						this.drawFace(var13[var11++]); // L: 1176
+						if (var11 == var12 && var13 != field2475[11]) { // L: 1177
+							var11 = 0; // L: 1178
+							var12 = field2496[11]; // L: 1179
+							var13 = field2475[11]; // L: 1180
+							var14 = field2434; // L: 1181
 						}
 
-						if (var11 < var12) { // L: 1083
+						if (var11 < var12) { // L: 1183
 							var10 = var14[var11];
 						} else {
-							var10 = -1000; // L: 1084
+							var10 = -1000; // L: 1184
 						}
 					}
 
-					var16 = field2558[var15]; // L: 1086
-					int[] var17 = field2559[var15]; // L: 1087
+					var16 = field2496[var15]; // L: 1186
+					int[] var17 = field2475[var15]; // L: 1187
 
-					for (var18 = 0; var18 < var16; ++var18) { // L: 1088
-						this.drawFace(var17[var18]); // L: 1089
+					for (var18 = 0; var18 < var16; ++var18) { // L: 1188
+						this.drawFace(var17[var18]); // L: 1189
 					}
 				}
 
-				while (var10 != -1000) { // L: 1092
-					this.drawFace(var13[var11++]); // L: 1093
-					if (var11 == var12 && var13 != field2559[11]) { // L: 1094
-						var11 = 0; // L: 1095
-						var13 = field2559[11]; // L: 1096
-						var12 = field2558[11]; // L: 1097
-						var14 = field2561; // L: 1098
+				while (var10 != -1000) { // L: 1192
+					this.drawFace(var13[var11++]); // L: 1193
+					if (var11 == var12 && var13 != field2475[11]) { // L: 1194
+						var11 = 0; // L: 1195
+						var13 = field2475[11]; // L: 1196
+						var12 = field2496[11]; // L: 1197
+						var14 = field2434; // L: 1198
 					}
 
-					if (var11 < var12) { // L: 1100
+					if (var11 < var12) { // L: 1200
 						var10 = var14[var11];
 					} else {
-						var10 = -1000; // L: 1101
+						var10 = -1000; // L: 1201
 					}
 				}
 
 			}
 		}
-	} // L: 1012 1103
+	} // L: 1112 1203
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("am")
 	@Export("drawFace")
 	final void drawFace(int var1) {
-		if (field2548[var1]) { // L: 1106
-			this.method4544(var1); // L: 1107
+		if (field2476[var1]) { // L: 1206
+			this.method4272(var1); // L: 1207
 		} else {
-			int var2 = this.indices1[var1]; // L: 1110
-			int var3 = this.indices2[var1]; // L: 1111
-			int var4 = this.indices3[var1]; // L: 1112
-			Rasterizer3D.field2365 = field2554[var1]; // L: 1113
-			if (this.faceAlphas == null) { // L: 1114
+			int var2 = this.indices1[var1]; // L: 1210
+			int var3 = this.indices2[var1]; // L: 1211
+			int var4 = this.indices3[var1]; // L: 1212
+			Rasterizer3D.field2253 = field2463[var1]; // L: 1213
+			if (this.faceAlphas == null) { // L: 1214
 				Rasterizer3D.Rasterizer3D_alpha = 0;
 			} else {
-				Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1115
+				Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1215
 			}
 
-			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1116
-				int var5;
-				int var6;
-				int var7;
-				if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1124
-					int var8 = this.field2566[var1] & 255; // L: 1125
-					var5 = this.field2529[var8]; // L: 1126
-					var6 = this.field2530[var8]; // L: 1127
-					var7 = this.field2538[var8]; // L: 1128
+			int var5;
+			int var6;
+			int var7;
+			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1216
+				if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1230
+					int var8 = this.field2439[var1] & 255; // L: 1231
+					var5 = this.field2443[var8]; // L: 1232
+					var6 = this.field2471[var8]; // L: 1233
+					var7 = this.field2445[var8]; // L: 1234
 				} else {
-					var5 = var2; // L: 1131
-					var6 = var3; // L: 1132
-					var7 = var4; // L: 1133
+					var5 = var2; // L: 1237
+					var6 = var3; // L: 1238
+					var7 = var4; // L: 1239
 				}
 
-				if (this.faceColors3[var1] == -1) {
-					Rasterizer3D.method4215(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2574[var5], field2574[var6], field2574[var7], field2547[var5], field2547[var6], field2547[var7], field2575[var5], field2575[var6], field2575[var7], this.faceTextures[var1]); // L: 1135
+				if (this.faceColors3[var1] == -1) { // L: 1241
+					Rasterizer3D.method3876(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var5], field2468[var6], field2468[var7], field2469[var5], field2469[var6], field2469[var7], field2470[var5], field2470[var6], field2470[var7], this.faceTextures[var1]);
 				} else {
-					Rasterizer3D.method4215(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2574[var5], field2574[var6], field2574[var7], field2547[var5], field2547[var6], field2547[var7], field2575[var5], field2575[var6], field2575[var7], this.faceTextures[var1]); // L: 1136
+					Rasterizer3D.method3876(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2468[var5], field2468[var6], field2468[var7], field2469[var5], field2469[var6], field2469[var7], field2470[var5], field2470[var6], field2470[var7], this.faceTextures[var1]); // L: 1242
 				}
-			} else if (this.faceColors3[var1] == -1) { // L: 1117
-				Rasterizer3D.method4213(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2540[this.faceColors1[var1]]);
+			} else if (this.faceColors3[var1] == -1) { // L: 1217
+				Rasterizer3D.method3856(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2490[this.faceColors1[var1]]);
+			} else if (this.field2474 > 0) { // L: 1218
+				var5 = this.method4216(this.faceColors1[var1], this.field2494, this.field2495, this.field2479, this.field2474); // L: 1219
+				var6 = this.method4216(this.faceColors2[var1], this.field2494, this.field2495, this.field2479, this.field2474); // L: 1220
+				var7 = this.method4216(this.faceColors3[var1], this.field2494, this.field2495, this.field2479, this.field2474); // L: 1221
+				Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], var5, var6, var7); // L: 1222
 			} else {
-				Rasterizer3D.method4211(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1118
+				Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1224
 			}
 
 		}
-	} // L: 1108 1138
+	} // L: 1208 1244
 
-	@ObfuscatedName("ae")
-	final void method4544(int var1) {
-		int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1141
-		int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1142
-		int var4 = 0; // L: 1143
-		int var5 = this.indices1[var1]; // L: 1144
-		int var6 = this.indices2[var1]; // L: 1145
-		int var7 = this.indices3[var1]; // L: 1146
-		int var8 = field2575[var5]; // L: 1147
-		int var9 = field2575[var6]; // L: 1148
-		int var10 = field2575[var7]; // L: 1149
-		if (this.faceAlphas == null) { // L: 1150
+	@ObfuscatedName("az")
+	final void method4272(int var1) {
+		int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1247
+		int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1248
+		int var4 = 0; // L: 1249
+		int var5 = this.indices1[var1]; // L: 1250
+		int var6 = this.indices2[var1]; // L: 1251
+		int var7 = this.indices3[var1]; // L: 1252
+		int var8 = field2470[var5]; // L: 1253
+		int var9 = field2470[var6]; // L: 1254
+		int var10 = field2470[var7]; // L: 1255
+		if (this.faceAlphas == null) { // L: 1256
 			Rasterizer3D.Rasterizer3D_alpha = 0;
 		} else {
-			Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1151
+			Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1257
 		}
 
 		int var11;
 		int var12;
 		int var13;
 		int var14;
-		if (var8 >= 50) { // L: 1152
-			field2563[var4] = modelViewportXs[var5]; // L: 1153
-			field2564[var4] = modelViewportYs[var5]; // L: 1154
-			field2521[var4++] = this.faceColors1[var1]; // L: 1155
+		if (var8 >= 50) { // L: 1258
+			field2467[var4] = modelViewportXs[var5]; // L: 1259
+			field2480[var4] = modelViewportYs[var5]; // L: 1260
+			field2453[var4++] = this.faceColors1[var1]; // L: 1261
 		} else {
-			var11 = field2574[var5]; // L: 1158
-			var12 = field2547[var5]; // L: 1159
-			var13 = this.faceColors1[var1]; // L: 1160
-			if (var10 >= 50) { // L: 1161
-				var14 = field2508[var10 - var8] * (50 - var8); // L: 1162
-				field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var7] - var11) * var14 >> 16)) / 50; // L: 1163
-				field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var7] - var12) * var14 >> 16)) / 50; // L: 1164
-				field2521[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1165
+			var11 = field2468[var5]; // L: 1264
+			var12 = field2469[var5]; // L: 1265
+			var13 = this.faceColors1[var1]; // L: 1266
+			if (var10 >= 50) { // L: 1267
+				var14 = field2491[var10 - var8] * (50 - var8); // L: 1268
+				field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var7] - var11) * var14 >> 16)) / 50; // L: 1269
+				field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var7] - var12) * var14 >> 16)) / 50; // L: 1270
+				field2453[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1271
 			}
 
-			if (var9 >= 50) { // L: 1167
-				var14 = field2508[var9 - var8] * (50 - var8); // L: 1168
-				field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var6] - var11) * var14 >> 16)) / 50; // L: 1169
-				field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var6] - var12) * var14 >> 16)) / 50; // L: 1170
-				field2521[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1171
+			if (var9 >= 50) { // L: 1273
+				var14 = field2491[var9 - var8] * (50 - var8); // L: 1274
+				field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var6] - var11) * var14 >> 16)) / 50; // L: 1275
+				field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var6] - var12) * var14 >> 16)) / 50; // L: 1276
+				field2453[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1277
 			}
 		}
 
-		if (var9 >= 50) { // L: 1174
-			field2563[var4] = modelViewportXs[var6]; // L: 1175
-			field2564[var4] = modelViewportYs[var6]; // L: 1176
-			field2521[var4++] = this.faceColors2[var1]; // L: 1177
+		if (var9 >= 50) { // L: 1280
+			field2467[var4] = modelViewportXs[var6]; // L: 1281
+			field2480[var4] = modelViewportYs[var6]; // L: 1282
+			field2453[var4++] = this.faceColors2[var1]; // L: 1283
 		} else {
-			var11 = field2574[var6]; // L: 1180
-			var12 = field2547[var6]; // L: 1181
-			var13 = this.faceColors2[var1]; // L: 1182
-			if (var8 >= 50) { // L: 1183
-				var14 = field2508[var8 - var9] * (50 - var9); // L: 1184
-				field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var5] - var11) * var14 >> 16)) / 50; // L: 1185
-				field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var5] - var12) * var14 >> 16)) / 50; // L: 1186
-				field2521[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1187
+			var11 = field2468[var6]; // L: 1286
+			var12 = field2469[var6]; // L: 1287
+			var13 = this.faceColors2[var1]; // L: 1288
+			if (var8 >= 50) { // L: 1289
+				var14 = field2491[var8 - var9] * (50 - var9); // L: 1290
+				field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var5] - var11) * var14 >> 16)) / 50; // L: 1291
+				field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var5] - var12) * var14 >> 16)) / 50; // L: 1292
+				field2453[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1293
 			}
 
-			if (var10 >= 50) { // L: 1189
-				var14 = field2508[var10 - var9] * (50 - var9); // L: 1190
-				field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var7] - var11) * var14 >> 16)) / 50; // L: 1191
-				field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var7] - var12) * var14 >> 16)) / 50; // L: 1192
-				field2521[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1193
+			if (var10 >= 50) { // L: 1295
+				var14 = field2491[var10 - var9] * (50 - var9); // L: 1296
+				field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var7] - var11) * var14 >> 16)) / 50; // L: 1297
+				field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var7] - var12) * var14 >> 16)) / 50; // L: 1298
+				field2453[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1299
 			}
 		}
 
-		if (var10 >= 50) { // L: 1196
-			field2563[var4] = modelViewportXs[var7]; // L: 1197
-			field2564[var4] = modelViewportYs[var7]; // L: 1198
-			field2521[var4++] = this.faceColors3[var1]; // L: 1199
+		if (var10 >= 50) { // L: 1302
+			field2467[var4] = modelViewportXs[var7]; // L: 1303
+			field2480[var4] = modelViewportYs[var7]; // L: 1304
+			field2453[var4++] = this.faceColors3[var1]; // L: 1305
 		} else {
-			var11 = field2574[var7]; // L: 1202
-			var12 = field2547[var7]; // L: 1203
-			var13 = this.faceColors3[var1]; // L: 1204
-			if (var9 >= 50) { // L: 1205
-				var14 = field2508[var9 - var10] * (50 - var10); // L: 1206
-				field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var6] - var11) * var14 >> 16)) / 50; // L: 1207
-				field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var6] - var12) * var14 >> 16)) / 50; // L: 1208
-				field2521[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1209
+			var11 = field2468[var7]; // L: 1308
+			var12 = field2469[var7]; // L: 1309
+			var13 = this.faceColors3[var1]; // L: 1310
+			if (var9 >= 50) { // L: 1311
+				var14 = field2491[var9 - var10] * (50 - var10); // L: 1312
+				field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var6] - var11) * var14 >> 16)) / 50; // L: 1313
+				field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var6] - var12) * var14 >> 16)) / 50; // L: 1314
+				field2453[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1315
 			}
 
-			if (var8 >= 50) { // L: 1211
-				var14 = field2508[var8 - var10] * (50 - var10); // L: 1212
-				field2563[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2574[var5] - var11) * var14 >> 16)) / 50; // L: 1213
-				field2564[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2547[var5] - var12) * var14 >> 16)) / 50; // L: 1214
-				field2521[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1215
+			if (var8 >= 50) { // L: 1317
+				var14 = field2491[var8 - var10] * (50 - var10); // L: 1318
+				field2467[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2468[var5] - var11) * var14 >> 16)) / 50; // L: 1319
+				field2480[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2469[var5] - var12) * var14 >> 16)) / 50; // L: 1320
+				field2453[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1321
 			}
 		}
 
-		var11 = field2563[0]; // L: 1218
-		var12 = field2563[1]; // L: 1219
-		var13 = field2563[2]; // L: 1220
-		var14 = field2564[0]; // L: 1221
-		int var15 = field2564[1]; // L: 1222
-		int var16 = field2564[2]; // L: 1223
-		Rasterizer3D.field2365 = false; // L: 1224
+		var11 = field2467[0]; // L: 1324
+		var12 = field2467[1]; // L: 1325
+		var13 = field2467[2]; // L: 1326
+		var14 = field2480[0]; // L: 1327
+		int var15 = field2480[1]; // L: 1328
+		int var16 = field2480[2]; // L: 1329
+		Rasterizer3D.field2253 = false; // L: 1330
 		int var17;
 		int var18;
 		int var19;
 		int var20;
-		if (var4 == 3) { // L: 1225
-			if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1226
-				Rasterizer3D.field2365 = true;
+		if (var4 == 3) { // L: 1331
+			if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1332
+				Rasterizer3D.field2253 = true;
 			}
 
-			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1227
-				if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1235
-					var20 = this.field2566[var1] & 255; // L: 1236
-					var17 = this.field2529[var20]; // L: 1237
-					var18 = this.field2530[var20]; // L: 1238
-					var19 = this.field2538[var20]; // L: 1239
+			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1333
+				if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1341
+					var20 = this.field2439[var1] & 255; // L: 1342
+					var17 = this.field2443[var20]; // L: 1343
+					var18 = this.field2471[var20]; // L: 1344
+					var19 = this.field2445[var20]; // L: 1345
 				} else {
-					var17 = var5; // L: 1242
-					var18 = var6; // L: 1243
-					var19 = var7; // L: 1244
+					var17 = var5; // L: 1348
+					var18 = var6; // L: 1349
+					var19 = var7; // L: 1350
 				}
 
-				if (this.faceColors3[var1] == -1) { // L: 1246
-					Rasterizer3D.method4215(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], this.faceTextures[var1]);
+				if (this.faceColors3[var1] == -1) { // L: 1352
+					Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], this.faceTextures[var1]);
 				} else {
-					Rasterizer3D.method4215(var14, var15, var16, var11, var12, var13, field2521[0], field2521[1], field2521[2], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], this.faceTextures[var1]); // L: 1247
+					Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], this.faceTextures[var1]); // L: 1353
 				}
-			} else if (this.faceColors3[var1] == -1) { // L: 1228
-				Rasterizer3D.method4213(var14, var15, var16, var11, var12, var13, field2540[this.faceColors1[var1]]);
+			} else if (this.faceColors3[var1] == -1) { // L: 1334
+				Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, field2490[this.faceColors1[var1]]);
 			} else {
-				Rasterizer3D.method4211(var14, var15, var16, var11, var12, var13, field2521[0], field2521[1], field2521[2]); // L: 1229
+				Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2]); // L: 1335
 			}
 		}
 
-		if (var4 == 4) { // L: 1250
-			if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2563[3] < 0 || field2563[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1251
-				Rasterizer3D.field2365 = true;
+		if (var4 == 4) { // L: 1356
+			if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2467[3] < 0 || field2467[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1357
+				Rasterizer3D.field2253 = true;
 			}
 
-			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1252
-				if (this.field2566 != null && this.field2566[var1] != -1) { // L: 1267
-					var20 = this.field2566[var1] & 255; // L: 1268
-					var17 = this.field2529[var20]; // L: 1269
-					var18 = this.field2530[var20]; // L: 1270
-					var19 = this.field2538[var20]; // L: 1271
+			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1358
+				if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1373
+					var20 = this.field2439[var1] & 255; // L: 1374
+					var17 = this.field2443[var20]; // L: 1375
+					var18 = this.field2471[var20]; // L: 1376
+					var19 = this.field2445[var20]; // L: 1377
 				} else {
-					var17 = var5; // L: 1274
-					var18 = var6; // L: 1275
-					var19 = var7; // L: 1276
+					var17 = var5; // L: 1380
+					var18 = var6; // L: 1381
+					var19 = var7; // L: 1382
 				}
 
-				short var21 = this.faceTextures[var1]; // L: 1278
-				if (this.faceColors3[var1] == -1) { // L: 1279
-					Rasterizer3D.method4215(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], var21); // L: 1280
-					Rasterizer3D.method4215(var14, var16, field2564[3], var11, var13, field2563[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], var21); // L: 1281
+				short var21 = this.faceTextures[var1]; // L: 1384
+				if (this.faceColors3[var1] == -1) { // L: 1385
+					Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); // L: 1386
+					Rasterizer3D.method3876(var14, var16, field2480[3], var11, var13, field2467[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); // L: 1387
 				} else {
-					Rasterizer3D.method4215(var14, var15, var16, var11, var12, var13, field2521[0], field2521[1], field2521[2], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], var21); // L: 1284
-					Rasterizer3D.method4215(var14, var16, field2564[3], var11, var13, field2563[3], field2521[0], field2521[2], field2521[3], field2574[var17], field2574[var18], field2574[var19], field2547[var17], field2547[var18], field2547[var19], field2575[var17], field2575[var18], field2575[var19], var21); // L: 1285
+					Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); // L: 1390
+					Rasterizer3D.method3876(var14, var16, field2480[3], var11, var13, field2467[3], field2453[0], field2453[2], field2453[3], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21); // L: 1391
 				}
-			} else if (this.faceColors3[var1] == -1) { // L: 1253
-				var17 = field2540[this.faceColors1[var1]]; // L: 1254
-				Rasterizer3D.method4213(var14, var15, var16, var11, var12, var13, var17); // L: 1255
-				Rasterizer3D.method4213(var14, var16, field2564[3], var11, var13, field2563[3], var17); // L: 1256
+			} else if (this.faceColors3[var1] == -1) { // L: 1359
+				var17 = field2490[this.faceColors1[var1]]; // L: 1360
+				Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, var17); // L: 1361
+				Rasterizer3D.method3856(var14, var16, field2480[3], var11, var13, field2467[3], var17); // L: 1362
 			} else {
-				Rasterizer3D.method4211(var14, var15, var16, var11, var12, var13, field2521[0], field2521[1], field2521[2]); // L: 1259
-				Rasterizer3D.method4211(var14, var16, field2564[3], var11, var13, field2563[3], field2521[0], field2521[2], field2521[3]); // L: 1260
+				Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2]); // L: 1365
+				Rasterizer3D.method3854(var14, var16, field2480[3], var11, var13, field2467[3], field2453[0], field2453[2], field2453[3]); // L: 1366
 			}
 		}
 
-	} // L: 1289
+	} // L: 1395
+
+	@ObfuscatedName("au")
+	int method4216(int var1, byte var2, byte var3, byte var4, byte var5) {
+		int var6 = var1 >> 10 & 63; // L: 1398
+		int var7 = var1 >> 7 & 7; // L: 1399
+		int var8 = var1 & 127; // L: 1400
+		int var9 = var5 & 255; // L: 1401
+		if (var2 != -1) { // L: 1402
+			var6 += var9 * (var2 - var6) >> 7; // L: 1403
+		}
+
+		if (var3 != -1) { // L: 1405
+			var7 += var9 * (var3 - var7) >> 7; // L: 1406
+		}
+
+		if (var4 != -1) { // L: 1408
+			var8 += var9 * (var4 - var8) >> 7; // L: 1409
+		}
+
+		return (var6 << 10 | var7 << 7 | var8) & 65535; // L: 1411
+	}
+
+	@ObfuscatedName("av")
+	@ObfuscatedSignature(
+		descriptor = "(ILno;)V"
+	)
+	void method4217(int var1, class366 var2) {
+		float var3 = (float)this.verticesX[var1]; // L: 1415
+		float var4 = (float)(-this.verticesY[var1]); // L: 1416
+		float var5 = (float)(-this.verticesZ[var1]); // L: 1417
+		float var6 = 1.0F; // L: 1418
+		this.verticesX[var1] = (int)(var2.field4196[0] * var3 + var2.field4196[4] * var4 + var2.field4196[8] * var5 + var2.field4196[12] * var6); // L: 1419
+		this.verticesY[var1] = -((int)(var2.field4196[1] * var3 + var2.field4196[5] * var4 + var2.field4196[9] * var5 + var2.field4196[13] * var6)); // L: 1420
+		this.verticesZ[var1] = -((int)(var2.field4196[2] * var3 + var2.field4196[6] * var4 + var2.field4196[10] * var5 + var2.field4196[14] * var6)); // L: 1421
+	} // L: 1422
+
+	@ObfuscatedName("ap")
+	@ObfuscatedSignature(
+		descriptor = "(Lgq;I)V"
+	)
+	void method4218(class194 var1, int var2) {
+		if (this.field2448 != null) { // L: 1425
+			for (int var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1426
+				int[] var4 = this.field2448[var3]; // L: 1427
+				if (var4 != null && var4.length != 0) { // L: 1428
+					int[] var5 = this.field2449[var3]; // L: 1429
+					field2452.method6708(); // L: 1430
+
+					for (int var6 = 0; var6 < var4.length; ++var6) { // L: 1431
+						int var7 = var4[var6]; // L: 1432
+						class113 var8 = var1.method3923(var7); // L: 1433
+						if (var8 != null) { // L: 1434
+							field2424.method6655((float)var5[var6] / 255.0F); // L: 1435
+							field2419.method6654(var8.method2582(var2)); // L: 1436
+							field2419.method6670(field2424); // L: 1437
+							field2452.method6657(field2419); // L: 1438
+						}
+					}
+
+					this.method4217(var3, field2452); // L: 1440
+				}
+			}
+
+		}
+	} // L: 1442
 
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cq")
 	@Export("draw")
 	void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
-		field2556[0] = -1; // L: 723
-		if (this.boundsType != 1) { // L: 724
+		field2422[0] = -1; // L: 822
+		if (this.boundsType != 1) { // L: 823
 			this.calculateBoundsCylinder();
 		}
 
-		this.calculateBoundingBox(var1); // L: 725
-		int var11 = var5 * var8 - var4 * var6 >> 16; // L: 726
-		int var12 = var2 * var7 + var3 * var11 >> 16; // L: 727
-		int var13 = var3 * this.xzRadius >> 16; // L: 728
-		int var14 = var12 + var13; // L: 729
-		if (var14 > 50 && var12 < 3500) { // L: 730
-			int var15 = var8 * var4 + var5 * var6 >> 16; // L: 731
-			int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 732
-			if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { // L: 733
-				int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 734
-				if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { // L: 735
-					int var18 = var3 * var7 - var11 * var2 >> 16; // L: 736
-					int var19 = var2 * this.xzRadius >> 16; // L: 737
-					int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; // L: 738
-					if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { // L: 739
-						int var21 = (var3 * super.height >> 16) + var19; // L: 740
-						int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; // L: 741
-						if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { // L: 742
-							int var23 = var13 + (var2 * super.height >> 16); // L: 743
-							boolean var24 = false; // L: 744
-							boolean var25 = false; // L: 745
-							if (var12 - var23 <= 50) { // L: 746
-								var25 = true;
+		this.calculateBoundingBox(var1); // L: 824
+		int var11 = var5 * var8 - var4 * var6 >> 16; // L: 825
+		int var12 = var2 * var7 + var3 * var11 >> 16; // L: 826
+		int var13 = var3 * this.xzRadius >> 16; // L: 827
+		int var14 = var12 + var13; // L: 828
+		if (var14 > 50 && var12 < 3500) { // L: 829
+			int var15 = var8 * var4 + var5 * var6 >> 16; // L: 830
+			int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 831
+			if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { // L: 832
+				int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 833
+				if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { // L: 834
+					int var18 = var3 * var7 - var11 * var2 >> 16; // L: 835
+					int var19 = var2 * this.xzRadius >> 16; // L: 836
+					int var20 = (var3 * this.bottomY >> 16) + var19; // L: 837
+					int var21 = (var18 + var20) * Rasterizer3D.Rasterizer3D_zoom; // L: 838
+					if (var21 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { // L: 839
+						int var22 = (var3 * super.height >> 16) + var19; // L: 840
+						int var23 = (var18 - var22) * Rasterizer3D.Rasterizer3D_zoom; // L: 841
+						if (var23 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { // L: 842
+							int var24 = var13 + (var2 * super.height >> 16); // L: 843
+							boolean var25 = false; // L: 844
+							boolean var26 = false; // L: 845
+							if (var12 - var24 <= 50) { // L: 846
+								var26 = true;
 							}
 
-							boolean var26 = var25 || this.field2522 > 0; // L: 747
-							int var27 = ViewportMouse.ViewportMouse_x; // L: 750
-							int var29 = ParamComposition.method3229(); // L: 753
-							boolean var30 = class176.method3531(); // L: 754
-							boolean var31 = ItemLayer.method4106(var9); // L: 755
-							boolean var32 = false; // L: 756
-							int var36;
+							boolean var27 = var26 || this.field2442 > 0; // L: 847
+							int var28 = class91.method2332(); // L: 848
+							int var29 = ViewportMouse.ViewportMouse_y; // L: 851
+							boolean var31 = class139.method2931(); // L: 854
+							boolean var32 = class116.method2671(var9); // L: 855
+							boolean var33 = false; // L: 856
 							int var37;
 							int var38;
 							int var39;
-							int var47;
-							int var53;
+							int var40;
+							int var48;
 							int var54;
 							int var55;
-							if (var31 && var30) { // L: 757
-								boolean var33 = false; // L: 758
-								if (field2576) { // L: 759
-									boolean var34;
-									if (!class176.method3531()) { // L: 763
-										var34 = false; // L: 764
+							int var56;
+							if (var32 && var31) { // L: 857
+								boolean var34 = false; // L: 858
+								if (field2492) { // L: 859
+									boolean var35;
+									if (!class139.method2931()) { // L: 863
+										var35 = false; // L: 864
 									} else {
-										int var42;
 										int var43;
 										int var44;
-										if (!ViewportMouse.ViewportMouse_false0) { // L: 768
-											var36 = Scene.Scene_cameraPitchSine; // L: 769
-											var37 = Scene.Scene_cameraPitchCosine; // L: 770
-											var38 = Scene.Scene_cameraYawSine; // L: 771
-											var39 = Scene.Scene_cameraYawCosine; // L: 772
-											byte var40 = 50; // L: 773
-											short var41 = 3500; // L: 774
-											var42 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var40 / Rasterizer3D.Rasterizer3D_zoom; // L: 775
-											var43 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var40 / Rasterizer3D.Rasterizer3D_zoom; // L: 776
-											var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 777
-											int var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 778
-											int var46 = Rasterizer3D.method4224(var43, var40, var37, var36); // L: 780
-											var54 = Rasterizer3D.method4225(var43, var40, var37, var36); // L: 781
-											var43 = var46; // L: 782
-											var46 = Rasterizer3D.method4224(var45, var41, var37, var36); // L: 783
-											var55 = Rasterizer3D.method4225(var45, var41, var37, var36); // L: 784
-											var45 = var46; // L: 785
-											var46 = Rasterizer3D.method4222(var42, var54, var39, var38); // L: 786
-											var54 = Rasterizer3D.method4223(var42, var54, var39, var38); // L: 787
-											var42 = var46; // L: 788
-											var46 = Rasterizer3D.method4222(var44, var55, var39, var38); // L: 789
-											var55 = Rasterizer3D.method4223(var44, var55, var39, var38); // L: 790
-											ViewportMouse.field2582 = (var46 + var42) / 2; // L: 792
-											ViewportMouse.field2579 = (var45 + var43) / 2; // L: 793
-											class157.field1675 = (var54 + var55) / 2; // L: 794
-											ViewportMouse.field2584 = (var46 - var42) / 2; // L: 795
-											class361.field4050 = (var45 - var43) / 2; // L: 796
-											ViewportMouse.field2590 = (var55 - var54) / 2; // L: 797
-											FriendLoginUpdate.field3943 = Math.abs(ViewportMouse.field2584); // L: 798
-											class120.field1403 = Math.abs(class361.field4050); // L: 799
-											class131.field1485 = Math.abs(ViewportMouse.field2590); // L: 800
+										int var45;
+										if (!ViewportMouse.ViewportMouse_false0) { // L: 868
+											var37 = Scene.Scene_cameraPitchSine; // L: 869
+											var38 = Scene.Scene_cameraPitchCosine; // L: 870
+											var39 = Scene.Scene_cameraYawSine; // L: 871
+											var40 = Scene.Scene_cameraYawCosine; // L: 872
+											byte var41 = 50; // L: 873
+											short var42 = 3500; // L: 874
+											var43 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 875
+											var44 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 876
+											var45 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 877
+											int var46 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var42 / Rasterizer3D.Rasterizer3D_zoom; // L: 878
+											int var47 = Rasterizer3D.method3917(var44, var41, var38, var37); // L: 880
+											var55 = Rasterizer3D.method3868(var44, var41, var38, var37); // L: 881
+											var44 = var47; // L: 882
+											var47 = Rasterizer3D.method3917(var46, var42, var38, var37); // L: 883
+											var56 = Rasterizer3D.method3868(var46, var42, var38, var37); // L: 884
+											var46 = var47; // L: 885
+											var47 = Rasterizer3D.method3859(var43, var55, var40, var39); // L: 886
+											var55 = Rasterizer3D.method3866(var43, var55, var40, var39); // L: 887
+											var43 = var47; // L: 888
+											var47 = Rasterizer3D.method3859(var45, var56, var40, var39); // L: 889
+											var56 = Rasterizer3D.method3866(var45, var56, var40, var39); // L: 890
+											ViewportMouse.field2503 = (var43 + var47) / 2; // L: 892
+											HealthBar.field1209 = (var46 + var44) / 2; // L: 893
+											class257.field3042 = (var56 + var55) / 2; // L: 894
+											class28.field168 = (var47 - var43) / 2; // L: 895
+											class149.field1661 = (var46 - var44) / 2; // L: 896
+											class186.field2135 = (var56 - var55) / 2; // L: 897
+											class17.field93 = Math.abs(class28.field168); // L: 898
+											ScriptFrame.field446 = Math.abs(class149.field1661); // L: 899
+											class338.field4055 = Math.abs(class186.field2135); // L: 900
 										}
 
-										var36 = this.xMid + var6; // L: 802
-										var37 = var7 + this.yMid; // L: 803
-										var38 = var8 + this.zMid; // L: 804
-										var39 = this.xMidOffset; // L: 805
-										var54 = this.yMidOffset; // L: 806
-										var55 = this.zMidOffset; // L: 807
-										var42 = ViewportMouse.field2582 - var36; // L: 808
-										var43 = ViewportMouse.field2579 - var37; // L: 809
-										var44 = class157.field1675 - var38; // L: 810
-										if (Math.abs(var42) > var39 + FriendLoginUpdate.field3943) { // L: 811
-											var34 = false; // L: 812
-										} else if (Math.abs(var43) > var54 + class120.field1403) { // L: 815
-											var34 = false; // L: 816
-										} else if (Math.abs(var44) > var55 + class131.field1485) { // L: 819
-											var34 = false; // L: 820
-										} else if (Math.abs(var44 * class361.field4050 - var43 * ViewportMouse.field2590) > var55 * class120.field1403 + var54 * class131.field1485) { // L: 823
-											var34 = false; // L: 824
-										} else if (Math.abs(var42 * ViewportMouse.field2590 - var44 * ViewportMouse.field2584) > var55 * FriendLoginUpdate.field3943 + var39 * class131.field1485) { // L: 827
-											var34 = false; // L: 828
-										} else if (Math.abs(var43 * ViewportMouse.field2584 - var42 * class361.field4050) > var39 * class120.field1403 + var54 * FriendLoginUpdate.field3943) { // L: 831
-											var34 = false; // L: 832
+										var37 = this.xMid + var6; // L: 902
+										var38 = var7 + this.yMid; // L: 903
+										var39 = var8 + this.zMid; // L: 904
+										var40 = this.xMidOffset; // L: 905
+										var55 = this.yMidOffset; // L: 906
+										var56 = this.zMidOffset; // L: 907
+										var43 = ViewportMouse.field2503 - var37; // L: 908
+										var44 = HealthBar.field1209 - var38; // L: 909
+										var45 = class257.field3042 - var39; // L: 910
+										if (Math.abs(var43) > var40 + class17.field93) { // L: 911
+											var35 = false; // L: 912
+										} else if (Math.abs(var44) > var55 + ScriptFrame.field446) { // L: 915
+											var35 = false; // L: 916
+										} else if (Math.abs(var45) > var56 + class338.field4055) { // L: 919
+											var35 = false; // L: 920
+										} else if (Math.abs(var45 * class149.field1661 - var44 * class186.field2135) > var56 * ScriptFrame.field446 + var55 * class338.field4055) { // L: 923
+											var35 = false; // L: 924
+										} else if (Math.abs(var43 * class186.field2135 - var45 * class28.field168) > var40 * class338.field4055 + var56 * class17.field93) { // L: 927
+											var35 = false; // L: 928
+										} else if (Math.abs(var44 * class28.field168 - var43 * class149.field1661) > var40 * ScriptFrame.field446 + var55 * class17.field93) { // L: 931
+											var35 = false; // L: 932
 										} else {
-											var34 = true; // L: 835
+											var35 = true; // L: 935
 										}
 									}
 
-									var33 = var34; // L: 837
+									var34 = var35; // L: 937
 								} else {
-									var53 = var12 - var13; // L: 840
-									if (var53 <= 50) { // L: 841
-										var53 = 50;
+									var54 = var12 - var13; // L: 940
+									if (var54 <= 50) { // L: 941
+										var54 = 50;
 									}
 
-									if (var15 > 0) { // L: 842
-										var16 /= var14; // L: 843
-										var17 /= var53; // L: 844
+									if (var15 > 0) { // L: 942
+										var16 /= var14; // L: 943
+										var17 /= var54; // L: 944
 									} else {
-										var17 /= var14; // L: 847
-										var16 /= var53; // L: 848
+										var17 /= var14; // L: 947
+										var16 /= var54; // L: 948
 									}
 
-									if (var18 > 0) { // L: 850
-										var22 /= var14; // L: 851
-										var20 /= var53; // L: 852
+									if (var18 > 0) { // L: 950
+										var23 /= var14; // L: 951
+										var21 /= var54; // L: 952
 									} else {
-										var20 /= var14; // L: 855
-										var22 /= var53; // L: 856
+										var21 /= var14; // L: 955
+										var23 /= var54; // L: 956
 									}
 
-									var47 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 858
-									var36 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 859
-									if (var47 > var16 && var47 < var17 && var36 > var22 && var36 < var20) { // L: 860
-										var33 = true; // L: 861
+									var48 = var28 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 958
+									var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 959
+									if (var48 > var16 && var48 < var17 && var37 > var23 && var37 < var21) { // L: 960
+										var34 = true; // L: 961
 									}
 								}
 
-								if (var33) { // L: 864
-									if (this.isSingleTile) { // L: 865
-										ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 868
+								if (var34) { // L: 964
+									if (this.isSingleTile) { // L: 965
+										ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 968
 									} else {
-										var32 = true; // L: 871
+										var33 = true; // L: 971
 									}
 								}
 							}
 
-							int var52 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 874
-							var53 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 875
-							var47 = 0; // L: 876
-							var36 = 0; // L: 877
-							if (var1 != 0) { // L: 878
-								var47 = Model_sine[var1]; // L: 879
-								var36 = Model_cosine[var1]; // L: 880
+							int var53 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 974
+							var54 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 975
+							var48 = 0; // L: 976
+							var37 = 0; // L: 977
+							if (var1 != 0) { // L: 978
+								var48 = field2465[var1]; // L: 979
+								var37 = field2489[var1]; // L: 980
 							}
 
-							for (var37 = 0; var37 < this.verticesCount; ++var37) { // L: 882
-								var38 = this.verticesX[var37]; // L: 883
-								var39 = this.verticesY[var37]; // L: 884
-								var54 = this.verticesZ[var37]; // L: 885
-								if (var1 != 0) { // L: 886
-									var55 = var54 * var47 + var38 * var36 >> 16; // L: 887
-									var54 = var54 * var36 - var38 * var47 >> 16; // L: 888
-									var38 = var55; // L: 889
+							for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 982
+								var39 = this.verticesX[var38]; // L: 983
+								var40 = this.verticesY[var38]; // L: 984
+								var55 = this.verticesZ[var38]; // L: 985
+								if (var1 != 0) { // L: 986
+									var56 = var55 * var48 + var39 * var37 >> 16; // L: 987
+									var55 = var55 * var37 - var39 * var48 >> 16; // L: 988
+									var39 = var56; // L: 989
 								}
 
-								var38 += var6; // L: 891
-								var39 += var7; // L: 892
-								var54 += var8; // L: 893
-								var55 = var54 * var4 + var5 * var38 >> 16; // L: 894
-								var54 = var5 * var54 - var38 * var4 >> 16; // L: 895
-								var38 = var55; // L: 896
-								var55 = var3 * var39 - var54 * var2 >> 16; // L: 897
-								var54 = var39 * var2 + var3 * var54 >> 16; // L: 898
-								field2551[var37] = var54 - var12; // L: 900
-								if (var54 >= 50) { // L: 901
-									modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var54 + var52; // L: 902
-									modelViewportYs[var37] = var55 * Rasterizer3D.Rasterizer3D_zoom / var54 + var53; // L: 903
+								var39 += var6; // L: 991
+								var40 += var7; // L: 992
+								var55 += var8; // L: 993
+								var56 = var55 * var4 + var5 * var39 >> 16; // L: 994
+								var55 = var5 * var55 - var39 * var4 >> 16; // L: 995
+								var39 = var56; // L: 996
+								var56 = var3 * var40 - var55 * var2 >> 16; // L: 997
+								var55 = var40 * var2 + var3 * var55 >> 16; // L: 998
+								field2497[var38] = var55 - var12; // L: 1000
+								if (var55 >= 50) { // L: 1001
+									modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var55 + var53; // L: 1002
+									modelViewportYs[var38] = var56 * Rasterizer3D.Rasterizer3D_zoom / var55 + var54; // L: 1003
 								} else {
-									modelViewportXs[var37] = -5000; // L: 906
-									var24 = true; // L: 907
+									modelViewportXs[var38] = -5000; // L: 1006
+									var25 = true; // L: 1007
 								}
 
-								if (var26) { // L: 909
-									field2574[var37] = var38; // L: 910
-									field2547[var37] = var55; // L: 911
-									field2575[var37] = var54; // L: 912
+								if (var27) { // L: 1009
+									field2468[var38] = var39; // L: 1010
+									field2469[var38] = var56; // L: 1011
+									field2470[var38] = var55; // L: 1012
 								}
 							}
 
 							try {
-								this.draw0(var24, var32, this.isSingleTile, var9); // L: 916
-							} catch (Exception var51) { // L: 918
+								this.draw0(var25, var33, this.isSingleTile, var9); // L: 1016
+							} catch (Exception var52) { // L: 1018
 							}
 
 						}
@@ -1799,5 +2019,5 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7,
 				}
 			}
 		}
-	} // L: 919
+	} // L: 1019
 }
diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java
index d634ba76cb..4a0a980f34 100644
--- a/runescape-client/src/main/java/ModelData.java
+++ b/runescape-client/src/main/java/ModelData.java
@@ -3,137 +3,141 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gk")
+@ObfuscatedName("ge")
 @Implements("ModelData")
 public class ModelData extends Renderable {
-	@ObfuscatedName("az")
-	static int[] field2255;
-	@ObfuscatedName("ac")
-	static int[] field2283;
-	@ObfuscatedName("ak")
-	static int field2269;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ag")
+	static int[] field2187;
+	@ObfuscatedName("al")
+	static int[] field2188;
+	@ObfuscatedName("aa")
+	static int field2189;
+	@ObfuscatedName("as")
 	@Export("ModelData_sine")
 	static int[] ModelData_sine;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("at")
 	@Export("ModelData_cosine")
 	static int[] ModelData_cosine;
-	@ObfuscatedName("i")
+	@ObfuscatedName("m")
 	@Export("verticesCount")
 	int verticesCount;
-	@ObfuscatedName("w")
+	@ObfuscatedName("t")
 	@Export("verticesX")
 	int[] verticesX;
 	@ObfuscatedName("s")
 	@Export("verticesY")
 	int[] verticesY;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@Export("verticesZ")
 	int[] verticesZ;
-	@ObfuscatedName("o")
+	@ObfuscatedName("w")
 	@Export("faceCount")
 	int faceCount;
-	@ObfuscatedName("g")
+	@ObfuscatedName("n")
 	@Export("indices1")
 	int[] indices1;
-	@ObfuscatedName("e")
+	@ObfuscatedName("r")
 	@Export("indices2")
 	int[] indices2;
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@Export("indices3")
 	int[] indices3;
-	@ObfuscatedName("j")
+	@ObfuscatedName("v")
 	@Export("faceRenderTypes")
 	byte[] faceRenderTypes;
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@Export("faceRenderPriorities")
 	byte[] faceRenderPriorities;
-	@ObfuscatedName("x")
+	@ObfuscatedName("h")
 	@Export("faceAlphas")
 	byte[] faceAlphas;
-	@ObfuscatedName("y")
+	@ObfuscatedName("g")
 	@Export("textureCoords")
 	byte[] textureCoords;
-	@ObfuscatedName("k")
+	@ObfuscatedName("e")
 	@Export("faceColors")
 	short[] faceColors;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("faceTextures")
 	short[] faceTextures;
-	@ObfuscatedName("l")
+	@ObfuscatedName("u")
 	@Export("priority")
 	byte priority;
-	@ObfuscatedName("u")
+	@ObfuscatedName("k")
 	@Export("textureTriangleCount")
 	int textureTriangleCount;
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@Export("textureRenderTypes")
 	byte[] textureRenderTypes;
-	@ObfuscatedName("z")
+	@ObfuscatedName("l")
 	@Export("texTriangleX")
 	short[] texTriangleX;
 	@ObfuscatedName("q")
 	@Export("texTriangleY")
 	short[] texTriangleY;
-	@ObfuscatedName("d")
+	@ObfuscatedName("x")
 	@Export("texTriangleZ")
 	short[] texTriangleZ;
-	@ObfuscatedName("r")
+	@ObfuscatedName("z")
 	@Export("vertexSkins")
 	int[] vertexSkins;
-	@ObfuscatedName("m")
+	@ObfuscatedName("i")
 	@Export("faceSkins")
 	int[] faceSkins;
-	@ObfuscatedName("c")
+	@ObfuscatedName("y")
 	@Export("vertexLabels")
 	int[][] vertexLabels;
-	@ObfuscatedName("f")
+	@ObfuscatedName("ah")
 	@Export("faceLabelsAlpha")
 	int[][] faceLabelsAlpha;
-	@ObfuscatedName("h")
+	@ObfuscatedName("ao")
+	int[][] field2185;
+	@ObfuscatedName("ab")
+	int[][] field2173;
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		descriptor = "[Lhq;"
+		descriptor = "[Lgh;"
 	)
 	@Export("faceNormals")
 	FaceNormal[] faceNormals;
-	@ObfuscatedName("v")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "[Lhp;"
+		descriptor = "[Lga;"
 	)
 	@Export("vertexNormals")
 	VertexNormal[] vertexNormals;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "[Lhp;"
+		descriptor = "[Lga;"
 	)
 	@Export("vertexVertices")
 	VertexNormal[] vertexVertices;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("az")
 	@Export("ambient")
 	public short ambient;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("au")
 	@Export("contrast")
 	public short contrast;
-	@ObfuscatedName("al")
+	@ObfuscatedName("av")
 	@Export("isBoundsCalculated")
 	boolean isBoundsCalculated;
-	@ObfuscatedName("am")
-	int field2277;
-	@ObfuscatedName("ai")
-	int field2278;
-	@ObfuscatedName("ah")
-	int field2275;
-	@ObfuscatedName("as")
-	int field2280;
-	@ObfuscatedName("at")
-	int field2267;
+	@ObfuscatedName("ap")
+	int field2182;
+	@ObfuscatedName("ac")
+	int field2176;
+	@ObfuscatedName("aj")
+	int field2152;
+	@ObfuscatedName("af")
+	int field2168;
+	@ObfuscatedName("ar")
+	int field2186;
 
 	static {
-		field2255 = new int[10000]; // L: 44
-		field2283 = new int[10000]; // L: 45
-		field2269 = 0; // L: 46
-		ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47
-		ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48
+		field2187 = new int[10000]; // L: 49
+		field2188 = new int[10000]; // L: 50
+		field2189 = 0; // L: 51
+		ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 52
+		ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 53
 	}
 
 	ModelData() {
@@ -141,949 +145,1586 @@ public class ModelData extends Renderable {
 		this.faceCount = 0;
 		this.priority = 0;
 		this.isBoundsCalculated = false;
-	} // L: 50
+	} // L: 55
 
 	@ObfuscatedSignature(
-		descriptor = "([Lgk;I)V"
+		descriptor = "([Lge;I)V"
 	)
 	public ModelData(ModelData[] var1, int var2) {
 		this.verticesCount = 0;
 		this.faceCount = 0;
 		this.priority = 0;
 		this.isBoundsCalculated = false;
-		boolean var3 = false; // L: 471
-		boolean var4 = false; // L: 472
-		boolean var5 = false; // L: 473
-		boolean var6 = false; // L: 474
-		boolean var7 = false; // L: 475
-		boolean var8 = false; // L: 476
-		this.verticesCount = 0; // L: 477
-		this.faceCount = 0; // L: 478
-		this.textureTriangleCount = 0; // L: 479
-		this.priority = -1; // L: 480
-
-		int var9;
-		ModelData var10;
-		for (var9 = 0; var9 < var2; ++var9) { // L: 481
-			var10 = var1[var9]; // L: 482
-			if (var10 != null) { // L: 483
-				this.verticesCount += var10.verticesCount; // L: 484
-				this.faceCount += var10.faceCount; // L: 485
-				this.textureTriangleCount += var10.textureTriangleCount; // L: 486
-				if (var10.faceRenderPriorities != null) { // L: 487
+		boolean var3 = false; // L: 921
+		boolean var4 = false; // L: 922
+		boolean var5 = false; // L: 923
+		boolean var6 = false; // L: 924
+		boolean var7 = false; // L: 925
+		boolean var8 = false; // L: 926
+		boolean var9 = false; // L: 927
+		this.verticesCount = 0; // L: 928
+		this.faceCount = 0; // L: 929
+		this.textureTriangleCount = 0; // L: 930
+		this.priority = -1; // L: 931
+
+		int var10;
+		ModelData var11;
+		for (var10 = 0; var10 < var2; ++var10) { // L: 932
+			var11 = var1[var10]; // L: 933
+			if (var11 != null) { // L: 934
+				this.verticesCount += var11.verticesCount; // L: 935
+				this.faceCount += var11.faceCount; // L: 936
+				this.textureTriangleCount += var11.textureTriangleCount; // L: 937
+				if (var11.faceRenderPriorities != null) { // L: 938
 					var4 = true;
 				} else {
-					if (this.priority == -1) { // L: 489
-						this.priority = var10.priority;
+					if (this.priority == -1) { // L: 940
+						this.priority = var11.priority;
 					}
 
-					if (this.priority != var10.priority) { // L: 490
+					if (this.priority != var11.priority) { // L: 941
 						var4 = true;
 					}
 				}
 
-				var3 |= var10.faceRenderTypes != null; // L: 492
-				var5 |= var10.faceAlphas != null; // L: 493
-				var6 |= var10.faceSkins != null; // L: 494
-				var7 |= var10.faceTextures != null; // L: 495
-				var8 |= var10.textureCoords != null; // L: 496
+				var3 |= var11.faceRenderTypes != null; // L: 943
+				var5 |= var11.faceAlphas != null; // L: 944
+				var6 |= var11.faceSkins != null; // L: 945
+				var7 |= var11.faceTextures != null; // L: 946
+				var8 |= var11.textureCoords != null; // L: 947
+				var9 |= var11.field2185 != null; // L: 948
 			}
 		}
 
-		this.verticesX = new int[this.verticesCount]; // L: 499
-		this.verticesY = new int[this.verticesCount]; // L: 500
-		this.verticesZ = new int[this.verticesCount]; // L: 501
-		this.vertexSkins = new int[this.verticesCount]; // L: 502
-		this.indices1 = new int[this.faceCount]; // L: 503
-		this.indices2 = new int[this.faceCount]; // L: 504
-		this.indices3 = new int[this.faceCount]; // L: 505
-		if (var3) { // L: 506
+		this.verticesX = new int[this.verticesCount]; // L: 951
+		this.verticesY = new int[this.verticesCount]; // L: 952
+		this.verticesZ = new int[this.verticesCount]; // L: 953
+		this.vertexSkins = new int[this.verticesCount]; // L: 954
+		this.indices1 = new int[this.faceCount]; // L: 955
+		this.indices2 = new int[this.faceCount]; // L: 956
+		this.indices3 = new int[this.faceCount]; // L: 957
+		if (var3) { // L: 958
 			this.faceRenderTypes = new byte[this.faceCount];
 		}
 
-		if (var4) { // L: 507
+		if (var4) { // L: 959
 			this.faceRenderPriorities = new byte[this.faceCount];
 		}
 
-		if (var5) { // L: 508
+		if (var5) { // L: 960
 			this.faceAlphas = new byte[this.faceCount];
 		}
 
-		if (var6) { // L: 509
+		if (var6) { // L: 961
 			this.faceSkins = new int[this.faceCount];
 		}
 
-		if (var7) { // L: 510
+		if (var7) { // L: 962
 			this.faceTextures = new short[this.faceCount];
 		}
 
-		if (var8) { // L: 511
+		if (var8) { // L: 963
 			this.textureCoords = new byte[this.faceCount];
 		}
 
-		this.faceColors = new short[this.faceCount]; // L: 512
-		if (this.textureTriangleCount > 0) { // L: 513
-			this.textureRenderTypes = new byte[this.textureTriangleCount]; // L: 514
-			this.texTriangleX = new short[this.textureTriangleCount]; // L: 515
-			this.texTriangleY = new short[this.textureTriangleCount]; // L: 516
-			this.texTriangleZ = new short[this.textureTriangleCount]; // L: 517
+		if (var9) { // L: 964
+			this.field2185 = new int[this.verticesCount][]; // L: 965
+			this.field2173 = new int[this.verticesCount][]; // L: 966
 		}
 
-		this.verticesCount = 0; // L: 519
-		this.faceCount = 0; // L: 520
-		this.textureTriangleCount = 0; // L: 521
+		this.faceColors = new short[this.faceCount]; // L: 968
+		if (this.textureTriangleCount > 0) { // L: 969
+			this.textureRenderTypes = new byte[this.textureTriangleCount]; // L: 970
+			this.texTriangleX = new short[this.textureTriangleCount]; // L: 971
+			this.texTriangleY = new short[this.textureTriangleCount]; // L: 972
+			this.texTriangleZ = new short[this.textureTriangleCount]; // L: 973
+		}
 
-		for (var9 = 0; var9 < var2; ++var9) { // L: 522
-			var10 = var1[var9]; // L: 523
-			if (var10 != null) { // L: 524
-				int var11;
-				for (var11 = 0; var11 < var10.faceCount; ++var11) { // L: 525
-					if (var3 && var10.faceRenderTypes != null) { // L: 526 527
-						this.faceRenderTypes[this.faceCount] = var10.faceRenderTypes[var11];
+		this.verticesCount = 0; // L: 975
+		this.faceCount = 0; // L: 976
+		this.textureTriangleCount = 0; // L: 977
+
+		for (var10 = 0; var10 < var2; ++var10) { // L: 978
+			var11 = var1[var10]; // L: 979
+			if (var11 != null) { // L: 980
+				int var12;
+				for (var12 = 0; var12 < var11.faceCount; ++var12) { // L: 981
+					if (var3 && var11.faceRenderTypes != null) { // L: 982 983
+						this.faceRenderTypes[this.faceCount] = var11.faceRenderTypes[var12];
 					}
 
-					if (var4) { // L: 529
-						if (var10.faceRenderPriorities != null) { // L: 530
-							this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11];
+					if (var4) { // L: 985
+						if (var11.faceRenderPriorities != null) { // L: 986
+							this.faceRenderPriorities[this.faceCount] = var11.faceRenderPriorities[var12];
 						} else {
-							this.faceRenderPriorities[this.faceCount] = var10.priority; // L: 531
+							this.faceRenderPriorities[this.faceCount] = var11.priority; // L: 987
 						}
 					}
 
-					if (var5 && var10.faceAlphas != null) { // L: 533 534
-						this.faceAlphas[this.faceCount] = var10.faceAlphas[var11];
+					if (var5 && var11.faceAlphas != null) { // L: 989 990
+						this.faceAlphas[this.faceCount] = var11.faceAlphas[var12];
 					}
 
-					if (var6 && var10.faceSkins != null) { // L: 536 537
-						this.faceSkins[this.faceCount] = var10.faceSkins[var11];
+					if (var6 && var11.faceSkins != null) { // L: 992 993
+						this.faceSkins[this.faceCount] = var11.faceSkins[var12];
 					}
 
-					if (var7) { // L: 539
-						if (var10.faceTextures != null) { // L: 540
-							this.faceTextures[this.faceCount] = var10.faceTextures[var11];
+					if (var7) { // L: 995
+						if (var11.faceTextures != null) { // L: 996
+							this.faceTextures[this.faceCount] = var11.faceTextures[var12];
 						} else {
-							this.faceTextures[this.faceCount] = -1; // L: 541
+							this.faceTextures[this.faceCount] = -1; // L: 997
 						}
 					}
 
-					if (var8) { // L: 543
-						if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { // L: 544
-							this.textureCoords[this.faceCount] = (byte)(this.textureTriangleCount + var10.textureCoords[var11]);
+					if (var8) { // L: 999
+						if (var11.textureCoords != null && var11.textureCoords[var12] != -1) { // L: 1000
+							this.textureCoords[this.faceCount] = (byte)(this.textureTriangleCount + var11.textureCoords[var12]);
 						} else {
-							this.textureCoords[this.faceCount] = -1; // L: 545
+							this.textureCoords[this.faceCount] = -1; // L: 1001
 						}
 					}
 
-					this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547
-					this.indices1[this.faceCount] = this.method4123(var10, var10.indices1[var11]); // L: 548
-					this.indices2[this.faceCount] = this.method4123(var10, var10.indices2[var11]); // L: 549
-					this.indices3[this.faceCount] = this.method4123(var10, var10.indices3[var11]); // L: 550
-					++this.faceCount; // L: 551
+					this.faceColors[this.faceCount] = var11.faceColors[var12]; // L: 1003
+					this.indices1[this.faceCount] = this.method3762(var11, var11.indices1[var12]); // L: 1004
+					this.indices2[this.faceCount] = this.method3762(var11, var11.indices2[var12]); // L: 1005
+					this.indices3[this.faceCount] = this.method3762(var11, var11.indices3[var12]); // L: 1006
+					++this.faceCount; // L: 1007
 				}
 
-				for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { // L: 553
-					byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; // L: 554
-					if (var12 == 0) { // L: 555
-						this.texTriangleX[this.textureTriangleCount] = (short)this.method4123(var10, var10.texTriangleX[var11]); // L: 556
-						this.texTriangleY[this.textureTriangleCount] = (short)this.method4123(var10, var10.texTriangleY[var11]); // L: 557
-						this.texTriangleZ[this.textureTriangleCount] = (short)this.method4123(var10, var10.texTriangleZ[var11]); // L: 558
+				for (var12 = 0; var12 < var11.textureTriangleCount; ++var12) { // L: 1009
+					byte var13 = this.textureRenderTypes[this.textureTriangleCount] = var11.textureRenderTypes[var12]; // L: 1010
+					if (var13 == 0) { // L: 1011
+						this.texTriangleX[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleX[var12]); // L: 1012
+						this.texTriangleY[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleY[var12]); // L: 1013
+						this.texTriangleZ[this.textureTriangleCount] = (short)this.method3762(var11, var11.texTriangleZ[var12]); // L: 1014
 					}
 
-					++this.textureTriangleCount; // L: 560
+					++this.textureTriangleCount; // L: 1016
 				}
 			}
 		}
 
-	} // L: 564
+	} // L: 1020
 
 	ModelData(byte[] var1) {
 		this.verticesCount = 0;
 		this.faceCount = 0;
 		this.priority = 0;
 		this.isBoundsCalculated = false;
-		if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 59
-			this.method4112(var1);
+		Buffer var2 = new Buffer(10); // L: 64
+		var2.writeShort(-2); // L: 65
+		if (var1[var1.length - 1] == -3 && var1[var1.length - 2] == -1) { // L: 66
+			this.method3742(var1);
+		} else if (var1[var1.length - 1] == -2 && var1[var1.length - 2] == -1) { // L: 67
+			this.method3784(var1);
+		} else if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 68
+			this.method3758(var1);
 		} else {
-			this.method4113(var1); // L: 60
+			this.method3747(var1); // L: 69
 		}
 
-	} // L: 61
+	} // L: 70
 
 	@ObfuscatedSignature(
-		descriptor = "(Lgk;ZZZZ)V",
+		descriptor = "(Lge;ZZZZ)V",
 		garbageValue = "1"
 	)
 	public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) {
-		this.verticesCount = 0; // L: 9
-		this.faceCount = 0; // L: 13
-		this.priority = 0; // L: 23
-		this.isBoundsCalculated = false; // L: 38
-		this.verticesCount = var1.verticesCount; // L: 588
-		this.faceCount = var1.faceCount; // L: 589
-		this.textureTriangleCount = var1.textureTriangleCount; // L: 590
+		this.verticesCount = 0; // L: 12
+		this.faceCount = 0; // L: 16
+		this.priority = 0; // L: 26
+		this.isBoundsCalculated = false; // L: 43
+		this.verticesCount = var1.verticesCount; // L: 1048
+		this.faceCount = var1.faceCount; // L: 1049
+		this.textureTriangleCount = var1.textureTriangleCount; // L: 1050
 		int var6;
-		if (var2) { // L: 591
-			this.verticesX = var1.verticesX; // L: 592
-			this.verticesY = var1.verticesY; // L: 593
-			this.verticesZ = var1.verticesZ; // L: 594
+		if (var2) { // L: 1051
+			this.verticesX = var1.verticesX; // L: 1052
+			this.verticesY = var1.verticesY; // L: 1053
+			this.verticesZ = var1.verticesZ; // L: 1054
 		} else {
-			this.verticesX = new int[this.verticesCount]; // L: 597
-			this.verticesY = new int[this.verticesCount]; // L: 598
-			this.verticesZ = new int[this.verticesCount]; // L: 599
-
-			for (var6 = 0; var6 < this.verticesCount; ++var6) { // L: 600
-				this.verticesX[var6] = var1.verticesX[var6]; // L: 601
-				this.verticesY[var6] = var1.verticesY[var6]; // L: 602
-				this.verticesZ[var6] = var1.verticesZ[var6]; // L: 603
+			this.verticesX = new int[this.verticesCount]; // L: 1057
+			this.verticesY = new int[this.verticesCount]; // L: 1058
+			this.verticesZ = new int[this.verticesCount]; // L: 1059
+
+			for (var6 = 0; var6 < this.verticesCount; ++var6) { // L: 1060
+				this.verticesX[var6] = var1.verticesX[var6]; // L: 1061
+				this.verticesY[var6] = var1.verticesY[var6]; // L: 1062
+				this.verticesZ[var6] = var1.verticesZ[var6]; // L: 1063
 			}
 		}
 
-		if (var3) { // L: 606
+		if (var3) { // L: 1066
 			this.faceColors = var1.faceColors;
 		} else {
-			this.faceColors = new short[this.faceCount]; // L: 608
+			this.faceColors = new short[this.faceCount]; // L: 1068
 
-			for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 609
+			for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 1069
 				this.faceColors[var6] = var1.faceColors[var6];
 			}
 		}
 
-		if (!var4 && var1.faceTextures != null) { // L: 611
-			this.faceTextures = new short[this.faceCount]; // L: 613
+		if (!var4 && var1.faceTextures != null) { // L: 1071
+			this.faceTextures = new short[this.faceCount]; // L: 1073
 
-			for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 614
+			for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 1074
 				this.faceTextures[var6] = var1.faceTextures[var6];
 			}
 		} else {
 			this.faceTextures = var1.faceTextures;
 		}
 
-		this.faceAlphas = var1.faceAlphas; // L: 616
-		this.indices1 = var1.indices1; // L: 626
-		this.indices2 = var1.indices2; // L: 627
-		this.indices3 = var1.indices3; // L: 628
-		this.faceRenderTypes = var1.faceRenderTypes; // L: 629
-		this.faceRenderPriorities = var1.faceRenderPriorities; // L: 630
-		this.textureCoords = var1.textureCoords; // L: 631
-		this.priority = var1.priority; // L: 632
-		this.textureRenderTypes = var1.textureRenderTypes; // L: 633
-		this.texTriangleX = var1.texTriangleX; // L: 634
-		this.texTriangleY = var1.texTriangleY; // L: 635
-		this.texTriangleZ = var1.texTriangleZ; // L: 636
-		this.vertexSkins = var1.vertexSkins; // L: 637
-		this.faceSkins = var1.faceSkins; // L: 638
-		this.vertexLabels = var1.vertexLabels; // L: 639
-		this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 640
-		this.vertexNormals = var1.vertexNormals; // L: 641
-		this.faceNormals = var1.faceNormals; // L: 642
-		this.vertexVertices = var1.vertexVertices; // L: 643
-		this.ambient = var1.ambient; // L: 644
-		this.contrast = var1.contrast; // L: 645
+		this.faceAlphas = var1.faceAlphas; // L: 1076
+		this.indices1 = var1.indices1; // L: 1086
+		this.indices2 = var1.indices2; // L: 1087
+		this.indices3 = var1.indices3; // L: 1088
+		this.faceRenderTypes = var1.faceRenderTypes; // L: 1089
+		this.faceRenderPriorities = var1.faceRenderPriorities; // L: 1090
+		this.textureCoords = var1.textureCoords; // L: 1091
+		this.priority = var1.priority; // L: 1092
+		this.textureRenderTypes = var1.textureRenderTypes; // L: 1093
+		this.texTriangleX = var1.texTriangleX; // L: 1094
+		this.texTriangleY = var1.texTriangleY; // L: 1095
+		this.texTriangleZ = var1.texTriangleZ; // L: 1096
+		this.vertexSkins = var1.vertexSkins; // L: 1097
+		this.faceSkins = var1.faceSkins; // L: 1098
+		this.vertexLabels = var1.vertexLabels; // L: 1099
+		this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 1100
+		this.vertexNormals = var1.vertexNormals; // L: 1101
+		this.faceNormals = var1.faceNormals; // L: 1102
+		this.vertexVertices = var1.vertexVertices; // L: 1103
+		this.field2185 = var1.field2185; // L: 1104
+		this.field2173 = var1.field2173; // L: 1105
+		this.ambient = var1.ambient; // L: 1106
+		this.contrast = var1.contrast; // L: 1107
 	}
 
-	@ObfuscatedName("s")
-	void method4112(byte[] var1) {
-		Buffer var2 = new Buffer(var1); // L: 64
-		Buffer var3 = new Buffer(var1); // L: 65
-		Buffer var4 = new Buffer(var1); // L: 66
-		Buffer var5 = new Buffer(var1); // L: 67
-		Buffer var6 = new Buffer(var1); // L: 68
-		Buffer var7 = new Buffer(var1); // L: 69
-		Buffer var8 = new Buffer(var1); // L: 70
-		var2.offset = var1.length - 23; // L: 71
-		int var9 = var2.readUnsignedShort(); // L: 72
-		int var10 = var2.readUnsignedShort(); // L: 73
-		int var11 = var2.readUnsignedByte(); // L: 74
-		int var12 = var2.readUnsignedByte(); // L: 75
-		int var13 = var2.readUnsignedByte(); // L: 76
-		int var14 = var2.readUnsignedByte(); // L: 77
-		int var15 = var2.readUnsignedByte(); // L: 78
-		int var16 = var2.readUnsignedByte(); // L: 79
-		int var17 = var2.readUnsignedByte(); // L: 80
-		int var18 = var2.readUnsignedShort(); // L: 81
-		int var19 = var2.readUnsignedShort(); // L: 82
-		int var20 = var2.readUnsignedShort(); // L: 83
-		int var21 = var2.readUnsignedShort(); // L: 84
-		int var22 = var2.readUnsignedShort(); // L: 85
-		int var23 = 0; // L: 86
-		int var24 = 0; // L: 87
-		int var25 = 0; // L: 88
+	@ObfuscatedName("p")
+	void method3742(byte[] var1) {
+		Buffer var2 = new Buffer(var1); // L: 73
+		Buffer var3 = new Buffer(var1); // L: 74
+		Buffer var4 = new Buffer(var1); // L: 75
+		Buffer var5 = new Buffer(var1); // L: 76
+		Buffer var6 = new Buffer(var1); // L: 77
+		Buffer var7 = new Buffer(var1); // L: 78
+		Buffer var8 = new Buffer(var1); // L: 79
+		var2.offset = var1.length - 26; // L: 80
+		int var9 = var2.readUnsignedShort(); // L: 81
+		int var10 = var2.readUnsignedShort(); // L: 82
+		int var11 = var2.readUnsignedByte(); // L: 83
+		int var12 = var2.readUnsignedByte(); // L: 84
+		int var13 = var2.readUnsignedByte(); // L: 85
+		int var14 = var2.readUnsignedByte(); // L: 86
+		int var15 = var2.readUnsignedByte(); // L: 87
+		int var16 = var2.readUnsignedByte(); // L: 88
+		int var17 = var2.readUnsignedByte(); // L: 89
+		int var18 = var2.readUnsignedByte(); // L: 90
+		int var19 = var2.readUnsignedShort(); // L: 91
+		int var20 = var2.readUnsignedShort(); // L: 92
+		int var21 = var2.readUnsignedShort(); // L: 93
+		int var22 = var2.readUnsignedShort(); // L: 94
+		int var23 = var2.readUnsignedShort(); // L: 95
+		int var24 = var2.readUnsignedShort(); // L: 96
+		int var25 = 0; // L: 97
+		int var26 = 0; // L: 98
+		int var27 = 0; // L: 99
+		int var28;
+		if (var11 > 0) { // L: 100
+			this.textureRenderTypes = new byte[var11]; // L: 101
+			var2.offset = 0; // L: 102
+
+			for (var28 = 0; var28 < var11; ++var28) { // L: 103
+				byte var29 = this.textureRenderTypes[var28] = var2.readByte(); // L: 104
+				if (var29 == 0) { // L: 105
+					++var25;
+				}
+
+				if (var29 >= 1 && var29 <= 3) { // L: 106
+					++var26;
+				}
+
+				if (var29 == 2) { // L: 107
+					++var27;
+				}
+			}
+		}
+
+		var28 = var11 + var9; // L: 112
+		int var30 = var28; // L: 113
+		if (var12 == 1) { // L: 114
+			var28 += var10;
+		}
+
+		int var31 = var28; // L: 115
+		var28 += var10; // L: 116
+		int var32 = var28; // L: 117
+		if (var13 == 255) { // L: 118
+			var28 += var10;
+		}
+
+		int var33 = var28; // L: 119
+		if (var15 == 1) { // L: 120
+			var28 += var10;
+		}
+
+		int var34 = var28; // L: 121
+		var28 += var24; // L: 122
+		int var35 = var28; // L: 123
+		if (var14 == 1) { // L: 124
+			var28 += var10;
+		}
+
+		int var36 = var28; // L: 125
+		var28 += var22; // L: 126
+		int var37 = var28; // L: 127
+		if (var16 == 1) { // L: 128
+			var28 += var10 * 2;
+		}
+
+		int var38 = var28; // L: 129
+		var28 += var23; // L: 130
+		int var39 = var28; // L: 131
+		var28 += var10 * 2; // L: 132
+		int var40 = var28; // L: 133
+		var28 += var19; // L: 134
+		int var41 = var28; // L: 135
+		var28 += var20; // L: 136
+		int var42 = var28; // L: 137
+		var28 += var21; // L: 138
+		int var43 = var28; // L: 139
+		var28 += var25 * 6; // L: 140
+		int var44 = var28; // L: 141
+		var28 += var26 * 6; // L: 142
+		int var45 = var28; // L: 143
+		var28 += var26 * 6; // L: 144
+		int var46 = var28; // L: 145
+		var28 += var26 * 2; // L: 146
+		int var47 = var28; // L: 147
+		var28 += var26; // L: 148
+		int var48 = var28; // L: 149
+		var28 += var26 * 2 + var27 * 2; // L: 150
+		this.verticesCount = var9; // L: 152
+		this.faceCount = var10; // L: 153
+		this.textureTriangleCount = var11; // L: 154
+		this.verticesX = new int[var9]; // L: 155
+		this.verticesY = new int[var9]; // L: 156
+		this.verticesZ = new int[var9]; // L: 157
+		this.indices1 = new int[var10]; // L: 158
+		this.indices2 = new int[var10]; // L: 159
+		this.indices3 = new int[var10]; // L: 160
+		if (var17 == 1) { // L: 161
+			this.vertexSkins = new int[var9];
+		}
+
+		if (var12 == 1) { // L: 162
+			this.faceRenderTypes = new byte[var10];
+		}
+
+		if (var13 == 255) { // L: 163
+			this.faceRenderPriorities = new byte[var10];
+		} else {
+			this.priority = (byte)var13; // L: 164
+		}
+
+		if (var14 == 1) { // L: 165
+			this.faceAlphas = new byte[var10];
+		}
+
+		if (var15 == 1) { // L: 166
+			this.faceSkins = new int[var10];
+		}
+
+		if (var16 == 1) { // L: 167
+			this.faceTextures = new short[var10];
+		}
+
+		if (var16 == 1 && var11 > 0) { // L: 168
+			this.textureCoords = new byte[var10];
+		}
+
+		if (var18 == 1) { // L: 169
+			this.field2185 = new int[var9][]; // L: 170
+			this.field2173 = new int[var9][]; // L: 171
+		}
+
+		this.faceColors = new short[var10]; // L: 173
+		if (var11 > 0) { // L: 174
+			this.texTriangleX = new short[var11]; // L: 175
+			this.texTriangleY = new short[var11]; // L: 176
+			this.texTriangleZ = new short[var11]; // L: 177
+		}
+
+		var2.offset = var11; // L: 179
+		var3.offset = var40; // L: 180
+		var4.offset = var41; // L: 181
+		var5.offset = var42; // L: 182
+		var6.offset = var34; // L: 183
+		int var50 = 0; // L: 184
+		int var51 = 0; // L: 185
+		int var52 = 0; // L: 186
+
+		int var53;
+		int var54;
+		int var55;
+		int var56;
+		int var57;
+		for (var53 = 0; var53 < var9; ++var53) { // L: 187
+			var54 = var2.readUnsignedByte(); // L: 188
+			var55 = 0; // L: 189
+			if ((var54 & 1) != 0) { // L: 190
+				var55 = var3.readShortSmart();
+			}
+
+			var56 = 0; // L: 191
+			if ((var54 & 2) != 0) { // L: 192
+				var56 = var4.readShortSmart();
+			}
+
+			var57 = 0; // L: 193
+			if ((var54 & 4) != 0) { // L: 194
+				var57 = var5.readShortSmart();
+			}
+
+			this.verticesX[var53] = var50 + var55; // L: 195
+			this.verticesY[var53] = var51 + var56; // L: 196
+			this.verticesZ[var53] = var52 + var57; // L: 197
+			var50 = this.verticesX[var53]; // L: 198
+			var51 = this.verticesY[var53]; // L: 199
+			var52 = this.verticesZ[var53]; // L: 200
+			if (var17 == 1) { // L: 201
+				this.vertexSkins[var53] = var6.readUnsignedByte();
+			}
+		}
+
+		if (var18 == 1) { // L: 203
+			for (var53 = 0; var53 < var9; ++var53) { // L: 204
+				var54 = var6.readUnsignedByte(); // L: 205
+				this.field2185[var53] = new int[var54]; // L: 206
+				this.field2173[var53] = new int[var54]; // L: 207
+
+				for (var55 = 0; var55 < var54; ++var55) { // L: 208
+					this.field2185[var53][var55] = var6.readUnsignedByte(); // L: 209
+					this.field2173[var53][var55] = var6.readUnsignedByte(); // L: 210
+				}
+			}
+		}
+
+		var2.offset = var39; // L: 214
+		var3.offset = var30; // L: 215
+		var4.offset = var32; // L: 216
+		var5.offset = var35; // L: 217
+		var6.offset = var33; // L: 218
+		var7.offset = var37; // L: 219
+		var8.offset = var38; // L: 220
+
+		for (var53 = 0; var53 < var10; ++var53) { // L: 221
+			this.faceColors[var53] = (short)var2.readUnsignedShort(); // L: 222
+			if (var12 == 1) { // L: 223
+				this.faceRenderTypes[var53] = var3.readByte();
+			}
+
+			if (var13 == 255) { // L: 224
+				this.faceRenderPriorities[var53] = var4.readByte();
+			}
+
+			if (var14 == 1) { // L: 225
+				this.faceAlphas[var53] = var5.readByte();
+			}
+
+			if (var15 == 1) { // L: 226
+				this.faceSkins[var53] = var6.readUnsignedByte();
+			}
+
+			if (var16 == 1) { // L: 227
+				this.faceTextures[var53] = (short)(var7.readUnsignedShort() - 1);
+			}
+
+			if (this.textureCoords != null && this.faceTextures[var53] != -1) { // L: 228
+				this.textureCoords[var53] = (byte)(var8.readUnsignedByte() - 1);
+			}
+		}
+
+		var2.offset = var36; // L: 230
+		var3.offset = var31; // L: 231
+		var53 = 0; // L: 232
+		var54 = 0; // L: 233
+		var55 = 0; // L: 234
+		var56 = 0; // L: 235
+
+		int var58;
+		for (var57 = 0; var57 < var10; ++var57) { // L: 236
+			var58 = var3.readUnsignedByte(); // L: 237
+			if (var58 == 1) { // L: 238
+				var53 = var2.readShortSmart() + var56; // L: 239
+				var54 = var2.readShortSmart() + var53; // L: 241
+				var55 = var2.readShortSmart() + var54; // L: 243
+				var56 = var55; // L: 244
+				this.indices1[var57] = var53; // L: 245
+				this.indices2[var57] = var54; // L: 246
+				this.indices3[var57] = var55; // L: 247
+			}
+
+			if (var58 == 2) { // L: 249
+				var54 = var55; // L: 250
+				var55 = var2.readShortSmart() + var56; // L: 251
+				var56 = var55; // L: 252
+				this.indices1[var57] = var53; // L: 253
+				this.indices2[var57] = var54; // L: 254
+				this.indices3[var57] = var55; // L: 255
+			}
+
+			if (var58 == 3) { // L: 257
+				var53 = var55; // L: 258
+				var55 = var2.readShortSmart() + var56; // L: 259
+				var56 = var55; // L: 260
+				this.indices1[var57] = var53; // L: 261
+				this.indices2[var57] = var54; // L: 262
+				this.indices3[var57] = var55; // L: 263
+			}
+
+			if (var58 == 4) { // L: 265
+				int var59 = var53; // L: 266
+				var53 = var54; // L: 267
+				var54 = var59; // L: 268
+				var55 = var2.readShortSmart() + var56; // L: 269
+				var56 = var55; // L: 270
+				this.indices1[var57] = var53; // L: 271
+				this.indices2[var57] = var59; // L: 272
+				this.indices3[var57] = var55; // L: 273
+			}
+		}
+
+		var2.offset = var43; // L: 276
+		var3.offset = var44; // L: 277
+		var4.offset = var45; // L: 278
+		var5.offset = var46; // L: 279
+		var6.offset = var47; // L: 280
+		var7.offset = var48; // L: 281
+
+		for (var57 = 0; var57 < var11; ++var57) { // L: 282
+			var58 = this.textureRenderTypes[var57] & 255; // L: 283
+			if (var58 == 0) { // L: 284
+				this.texTriangleX[var57] = (short)var2.readUnsignedShort(); // L: 285
+				this.texTriangleY[var57] = (short)var2.readUnsignedShort(); // L: 286
+				this.texTriangleZ[var57] = (short)var2.readUnsignedShort(); // L: 287
+			}
+		}
+
+		var2.offset = var28; // L: 290
+		var57 = var2.readUnsignedByte(); // L: 291
+		if (var57 != 0) { // L: 292
+			new ModelData0();
+			var2.readUnsignedShort(); // L: 294
+			var2.readUnsignedShort(); // L: 295
+			var2.readUnsignedShort(); // L: 296
+			var2.readInt(); // L: 297
+		}
+
+	} // L: 299
+
+	@ObfuscatedName("m")
+	void method3784(byte[] var1) {
+		boolean var2 = false; // L: 302
+		boolean var3 = false; // L: 303
+		Buffer var4 = new Buffer(var1); // L: 304
+		Buffer var5 = new Buffer(var1); // L: 305
+		Buffer var6 = new Buffer(var1); // L: 306
+		Buffer var7 = new Buffer(var1); // L: 307
+		Buffer var8 = new Buffer(var1); // L: 308
+		var4.offset = var1.length - 23; // L: 309
+		int var9 = var4.readUnsignedShort(); // L: 310
+		int var10 = var4.readUnsignedShort(); // L: 311
+		int var11 = var4.readUnsignedByte(); // L: 312
+		int var12 = var4.readUnsignedByte(); // L: 313
+		int var13 = var4.readUnsignedByte(); // L: 314
+		int var14 = var4.readUnsignedByte(); // L: 315
+		int var15 = var4.readUnsignedByte(); // L: 316
+		int var16 = var4.readUnsignedByte(); // L: 317
+		int var17 = var4.readUnsignedByte(); // L: 318
+		int var18 = var4.readUnsignedShort(); // L: 319
+		int var19 = var4.readUnsignedShort(); // L: 320
+		int var20 = var4.readUnsignedShort(); // L: 321
+		int var21 = var4.readUnsignedShort(); // L: 322
+		int var22 = var4.readUnsignedShort(); // L: 323
+		byte var23 = 0; // L: 324
+		int var47 = var23 + var9; // L: 326
+		int var25 = var47; // L: 327
+		var47 += var10; // L: 328
+		int var26 = var47; // L: 329
+		if (var13 == 255) { // L: 330
+			var47 += var10;
+		}
+
+		int var27 = var47; // L: 331
+		if (var15 == 1) { // L: 332
+			var47 += var10;
+		}
+
+		int var28 = var47; // L: 333
+		if (var12 == 1) { // L: 334
+			var47 += var10;
+		}
+
+		int var29 = var47; // L: 335
+		var47 += var22; // L: 336
+		int var30 = var47; // L: 337
+		if (var14 == 1) { // L: 338
+			var47 += var10;
+		}
+
+		int var31 = var47; // L: 339
+		var47 += var21; // L: 340
+		int var32 = var47; // L: 341
+		var47 += var10 * 2; // L: 342
+		int var33 = var47; // L: 343
+		var47 += var11 * 6; // L: 344
+		int var34 = var47; // L: 345
+		var47 += var18; // L: 346
+		int var35 = var47; // L: 347
+		var47 += var19; // L: 348
+		int var10000 = var47 + var20; // L: 350
+		this.verticesCount = var9; // L: 351
+		this.faceCount = var10; // L: 352
+		this.textureTriangleCount = var11; // L: 353
+		this.verticesX = new int[var9]; // L: 354
+		this.verticesY = new int[var9]; // L: 355
+		this.verticesZ = new int[var9]; // L: 356
+		this.indices1 = new int[var10]; // L: 357
+		this.indices2 = new int[var10]; // L: 358
+		this.indices3 = new int[var10]; // L: 359
+		if (var11 > 0) { // L: 360
+			this.textureRenderTypes = new byte[var11]; // L: 361
+			this.texTriangleX = new short[var11]; // L: 362
+			this.texTriangleY = new short[var11]; // L: 363
+			this.texTriangleZ = new short[var11]; // L: 364
+		}
+
+		if (var16 == 1) { // L: 366
+			this.vertexSkins = new int[var9];
+		}
+
+		if (var12 == 1) { // L: 367
+			this.faceRenderTypes = new byte[var10]; // L: 368
+			this.textureCoords = new byte[var10]; // L: 369
+			this.faceTextures = new short[var10]; // L: 370
+		}
+
+		if (var13 == 255) { // L: 372
+			this.faceRenderPriorities = new byte[var10];
+		} else {
+			this.priority = (byte)var13; // L: 373
+		}
+
+		if (var14 == 1) { // L: 374
+			this.faceAlphas = new byte[var10];
+		}
+
+		if (var15 == 1) { // L: 375
+			this.faceSkins = new int[var10];
+		}
+
+		if (var17 == 1) { // L: 376
+			this.field2185 = new int[var9][]; // L: 377
+			this.field2173 = new int[var9][]; // L: 378
+		}
+
+		this.faceColors = new short[var10]; // L: 380
+		var4.offset = var23; // L: 381
+		var5.offset = var34; // L: 382
+		var6.offset = var35; // L: 383
+		var7.offset = var47; // L: 384
+		var8.offset = var29; // L: 385
+		int var37 = 0; // L: 386
+		int var38 = 0; // L: 387
+		int var39 = 0; // L: 388
+
+		int var40;
+		int var41;
+		int var42;
+		int var43;
+		int var44;
+		for (var40 = 0; var40 < var9; ++var40) { // L: 389
+			var41 = var4.readUnsignedByte(); // L: 390
+			var42 = 0; // L: 391
+			if ((var41 & 1) != 0) { // L: 392
+				var42 = var5.readShortSmart();
+			}
+
+			var43 = 0; // L: 393
+			if ((var41 & 2) != 0) { // L: 394
+				var43 = var6.readShortSmart();
+			}
+
+			var44 = 0; // L: 395
+			if ((var41 & 4) != 0) { // L: 396
+				var44 = var7.readShortSmart();
+			}
+
+			this.verticesX[var40] = var37 + var42; // L: 397
+			this.verticesY[var40] = var38 + var43; // L: 398
+			this.verticesZ[var40] = var39 + var44; // L: 399
+			var37 = this.verticesX[var40]; // L: 400
+			var38 = this.verticesY[var40]; // L: 401
+			var39 = this.verticesZ[var40]; // L: 402
+			if (var16 == 1) { // L: 403
+				this.vertexSkins[var40] = var8.readUnsignedByte();
+			}
+		}
+
+		if (var17 == 1) { // L: 405
+			for (var40 = 0; var40 < var9; ++var40) { // L: 406
+				var41 = var8.readUnsignedByte(); // L: 407
+				this.field2185[var40] = new int[var41]; // L: 408
+				this.field2173[var40] = new int[var41]; // L: 409
+
+				for (var42 = 0; var42 < var41; ++var42) { // L: 410
+					this.field2185[var40][var42] = var8.readUnsignedByte(); // L: 411
+					this.field2173[var40][var42] = var8.readUnsignedByte(); // L: 412
+				}
+			}
+		}
+
+		var4.offset = var32; // L: 416
+		var5.offset = var28; // L: 417
+		var6.offset = var26; // L: 418
+		var7.offset = var30; // L: 419
+		var8.offset = var27; // L: 420
+
+		for (var40 = 0; var40 < var10; ++var40) { // L: 421
+			this.faceColors[var40] = (short)var4.readUnsignedShort(); // L: 422
+			if (var12 == 1) { // L: 423
+				var41 = var5.readUnsignedByte(); // L: 424
+				if ((var41 & 1) == 1) { // L: 425
+					this.faceRenderTypes[var40] = 1; // L: 426
+					var2 = true; // L: 427
+				} else {
+					this.faceRenderTypes[var40] = 0; // L: 429
+				}
+
+				if ((var41 & 2) == 2) { // L: 430
+					this.textureCoords[var40] = (byte)(var41 >> 2); // L: 431
+					this.faceTextures[var40] = this.faceColors[var40]; // L: 432
+					this.faceColors[var40] = 127; // L: 433
+					if (this.faceTextures[var40] != -1) { // L: 434
+						var3 = true;
+					}
+				} else {
+					this.textureCoords[var40] = -1; // L: 437
+					this.faceTextures[var40] = -1; // L: 438
+				}
+			}
+
+			if (var13 == 255) { // L: 441
+				this.faceRenderPriorities[var40] = var6.readByte();
+			}
+
+			if (var14 == 1) { // L: 442
+				this.faceAlphas[var40] = var7.readByte();
+			}
+
+			if (var15 == 1) { // L: 443
+				this.faceSkins[var40] = var8.readUnsignedByte();
+			}
+		}
+
+		var4.offset = var31; // L: 445
+		var5.offset = var25; // L: 446
+		var40 = 0; // L: 447
+		var41 = 0; // L: 448
+		var42 = 0; // L: 449
+		var43 = 0; // L: 450
+
+		int var45;
+		int var46;
+		for (var44 = 0; var44 < var10; ++var44) { // L: 451
+			var45 = var5.readUnsignedByte(); // L: 452
+			if (var45 == 1) { // L: 453
+				var40 = var4.readShortSmart() + var43; // L: 454
+				var41 = var4.readShortSmart() + var40; // L: 456
+				var42 = var4.readShortSmart() + var41; // L: 458
+				var43 = var42; // L: 459
+				this.indices1[var44] = var40; // L: 460
+				this.indices2[var44] = var41; // L: 461
+				this.indices3[var44] = var42; // L: 462
+			}
+
+			if (var45 == 2) { // L: 464
+				var41 = var42; // L: 465
+				var42 = var4.readShortSmart() + var43; // L: 466
+				var43 = var42; // L: 467
+				this.indices1[var44] = var40; // L: 468
+				this.indices2[var44] = var41; // L: 469
+				this.indices3[var44] = var42; // L: 470
+			}
+
+			if (var45 == 3) { // L: 472
+				var40 = var42; // L: 473
+				var42 = var4.readShortSmart() + var43; // L: 474
+				var43 = var42; // L: 475
+				this.indices1[var44] = var40; // L: 476
+				this.indices2[var44] = var41; // L: 477
+				this.indices3[var44] = var42; // L: 478
+			}
+
+			if (var45 == 4) { // L: 480
+				var46 = var40; // L: 481
+				var40 = var41; // L: 482
+				var41 = var46; // L: 483
+				var42 = var4.readShortSmart() + var43; // L: 484
+				var43 = var42; // L: 485
+				this.indices1[var44] = var40; // L: 486
+				this.indices2[var44] = var46; // L: 487
+				this.indices3[var44] = var42; // L: 488
+			}
+		}
+
+		var4.offset = var33; // L: 491
+
+		for (var44 = 0; var44 < var11; ++var44) { // L: 492
+			this.textureRenderTypes[var44] = 0; // L: 493
+			this.texTriangleX[var44] = (short)var4.readUnsignedShort(); // L: 494
+			this.texTriangleY[var44] = (short)var4.readUnsignedShort(); // L: 495
+			this.texTriangleZ[var44] = (short)var4.readUnsignedShort(); // L: 496
+		}
+
+		if (this.textureCoords != null) { // L: 498
+			boolean var48 = false; // L: 499
+
+			for (var45 = 0; var45 < var10; ++var45) { // L: 500
+				var46 = this.textureCoords[var45] & 255; // L: 501
+				if (var46 != 255) { // L: 502
+					if (this.indices1[var45] == (this.texTriangleX[var46] & '\uffff') && this.indices2[var45] == (this.texTriangleY[var46] & '\uffff') && this.indices3[var45] == (this.texTriangleZ[var46] & '\uffff')) { // L: 503
+						this.textureCoords[var45] = -1;
+					} else {
+						var48 = true; // L: 504
+					}
+				}
+			}
+
+			if (!var48) { // L: 507
+				this.textureCoords = null;
+			}
+		}
+
+		if (!var3) { // L: 509
+			this.faceTextures = null;
+		}
+
+		if (!var2) { // L: 510
+			this.faceRenderTypes = null;
+		}
+
+	} // L: 511
+
+	@ObfuscatedName("t")
+	void method3758(byte[] var1) {
+		Buffer var2 = new Buffer(var1); // L: 514
+		Buffer var3 = new Buffer(var1); // L: 515
+		Buffer var4 = new Buffer(var1); // L: 516
+		Buffer var5 = new Buffer(var1); // L: 517
+		Buffer var6 = new Buffer(var1); // L: 518
+		Buffer var7 = new Buffer(var1); // L: 519
+		Buffer var8 = new Buffer(var1); // L: 520
+		var2.offset = var1.length - 23; // L: 521
+		int var9 = var2.readUnsignedShort(); // L: 522
+		int var10 = var2.readUnsignedShort(); // L: 523
+		int var11 = var2.readUnsignedByte(); // L: 524
+		int var12 = var2.readUnsignedByte(); // L: 525
+		int var13 = var2.readUnsignedByte(); // L: 526
+		int var14 = var2.readUnsignedByte(); // L: 527
+		int var15 = var2.readUnsignedByte(); // L: 528
+		int var16 = var2.readUnsignedByte(); // L: 529
+		int var17 = var2.readUnsignedByte(); // L: 530
+		int var18 = var2.readUnsignedShort(); // L: 531
+		int var19 = var2.readUnsignedShort(); // L: 532
+		int var20 = var2.readUnsignedShort(); // L: 533
+		int var21 = var2.readUnsignedShort(); // L: 534
+		int var22 = var2.readUnsignedShort(); // L: 535
+		int var23 = 0; // L: 536
+		int var24 = 0; // L: 537
+		int var25 = 0; // L: 538
 		int var26;
-		if (var11 > 0) { // L: 89
-			this.textureRenderTypes = new byte[var11]; // L: 90
-			var2.offset = 0; // L: 91
+		if (var11 > 0) { // L: 539
+			this.textureRenderTypes = new byte[var11]; // L: 540
+			var2.offset = 0; // L: 541
 
-			for (var26 = 0; var26 < var11; ++var26) { // L: 92
-				byte var27 = this.textureRenderTypes[var26] = var2.readByte(); // L: 93
-				if (var27 == 0) { // L: 94
+			for (var26 = 0; var26 < var11; ++var26) { // L: 542
+				byte var27 = this.textureRenderTypes[var26] = var2.readByte(); // L: 543
+				if (var27 == 0) { // L: 544
 					++var23;
 				}
 
-				if (var27 >= 1 && var27 <= 3) { // L: 95
+				if (var27 >= 1 && var27 <= 3) { // L: 545
 					++var24;
 				}
 
-				if (var27 == 2) { // L: 96
+				if (var27 == 2) { // L: 546
 					++var25;
 				}
 			}
 		}
 
-		var26 = var11 + var9; // L: 101
-		int var28 = var26; // L: 102
-		if (var12 == 1) { // L: 103
+		var26 = var11 + var9; // L: 551
+		int var28 = var26; // L: 552
+		if (var12 == 1) { // L: 553
 			var26 += var10;
 		}
 
-		int var29 = var26; // L: 104
-		var26 += var10; // L: 105
-		int var30 = var26; // L: 106
-		if (var13 == 255) { // L: 107
+		int var29 = var26; // L: 554
+		var26 += var10; // L: 555
+		int var30 = var26; // L: 556
+		if (var13 == 255) { // L: 557
 			var26 += var10;
 		}
 
-		int var31 = var26; // L: 108
-		if (var15 == 1) { // L: 109
+		int var31 = var26; // L: 558
+		if (var15 == 1) { // L: 559
 			var26 += var10;
 		}
 
-		int var32 = var26; // L: 110
-		if (var17 == 1) { // L: 111
+		int var32 = var26; // L: 560
+		if (var17 == 1) { // L: 561
 			var26 += var9;
 		}
 
-		int var33 = var26; // L: 112
-		if (var14 == 1) { // L: 113
+		int var33 = var26; // L: 562
+		if (var14 == 1) { // L: 563
 			var26 += var10;
 		}
 
-		int var34 = var26; // L: 114
-		var26 += var21; // L: 115
-		int var35 = var26; // L: 116
-		if (var16 == 1) { // L: 117
+		int var34 = var26; // L: 564
+		var26 += var21; // L: 565
+		int var35 = var26; // L: 566
+		if (var16 == 1) { // L: 567
 			var26 += var10 * 2;
 		}
 
-		int var36 = var26; // L: 118
-		var26 += var22; // L: 119
-		int var37 = var26; // L: 120
-		var26 += var10 * 2; // L: 121
-		int var38 = var26; // L: 122
-		var26 += var18; // L: 123
-		int var39 = var26; // L: 124
-		var26 += var19; // L: 125
-		int var40 = var26; // L: 126
-		var26 += var20; // L: 127
-		int var41 = var26; // L: 128
-		var26 += var23 * 6; // L: 129
-		int var42 = var26; // L: 130
-		var26 += var24 * 6; // L: 131
-		int var43 = var26; // L: 132
-		var26 += var24 * 6; // L: 133
-		int var44 = var26; // L: 134
-		var26 += var24 * 2; // L: 135
-		int var45 = var26; // L: 136
-		var26 += var24; // L: 137
-		int var46 = var26; // L: 138
-		var26 += var24 * 2 + var25 * 2; // L: 139
-		this.verticesCount = var9; // L: 141
-		this.faceCount = var10; // L: 142
-		this.textureTriangleCount = var11; // L: 143
-		this.verticesX = new int[var9]; // L: 144
-		this.verticesY = new int[var9]; // L: 145
-		this.verticesZ = new int[var9]; // L: 146
-		this.indices1 = new int[var10]; // L: 147
-		this.indices2 = new int[var10]; // L: 148
-		this.indices3 = new int[var10]; // L: 149
-		if (var17 == 1) { // L: 150
+		int var36 = var26; // L: 568
+		var26 += var22; // L: 569
+		int var37 = var26; // L: 570
+		var26 += var10 * 2; // L: 571
+		int var38 = var26; // L: 572
+		var26 += var18; // L: 573
+		int var39 = var26; // L: 574
+		var26 += var19; // L: 575
+		int var40 = var26; // L: 576
+		var26 += var20; // L: 577
+		int var41 = var26; // L: 578
+		var26 += var23 * 6; // L: 579
+		int var42 = var26; // L: 580
+		var26 += var24 * 6; // L: 581
+		int var43 = var26; // L: 582
+		var26 += var24 * 6; // L: 583
+		int var44 = var26; // L: 584
+		var26 += var24 * 2; // L: 585
+		int var45 = var26; // L: 586
+		var26 += var24; // L: 587
+		int var46 = var26; // L: 588
+		var26 += var24 * 2 + var25 * 2; // L: 589
+		this.verticesCount = var9; // L: 591
+		this.faceCount = var10; // L: 592
+		this.textureTriangleCount = var11; // L: 593
+		this.verticesX = new int[var9]; // L: 594
+		this.verticesY = new int[var9]; // L: 595
+		this.verticesZ = new int[var9]; // L: 596
+		this.indices1 = new int[var10]; // L: 597
+		this.indices2 = new int[var10]; // L: 598
+		this.indices3 = new int[var10]; // L: 599
+		if (var17 == 1) { // L: 600
 			this.vertexSkins = new int[var9];
 		}
 
-		if (var12 == 1) { // L: 151
+		if (var12 == 1) { // L: 601
 			this.faceRenderTypes = new byte[var10];
 		}
 
-		if (var13 == 255) { // L: 152
+		if (var13 == 255) { // L: 602
 			this.faceRenderPriorities = new byte[var10];
 		} else {
-			this.priority = (byte)var13; // L: 153
+			this.priority = (byte)var13; // L: 603
 		}
 
-		if (var14 == 1) { // L: 154
+		if (var14 == 1) { // L: 604
 			this.faceAlphas = new byte[var10];
 		}
 
-		if (var15 == 1) { // L: 155
+		if (var15 == 1) { // L: 605
 			this.faceSkins = new int[var10];
 		}
 
-		if (var16 == 1) { // L: 156
+		if (var16 == 1) { // L: 606
 			this.faceTextures = new short[var10];
 		}
 
-		if (var16 == 1 && var11 > 0) { // L: 157
+		if (var16 == 1 && var11 > 0) { // L: 607
 			this.textureCoords = new byte[var10];
 		}
 
-		this.faceColors = new short[var10]; // L: 158
-		if (var11 > 0) { // L: 159
-			this.texTriangleX = new short[var11]; // L: 160
-			this.texTriangleY = new short[var11]; // L: 161
-			this.texTriangleZ = new short[var11]; // L: 162
+		this.faceColors = new short[var10]; // L: 608
+		if (var11 > 0) { // L: 609
+			this.texTriangleX = new short[var11]; // L: 610
+			this.texTriangleY = new short[var11]; // L: 611
+			this.texTriangleZ = new short[var11]; // L: 612
 		}
 
-		var2.offset = var11; // L: 164
-		var3.offset = var38; // L: 165
-		var4.offset = var39; // L: 166
-		var5.offset = var40; // L: 167
-		var6.offset = var32; // L: 168
-		int var48 = 0; // L: 169
-		int var49 = 0; // L: 170
-		int var50 = 0; // L: 171
+		var2.offset = var11; // L: 614
+		var3.offset = var38; // L: 615
+		var4.offset = var39; // L: 616
+		var5.offset = var40; // L: 617
+		var6.offset = var32; // L: 618
+		int var48 = 0; // L: 619
+		int var49 = 0; // L: 620
+		int var50 = 0; // L: 621
 
 		int var51;
 		int var52;
 		int var53;
 		int var54;
 		int var55;
-		for (var51 = 0; var51 < var9; ++var51) { // L: 172
-			var52 = var2.readUnsignedByte(); // L: 173
-			var53 = 0; // L: 174
-			if ((var52 & 1) != 0) { // L: 175
+		for (var51 = 0; var51 < var9; ++var51) { // L: 622
+			var52 = var2.readUnsignedByte(); // L: 623
+			var53 = 0; // L: 624
+			if ((var52 & 1) != 0) { // L: 625
 				var53 = var3.readShortSmart();
 			}
 
-			var54 = 0; // L: 176
-			if ((var52 & 2) != 0) { // L: 177
+			var54 = 0; // L: 626
+			if ((var52 & 2) != 0) { // L: 627
 				var54 = var4.readShortSmart();
 			}
 
-			var55 = 0; // L: 178
-			if ((var52 & 4) != 0) { // L: 179
+			var55 = 0; // L: 628
+			if ((var52 & 4) != 0) { // L: 629
 				var55 = var5.readShortSmart();
 			}
 
-			this.verticesX[var51] = var48 + var53; // L: 180
-			this.verticesY[var51] = var49 + var54; // L: 181
-			this.verticesZ[var51] = var50 + var55; // L: 182
-			var48 = this.verticesX[var51]; // L: 183
-			var49 = this.verticesY[var51]; // L: 184
-			var50 = this.verticesZ[var51]; // L: 185
-			if (var17 == 1) { // L: 186
+			this.verticesX[var51] = var48 + var53; // L: 630
+			this.verticesY[var51] = var49 + var54; // L: 631
+			this.verticesZ[var51] = var50 + var55; // L: 632
+			var48 = this.verticesX[var51]; // L: 633
+			var49 = this.verticesY[var51]; // L: 634
+			var50 = this.verticesZ[var51]; // L: 635
+			if (var17 == 1) { // L: 636
 				this.vertexSkins[var51] = var6.readUnsignedByte();
 			}
 		}
 
-		var2.offset = var37; // L: 188
-		var3.offset = var28; // L: 189
-		var4.offset = var30; // L: 190
-		var5.offset = var33; // L: 191
-		var6.offset = var31; // L: 192
-		var7.offset = var35; // L: 193
-		var8.offset = var36; // L: 194
+		var2.offset = var37; // L: 638
+		var3.offset = var28; // L: 639
+		var4.offset = var30; // L: 640
+		var5.offset = var33; // L: 641
+		var6.offset = var31; // L: 642
+		var7.offset = var35; // L: 643
+		var8.offset = var36; // L: 644
 
-		for (var51 = 0; var51 < var10; ++var51) { // L: 195
-			this.faceColors[var51] = (short)var2.readUnsignedShort(); // L: 196
-			if (var12 == 1) { // L: 197
+		for (var51 = 0; var51 < var10; ++var51) { // L: 645
+			this.faceColors[var51] = (short)var2.readUnsignedShort(); // L: 646
+			if (var12 == 1) { // L: 647
 				this.faceRenderTypes[var51] = var3.readByte();
 			}
 
-			if (var13 == 255) { // L: 198
+			if (var13 == 255) { // L: 648
 				this.faceRenderPriorities[var51] = var4.readByte();
 			}
 
-			if (var14 == 1) { // L: 199
+			if (var14 == 1) { // L: 649
 				this.faceAlphas[var51] = var5.readByte();
 			}
 
-			if (var15 == 1) { // L: 200
+			if (var15 == 1) { // L: 650
 				this.faceSkins[var51] = var6.readUnsignedByte();
 			}
 
-			if (var16 == 1) { // L: 201
+			if (var16 == 1) { // L: 651
 				this.faceTextures[var51] = (short)(var7.readUnsignedShort() - 1);
 			}
 
-			if (this.textureCoords != null && this.faceTextures[var51] != -1) { // L: 202
+			if (this.textureCoords != null && this.faceTextures[var51] != -1) { // L: 652
 				this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1);
 			}
 		}
 
-		var2.offset = var34; // L: 204
-		var3.offset = var29; // L: 205
-		var51 = 0; // L: 206
-		var52 = 0; // L: 207
-		var53 = 0; // L: 208
-		var54 = 0; // L: 209
+		var2.offset = var34; // L: 654
+		var3.offset = var29; // L: 655
+		var51 = 0; // L: 656
+		var52 = 0; // L: 657
+		var53 = 0; // L: 658
+		var54 = 0; // L: 659
 
 		int var56;
-		for (var55 = 0; var55 < var10; ++var55) { // L: 210
-			var56 = var3.readUnsignedByte(); // L: 211
-			if (var56 == 1) { // L: 212
-				var51 = var2.readShortSmart() + var54; // L: 213
-				var52 = var2.readShortSmart() + var51; // L: 215
-				var53 = var2.readShortSmart() + var52; // L: 217
-				var54 = var53; // L: 218
-				this.indices1[var55] = var51; // L: 219
-				this.indices2[var55] = var52; // L: 220
-				this.indices3[var55] = var53; // L: 221
-			}
-
-			if (var56 == 2) { // L: 223
-				var52 = var53; // L: 224
-				var53 = var2.readShortSmart() + var54; // L: 225
-				var54 = var53; // L: 226
-				this.indices1[var55] = var51; // L: 227
-				this.indices2[var55] = var52; // L: 228
-				this.indices3[var55] = var53; // L: 229
-			}
-
-			if (var56 == 3) { // L: 231
-				var51 = var53; // L: 232
-				var53 = var2.readShortSmart() + var54; // L: 233
-				var54 = var53; // L: 234
-				this.indices1[var55] = var51; // L: 235
-				this.indices2[var55] = var52; // L: 236
-				this.indices3[var55] = var53; // L: 237
-			}
-
-			if (var56 == 4) { // L: 239
-				int var57 = var51; // L: 240
-				var51 = var52; // L: 241
-				var52 = var57; // L: 242
-				var53 = var2.readShortSmart() + var54; // L: 243
-				var54 = var53; // L: 244
-				this.indices1[var55] = var51; // L: 245
-				this.indices2[var55] = var57; // L: 246
-				this.indices3[var55] = var53; // L: 247
-			}
-		}
-
-		var2.offset = var41; // L: 250
-		var3.offset = var42; // L: 251
-		var4.offset = var43; // L: 252
-		var5.offset = var44; // L: 253
-		var6.offset = var45; // L: 254
-		var7.offset = var46; // L: 255
-
-		for (var55 = 0; var55 < var11; ++var55) { // L: 256
-			var56 = this.textureRenderTypes[var55] & 255; // L: 257
-			if (var56 == 0) { // L: 258
-				this.texTriangleX[var55] = (short)var2.readUnsignedShort(); // L: 259
-				this.texTriangleY[var55] = (short)var2.readUnsignedShort(); // L: 260
-				this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); // L: 261
-			}
-		}
-
-		var2.offset = var26; // L: 264
-		var55 = var2.readUnsignedByte(); // L: 265
-		if (var55 != 0) { // L: 266
+		for (var55 = 0; var55 < var10; ++var55) { // L: 660
+			var56 = var3.readUnsignedByte(); // L: 661
+			if (var56 == 1) { // L: 662
+				var51 = var2.readShortSmart() + var54; // L: 663
+				var52 = var2.readShortSmart() + var51; // L: 665
+				var53 = var2.readShortSmart() + var52; // L: 667
+				var54 = var53; // L: 668
+				this.indices1[var55] = var51; // L: 669
+				this.indices2[var55] = var52; // L: 670
+				this.indices3[var55] = var53; // L: 671
+			}
+
+			if (var56 == 2) { // L: 673
+				var52 = var53; // L: 674
+				var53 = var2.readShortSmart() + var54; // L: 675
+				var54 = var53; // L: 676
+				this.indices1[var55] = var51; // L: 677
+				this.indices2[var55] = var52; // L: 678
+				this.indices3[var55] = var53; // L: 679
+			}
+
+			if (var56 == 3) { // L: 681
+				var51 = var53; // L: 682
+				var53 = var2.readShortSmart() + var54; // L: 683
+				var54 = var53; // L: 684
+				this.indices1[var55] = var51; // L: 685
+				this.indices2[var55] = var52; // L: 686
+				this.indices3[var55] = var53; // L: 687
+			}
+
+			if (var56 == 4) { // L: 689
+				int var57 = var51; // L: 690
+				var51 = var52; // L: 691
+				var52 = var57; // L: 692
+				var53 = var2.readShortSmart() + var54; // L: 693
+				var54 = var53; // L: 694
+				this.indices1[var55] = var51; // L: 695
+				this.indices2[var55] = var57; // L: 696
+				this.indices3[var55] = var53; // L: 697
+			}
+		}
+
+		var2.offset = var41; // L: 700
+		var3.offset = var42; // L: 701
+		var4.offset = var43; // L: 702
+		var5.offset = var44; // L: 703
+		var6.offset = var45; // L: 704
+		var7.offset = var46; // L: 705
+
+		for (var55 = 0; var55 < var11; ++var55) { // L: 706
+			var56 = this.textureRenderTypes[var55] & 255; // L: 707
+			if (var56 == 0) { // L: 708
+				this.texTriangleX[var55] = (short)var2.readUnsignedShort(); // L: 709
+				this.texTriangleY[var55] = (short)var2.readUnsignedShort(); // L: 710
+				this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); // L: 711
+			}
+		}
+
+		var2.offset = var26; // L: 714
+		var55 = var2.readUnsignedByte(); // L: 715
+		if (var55 != 0) { // L: 716
 			new ModelData0();
-			var2.readUnsignedShort(); // L: 268
-			var2.readUnsignedShort(); // L: 269
-			var2.readUnsignedShort(); // L: 270
-			var2.readInt(); // L: 271
+			var2.readUnsignedShort(); // L: 718
+			var2.readUnsignedShort(); // L: 719
+			var2.readUnsignedShort(); // L: 720
+			var2.readInt(); // L: 721
 		}
 
-	} // L: 273
+	} // L: 723
 
-	@ObfuscatedName("a")
-	void method4113(byte[] var1) {
-		boolean var2 = false; // L: 276
-		boolean var3 = false; // L: 277
-		Buffer var4 = new Buffer(var1); // L: 278
-		Buffer var5 = new Buffer(var1); // L: 279
-		Buffer var6 = new Buffer(var1); // L: 280
-		Buffer var7 = new Buffer(var1); // L: 281
-		Buffer var8 = new Buffer(var1); // L: 282
-		var4.offset = var1.length - 18; // L: 283
-		int var9 = var4.readUnsignedShort(); // L: 284
-		int var10 = var4.readUnsignedShort(); // L: 285
-		int var11 = var4.readUnsignedByte(); // L: 286
-		int var12 = var4.readUnsignedByte(); // L: 287
-		int var13 = var4.readUnsignedByte(); // L: 288
-		int var14 = var4.readUnsignedByte(); // L: 289
-		int var15 = var4.readUnsignedByte(); // L: 290
-		int var16 = var4.readUnsignedByte(); // L: 291
-		int var17 = var4.readUnsignedShort(); // L: 292
-		int var18 = var4.readUnsignedShort(); // L: 293
-		int var19 = var4.readUnsignedShort(); // L: 294
-		int var20 = var4.readUnsignedShort(); // L: 295
-		byte var21 = 0; // L: 296
-		int var45 = var21 + var9; // L: 298
-		int var23 = var45; // L: 299
-		var45 += var10; // L: 300
-		int var24 = var45; // L: 301
-		if (var13 == 255) { // L: 302
+	@ObfuscatedName("r")
+	void method3747(byte[] var1) {
+		boolean var2 = false; // L: 726
+		boolean var3 = false; // L: 727
+		Buffer var4 = new Buffer(var1); // L: 728
+		Buffer var5 = new Buffer(var1); // L: 729
+		Buffer var6 = new Buffer(var1); // L: 730
+		Buffer var7 = new Buffer(var1); // L: 731
+		Buffer var8 = new Buffer(var1); // L: 732
+		var4.offset = var1.length - 18; // L: 733
+		int var9 = var4.readUnsignedShort(); // L: 734
+		int var10 = var4.readUnsignedShort(); // L: 735
+		int var11 = var4.readUnsignedByte(); // L: 736
+		int var12 = var4.readUnsignedByte(); // L: 737
+		int var13 = var4.readUnsignedByte(); // L: 738
+		int var14 = var4.readUnsignedByte(); // L: 739
+		int var15 = var4.readUnsignedByte(); // L: 740
+		int var16 = var4.readUnsignedByte(); // L: 741
+		int var17 = var4.readUnsignedShort(); // L: 742
+		int var18 = var4.readUnsignedShort(); // L: 743
+		int var19 = var4.readUnsignedShort(); // L: 744
+		int var20 = var4.readUnsignedShort(); // L: 745
+		byte var21 = 0; // L: 746
+		int var45 = var21 + var9; // L: 748
+		int var23 = var45; // L: 749
+		var45 += var10; // L: 750
+		int var24 = var45; // L: 751
+		if (var13 == 255) { // L: 752
 			var45 += var10;
 		}
 
-		int var25 = var45; // L: 303
-		if (var15 == 1) { // L: 304
+		int var25 = var45; // L: 753
+		if (var15 == 1) { // L: 754
 			var45 += var10;
 		}
 
-		int var26 = var45; // L: 305
-		if (var12 == 1) { // L: 306
+		int var26 = var45; // L: 755
+		if (var12 == 1) { // L: 756
 			var45 += var10;
 		}
 
-		int var27 = var45; // L: 307
-		if (var16 == 1) { // L: 308
+		int var27 = var45; // L: 757
+		if (var16 == 1) { // L: 758
 			var45 += var9;
 		}
 
-		int var28 = var45; // L: 309
-		if (var14 == 1) { // L: 310
+		int var28 = var45; // L: 759
+		if (var14 == 1) { // L: 760
 			var45 += var10;
 		}
 
-		int var29 = var45; // L: 311
-		var45 += var20; // L: 312
-		int var30 = var45; // L: 313
-		var45 += var10 * 2; // L: 314
-		int var31 = var45; // L: 315
-		var45 += var11 * 6; // L: 316
-		int var32 = var45; // L: 317
-		var45 += var17; // L: 318
-		int var33 = var45; // L: 319
-		var45 += var18; // L: 320
-		int var10000 = var45 + var19; // L: 322
-		this.verticesCount = var9; // L: 323
-		this.faceCount = var10; // L: 324
-		this.textureTriangleCount = var11; // L: 325
-		this.verticesX = new int[var9]; // L: 326
-		this.verticesY = new int[var9]; // L: 327
-		this.verticesZ = new int[var9]; // L: 328
-		this.indices1 = new int[var10]; // L: 329
-		this.indices2 = new int[var10]; // L: 330
-		this.indices3 = new int[var10]; // L: 331
-		if (var11 > 0) { // L: 332
-			this.textureRenderTypes = new byte[var11]; // L: 333
-			this.texTriangleX = new short[var11]; // L: 334
-			this.texTriangleY = new short[var11]; // L: 335
-			this.texTriangleZ = new short[var11]; // L: 336
-		}
-
-		if (var16 == 1) { // L: 338
+		int var29 = var45; // L: 761
+		var45 += var20; // L: 762
+		int var30 = var45; // L: 763
+		var45 += var10 * 2; // L: 764
+		int var31 = var45; // L: 765
+		var45 += var11 * 6; // L: 766
+		int var32 = var45; // L: 767
+		var45 += var17; // L: 768
+		int var33 = var45; // L: 769
+		var45 += var18; // L: 770
+		int var10000 = var45 + var19; // L: 772
+		this.verticesCount = var9; // L: 773
+		this.faceCount = var10; // L: 774
+		this.textureTriangleCount = var11; // L: 775
+		this.verticesX = new int[var9]; // L: 776
+		this.verticesY = new int[var9]; // L: 777
+		this.verticesZ = new int[var9]; // L: 778
+		this.indices1 = new int[var10]; // L: 779
+		this.indices2 = new int[var10]; // L: 780
+		this.indices3 = new int[var10]; // L: 781
+		if (var11 > 0) { // L: 782
+			this.textureRenderTypes = new byte[var11]; // L: 783
+			this.texTriangleX = new short[var11]; // L: 784
+			this.texTriangleY = new short[var11]; // L: 785
+			this.texTriangleZ = new short[var11]; // L: 786
+		}
+
+		if (var16 == 1) { // L: 788
 			this.vertexSkins = new int[var9];
 		}
 
-		if (var12 == 1) { // L: 339
-			this.faceRenderTypes = new byte[var10]; // L: 340
-			this.textureCoords = new byte[var10]; // L: 341
-			this.faceTextures = new short[var10]; // L: 342
+		if (var12 == 1) { // L: 789
+			this.faceRenderTypes = new byte[var10]; // L: 790
+			this.textureCoords = new byte[var10]; // L: 791
+			this.faceTextures = new short[var10]; // L: 792
 		}
 
-		if (var13 == 255) { // L: 344
+		if (var13 == 255) { // L: 794
 			this.faceRenderPriorities = new byte[var10];
 		} else {
-			this.priority = (byte)var13; // L: 345
+			this.priority = (byte)var13; // L: 795
 		}
 
-		if (var14 == 1) { // L: 346
+		if (var14 == 1) { // L: 796
 			this.faceAlphas = new byte[var10];
 		}
 
-		if (var15 == 1) { // L: 347
+		if (var15 == 1) { // L: 797
 			this.faceSkins = new int[var10];
 		}
 
-		this.faceColors = new short[var10]; // L: 348
-		var4.offset = var21; // L: 349
-		var5.offset = var32; // L: 350
-		var6.offset = var33; // L: 351
-		var7.offset = var45; // L: 352
-		var8.offset = var27; // L: 353
-		int var35 = 0; // L: 354
-		int var36 = 0; // L: 355
-		int var37 = 0; // L: 356
+		this.faceColors = new short[var10]; // L: 798
+		var4.offset = var21; // L: 799
+		var5.offset = var32; // L: 800
+		var6.offset = var33; // L: 801
+		var7.offset = var45; // L: 802
+		var8.offset = var27; // L: 803
+		int var35 = 0; // L: 804
+		int var36 = 0; // L: 805
+		int var37 = 0; // L: 806
 
 		int var38;
 		int var39;
 		int var40;
 		int var41;
 		int var42;
-		for (var38 = 0; var38 < var9; ++var38) { // L: 357
-			var39 = var4.readUnsignedByte(); // L: 358
-			var40 = 0; // L: 359
-			if ((var39 & 1) != 0) { // L: 360
+		for (var38 = 0; var38 < var9; ++var38) { // L: 807
+			var39 = var4.readUnsignedByte(); // L: 808
+			var40 = 0; // L: 809
+			if ((var39 & 1) != 0) { // L: 810
 				var40 = var5.readShortSmart();
 			}
 
-			var41 = 0; // L: 361
-			if ((var39 & 2) != 0) { // L: 362
+			var41 = 0; // L: 811
+			if ((var39 & 2) != 0) { // L: 812
 				var41 = var6.readShortSmart();
 			}
 
-			var42 = 0; // L: 363
-			if ((var39 & 4) != 0) { // L: 364
+			var42 = 0; // L: 813
+			if ((var39 & 4) != 0) { // L: 814
 				var42 = var7.readShortSmart();
 			}
 
-			this.verticesX[var38] = var35 + var40; // L: 365
-			this.verticesY[var38] = var36 + var41; // L: 366
-			this.verticesZ[var38] = var37 + var42; // L: 367
-			var35 = this.verticesX[var38]; // L: 368
-			var36 = this.verticesY[var38]; // L: 369
-			var37 = this.verticesZ[var38]; // L: 370
-			if (var16 == 1) { // L: 371
+			this.verticesX[var38] = var35 + var40; // L: 815
+			this.verticesY[var38] = var36 + var41; // L: 816
+			this.verticesZ[var38] = var37 + var42; // L: 817
+			var35 = this.verticesX[var38]; // L: 818
+			var36 = this.verticesY[var38]; // L: 819
+			var37 = this.verticesZ[var38]; // L: 820
+			if (var16 == 1) { // L: 821
 				this.vertexSkins[var38] = var8.readUnsignedByte();
 			}
 		}
 
-		var4.offset = var30; // L: 373
-		var5.offset = var26; // L: 374
-		var6.offset = var24; // L: 375
-		var7.offset = var28; // L: 376
-		var8.offset = var25; // L: 377
+		var4.offset = var30; // L: 823
+		var5.offset = var26; // L: 824
+		var6.offset = var24; // L: 825
+		var7.offset = var28; // L: 826
+		var8.offset = var25; // L: 827
 
-		for (var38 = 0; var38 < var10; ++var38) { // L: 378
-			this.faceColors[var38] = (short)var4.readUnsignedShort(); // L: 379
-			if (var12 == 1) { // L: 380
-				var39 = var5.readUnsignedByte(); // L: 381
-				if ((var39 & 1) == 1) { // L: 382
-					this.faceRenderTypes[var38] = 1; // L: 383
-					var2 = true; // L: 384
+		for (var38 = 0; var38 < var10; ++var38) { // L: 828
+			this.faceColors[var38] = (short)var4.readUnsignedShort(); // L: 829
+			if (var12 == 1) { // L: 830
+				var39 = var5.readUnsignedByte(); // L: 831
+				if ((var39 & 1) == 1) { // L: 832
+					this.faceRenderTypes[var38] = 1; // L: 833
+					var2 = true; // L: 834
 				} else {
-					this.faceRenderTypes[var38] = 0; // L: 386
+					this.faceRenderTypes[var38] = 0; // L: 836
 				}
 
-				if ((var39 & 2) == 2) { // L: 387
-					this.textureCoords[var38] = (byte)(var39 >> 2); // L: 388
-					this.faceTextures[var38] = this.faceColors[var38]; // L: 389
-					this.faceColors[var38] = 127; // L: 390
-					if (this.faceTextures[var38] != -1) { // L: 391
+				if ((var39 & 2) == 2) { // L: 837
+					this.textureCoords[var38] = (byte)(var39 >> 2); // L: 838
+					this.faceTextures[var38] = this.faceColors[var38]; // L: 839
+					this.faceColors[var38] = 127; // L: 840
+					if (this.faceTextures[var38] != -1) { // L: 841
 						var3 = true;
 					}
 				} else {
-					this.textureCoords[var38] = -1; // L: 394
-					this.faceTextures[var38] = -1; // L: 395
+					this.textureCoords[var38] = -1; // L: 844
+					this.faceTextures[var38] = -1; // L: 845
 				}
 			}
 
-			if (var13 == 255) { // L: 398
+			if (var13 == 255) { // L: 848
 				this.faceRenderPriorities[var38] = var6.readByte();
 			}
 
-			if (var14 == 1) { // L: 399
+			if (var14 == 1) { // L: 849
 				this.faceAlphas[var38] = var7.readByte();
 			}
 
-			if (var15 == 1) { // L: 400
+			if (var15 == 1) { // L: 850
 				this.faceSkins[var38] = var8.readUnsignedByte();
 			}
 		}
 
-		var4.offset = var29; // L: 402
-		var5.offset = var23; // L: 403
-		var38 = 0; // L: 404
-		var39 = 0; // L: 405
-		var40 = 0; // L: 406
-		var41 = 0; // L: 407
+		var4.offset = var29; // L: 852
+		var5.offset = var23; // L: 853
+		var38 = 0; // L: 854
+		var39 = 0; // L: 855
+		var40 = 0; // L: 856
+		var41 = 0; // L: 857
 
 		int var43;
 		int var44;
-		for (var42 = 0; var42 < var10; ++var42) { // L: 408
-			var43 = var5.readUnsignedByte(); // L: 409
-			if (var43 == 1) { // L: 410
-				var38 = var4.readShortSmart() + var41; // L: 411
-				var39 = var4.readShortSmart() + var38; // L: 413
-				var40 = var4.readShortSmart() + var39; // L: 415
-				var41 = var40; // L: 416
-				this.indices1[var42] = var38; // L: 417
-				this.indices2[var42] = var39; // L: 418
-				this.indices3[var42] = var40; // L: 419
-			}
-
-			if (var43 == 2) { // L: 421
-				var39 = var40; // L: 422
-				var40 = var4.readShortSmart() + var41; // L: 423
-				var41 = var40; // L: 424
-				this.indices1[var42] = var38; // L: 425
-				this.indices2[var42] = var39; // L: 426
-				this.indices3[var42] = var40; // L: 427
-			}
-
-			if (var43 == 3) { // L: 429
-				var38 = var40; // L: 430
-				var40 = var4.readShortSmart() + var41; // L: 431
-				var41 = var40; // L: 432
-				this.indices1[var42] = var38; // L: 433
-				this.indices2[var42] = var39; // L: 434
-				this.indices3[var42] = var40; // L: 435
-			}
-
-			if (var43 == 4) { // L: 437
-				var44 = var38; // L: 438
-				var38 = var39; // L: 439
-				var39 = var44; // L: 440
-				var40 = var4.readShortSmart() + var41; // L: 441
-				var41 = var40; // L: 442
-				this.indices1[var42] = var38; // L: 443
-				this.indices2[var42] = var44; // L: 444
-				this.indices3[var42] = var40; // L: 445
-			}
-		}
-
-		var4.offset = var31; // L: 448
-
-		for (var42 = 0; var42 < var11; ++var42) { // L: 449
-			this.textureRenderTypes[var42] = 0; // L: 450
-			this.texTriangleX[var42] = (short)var4.readUnsignedShort(); // L: 451
-			this.texTriangleY[var42] = (short)var4.readUnsignedShort(); // L: 452
-			this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); // L: 453
-		}
-
-		if (this.textureCoords != null) { // L: 455
-			boolean var46 = false; // L: 456
-
-			for (var43 = 0; var43 < var10; ++var43) { // L: 457
-				var44 = this.textureCoords[var43] & 255; // L: 458
-				if (var44 != 255) { // L: 459
-					if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { // L: 460
+		for (var42 = 0; var42 < var10; ++var42) { // L: 858
+			var43 = var5.readUnsignedByte(); // L: 859
+			if (var43 == 1) { // L: 860
+				var38 = var4.readShortSmart() + var41; // L: 861
+				var39 = var4.readShortSmart() + var38; // L: 863
+				var40 = var4.readShortSmart() + var39; // L: 865
+				var41 = var40; // L: 866
+				this.indices1[var42] = var38; // L: 867
+				this.indices2[var42] = var39; // L: 868
+				this.indices3[var42] = var40; // L: 869
+			}
+
+			if (var43 == 2) { // L: 871
+				var39 = var40; // L: 872
+				var40 = var4.readShortSmart() + var41; // L: 873
+				var41 = var40; // L: 874
+				this.indices1[var42] = var38; // L: 875
+				this.indices2[var42] = var39; // L: 876
+				this.indices3[var42] = var40; // L: 877
+			}
+
+			if (var43 == 3) { // L: 879
+				var38 = var40; // L: 880
+				var40 = var4.readShortSmart() + var41; // L: 881
+				var41 = var40; // L: 882
+				this.indices1[var42] = var38; // L: 883
+				this.indices2[var42] = var39; // L: 884
+				this.indices3[var42] = var40; // L: 885
+			}
+
+			if (var43 == 4) { // L: 887
+				var44 = var38; // L: 888
+				var38 = var39; // L: 889
+				var39 = var44; // L: 890
+				var40 = var4.readShortSmart() + var41; // L: 891
+				var41 = var40; // L: 892
+				this.indices1[var42] = var38; // L: 893
+				this.indices2[var42] = var44; // L: 894
+				this.indices3[var42] = var40; // L: 895
+			}
+		}
+
+		var4.offset = var31; // L: 898
+
+		for (var42 = 0; var42 < var11; ++var42) { // L: 899
+			this.textureRenderTypes[var42] = 0; // L: 900
+			this.texTriangleX[var42] = (short)var4.readUnsignedShort(); // L: 901
+			this.texTriangleY[var42] = (short)var4.readUnsignedShort(); // L: 902
+			this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); // L: 903
+		}
+
+		if (this.textureCoords != null) { // L: 905
+			boolean var46 = false; // L: 906
+
+			for (var43 = 0; var43 < var10; ++var43) { // L: 907
+				var44 = this.textureCoords[var43] & 255; // L: 908
+				if (var44 != 255) { // L: 909
+					if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { // L: 910
 						this.textureCoords[var43] = -1;
 					} else {
-						var46 = true; // L: 461
+						var46 = true; // L: 911
 					}
 				}
 			}
 
-			if (!var46) { // L: 464
+			if (!var46) { // L: 914
 				this.textureCoords = null;
 			}
 		}
 
-		if (!var3) { // L: 466
+		if (!var3) { // L: 916
 			this.faceTextures = null;
 		}
 
-		if (!var2) { // L: 467
+		if (!var2) { // L: 917
 			this.faceRenderTypes = null;
 		}
 
-	} // L: 468
+	} // L: 918
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lgk;I)I"
+		descriptor = "(Lge;I)I"
 	)
-	final int method4123(ModelData var1, int var2) {
-		int var3 = -1; // L: 567
-		int var4 = var1.verticesX[var2]; // L: 568
-		int var5 = var1.verticesY[var2]; // L: 569
-		int var6 = var1.verticesZ[var2]; // L: 570
-
-		for (int var7 = 0; var7 < this.verticesCount; ++var7) { // L: 571
-			if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { // L: 572
-				var3 = var7; // L: 573
+	final int method3762(ModelData var1, int var2) {
+		int var3 = -1; // L: 1023
+		int var4 = var1.verticesX[var2]; // L: 1024
+		int var5 = var1.verticesY[var2]; // L: 1025
+		int var6 = var1.verticesZ[var2]; // L: 1026
+
+		for (int var7 = 0; var7 < this.verticesCount; ++var7) { // L: 1027
+			if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { // L: 1028
+				var3 = var7; // L: 1029
 				break;
 			}
 		}
 
-		if (var3 == -1) { // L: 577
-			this.verticesX[this.verticesCount] = var4; // L: 578
-			this.verticesY[this.verticesCount] = var5; // L: 579
-			this.verticesZ[this.verticesCount] = var6; // L: 580
-			if (var1.vertexSkins != null) { // L: 581
-				this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2];
+		if (var3 == -1) { // L: 1033
+			this.verticesX[this.verticesCount] = var4; // L: 1034
+			this.verticesY[this.verticesCount] = var5; // L: 1035
+			this.verticesZ[this.verticesCount] = var6; // L: 1036
+			if (var1.vertexSkins != null) {
+				this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 1037
 			}
 
-			var3 = this.verticesCount++; // L: 582
+			if (var1.field2185 != null) { // L: 1038
+				this.field2185[this.verticesCount] = var1.field2185[var2]; // L: 1039
+				this.field2173[this.verticesCount] = var1.field2173[var2]; // L: 1040
+			}
+
+			var3 = this.verticesCount++; // L: 1042
 		}
 
-		return var3; // L: 584
+		return var3; // L: 1044
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "()Lgk;"
+		descriptor = "()Lge;"
 	)
-	public ModelData method4115() {
-		ModelData var1 = new ModelData(); // L: 650
-		if (this.faceRenderTypes != null) { // L: 651
-			var1.faceRenderTypes = new byte[this.faceCount]; // L: 652
+	public ModelData method3751() {
+		ModelData var1 = new ModelData(); // L: 1112
+		if (this.faceRenderTypes != null) { // L: 1113
+			var1.faceRenderTypes = new byte[this.faceCount]; // L: 1114
 
-			for (int var2 = 0; var2 < this.faceCount; ++var2) { // L: 653
+			for (int var2 = 0; var2 < this.faceCount; ++var2) { // L: 1115
 				var1.faceRenderTypes[var2] = this.faceRenderTypes[var2];
 			}
 		}
 
-		var1.verticesCount = this.verticesCount; // L: 655
-		var1.faceCount = this.faceCount; // L: 656
-		var1.textureTriangleCount = this.textureTriangleCount; // L: 657
-		var1.verticesX = this.verticesX; // L: 658
-		var1.verticesY = this.verticesY; // L: 659
-		var1.verticesZ = this.verticesZ; // L: 660
-		var1.indices1 = this.indices1; // L: 661
-		var1.indices2 = this.indices2; // L: 662
-		var1.indices3 = this.indices3; // L: 663
-		var1.faceRenderPriorities = this.faceRenderPriorities; // L: 664
-		var1.faceAlphas = this.faceAlphas; // L: 665
-		var1.textureCoords = this.textureCoords; // L: 666
-		var1.faceColors = this.faceColors; // L: 667
-		var1.faceTextures = this.faceTextures; // L: 668
-		var1.priority = this.priority; // L: 669
-		var1.textureRenderTypes = this.textureRenderTypes; // L: 670
-		var1.texTriangleX = this.texTriangleX; // L: 671
-		var1.texTriangleY = this.texTriangleY; // L: 672
-		var1.texTriangleZ = this.texTriangleZ; // L: 673
-		var1.vertexSkins = this.vertexSkins; // L: 674
-		var1.faceSkins = this.faceSkins; // L: 675
-		var1.vertexLabels = this.vertexLabels; // L: 676
-		var1.faceLabelsAlpha = this.faceLabelsAlpha; // L: 677
-		var1.vertexNormals = this.vertexNormals; // L: 678
-		var1.faceNormals = this.faceNormals; // L: 679
-		var1.ambient = this.ambient; // L: 680
-		var1.contrast = this.contrast; // L: 681
-		return var1; // L: 682
+		var1.verticesCount = this.verticesCount; // L: 1117
+		var1.faceCount = this.faceCount; // L: 1118
+		var1.textureTriangleCount = this.textureTriangleCount; // L: 1119
+		var1.verticesX = this.verticesX; // L: 1120
+		var1.verticesY = this.verticesY; // L: 1121
+		var1.verticesZ = this.verticesZ; // L: 1122
+		var1.indices1 = this.indices1; // L: 1123
+		var1.indices2 = this.indices2; // L: 1124
+		var1.indices3 = this.indices3; // L: 1125
+		var1.faceRenderPriorities = this.faceRenderPriorities; // L: 1126
+		var1.faceAlphas = this.faceAlphas; // L: 1127
+		var1.textureCoords = this.textureCoords; // L: 1128
+		var1.faceColors = this.faceColors; // L: 1129
+		var1.faceTextures = this.faceTextures; // L: 1130
+		var1.priority = this.priority; // L: 1131
+		var1.textureRenderTypes = this.textureRenderTypes; // L: 1132
+		var1.texTriangleX = this.texTriangleX; // L: 1133
+		var1.texTriangleY = this.texTriangleY; // L: 1134
+		var1.texTriangleZ = this.texTriangleZ; // L: 1135
+		var1.vertexSkins = this.vertexSkins; // L: 1136
+		var1.faceSkins = this.faceSkins; // L: 1137
+		var1.vertexLabels = this.vertexLabels; // L: 1138
+		var1.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1139
+		var1.vertexNormals = this.vertexNormals; // L: 1140
+		var1.faceNormals = this.faceNormals; // L: 1141
+		var1.ambient = this.ambient; // L: 1142
+		var1.contrast = this.contrast; // L: 1143
+		return var1; // L: 1144
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "([[IIIIZI)Lgk;"
+		descriptor = "([[IIIIZI)Lge;"
 	)
-	public ModelData method4135(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
-		this.calculateBounds(); // L: 686
-		int var7 = var2 + this.field2278; // L: 687
-		int var8 = var2 + this.field2275; // L: 688
-		int var9 = var4 + this.field2267; // L: 689
-		int var10 = var4 + this.field2280; // L: 690
-		if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 691
-			var7 >>= 7; // L: 692
-			var8 = var8 + 127 >> 7; // L: 693
-			var9 >>= 7; // L: 694
-			var10 = var10 + 127 >> 7; // L: 695
-			if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 696
+	public ModelData method3752(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
+		this.calculateBounds(); // L: 1148
+		int var7 = var2 + this.field2176; // L: 1149
+		int var8 = var2 + this.field2152; // L: 1150
+		int var9 = var4 + this.field2186; // L: 1151
+		int var10 = var4 + this.field2168; // L: 1152
+		if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 1153
+			var7 >>= 7; // L: 1154
+			var8 = var8 + 127 >> 7; // L: 1155
+			var9 >>= 7; // L: 1156
+			var10 = var10 + 127 >> 7; // L: 1157
+			if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 1158
 				return this;
 			} else {
-				ModelData var11 = new ModelData(); // L: 699
-				var11.verticesCount = this.verticesCount; // L: 700
-				var11.faceCount = this.faceCount; // L: 701
-				var11.textureTriangleCount = this.textureTriangleCount; // L: 702
-				var11.verticesX = this.verticesX; // L: 703
-				var11.verticesZ = this.verticesZ; // L: 704
-				var11.indices1 = this.indices1; // L: 705
-				var11.indices2 = this.indices2; // L: 706
-				var11.indices3 = this.indices3; // L: 707
-				var11.faceRenderTypes = this.faceRenderTypes; // L: 708
-				var11.faceRenderPriorities = this.faceRenderPriorities; // L: 709
-				var11.faceAlphas = this.faceAlphas; // L: 710
-				var11.textureCoords = this.textureCoords; // L: 711
-				var11.faceColors = this.faceColors; // L: 712
-				var11.faceTextures = this.faceTextures; // L: 713
-				var11.priority = this.priority; // L: 714
-				var11.textureRenderTypes = this.textureRenderTypes; // L: 715
-				var11.texTriangleX = this.texTriangleX; // L: 716
-				var11.texTriangleY = this.texTriangleY; // L: 717
-				var11.texTriangleZ = this.texTriangleZ; // L: 718
-				var11.vertexSkins = this.vertexSkins; // L: 719
-				var11.faceSkins = this.faceSkins; // L: 720
-				var11.vertexLabels = this.vertexLabels; // L: 721
-				var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 722
-				var11.ambient = this.ambient; // L: 723
-				var11.contrast = this.contrast; // L: 724
-				var11.verticesY = new int[var11.verticesCount]; // L: 725
+				ModelData var11 = new ModelData(); // L: 1161
+				var11.verticesCount = this.verticesCount; // L: 1162
+				var11.faceCount = this.faceCount; // L: 1163
+				var11.textureTriangleCount = this.textureTriangleCount; // L: 1164
+				var11.verticesX = this.verticesX; // L: 1165
+				var11.verticesZ = this.verticesZ; // L: 1166
+				var11.indices1 = this.indices1; // L: 1167
+				var11.indices2 = this.indices2; // L: 1168
+				var11.indices3 = this.indices3; // L: 1169
+				var11.faceRenderTypes = this.faceRenderTypes; // L: 1170
+				var11.faceRenderPriorities = this.faceRenderPriorities; // L: 1171
+				var11.faceAlphas = this.faceAlphas; // L: 1172
+				var11.textureCoords = this.textureCoords; // L: 1173
+				var11.faceColors = this.faceColors; // L: 1174
+				var11.faceTextures = this.faceTextures; // L: 1175
+				var11.priority = this.priority; // L: 1176
+				var11.textureRenderTypes = this.textureRenderTypes; // L: 1177
+				var11.texTriangleX = this.texTriangleX; // L: 1178
+				var11.texTriangleY = this.texTriangleY; // L: 1179
+				var11.texTriangleZ = this.texTriangleZ; // L: 1180
+				var11.vertexSkins = this.vertexSkins; // L: 1181
+				var11.faceSkins = this.faceSkins; // L: 1182
+				var11.vertexLabels = this.vertexLabels; // L: 1183
+				var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1184
+				var11.ambient = this.ambient; // L: 1185
+				var11.contrast = this.contrast; // L: 1186
+				var11.verticesY = new int[var11.verticesCount]; // L: 1187
 				int var12;
 				int var13;
 				int var14;
@@ -1094,601 +1735,603 @@ public ModelData method4135(int[][] var1, int var2, int var3, int var4, boolean
 				int var19;
 				int var20;
 				int var21;
-				if (var6 == 0) { // L: 730
-					for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 731
-						var13 = var2 + this.verticesX[var12]; // L: 732
-						var14 = var4 + this.verticesZ[var12]; // L: 733
-						var15 = var13 & 127; // L: 734
-						var16 = var14 & 127; // L: 735
-						var17 = var13 >> 7; // L: 736
-						var18 = var14 >> 7; // L: 737
-						var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 738
-						var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 739
-						var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 740
-						var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 741
+				if (var6 == 0) { // L: 1192
+					for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 1193
+						var13 = var2 + this.verticesX[var12]; // L: 1194
+						var14 = var4 + this.verticesZ[var12]; // L: 1195
+						var15 = var13 & 127; // L: 1196
+						var16 = var14 & 127; // L: 1197
+						var17 = var13 >> 7; // L: 1198
+						var18 = var14 >> 7; // L: 1199
+						var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 1200
+						var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 1201
+						var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 1202
+						var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 1203
 					}
 				} else {
-					for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 745
-						var13 = (-this.verticesY[var12] << 16) / super.height; // L: 746
-						if (var13 < var6) { // L: 747
-							var14 = var2 + this.verticesX[var12]; // L: 748
-							var15 = var4 + this.verticesZ[var12]; // L: 749
-							var16 = var14 & 127; // L: 750
-							var17 = var15 & 127; // L: 751
-							var18 = var14 >> 7; // L: 752
-							var19 = var15 >> 7; // L: 753
-							var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 754
-							var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 755
-							int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 756
-							var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 757
+					for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 1207
+						var13 = (-this.verticesY[var12] << 16) / super.height; // L: 1208
+						if (var13 < var6) { // L: 1209
+							var14 = var2 + this.verticesX[var12]; // L: 1210
+							var15 = var4 + this.verticesZ[var12]; // L: 1211
+							var16 = var14 & 127; // L: 1212
+							var17 = var15 & 127; // L: 1213
+							var18 = var14 >> 7; // L: 1214
+							var19 = var15 >> 7; // L: 1215
+							var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 1216
+							var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 1217
+							int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 1218
+							var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 1219
 						}
 					}
 				}
 
-				var11.invalidate(); // L: 761
-				return var11; // L: 762
+				var11.invalidate(); // L: 1223
+				return var11; // L: 1224
 			}
 		} else {
 			return this;
 		}
 	}
 
-	@ObfuscatedName("y")
-	void method4147() {
+	@ObfuscatedName("h")
+	void method3753() {
 		int[] var1;
 		int var2;
 		int var10002;
 		int var3;
 		int var4;
-		if (this.vertexSkins != null) { // L: 766
-			var1 = new int[256]; // L: 767
-			var2 = 0; // L: 768
-
-			for (var3 = 0; var3 < this.verticesCount; ++var3) { // L: 769
-				var4 = this.vertexSkins[var3]; // L: 770
-				var10002 = var1[var4]++; // L: 771
-				if (var4 > var2) { // L: 772
+		if (this.vertexSkins != null) { // L: 1228
+			var1 = new int[256]; // L: 1229
+			var2 = 0; // L: 1230
+
+			for (var3 = 0; var3 < this.verticesCount; ++var3) { // L: 1231
+				var4 = this.vertexSkins[var3]; // L: 1232
+				var10002 = var1[var4]++; // L: 1233
+				if (var4 > var2) { // L: 1234
 					var2 = var4;
 				}
 			}
 
-			this.vertexLabels = new int[var2 + 1][]; // L: 774
+			this.vertexLabels = new int[var2 + 1][]; // L: 1236
 
-			for (var3 = 0; var3 <= var2; ++var3) { // L: 775
-				this.vertexLabels[var3] = new int[var1[var3]]; // L: 776
-				var1[var3] = 0; // L: 777
+			for (var3 = 0; var3 <= var2; ++var3) { // L: 1237
+				this.vertexLabels[var3] = new int[var1[var3]]; // L: 1238
+				var1[var3] = 0; // L: 1239
 			}
 
-			for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { // L: 779 781
-				var4 = this.vertexSkins[var3]; // L: 780
+			for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { // L: 1241 1243
+				var4 = this.vertexSkins[var3]; // L: 1242
 			}
 
-			this.vertexSkins = null; // L: 783
+			this.vertexSkins = null; // L: 1245
 		}
 
-		if (this.faceSkins != null) { // L: 785
-			var1 = new int[256]; // L: 786
-			var2 = 0; // L: 787
+		if (this.faceSkins != null) { // L: 1247
+			var1 = new int[256]; // L: 1248
+			var2 = 0; // L: 1249
 
-			for (var3 = 0; var3 < this.faceCount; ++var3) { // L: 788
-				var4 = this.faceSkins[var3]; // L: 789
-				var10002 = var1[var4]++; // L: 790
-				if (var4 > var2) { // L: 791
+			for (var3 = 0; var3 < this.faceCount; ++var3) { // L: 1250
+				var4 = this.faceSkins[var3]; // L: 1251
+				var10002 = var1[var4]++; // L: 1252
+				if (var4 > var2) { // L: 1253
 					var2 = var4;
 				}
 			}
 
-			this.faceLabelsAlpha = new int[var2 + 1][]; // L: 793
+			this.faceLabelsAlpha = new int[var2 + 1][]; // L: 1255
 
-			for (var3 = 0; var3 <= var2; ++var3) { // L: 794
-				this.faceLabelsAlpha[var3] = new int[var1[var3]]; // L: 795
-				var1[var3] = 0; // L: 796
+			for (var3 = 0; var3 <= var2; ++var3) { // L: 1256
+				this.faceLabelsAlpha[var3] = new int[var1[var3]]; // L: 1257
+				var1[var3] = 0; // L: 1258
 			}
 
-			for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { // L: 798 800
-				var4 = this.faceSkins[var3]; // L: 799
+			for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { // L: 1260 1262
+				var4 = this.faceSkins[var3]; // L: 1261
 			}
 
-			this.faceSkins = null; // L: 802
+			this.faceSkins = null; // L: 1264
 		}
 
-	} // L: 804
+	} // L: 1266
 
-	@ObfuscatedName("k")
-	public void method4158() {
-		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 807
-			int var2 = this.verticesX[var1]; // L: 808
-			this.verticesX[var1] = this.verticesZ[var1]; // L: 809
-			this.verticesZ[var1] = -var2; // L: 810
+	@ObfuscatedName("g")
+	public void method3754() {
+		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1269
+			int var2 = this.verticesX[var1]; // L: 1270
+			this.verticesX[var1] = this.verticesZ[var1]; // L: 1271
+			this.verticesZ[var1] = -var2; // L: 1272
 		}
 
-		this.invalidate(); // L: 812
-	} // L: 813
+		this.invalidate(); // L: 1274
+	} // L: 1275
 
-	@ObfuscatedName("t")
-	public void method4119() {
-		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 816
-			this.verticesX[var1] = -this.verticesX[var1]; // L: 817
-			this.verticesZ[var1] = -this.verticesZ[var1]; // L: 818
+	@ObfuscatedName("e")
+	public void method3755() {
+		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1278
+			this.verticesX[var1] = -this.verticesX[var1]; // L: 1279
+			this.verticesZ[var1] = -this.verticesZ[var1]; // L: 1280
 		}
 
-		this.invalidate(); // L: 820
-	} // L: 821
+		this.invalidate(); // L: 1282
+	} // L: 1283
 
-	@ObfuscatedName("l")
-	public void method4120() {
-		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 824
-			int var2 = this.verticesZ[var1]; // L: 825
-			this.verticesZ[var1] = this.verticesX[var1]; // L: 826
-			this.verticesX[var1] = -var2; // L: 827
+	@ObfuscatedName("a")
+	public void method3756() {
+		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1286
+			int var2 = this.verticesZ[var1]; // L: 1287
+			this.verticesZ[var1] = this.verticesX[var1]; // L: 1288
+			this.verticesX[var1] = -var2; // L: 1289
 		}
 
-		this.invalidate(); // L: 829
-	} // L: 830
+		this.invalidate(); // L: 1291
+	} // L: 1292
 
 	@ObfuscatedName("u")
-	public void method4111(int var1) {
-		int var2 = ModelData_sine[var1]; // L: 833
-		int var3 = ModelData_cosine[var1]; // L: 834
+	public void method3757(int var1) {
+		int var2 = ModelData_sine[var1]; // L: 1295
+		int var3 = ModelData_cosine[var1]; // L: 1296
 
-		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 835
-			int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; // L: 836
-			this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; // L: 837
-			this.verticesX[var4] = var5; // L: 838
+		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1297
+			int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; // L: 1298
+			this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; // L: 1299
+			this.verticesX[var4] = var5; // L: 1300
 		}
 
-		this.invalidate(); // L: 840
-	} // L: 841
+		this.invalidate(); // L: 1302
+	} // L: 1303
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("k")
 	@Export("changeOffset")
 	public void changeOffset(int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844
-			int[] var10000 = this.verticesX; // L: 845
+		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1306
+			int[] var10000 = this.verticesX; // L: 1307
 			var10000[var4] += var1;
-			var10000 = this.verticesY; // L: 846
+			var10000 = this.verticesY; // L: 1308
 			var10000[var4] += var2;
-			var10000 = this.verticesZ; // L: 847
+			var10000 = this.verticesZ; // L: 1309
 			var10000[var4] += var3;
 		}
 
-		this.invalidate(); // L: 849
-	} // L: 850
+		this.invalidate(); // L: 1311
+	} // L: 1312
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("f")
 	@Export("recolor")
 	public void recolor(short var1, short var2) {
-		for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 853
-			if (this.faceColors[var3] == var1) { // L: 854
+		for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 1315
+			if (this.faceColors[var3] == var1) { // L: 1316
 				this.faceColors[var3] = var2;
 			}
 		}
 
-	} // L: 856
+	} // L: 1318
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("l")
 	@Export("retexture")
 	public void retexture(short var1, short var2) {
-		if (this.faceTextures != null) { // L: 859
-			for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 860
+		if (this.faceTextures != null) { // L: 1321
+			for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 1322
 				if (this.faceTextures[var3] == var1) {
-					this.faceTextures[var3] = var2; // L: 861
+					this.faceTextures[var3] = var2; // L: 1323
 				}
 			}
 
 		}
-	} // L: 863
+	} // L: 1325
 
-	@ObfuscatedName("d")
-	public void method4125() {
+	@ObfuscatedName("q")
+	public void method3761() {
 		int var1;
-		for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866
+		for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1328
 			this.verticesZ[var1] = -this.verticesZ[var1];
 		}
 
-		for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 867
-			int var2 = this.indices1[var1]; // L: 868
-			this.indices1[var1] = this.indices3[var1]; // L: 869
-			this.indices3[var1] = var2; // L: 870
+		for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 1329
+			int var2 = this.indices1[var1]; // L: 1330
+			this.indices1[var1] = this.indices3[var1]; // L: 1331
+			this.indices3[var1] = var2; // L: 1332
 		}
 
-		this.invalidate(); // L: 872
-	} // L: 873
+		this.invalidate(); // L: 1334
+	} // L: 1335
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("x")
 	@Export("resize")
 	public void resize(int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876
-			this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 877
-			this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 878
-			this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 879
+		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 1338
+			this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 1339
+			this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 1340
+			this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 1341
 		}
 
-		this.invalidate(); // L: 881
-	} // L: 882
+		this.invalidate(); // L: 1343
+	} // L: 1344
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("z")
 	@Export("calculateVertexNormals")
 	public void calculateVertexNormals() {
-		if (this.vertexNormals == null) { // L: 885
-			this.vertexNormals = new VertexNormal[this.verticesCount]; // L: 886
+		if (this.vertexNormals == null) { // L: 1347
+			this.vertexNormals = new VertexNormal[this.verticesCount]; // L: 1348
 
 			int var1;
-			for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 887
+			for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1349
 				this.vertexNormals[var1] = new VertexNormal();
 			}
 
-			for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 888
-				int var2 = this.indices1[var1]; // L: 889
-				int var3 = this.indices2[var1]; // L: 890
-				int var4 = this.indices3[var1]; // L: 891
-				int var5 = this.verticesX[var3] - this.verticesX[var2]; // L: 892
-				int var6 = this.verticesY[var3] - this.verticesY[var2]; // L: 893
-				int var7 = this.verticesZ[var3] - this.verticesZ[var2]; // L: 894
-				int var8 = this.verticesX[var4] - this.verticesX[var2]; // L: 895
-				int var9 = this.verticesY[var4] - this.verticesY[var2]; // L: 896
-				int var10 = this.verticesZ[var4] - this.verticesZ[var2]; // L: 897
-				int var11 = var6 * var10 - var9 * var7; // L: 898
-				int var12 = var7 * var8 - var10 * var5; // L: 899
+			for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 1350
+				int var2 = this.indices1[var1]; // L: 1351
+				int var3 = this.indices2[var1]; // L: 1352
+				int var4 = this.indices3[var1]; // L: 1353
+				int var5 = this.verticesX[var3] - this.verticesX[var2]; // L: 1354
+				int var6 = this.verticesY[var3] - this.verticesY[var2]; // L: 1355
+				int var7 = this.verticesZ[var3] - this.verticesZ[var2]; // L: 1356
+				int var8 = this.verticesX[var4] - this.verticesX[var2]; // L: 1357
+				int var9 = this.verticesY[var4] - this.verticesY[var2]; // L: 1358
+				int var10 = this.verticesZ[var4] - this.verticesZ[var2]; // L: 1359
+				int var11 = var6 * var10 - var9 * var7; // L: 1360
+				int var12 = var7 * var8 - var10 * var5; // L: 1361
 
 				int var13;
-				for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { // L: 900 901 904
-					var11 >>= 1; // L: 902
-					var12 >>= 1; // L: 903
+				for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { // L: 1362 1363 1366
+					var11 >>= 1; // L: 1364
+					var12 >>= 1; // L: 1365
 				}
 
-				int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); // L: 906
-				if (var14 <= 0) { // L: 907
+				int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); // L: 1368
+				if (var14 <= 0) { // L: 1369
 					var14 = 1;
 				}
 
-				var11 = var11 * 256 / var14; // L: 908
-				var12 = var12 * 256 / var14; // L: 909
-				var13 = var13 * 256 / var14; // L: 910
+				var11 = var11 * 256 / var14; // L: 1370
+				var12 = var12 * 256 / var14; // L: 1371
+				var13 = var13 * 256 / var14; // L: 1372
 				byte var15;
-				if (this.faceRenderTypes == null) { // L: 912
+				if (this.faceRenderTypes == null) { // L: 1374
 					var15 = 0;
 				} else {
-					var15 = this.faceRenderTypes[var1]; // L: 913
+					var15 = this.faceRenderTypes[var1]; // L: 1375
 				}
 
-				if (var15 == 0) { // L: 914
-					VertexNormal var16 = this.vertexNormals[var2]; // L: 916
-					var16.x += var11; // L: 917
-					var16.y += var12; // L: 918
-					var16.z += var13; // L: 919
-					++var16.magnitude; // L: 920
-					var16 = this.vertexNormals[var3]; // L: 921
-					var16.x += var11; // L: 922
-					var16.y += var12; // L: 923
-					var16.z += var13; // L: 924
-					++var16.magnitude; // L: 925
-					var16 = this.vertexNormals[var4]; // L: 926
-					var16.x += var11; // L: 927
-					var16.y += var12; // L: 928
-					var16.z += var13; // L: 929
-					++var16.magnitude; // L: 930
-				} else if (var15 == 1) { // L: 932
-					if (this.faceNormals == null) { // L: 933
+				if (var15 == 0) { // L: 1376
+					VertexNormal var16 = this.vertexNormals[var2]; // L: 1378
+					var16.x += var11; // L: 1379
+					var16.y += var12; // L: 1380
+					var16.z += var13; // L: 1381
+					++var16.magnitude; // L: 1382
+					var16 = this.vertexNormals[var3]; // L: 1383
+					var16.x += var11; // L: 1384
+					var16.y += var12; // L: 1385
+					var16.z += var13; // L: 1386
+					++var16.magnitude; // L: 1387
+					var16 = this.vertexNormals[var4]; // L: 1388
+					var16.x += var11; // L: 1389
+					var16.y += var12; // L: 1390
+					var16.z += var13; // L: 1391
+					++var16.magnitude; // L: 1392
+				} else if (var15 == 1) { // L: 1394
+					if (this.faceNormals == null) { // L: 1395
 						this.faceNormals = new FaceNormal[this.faceCount];
 					}
 
-					FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); // L: 934
-					var17.x = var11; // L: 935
-					var17.y = var12; // L: 936
-					var17.z = var13; // L: 937
+					FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); // L: 1396
+					var17.x = var11; // L: 1397
+					var17.y = var12; // L: 1398
+					var17.z = var13; // L: 1399
 				}
 			}
 
 		}
-	} // L: 940
+	} // L: 1402
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("i")
 	@Export("invalidate")
 	void invalidate() {
-		this.vertexNormals = null; // L: 943
-		this.vertexVertices = null; // L: 944
-		this.faceNormals = null; // L: 945
-		this.isBoundsCalculated = false; // L: 946
-	} // L: 947
+		this.vertexNormals = null; // L: 1405
+		this.vertexVertices = null; // L: 1406
+		this.faceNormals = null; // L: 1407
+		this.isBoundsCalculated = false; // L: 1408
+	} // L: 1409
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@Export("calculateBounds")
 	void calculateBounds() {
-		if (!this.isBoundsCalculated) { // L: 950
-			super.height = 0; // L: 951
-			this.field2277 = 0; // L: 952
-			this.field2278 = 999999; // L: 953
-			this.field2275 = -999999; // L: 954
-			this.field2280 = -99999; // L: 955
-			this.field2267 = 99999; // L: 956
-
-			for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 957
-				int var2 = this.verticesX[var1]; // L: 958
-				int var3 = this.verticesY[var1]; // L: 959
-				int var4 = this.verticesZ[var1]; // L: 960
-				if (var2 < this.field2278) { // L: 961
-					this.field2278 = var2;
+		if (!this.isBoundsCalculated) { // L: 1412
+			super.height = 0; // L: 1413
+			this.field2182 = 0; // L: 1414
+			this.field2176 = 999999; // L: 1415
+			this.field2152 = -999999; // L: 1416
+			this.field2168 = -99999; // L: 1417
+			this.field2186 = 99999; // L: 1418
+
+			for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 1419
+				int var2 = this.verticesX[var1]; // L: 1420
+				int var3 = this.verticesY[var1]; // L: 1421
+				int var4 = this.verticesZ[var1]; // L: 1422
+				if (var2 < this.field2176) { // L: 1423
+					this.field2176 = var2;
 				}
 
-				if (var2 > this.field2275) { // L: 962
-					this.field2275 = var2;
+				if (var2 > this.field2152) { // L: 1424
+					this.field2152 = var2;
 				}
 
-				if (var4 < this.field2267) { // L: 963
-					this.field2267 = var4;
+				if (var4 < this.field2186) { // L: 1425
+					this.field2186 = var4;
 				}
 
-				if (var4 > this.field2280) { // L: 964
-					this.field2280 = var4;
+				if (var4 > this.field2168) { // L: 1426
+					this.field2168 = var4;
 				}
 
-				if (-var3 > super.height) { // L: 965
+				if (-var3 > super.height) { // L: 1427
 					super.height = -var3;
 				}
 
-				if (var3 > this.field2277) { // L: 966
-					this.field2277 = var3;
+				if (var3 > this.field2182) { // L: 1428
+					this.field2182 = var3;
 				}
 			}
 
-			this.isBoundsCalculated = true; // L: 968
+			this.isBoundsCalculated = true; // L: 1430
 		}
-	} // L: 969
+	} // L: 1431
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)Lhl;"
+		descriptor = "(IIIII)Lgo;"
 	)
 	@Export("toModel")
 	public final Model toModel(int var1, int var2, int var3, int var4, int var5) {
-		this.calculateVertexNormals(); // L: 1028
-		int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); // L: 1029
-		int var7 = var6 * var2 >> 8; // L: 1030
-		Model var8 = new Model(); // L: 1031
-		var8.faceColors1 = new int[this.faceCount]; // L: 1032
-		var8.faceColors2 = new int[this.faceCount]; // L: 1033
-		var8.faceColors3 = new int[this.faceCount]; // L: 1034
-		if (this.textureTriangleCount > 0 && this.textureCoords != null) { // L: 1035
-			int[] var9 = new int[this.textureTriangleCount]; // L: 1036
+		this.calculateVertexNormals(); // L: 1490
+		int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); // L: 1491
+		int var7 = var6 * var2 >> 8; // L: 1492
+		Model var8 = new Model(); // L: 1493
+		var8.faceColors1 = new int[this.faceCount]; // L: 1494
+		var8.faceColors2 = new int[this.faceCount]; // L: 1495
+		var8.faceColors3 = new int[this.faceCount]; // L: 1496
+		if (this.textureTriangleCount > 0 && this.textureCoords != null) { // L: 1497
+			int[] var9 = new int[this.textureTriangleCount]; // L: 1498
 
 			int var10;
-			for (var10 = 0; var10 < this.faceCount; ++var10) { // L: 1037
-				if (this.textureCoords[var10] != -1) { // L: 1038
+			for (var10 = 0; var10 < this.faceCount; ++var10) { // L: 1499
+				if (this.textureCoords[var10] != -1) { // L: 1500
 					++var9[this.textureCoords[var10] & 255];
 				}
 			}
 
-			var8.field2522 = 0; // L: 1040
+			var8.field2442 = 0; // L: 1502
 
-			for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041
-				if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042
-					++var8.field2522;
+			for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1503
+				if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1504
+					++var8.field2442;
 				}
 			}
 
-			var8.field2529 = new int[var8.field2522]; // L: 1044
-			var8.field2530 = new int[var8.field2522]; // L: 1045
-			var8.field2538 = new int[var8.field2522]; // L: 1046
-			var10 = 0; // L: 1047
+			var8.field2443 = new int[var8.field2442]; // L: 1506
+			var8.field2471 = new int[var8.field2442]; // L: 1507
+			var8.field2445 = new int[var8.field2442]; // L: 1508
+			var10 = 0; // L: 1509
 
 			int var11;
-			for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048
-				if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049
-					var8.field2529[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050
-					var8.field2530[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051
-					var8.field2538[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052
-					var9[var11] = var10++; // L: 1053
+			for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1510
+				if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1511
+					var8.field2443[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1512
+					var8.field2471[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1513
+					var8.field2445[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1514
+					var9[var11] = var10++; // L: 1515
 				} else {
-					var9[var11] = -1; // L: 1055
+					var9[var11] = -1; // L: 1517
 				}
 			}
 
-			var8.field2566 = new byte[this.faceCount]; // L: 1057
+			var8.field2439 = new byte[this.faceCount]; // L: 1519
 
-			for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058
-				if (this.textureCoords[var11] != -1) { // L: 1059
-					var8.field2566[var11] = (byte)var9[this.textureCoords[var11] & 255];
+			for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1520
+				if (this.textureCoords[var11] != -1) { // L: 1521
+					var8.field2439[var11] = (byte)var9[this.textureCoords[var11] & 255];
 				} else {
-					var8.field2566[var11] = -1; // L: 1060
+					var8.field2439[var11] = -1; // L: 1522
 				}
 			}
 		}
 
-		for (int var16 = 0; var16 < this.faceCount; ++var16) { // L: 1063
+		for (int var16 = 0; var16 < this.faceCount; ++var16) { // L: 1525
 			byte var17;
-			if (this.faceRenderTypes == null) { // L: 1065
+			if (this.faceRenderTypes == null) { // L: 1527
 				var17 = 0;
 			} else {
-				var17 = this.faceRenderTypes[var16]; // L: 1066
+				var17 = this.faceRenderTypes[var16]; // L: 1528
 			}
 
 			byte var18;
-			if (this.faceAlphas == null) { // L: 1068
+			if (this.faceAlphas == null) { // L: 1530
 				var18 = 0;
 			} else {
-				var18 = this.faceAlphas[var16]; // L: 1069
+				var18 = this.faceAlphas[var16]; // L: 1531
 			}
 
 			short var12;
-			if (this.faceTextures == null) { // L: 1071
+			if (this.faceTextures == null) { // L: 1533
 				var12 = -1;
 			} else {
-				var12 = this.faceTextures[var16]; // L: 1072
+				var12 = this.faceTextures[var16]; // L: 1534
 			}
 
-			if (var18 == -2) { // L: 1073
+			if (var18 == -2) { // L: 1535
 				var17 = 3;
 			}
 
-			if (var18 == -1) { // L: 1074
+			if (var18 == -1) { // L: 1536
 				var17 = 2;
 			}
 
 			VertexNormal var13;
 			int var14;
 			FaceNormal var19;
-			if (var12 == -1) { // L: 1075
-				if (var17 != 0) { // L: 1076
-					if (var17 == 1) { // L: 1093
-						var19 = this.faceNormals[var16]; // L: 1094
-						var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1095
-						var8.faceColors1[var16] = method4132(this.faceColors[var16] & '\uffff', var14); // L: 1096
-						var8.faceColors3[var16] = -1; // L: 1097
-					} else if (var17 == 3) { // L: 1099
-						var8.faceColors1[var16] = 128; // L: 1100
-						var8.faceColors3[var16] = -1; // L: 1101
+			if (var12 == -1) { // L: 1537
+				if (var17 != 0) { // L: 1538
+					if (var17 == 1) { // L: 1555
+						var19 = this.faceNormals[var16]; // L: 1556
+						var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1557
+						var8.faceColors1[var16] = method3767(this.faceColors[var16] & '\uffff', var14); // L: 1558
+						var8.faceColors3[var16] = -1; // L: 1559
+					} else if (var17 == 3) { // L: 1561
+						var8.faceColors1[var16] = 128; // L: 1562
+						var8.faceColors3[var16] = -1; // L: 1563
 					} else {
-						var8.faceColors3[var16] = -2; // L: 1104
+						var8.faceColors3[var16] = -2; // L: 1566
 					}
 				} else {
-					int var15 = this.faceColors[var16] & '\uffff'; // L: 1079
-					if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1080
+					int var15 = this.faceColors[var16] & '\uffff'; // L: 1541
+					if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1542
 						var13 = this.vertexVertices[this.indices1[var16]];
 					} else {
-						var13 = this.vertexNormals[this.indices1[var16]]; // L: 1081
+						var13 = this.vertexNormals[this.indices1[var16]]; // L: 1543
 					}
 
-					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082
-					var8.faceColors1[var16] = method4132(var15, var14); // L: 1083
-					if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1084
+					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1544
+					var8.faceColors1[var16] = method3767(var15, var14); // L: 1545
+					if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1546
 						var13 = this.vertexVertices[this.indices2[var16]];
 					} else {
-						var13 = this.vertexNormals[this.indices2[var16]]; // L: 1085
+						var13 = this.vertexNormals[this.indices2[var16]]; // L: 1547
 					}
 
-					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086
-					var8.faceColors2[var16] = method4132(var15, var14); // L: 1087
-					if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1088
+					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1548
+					var8.faceColors2[var16] = method3767(var15, var14); // L: 1549
+					if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1550
 						var13 = this.vertexVertices[this.indices3[var16]];
 					} else {
-						var13 = this.vertexNormals[this.indices3[var16]]; // L: 1089
+						var13 = this.vertexNormals[this.indices3[var16]]; // L: 1551
 					}
 
-					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090
-					var8.faceColors3[var16] = method4132(var15, var14); // L: 1091
+					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1552
+					var8.faceColors3[var16] = method3767(var15, var14); // L: 1553
 				}
-			} else if (var17 != 0) { // L: 1108
-				if (var17 == 1) { // L: 1124
-					var19 = this.faceNormals[var16]; // L: 1125
-					var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1126
-					var8.faceColors1[var16] = method4133(var14); // L: 1127
-					var8.faceColors3[var16] = -1; // L: 1128
+			} else if (var17 != 0) { // L: 1570
+				if (var17 == 1) { // L: 1586
+					var19 = this.faceNormals[var16]; // L: 1587
+					var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1588
+					var8.faceColors1[var16] = method3768(var14); // L: 1589
+					var8.faceColors3[var16] = -1; // L: 1590
 				} else {
-					var8.faceColors3[var16] = -2; // L: 1131
+					var8.faceColors3[var16] = -2; // L: 1593
 				}
 			} else {
-				if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1111
+				if (this.vertexVertices != null && this.vertexVertices[this.indices1[var16]] != null) { // L: 1573
 					var13 = this.vertexVertices[this.indices1[var16]];
 				} else {
-					var13 = this.vertexNormals[this.indices1[var16]]; // L: 1112
+					var13 = this.vertexNormals[this.indices1[var16]]; // L: 1574
 				}
 
-				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113
-				var8.faceColors1[var16] = method4133(var14); // L: 1114
-				if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1115
+				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1575
+				var8.faceColors1[var16] = method3768(var14); // L: 1576
+				if (this.vertexVertices != null && this.vertexVertices[this.indices2[var16]] != null) { // L: 1577
 					var13 = this.vertexVertices[this.indices2[var16]];
 				} else {
-					var13 = this.vertexNormals[this.indices2[var16]]; // L: 1116
+					var13 = this.vertexNormals[this.indices2[var16]]; // L: 1578
 				}
 
-				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117
-				var8.faceColors2[var16] = method4133(var14); // L: 1118
-				if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) { // L: 1119
-					var13 = this.vertexVertices[this.indices3[var16]];
+				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1579
+				var8.faceColors2[var16] = method3768(var14); // L: 1580
+				if (this.vertexVertices != null && this.vertexVertices[this.indices3[var16]] != null) {
+					var13 = this.vertexVertices[this.indices3[var16]]; // L: 1581
 				} else {
-					var13 = this.vertexNormals[this.indices3[var16]]; // L: 1120
+					var13 = this.vertexNormals[this.indices3[var16]]; // L: 1582
 				}
 
-				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121
-				var8.faceColors3[var16] = method4133(var14); // L: 1122
-			}
-		}
-
-		this.method4147(); // L: 1135
-		var8.verticesCount = this.verticesCount; // L: 1136
-		var8.verticesX = this.verticesX; // L: 1137
-		var8.verticesY = this.verticesY; // L: 1138
-		var8.verticesZ = this.verticesZ; // L: 1139
-		var8.indicesCount = this.faceCount; // L: 1140
-		var8.indices1 = this.indices1; // L: 1141
-		var8.indices2 = this.indices2; // L: 1142
-		var8.indices3 = this.indices3; // L: 1143
-		var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144
-		var8.faceAlphas = this.faceAlphas; // L: 1145
-		var8.field2527 = this.priority; // L: 1146
-		var8.vertexLabels = this.vertexLabels; // L: 1147
-		var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1148
-		var8.faceTextures = this.faceTextures; // L: 1149
-		return var8; // L: 1150
+				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1583
+				var8.faceColors3[var16] = method3768(var14); // L: 1584
+			}
+		}
+
+		this.method3753(); // L: 1597
+		var8.verticesCount = this.verticesCount; // L: 1598
+		var8.verticesX = this.verticesX; // L: 1599
+		var8.verticesY = this.verticesY; // L: 1600
+		var8.verticesZ = this.verticesZ; // L: 1601
+		var8.indicesCount = this.faceCount; // L: 1602
+		var8.indices1 = this.indices1; // L: 1603
+		var8.indices2 = this.indices2; // L: 1604
+		var8.indices3 = this.indices3; // L: 1605
+		var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1606
+		var8.faceAlphas = this.faceAlphas; // L: 1607
+		var8.field2444 = this.priority; // L: 1608
+		var8.vertexLabels = this.vertexLabels; // L: 1609
+		var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1610
+		var8.faceTextures = this.faceTextures; // L: 1611
+		var8.field2448 = this.field2185; // L: 1612
+		var8.field2449 = this.field2173; // L: 1613
+		return var8; // L: 1614
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;II)Lgk;"
+		descriptor = "(Lku;II)Lge;"
 	)
 	@Export("ModelData_get")
 	public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) {
-		byte[] var3 = var0.takeFile(var1, var2); // L: 53
-		return var3 == null ? null : new ModelData(var3); // L: 54
+		byte[] var3 = var0.takeFile(var1, var2); // L: 58
+		return var3 == null ? null : new ModelData(var3); // L: 59
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "(Lgk;Lgk;IIIZ)V"
+		descriptor = "(Lge;Lge;IIIZ)V"
 	)
-	static void method4130(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
-		var0.calculateBounds(); // L: 972
-		var0.calculateVertexNormals(); // L: 973
-		var1.calculateBounds(); // L: 974
-		var1.calculateVertexNormals(); // L: 975
-		++field2269; // L: 976
-		int var6 = 0; // L: 977
-		int[] var7 = var1.verticesX; // L: 978
-		int var8 = var1.verticesCount; // L: 979
+	static void method3812(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
+		var0.calculateBounds(); // L: 1434
+		var0.calculateVertexNormals(); // L: 1435
+		var1.calculateBounds(); // L: 1436
+		var1.calculateVertexNormals(); // L: 1437
+		++field2189; // L: 1438
+		int var6 = 0; // L: 1439
+		int[] var7 = var1.verticesX; // L: 1440
+		int var8 = var1.verticesCount; // L: 1441
 
 		int var9;
-		for (var9 = 0; var9 < var0.verticesCount; ++var9) { // L: 980
-			VertexNormal var10 = var0.vertexNormals[var9]; // L: 981
-			if (var10.magnitude != 0) { // L: 982
-				int var11 = var0.verticesY[var9] - var3; // L: 983
-				if (var11 <= var1.field2277) { // L: 984
-					int var12 = var0.verticesX[var9] - var2; // L: 985
-					if (var12 >= var1.field2278 && var12 <= var1.field2275) { // L: 986
-						int var13 = var0.verticesZ[var9] - var4; // L: 987
-						if (var13 >= var1.field2267 && var13 <= var1.field2280) { // L: 988
-							for (int var14 = 0; var14 < var8; ++var14) { // L: 989
-								VertexNormal var15 = var1.vertexNormals[var14]; // L: 990
-								if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 991
-									if (var0.vertexVertices == null) { // L: 992
+		for (var9 = 0; var9 < var0.verticesCount; ++var9) { // L: 1442
+			VertexNormal var10 = var0.vertexNormals[var9]; // L: 1443
+			if (var10.magnitude != 0) { // L: 1444
+				int var11 = var0.verticesY[var9] - var3; // L: 1445
+				if (var11 <= var1.field2182) { // L: 1446
+					int var12 = var0.verticesX[var9] - var2; // L: 1447
+					if (var12 >= var1.field2176 && var12 <= var1.field2152) { // L: 1448
+						int var13 = var0.verticesZ[var9] - var4; // L: 1449
+						if (var13 >= var1.field2186 && var13 <= var1.field2168) { // L: 1450
+							for (int var14 = 0; var14 < var8; ++var14) { // L: 1451
+								VertexNormal var15 = var1.vertexNormals[var14]; // L: 1452
+								if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 1453
+									if (var0.vertexVertices == null) { // L: 1454
 										var0.vertexVertices = new VertexNormal[var0.verticesCount];
 									}
 
-									if (var1.vertexVertices == null) { // L: 993
+									if (var1.vertexVertices == null) { // L: 1455
 										var1.vertexVertices = new VertexNormal[var8];
 									}
 
-									VertexNormal var16 = var0.vertexVertices[var9]; // L: 994
-									if (var16 == null) { // L: 995
+									VertexNormal var16 = var0.vertexVertices[var9]; // L: 1456
+									if (var16 == null) { // L: 1457
 										var16 = var0.vertexVertices[var9] = new VertexNormal(var10);
 									}
 
-									VertexNormal var17 = var1.vertexVertices[var14]; // L: 996
+									VertexNormal var17 = var1.vertexVertices[var14]; // L: 1458
 									if (var17 == null) {
-										var17 = var1.vertexVertices[var14] = new VertexNormal(var15); // L: 997
+										var17 = var1.vertexVertices[var14] = new VertexNormal(var15); // L: 1459
 									}
 
-									var16.x += var15.x; // L: 998
-									var16.y += var15.y; // L: 999
-									var16.z += var15.z; // L: 1000
-									var16.magnitude += var15.magnitude; // L: 1001
-									var17.x += var10.x; // L: 1002
-									var17.y += var10.y; // L: 1003
-									var17.z += var10.z; // L: 1004
-									var17.magnitude += var10.magnitude; // L: 1005
-									++var6; // L: 1006
-									field2255[var9] = field2269; // L: 1007
-									field2283[var14] = field2269; // L: 1008
+									var16.x += var15.x; // L: 1460
+									var16.y += var15.y; // L: 1461
+									var16.z += var15.z; // L: 1462
+									var16.magnitude += var15.magnitude; // L: 1463
+									var17.x += var10.x; // L: 1464
+									var17.y += var10.y; // L: 1465
+									var17.z += var10.z; // L: 1466
+									var17.magnitude += var10.magnitude; // L: 1467
+									++var6; // L: 1468
+									field2187[var9] = field2189; // L: 1469
+									field2188[var14] = field2189; // L: 1470
 								}
 							}
 						}
@@ -1697,50 +2340,50 @@ static void method4130(ModelData var0, ModelData var1, int var2, int var3, int v
 			}
 		}
 
-		if (var6 >= 3 && var5) { // L: 1012
-			for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013
-				if (field2255[var0.indices1[var9]] == field2269 && field2255[var0.indices2[var9]] == field2269 && field2255[var0.indices3[var9]] == field2269) { // L: 1014
-					if (var0.faceRenderTypes == null) { // L: 1015
+		if (var6 >= 3 && var5) { // L: 1474
+			for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1475
+				if (field2187[var0.indices1[var9]] == field2189 && field2187[var0.indices2[var9]] == field2189 && field2187[var0.indices3[var9]] == field2189) { // L: 1476
+					if (var0.faceRenderTypes == null) { // L: 1477
 						var0.faceRenderTypes = new byte[var0.faceCount];
 					}
 
-					var0.faceRenderTypes[var9] = 2; // L: 1016
+					var0.faceRenderTypes[var9] = 2; // L: 1478
 				}
 			}
 
-			for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019
-				if (field2269 == field2283[var1.indices1[var9]] && field2269 == field2283[var1.indices2[var9]] && field2269 == field2283[var1.indices3[var9]]) { // L: 1020
-					if (var1.faceRenderTypes == null) { // L: 1021
+			for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1481
+				if (field2189 == field2188[var1.indices1[var9]] && field2189 == field2188[var1.indices2[var9]] && field2189 == field2188[var1.indices3[var9]]) { // L: 1482
+					if (var1.faceRenderTypes == null) { // L: 1483
 						var1.faceRenderTypes = new byte[var1.faceCount];
 					}
 
-					var1.faceRenderTypes[var9] = 2; // L: 1022
+					var1.faceRenderTypes[var9] = 2; // L: 1484
 				}
 			}
 
 		}
-	} // L: 1025
+	} // L: 1487
 
-	@ObfuscatedName("ag")
-	static final int method4132(int var0, int var1) {
-		var1 = (var0 & 127) * var1 >> 7; // L: 1154
-		if (var1 < 2) { // L: 1155
+	@ObfuscatedName("ab")
+	static final int method3767(int var0, int var1) {
+		var1 = (var0 & 127) * var1 >> 7; // L: 1618
+		if (var1 < 2) { // L: 1619
 			var1 = 2;
-		} else if (var1 > 126) { // L: 1156
+		} else if (var1 > 126) { // L: 1620
 			var1 = 126;
 		}
 
-		return (var0 & 65408) + var1; // L: 1157
+		return (var0 & 65408) + var1; // L: 1621
 	}
 
-	@ObfuscatedName("ae")
-	static final int method4133(int var0) {
-		if (var0 < 2) { // L: 1161
+	@ObfuscatedName("an")
+	static final int method3768(int var0) {
+		if (var0 < 2) { // L: 1625
 			var0 = 2;
 		} else if (var0 > 126) {
-			var0 = 126; // L: 1162
+			var0 = 126; // L: 1626
 		}
 
-		return var0; // L: 1163
+		return var0; // L: 1627
 	}
 }
diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java
index ab3a1e11b5..38cb0e1ff1 100644
--- a/runescape-client/src/main/java/ModelData0.java
+++ b/runescape-client/src/main/java/ModelData0.java
@@ -1,33 +1,127 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hc")
+@ObfuscatedName("gd")
 @Implements("ModelData0")
 public class ModelData0 {
 	ModelData0() {
 	} // L: 4
 
-	@ObfuscatedName("ih")
+	@ObfuscatedName("hu")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
-		garbageValue = "-320838712"
+		descriptor = "(IIZI)V",
+		garbageValue = "190005998"
 	)
-	@Export("insertMenuItem")
-	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
-		if (!Client.isMenuOpen) { // L: 9298
-			if (Client.menuOptionsCount < 500) { // L: 9299
-				Client.menuActions[Client.menuOptionsCount] = var0; // L: 9300
-				Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9301
-				Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9302
-				Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9303
-				Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9304
-				Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9305
-				Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9306
-				++Client.menuOptionsCount; // L: 9307
+	static final void method4320(int var0, int var1, boolean var2) {
+		if (!var2 || var0 != Messages.field1277 || class4.field9 != var1) { // L: 6236
+			Messages.field1277 = var0; // L: 6239
+			class4.field9 = var1; // L: 6240
+			VertexNormal.updateGameState(25); // L: 6241
+			ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", true); // L: 6242
+			int var3 = class131.baseX; // L: 6243
+			int var4 = TileItem.baseY; // L: 6244
+			class131.baseX = (var0 - 6) * 8; // L: 6245
+			TileItem.baseY = (var1 - 6) * 8; // L: 6246
+			int var5 = class131.baseX - var3; // L: 6247
+			int var6 = TileItem.baseY - var4; // L: 6248
+			var3 = class131.baseX; // L: 6249
+			var4 = TileItem.baseY; // L: 6250
+
+			int var7;
+			int var9;
+			int[] var10000;
+			for (var7 = 0; var7 < 32768; ++var7) { // L: 6251
+				NPC var19 = Client.npcs[var7]; // L: 6252
+				if (var19 != null) { // L: 6253
+					for (var9 = 0; var9 < 10; ++var9) { // L: 6254
+						var10000 = var19.pathX; // L: 6255
+						var10000[var9] -= var5;
+						var10000 = var19.pathY; // L: 6256
+						var10000[var9] -= var6;
+					}
+
+					var19.x -= var5 * 128; // L: 6258
+					var19.y -= var6 * 128; // L: 6259
+				}
+			}
+
+			for (var7 = 0; var7 < 2048; ++var7) { // L: 6262
+				Player var22 = Client.players[var7]; // L: 6263
+				if (var22 != null) { // L: 6264
+					for (var9 = 0; var9 < 10; ++var9) { // L: 6265
+						var10000 = var22.pathX; // L: 6266
+						var10000[var9] -= var5;
+						var10000 = var22.pathY; // L: 6267
+						var10000[var9] -= var6;
+					}
+
+					var22.x -= var5 * 128; // L: 6269
+					var22.y -= var6 * 128; // L: 6270
+				}
+			}
+
+			byte var20 = 0; // L: 6273
+			byte var8 = 104; // L: 6274
+			byte var21 = 1; // L: 6275
+			if (var5 < 0) { // L: 6276
+				var20 = 103; // L: 6277
+				var8 = -1; // L: 6278
+				var21 = -1; // L: 6279
+			}
+
+			byte var10 = 0; // L: 6281
+			byte var11 = 104; // L: 6282
+			byte var12 = 1; // L: 6283
+			if (var6 < 0) { // L: 6284
+				var10 = 103; // L: 6285
+				var11 = -1; // L: 6286
+				var12 = -1; // L: 6287
+			}
+
+			int var14;
+			for (int var13 = var20; var13 != var8; var13 += var21) { // L: 6289
+				for (var14 = var10; var14 != var11; var14 += var12) { // L: 6290
+					int var15 = var13 + var5; // L: 6291
+					int var16 = var14 + var6; // L: 6292
+
+					for (int var17 = 0; var17 < 4; ++var17) { // L: 6293
+						if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
+							Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 6294
+						} else {
+							Client.groundItems[var17][var13][var14] = null; // L: 6295
+						}
+					}
+				}
+			}
+
+			for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6299 6300 6304
+				var18.x -= var5; // L: 6301
+				var18.y -= var6; // L: 6302
+				if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 6303
+					var18.remove();
+				}
+			}
+
+			if (Client.destinationX != 0) { // L: 6306
+				Client.destinationX -= var5; // L: 6307
+				Client.destinationY -= var6; // L: 6308
+			}
+
+			Client.soundEffectCount = 0; // L: 6310
+			Client.isCameraLocked = false; // L: 6311
+			UserComparator7.cameraX -= var5 << 7; // L: 6312
+			UserComparator10.cameraZ -= var6 << 7; // L: 6313
+			class7.oculusOrbFocalPointX -= var5 << 7; // L: 6314
+			Actor.oculusOrbFocalPointY -= var6 << 7; // L: 6315
+			Client.field570 = -1; // L: 6316
+			Client.graphicsObjects.clear(); // L: 6317
+			Client.projectiles.clear(); // L: 6318
+
+			for (var14 = 0; var14 < 4; ++var14) { // L: 6319
+				Client.collisionMaps[var14].clear();
 			}
 
 		}
-	} // L: 9309
+	} // L: 6237 6320
 }
diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java
index 28b96c02b4..eb309a5b3b 100644
--- a/runescape-client/src/main/java/MouseHandler.java
+++ b/runescape-client/src/main/java/MouseHandler.java
@@ -9,135 +9,122 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ah")
+@ObfuscatedName("az")
 @Implements("MouseHandler")
 public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener {
-	@ObfuscatedName("ph")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Leg;"
-	)
-	@Export("mouseWheel")
-	static class144 mouseWheel;
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lah;"
+		descriptor = "Laz;"
 	)
 	@Export("MouseHandler_instance")
 	static MouseHandler MouseHandler_instance;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1036288491
+		intValue = 1974176507
 	)
 	@Export("MouseHandler_idleCycles")
 	public static volatile int MouseHandler_idleCycles;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -422885389
+		intValue = 1015915071
 	)
 	@Export("MouseHandler_currentButtonVolatile")
 	static volatile int MouseHandler_currentButtonVolatile;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -19196403
+		intValue = 2002408097
 	)
 	@Export("MouseHandler_xVolatile")
 	static volatile int MouseHandler_xVolatile;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 197302675
+		intValue = 132217623
 	)
 	@Export("MouseHandler_yVolatile")
 	static volatile int MouseHandler_yVolatile;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		longValue = 8130240115469217441L
+		longValue = 3083150075737463137L
 	)
 	@Export("MouseHandler_lastMovedVolatile")
 	static volatile long MouseHandler_lastMovedVolatile;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1212092085
+		intValue = 111248997
 	)
 	@Export("MouseHandler_currentButton")
 	public static int MouseHandler_currentButton;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1137004173
+		intValue = 635129293
+	)
+	@Export("MouseHandler_x")
+	public static int MouseHandler_x;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 84217699
 	)
 	@Export("MouseHandler_y")
 	public static int MouseHandler_y;
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = 8667664769144098865L
+		longValue = 7951220240586932353L
 	)
 	@Export("MouseHandler_millis")
 	public static long MouseHandler_millis;
-	@ObfuscatedName("k")
-	@ObfuscatedGetter(
-		intValue = 1769064135
-	)
-	@Export("MouseHandler_x")
-	public static int MouseHandler_x;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1482494963
+		intValue = 1653302159
 	)
 	@Export("MouseHandler_lastButtonVolatile")
 	static volatile int MouseHandler_lastButtonVolatile;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 363259853
+		intValue = -1984749271
 	)
 	@Export("MouseHandler_lastPressedXVolatile")
 	static volatile int MouseHandler_lastPressedXVolatile;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1639433965
+		intValue = -2029009913
 	)
 	@Export("MouseHandler_lastPressedYVolatile")
 	static volatile int MouseHandler_lastPressedYVolatile;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		longValue = -7568180939030180395L
+		longValue = -3515226298509130765L
 	)
 	@Export("MouseHandler_lastPressedTimeMillisVolatile")
 	static volatile long MouseHandler_lastPressedTimeMillisVolatile;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 307748861
+		intValue = -1962519181
 	)
 	@Export("MouseHandler_lastButton")
 	public static int MouseHandler_lastButton;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -994811429
+		intValue = -2047825447
 	)
 	@Export("MouseHandler_lastPressedX")
 	public static int MouseHandler_lastPressedX;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1483939719
+		intValue = -459086865
 	)
 	@Export("MouseHandler_lastPressedY")
 	public static int MouseHandler_lastPressedY;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		longValue = 5932498801769663649L
+		longValue = -569068817016549579L
 	)
 	@Export("MouseHandler_lastPressedTimeMillis")
 	public static long MouseHandler_lastPressedTimeMillis;
-	@ObfuscatedName("bw")
-	@ObfuscatedSignature(
-		descriptor = "Lkz;"
-	)
-	@Export("clientLanguage")
-	static Language clientLanguage;
-	@ObfuscatedName("ix")
+	@ObfuscatedName("jt")
 	@ObfuscatedGetter(
-		intValue = 1129600087
+		intValue = 1070849037
 	)
-	@Export("selectedItemWidget")
-	static int selectedItemWidget;
+	static int field231;
 
 	static {
 		MouseHandler_instance = new MouseHandler(); // L: 15
@@ -147,7 +134,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 		MouseHandler_yVolatile = -1; // L: 19
 		MouseHandler_lastMovedVolatile = -1L; // L: 20
 		MouseHandler_currentButton = 0; // L: 21
-		MouseHandler_x = 0;
+		MouseHandler_x = 0; // L: 22
 		MouseHandler_y = 0; // L: 23
 		MouseHandler_millis = 0L; // L: 24
 		MouseHandler_lastButtonVolatile = 0; // L: 25
@@ -163,152 +150,283 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 	MouseHandler() {
 	} // L: 34
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/awt/event/MouseEvent;B)I",
-		garbageValue = "-42"
+		descriptor = "(Ljava/awt/event/MouseEvent;I)I",
+		garbageValue = "1878023149"
 	)
 	@Export("getButton")
 	final int getButton(MouseEvent var1) {
-		int var2 = var1.getButton(); // L: 70
-		if (!var1.isAltDown() && var2 != 2) { // L: 71
-			return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 72 73
+		int var2 = var1.getButton(); // L: 76
+		if (!var1.isAltDown() && var2 != 2) { // L: 77
+			return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 78 79
 		} else {
 			return 4;
 		}
 	}
 
 	public final synchronized void mouseMoved(MouseEvent var1) {
-		if (MouseHandler_instance != null) { // L: 118
-			MouseHandler_idleCycles = 0; // L: 119
-			MouseHandler_xVolatile = var1.getX(); // L: 120
-			MouseHandler_yVolatile = var1.getY(); // L: 121
-			MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 122
+		if (MouseHandler_instance != null) { // L: 124
+			MouseHandler_idleCycles = 0; // L: 125
+			MouseHandler_xVolatile = var1.getX(); // L: 126
+			MouseHandler_yVolatile = var1.getY(); // L: 127
+			MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 128
 		}
 
-	} // L: 124
+	} // L: 130
 
-	public final void mouseClicked(MouseEvent var1) {
-		if (var1.isPopupTrigger()) { // L: 97
+	public final synchronized void mousePressed(MouseEvent var1) {
+		if (MouseHandler_instance != null) { // L: 83
+			MouseHandler_idleCycles = 0; // L: 84
+			MouseHandler_lastPressedXVolatile = var1.getX(); // L: 85
+			MouseHandler_lastPressedYVolatile = var1.getY(); // L: 86
+			MouseHandler_lastPressedTimeMillisVolatile = Ignored.method6459(); // L: 87
+			MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 88
+			if (MouseHandler_lastButtonVolatile != 0) { // L: 89
+				MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile;
+			}
+		}
+
+		if (var1.isPopupTrigger()) { // L: 91
 			var1.consume();
 		}
 
-	} // L: 98
+	} // L: 92
 
-	public final synchronized void mouseEntered(MouseEvent var1) {
-		this.mouseMoved(var1);
-	} // L: 102
+	public final synchronized void mouseReleased(MouseEvent var1) {
+		if (MouseHandler_instance != null) { // L: 95
+			MouseHandler_idleCycles = 0; // L: 96
+			MouseHandler_currentButtonVolatile = 0; // L: 97
+		}
 
-	public final synchronized void mouseExited(MouseEvent var1) {
-		if (MouseHandler_instance != null) { // L: 105
-			MouseHandler_idleCycles = 0; // L: 106
-			MouseHandler_xVolatile = -1; // L: 107
-			MouseHandler_yVolatile = -1; // L: 108
-			MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 109
+		if (var1.isPopupTrigger()) { // L: 99
+			var1.consume();
 		}
 
-	} // L: 111
+	} // L: 100
 
-	public final synchronized void mouseDragged(MouseEvent var1) {
-		this.mouseMoved(var1); // L: 114
-	} // L: 115
+	public final void mouseClicked(MouseEvent var1) {
+		if (var1.isPopupTrigger()) { // L: 103
+			var1.consume();
+		}
 
-	public final void focusGained(FocusEvent var1) {
-	} // L: 126
+	} // L: 104
+
+	public final synchronized void mouseEntered(MouseEvent var1) {
+		this.mouseMoved(var1); // L: 107
+	} // L: 108
+
+	public final synchronized void mouseDragged(MouseEvent var1) {
+		this.mouseMoved(var1); // L: 120
+	} // L: 121
 
 	public final synchronized void focusLost(FocusEvent var1) {
-		if (MouseHandler_instance != null) { // L: 129
+		if (MouseHandler_instance != null) { // L: 135
 			MouseHandler_currentButtonVolatile = 0;
 		}
 
-	} // L: 130
+	} // L: 136
 
-	public final synchronized void mousePressed(MouseEvent var1) {
-		if (MouseHandler_instance != null) { // L: 77
-			MouseHandler_idleCycles = 0; // L: 78
-			MouseHandler_lastPressedXVolatile = var1.getX(); // L: 79
-			MouseHandler_lastPressedYVolatile = var1.getY(); // L: 80
-			MouseHandler_lastPressedTimeMillisVolatile = class111.method2516(); // L: 81
-			MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 82
-			if (MouseHandler_lastButtonVolatile != 0) { // L: 83
-				MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile;
-			}
+	public final synchronized void mouseExited(MouseEvent var1) {
+		if (MouseHandler_instance != null) { // L: 111
+			MouseHandler_idleCycles = 0; // L: 112
+			MouseHandler_xVolatile = -1; // L: 113
+			MouseHandler_yVolatile = -1; // L: 114
+			MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 115
 		}
 
-		if (var1.isPopupTrigger()) { // L: 85
-			var1.consume();
-		}
+	} // L: 117
 
-	} // L: 86
+	public final void focusGained(FocusEvent var1) {
+	} // L: 132
 
-	public final synchronized void mouseReleased(MouseEvent var1) {
-		if (MouseHandler_instance != null) { // L: 89
-			MouseHandler_idleCycles = 0; // L: 90
-			MouseHandler_currentButtonVolatile = 0; // L: 91
-		}
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lfs;",
+		garbageValue = "-1905138755"
+	)
+	static VerticalAlignment[] method651() {
+		return new VerticalAlignment[]{VerticalAlignment.field1869, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1870}; // L: 14
+	}
 
-		if (var1.isPopupTrigger()) { // L: 93
-			var1.consume();
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Z",
+		garbageValue = "7"
+	)
+	public static boolean method649(int var0) {
+		return (var0 >> 29 & 1) != 0; // L: 33
+	}
+
+	@ObfuscatedName("gk")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "769924990"
+	)
+	@Export("addNpcsToScene")
+	static final void addNpcsToScene(boolean var0) {
+		for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 5476
+			NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 5477
+			if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 5478
+				int var3 = var2.x >> 7; // L: 5479
+				int var4 = var2.y >> 7; // L: 5480
+				if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 5481
+					if (var2.field1120 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 5482
+						if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 5483
+							continue;
+						}
+
+						Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 5484
+					}
+
+					long var5 = SecureRandomFuture.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 5486
+					var2.playerCycle = Client.cycle; // L: 5487
+					class7.scene.drawEntity(class20.Client_plane, var2.x, var2.y, FaceNormal.getTileHeight(var2.field1120 * 64 - 64 + var2.x, var2.field1120 * 64 - 64 + var2.y, class20.Client_plane), var2.field1120 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 5488
+				}
+			}
 		}
 
-	} // L: 94
+	} // L: 5492
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("hq")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lfm;",
-		garbageValue = "58"
+		descriptor = "(IIB)V",
+		garbageValue = "16"
 	)
-	@Export("SequenceDefinition_get")
-	public static SequenceDefinition SequenceDefinition_get(int var0) {
-		SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 35
-		if (var1 != null) { // L: 36
-			return var1;
+	@Export("updateItemPile")
+	static final void updateItemPile(int var0, int var1) {
+		NodeDeque var2 = Client.groundItems[class20.Client_plane][var0][var1]; // L: 8234
+		if (var2 == null) { // L: 8235
+			class7.scene.removeGroundItemPile(class20.Client_plane, var0, var1); // L: 8236
 		} else {
-			byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 37
-			var1 = new SequenceDefinition(); // L: 38
-			if (var2 != null) { // L: 39
-				var1.decode(new Buffer(var2));
+			long var3 = -99999999L; // L: 8239
+			TileItem var5 = null; // L: 8240
+
+			TileItem var6;
+			for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 8241 8242 8250
+				ItemComposition var7 = UserComparator6.ItemDefinition_get(var6.id); // L: 8243
+				long var11 = (long)var7.price; // L: 8244
+				if (var7.isStackable == 1) { // L: 8245
+					var11 *= (long)(var6.quantity + 1);
+				}
+
+				if (var11 > var3) { // L: 8246
+					var3 = var11; // L: 8247
+					var5 = var6; // L: 8248
+				}
 			}
 
-			var1.postDecode(); // L: 40
-			SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 41
-			return var1; // L: 42
+			if (var5 == null) { // L: 8252
+				class7.scene.removeGroundItemPile(class20.Client_plane, var0, var1); // L: 8253
+			} else {
+				var2.addLast(var5); // L: 8256
+				TileItem var13 = null; // L: 8257
+				TileItem var8 = null; // L: 8258
+
+				for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 8259 8260 8265
+					if (var6.id != var5.id) { // L: 8261
+						if (var13 == null) { // L: 8262
+							var13 = var6;
+						}
+
+						if (var13.id != var6.id && var8 == null) { // L: 8263
+							var8 = var6;
+						}
+					}
+				}
+
+				long var9 = SecureRandomFuture.calculateTag(var0, var1, 3, false, 0); // L: 8267
+				class7.scene.newGroundItemPile(class20.Client_plane, var0, var1, FaceNormal.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class20.Client_plane), var5, var9, var13, var8); // L: 8268
+			}
 		}
-	}
+	} // L: 8237 8254 8269
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("ia")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lpg;"
+		descriptor = "(IIB)V",
+		garbageValue = "1"
 	)
-	@Export("newRunException")
-	public static RunException newRunException(Throwable var0, String var1) {
-		RunException var2;
-		if (var0 instanceof RunException) { // L: 99
-			var2 = (RunException)var0; // L: 100
-			var2.message = var2.message + ' ' + var1; // L: 101
-		} else {
-			var2 = new RunException(var0, var1); // L: 103
+	static void method646(int var0, int var1) {
+		int var2 = class136.fontBold12.stringWidth("Choose Option"); // L: 8974
+
+		int var3;
+		for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8975
+			Font var7 = class136.fontBold12; // L: 8976
+			String var8;
+			if (var3 < 0) { // L: 8979
+				var8 = ""; // L: 8980
+			} else if (Client.menuTargets[var3].length() > 0) { // L: 8983
+				var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3];
+			} else {
+				var8 = Client.menuActions[var3]; // L: 8984
+			}
+
+			int var6 = var7.stringWidth(var8); // L: 8986
+			if (var6 > var2) { // L: 8987
+				var2 = var6;
+			}
 		}
 
-		return var2; // L: 104
-	}
+		var2 += 8; // L: 8989
+		var3 = Client.menuOptionsCount * 15 + 22; // L: 8990
+		int var4 = var0 - var2 / 2; // L: 8991
+		if (var2 + var4 > class186.canvasWidth) { // L: 8992
+			var4 = class186.canvasWidth - var2;
+		}
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-1583806912"
-	)
-	@Export("colorStartTag")
-	static String colorStartTag(int var0) {
-		return "<col=" + Integer.toHexString(var0) + ">"; // L: 22
-	}
+		if (var4 < 0) { // L: 8993
+			var4 = 0;
+		}
+
+		int var5 = var1; // L: 8994
+		if (var3 + var1 > BoundaryObject.canvasHeight) { // L: 8995
+			var5 = BoundaryObject.canvasHeight - var3;
+		}
+
+		if (var5 < 0) { // L: 8996
+			var5 = 0;
+		}
+
+		ModeWhere.menuX = var4; // L: 8997
+		BufferedSink.menuY = var5; // L: 8998
+		GameObject.menuWidth = var2; // L: 8999
+		UserComparator3.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 9000
+	} // L: 9001
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("jz")
 	@ObfuscatedSignature(
-		descriptor = "(IS)I",
-		garbageValue = "15047"
+		descriptor = "(Ljm;IIB)V",
+		garbageValue = "-97"
 	)
-	static int method626(int var0) {
-		return (int)((Math.log((double)var0) / Interpreter.field801 - 7.0D) * 256.0D); // L: 3634
-	}
+	@Export("alignWidgetPosition")
+	static void alignWidgetPosition(Widget var0, int var1, int var2) {
+		if (var0.xAlignment == 0) { // L: 10975
+			var0.x = var0.rawX;
+		} else if (var0.xAlignment == 1) { // L: 10976
+			var0.x = var0.rawX + (var1 - var0.width) / 2;
+		} else if (var0.xAlignment == 2) { // L: 10977
+			var0.x = var1 - var0.width - var0.rawX;
+		} else if (var0.xAlignment == 3) { // L: 10978
+			var0.x = var0.rawX * var1 >> 14;
+		} else if (var0.xAlignment == 4) { // L: 10979
+			var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14);
+		} else {
+			var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10980
+		}
+
+		if (var0.yAlignment == 0) { // L: 10981
+			var0.y = var0.rawY;
+		} else if (var0.yAlignment == 1) { // L: 10982
+			var0.y = (var2 - var0.height) / 2 + var0.rawY;
+		} else if (var0.yAlignment == 2) { // L: 10983
+			var0.y = var2 - var0.height - var0.rawY;
+		} else if (var0.yAlignment == 3) {
+			var0.y = var2 * var0.rawY >> 14; // L: 10984
+		} else if (var0.yAlignment == 4) { // L: 10985
+			var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14);
+		} else {
+			var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10986
+		}
+
+	} // L: 10987
 }
diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java
index 0e7b7e9283..6399d58f62 100644
--- a/runescape-client/src/main/java/MouseRecorder.java
+++ b/runescape-client/src/main/java/MouseRecorder.java
@@ -1,40 +1,47 @@
+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;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ci")
+@ObfuscatedName("cd")
 @Implements("MouseRecorder")
 public class MouseRecorder implements Runnable {
-	@ObfuscatedName("t")
-	static int[] field1039;
-	@ObfuscatedName("ca")
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "[[Ljm;"
+	)
+	@Export("Widget_interfaceComponents")
+	public static Widget[][] Widget_interfaceComponents;
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
+		descriptor = "Lme;"
 	)
-	@Export("worldSelectRightSprite")
-	static IndexedSprite worldSelectRightSprite;
-	@ObfuscatedName("i")
+	static Bounds field1044;
+	@ObfuscatedName("c")
 	@Export("isRunning")
 	boolean isRunning;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("lock")
 	Object lock;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1216994745
+		intValue = 1539237497
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("xs")
 	int[] xs;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("ys")
 	int[] ys;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("millis")
 	long[] millis;
 
@@ -48,87 +55,68 @@ public class MouseRecorder implements Runnable {
 	} // L: 14
 
 	public void run() {
-		for (; this.isRunning; FloorUnderlayDefinition.method3190(50L)) { // L: 17 26
-			synchronized(this.lock) { // L: 18
-				if (this.index < 500) { // L: 19
-					this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 20
-					this.ys[this.index] = MouseHandler.MouseHandler_y; // L: 21
-					this.millis[this.index] = MouseHandler.MouseHandler_millis; // L: 22
-					++this.index; // L: 23
+		for (; this.isRunning; Bounds.method6608(50L)) { // L: 18
+			synchronized(this.lock) { // L: 19
+				if (this.index < 500) {
+					this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 21
+					this.ys[this.index] = MouseHandler.MouseHandler_y;
+					this.millis[this.index] = MouseHandler.MouseHandler_millis;
+					++this.index;
 				}
 			}
 		}
 
-	} // L: 28
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;B)V",
-		garbageValue = "-12"
-	)
-	public static void method2093(AbstractArchive var0) {
-		VarcInt.VarcInt_archive = var0; // L: 15
-	} // L: 16
+	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "355383775"
+		descriptor = "([BB)Lpl;",
+		garbageValue = "-5"
 	)
-	static int method2089(int var0, Script var1, boolean var2) {
-		Widget var5;
-		if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1365
-			var5 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1366
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.itemId; // L: 1367
-			return 1; // L: 1368
-		} else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1370
-			var5 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1371
-			if (var5.itemId != -1) { // L: 1372
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.itemQuantity;
-			} else {
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1373
-			}
+	public static final SpritePixels method2161(byte[] var0) {
+		BufferedImage var1 = null; // L: 20
 
-			return 1; // L: 1374
-		} else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1376
-			int var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1377
-			InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1378
-			if (var4 != null) { // L: 1379
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1;
-			} else {
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1380
-			}
-
-			return 1; // L: 1381
-		} else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1383
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1384
-			return 1; // L: 1385
-		} else {
-			return 2; // L: 1387
+		try {
+			var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22
+			int var2 = var1.getWidth(); // L: 23
+			int var3 = var1.getHeight(); // L: 24
+			int[] var4 = new int[var2 * var3]; // L: 25
+			PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26
+			var5.grabPixels(); // L: 27
+			return new SpritePixels(var4, var2, var3);
+		} catch (IOException var7) {
+		} catch (InterruptedException var8) {
 		}
+
+		return new SpritePixels(0, 0);
 	}
 
-	@ObfuscatedName("ie")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "([Ljf;Ljf;ZB)V",
-		garbageValue = "0"
+		descriptor = "(IIB)I",
+		garbageValue = "-41"
 	)
-	@Export("revalidateWidgetScroll")
-	static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
-		int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1040080419 * -992722549 : var1.width * -1492995549 * 1571065227; // L: 10229
-		int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -1297742855 * -1412739511 : var1.height * 380936511 * 1623576255; // L: 10230
-		WorldMapLabelSize.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10231
-		if (var1.children != null) { // L: 10232
-			WorldMapLabelSize.resizeInterface(var1.children, var1.id, var3, var4, var2);
-		}
+	static int method2160(int var0, int var1) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28
+		if (var2 == null) { // L: 29
+			return 0;
+		} else if (var1 == -1) { // L: 30
+			return 0;
+		} else {
+			int var3 = 0; // L: 31
 
-		InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10233
-		if (var5 != null) {
-			SecureRandomCallable.method2051(var5.group, var3, var4, var2); // L: 10234
-		}
+			for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32
+				if (var2.ids[var4] == var1) {
+					var3 += var2.quantities[var4]; // L: 33
+				}
+			}
 
-		if (var1.contentType == 1337) { // L: 10235
+			return var3; // L: 35
 		}
+	}
 
-	} // L: 10236
+	@ObfuscatedName("s")
+	public static int method2159(long var0) {
+		return (int)(var0 >>> 0 & 127L); // L: 68
+	}
 }
diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java
index e2c05332bd..3e36ec5b1e 100644
--- a/runescape-client/src/main/java/MouseWheel.java
+++ b/runescape-client/src/main/java/MouseWheel.java
@@ -3,13 +3,13 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kl")
+@ObfuscatedName("ll")
 @Implements("MouseWheel")
 public interface MouseWheel {
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	int rsOrdinal();
diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java
index 6eeff91988..a7fa8d523b 100644
--- a/runescape-client/src/main/java/MouseWheelHandler.java
+++ b/runescape-client/src/main/java/MouseWheelHandler.java
@@ -7,12 +7,12 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("c")
+@ObfuscatedName("x")
 @Implements("MouseWheelHandler")
-public final class MouseWheelHandler implements class144, MouseWheelListener {
-	@ObfuscatedName("i")
+public final class MouseWheelHandler implements class154, MouseWheelListener {
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 403973473
+		intValue = 187359743
 	)
 	@Export("rotation")
 	int rotation;
@@ -21,30 +21,30 @@ public final class MouseWheelHandler implements class144, MouseWheelListener {
 		this.rotation = 0; // L: 8
 	} // L: 10
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/awt/Component;I)V",
-		garbageValue = "-1467491328"
+		garbageValue = "-1662390688"
 	)
 	@Export("addTo")
 	void addTo(Component var1) {
 		var1.addMouseWheelListener(this); // L: 13
 	} // L: 14
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/awt/Component;I)V",
-		garbageValue = "-330102118"
+		descriptor = "(Ljava/awt/Component;B)V",
+		garbageValue = "127"
 	)
 	@Export("removeFrom")
 	void removeFrom(Component var1) {
 		var1.removeMouseWheelListener(this); // L: 17
 	} // L: 18
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1160529550"
+		descriptor = "(B)I",
+		garbageValue = "-65"
 	)
 	@Export("useRotation")
 	public synchronized int useRotation() {
diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java
index 6b6676b4aa..965ad5a1a4 100644
--- a/runescape-client/src/main/java/MusicPatch.java
+++ b/runescape-client/src/main/java/MusicPatch.java
@@ -1,140 +1,138 @@
-import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("iy")
+@ObfuscatedName("jt")
 @Implements("MusicPatch")
 public class MusicPatch extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -797794259
+		intValue = -183152089
 	)
-	int field2973;
-	@ObfuscatedName("w")
+	int field3114;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "[Laz;"
+		descriptor = "[Laj;"
 	)
 	@Export("rawSounds")
 	RawSound[] rawSounds;
+	@ObfuscatedName("p")
+	short[] field3113;
+	@ObfuscatedName("m")
+	byte[] field3111;
+	@ObfuscatedName("t")
+	byte[] field3115;
 	@ObfuscatedName("s")
-	short[] field2972;
-	@ObfuscatedName("a")
-	byte[] field2974;
-	@ObfuscatedName("o")
-	byte[] field2971;
-	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "[Lif;"
+		descriptor = "[Lil;"
 	)
-	MusicPatchNode2[] field2976;
-	@ObfuscatedName("e")
-	byte[] field2977;
-	@ObfuscatedName("p")
-	int[] field2975;
+	MusicPatchNode2[] field3117;
+	@ObfuscatedName("j")
+	byte[] field3119;
+	@ObfuscatedName("w")
+	int[] field3118;
 
 	MusicPatch(byte[] var1) {
 		this.rawSounds = new RawSound[128]; // L: 21
-		this.field2972 = new short[128]; // L: 22
-		this.field2974 = new byte[128]; // L: 23
-		this.field2971 = new byte[128]; // L: 24
-		this.field2976 = new MusicPatchNode2[128]; // L: 25
-		this.field2977 = new byte[128]; // L: 26
-		this.field2975 = new int[128]; // L: 27
+		this.field3113 = new short[128]; // L: 22
+		this.field3111 = new byte[128]; // L: 23
+		this.field3115 = new byte[128]; // L: 24
+		this.field3117 = new MusicPatchNode2[128]; // L: 25
+		this.field3119 = new byte[128]; // L: 26
+		this.field3118 = new int[128]; // L: 27
 		Buffer var2 = new Buffer(var1); // L: 28
 
 		int var3;
 		for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30
 		}
 
-		byte[] var4 = new byte[var3];
+		byte[] var4 = new byte[var3]; // L: 31
 
 		int var5;
 		for (var5 = 0; var5 < var3; ++var5) { // L: 32
 			var4[var5] = var2.readByte();
 		}
 
-		++var2.offset;
-		++var3;
-		var5 = var2.offset;
-		var2.offset += var3;
+		++var2.offset; // L: 33
+		++var3; // L: 34
+		var5 = var2.offset; // L: 35
+		var2.offset += var3; // L: 36
 
 		int var6;
-		for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) {
+		for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 37 38
 		}
 
-		byte[] var7 = new byte[var6];
+		byte[] var7 = new byte[var6]; // L: 39
 
 		int var8;
-		for (var8 = 0; var8 < var6; ++var8) {
+		for (var8 = 0; var8 < var6; ++var8) { // L: 40
 			var7[var8] = var2.readByte();
 		}
 
-		++var2.offset;
-		++var6;
-		var8 = var2.offset;
-		var2.offset += var6;
+		++var2.offset; // L: 41
+		++var6; // L: 42
+		var8 = var2.offset; // L: 43
+		var2.offset += var6; // L: 44
 
 		int var9;
-		for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) {
+		for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 45 46
 		}
 
-		byte[] var10 = new byte[var9];
+		byte[] var10 = new byte[var9]; // L: 47
 
-		for (int var11 = 0; var11 < var9; ++var11) {
+		for (int var11 = 0; var11 < var9; ++var11) { // L: 48
 			var10[var11] = var2.readByte();
 		}
 
-		++var2.offset;
-		++var9;
-		byte[] var38 = new byte[var9];
+		++var2.offset; // L: 49
+		++var9; // L: 50
+		byte[] var36 = new byte[var9]; // L: 51
 		int var12;
 		int var14;
 		if (var9 > 1) { // L: 53
-			var38[1] = 1; // L: 54
-			int var13 = 1;
-			var12 = 2;
+			var36[1] = 1; // L: 54
+			int var13 = 1; // L: 55
+			var12 = 2; // L: 56
 
-			for (var14 = 2; var14 < var9; ++var14) {
-				int var43 = var2.readUnsignedByte(); // L: 58
-				if (var43 == 0) {
+			for (var14 = 2; var14 < var9; ++var14) { // L: 57
+				int var41 = var2.readUnsignedByte(); // L: 58
+				if (var41 == 0) { // L: 59
 					var13 = var12++;
 				} else {
-					if (var43 <= var13) { // L: 61
-						--var43;
+					if (var41 <= var13) { // L: 61
+						--var41;
 					}
 
-					var13 = var43; // L: 62
+					var13 = var41; // L: 62
 				}
 
-				var38[var14] = (byte)var13; // L: 64
+				var36[var14] = (byte)var13; // L: 64
 			}
 		} else {
 			var12 = var9; // L: 67
 		}
 
-		MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 68
+		MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; // L: 68
 
 		MusicPatchNode2 var15;
-		for (var14 = 0; var14 < var39.length; ++var14) { // L: 69
-			var15 = var39[var14] = new MusicPatchNode2(); // L: 70
-			int var42 = var2.readUnsignedByte(); // L: 71
-			if (var42 > 0) { // L: 72
-				var15.field2916 = new byte[var42 * 2];
+		for (var14 = 0; var14 < var37.length; ++var14) { // L: 69
+			var15 = var37[var14] = new MusicPatchNode2(); // L: 70
+			int var40 = var2.readUnsignedByte(); // L: 71
+			if (var40 > 0) { // L: 72
+				var15.field3056 = new byte[var40 * 2];
 			}
 
-			var42 = var2.readUnsignedByte(); // L: 73
-			if (var42 > 0) { // L: 74
-				var15.field2914 = new byte[var42 * 2 + 2]; // L: 75
-				var15.field2914[1] = 64; // L: 76
+			var40 = var2.readUnsignedByte(); // L: 73
+			if (var40 > 0) { // L: 74
+				var15.field3054 = new byte[var40 * 2 + 2]; // L: 75
+				var15.field3054[1] = 64; // L: 76
 			}
 		}
 
 		var14 = var2.readUnsignedByte(); // L: 79
-		byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80
+		byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80
 		var14 = var2.readUnsignedByte(); // L: 81
 		byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 82
 
@@ -156,16 +154,16 @@ public class MusicPatch extends Node {
 		int var20;
 		for (var20 = 0; var20 < 128; ++var20) { // L: 90
 			var19 += var2.readUnsignedByte(); // L: 91
-			this.field2972[var20] = (short)var19; // L: 92
+			this.field3113[var20] = (short)var19; // L: 92
 		}
 
 		var19 = 0; // L: 94
 
-		short[] var50;
+		short[] var48;
 		for (var20 = 0; var20 < 128; ++var20) { // L: 95
 			var19 += var2.readUnsignedByte(); // L: 96
-			var50 = this.field2972; // L: 97
-			var50[var20] = (short)(var50[var20] + (var19 << 8));
+			var48 = this.field3113; // L: 97
+			var48[var20] = (short)(var48[var20] + (var19 << 8));
 		}
 
 		var20 = 0; // L: 99
@@ -184,9 +182,9 @@ public class MusicPatch extends Node {
 				var22 = var2.readVarInt(); // L: 106
 			}
 
-			var50 = this.field2972; // L: 108
-			var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14));
-			this.field2975[var23] = var22; // L: 109
+			var48 = this.field3113; // L: 108
+			var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14));
+			this.field3118[var23] = var22; // L: 109
 			--var20; // L: 110
 		}
 
@@ -196,7 +194,7 @@ public class MusicPatch extends Node {
 
 		int var24;
 		for (var24 = 0; var24 < 128; ++var24) { // L: 115
-			if (this.field2975[var24] != 0) { // L: 116
+			if (this.field3118[var24] != 0) { // L: 116
 				if (var20 == 0) { // L: 117
 					if (var21 < var4.length) { // L: 118
 						var20 = var4[var21++];
@@ -207,7 +205,7 @@ public class MusicPatch extends Node {
 					var23 = var2.array[var5++] - 1; // L: 120
 				}
 
-				this.field2977[var24] = (byte)var23; // L: 122
+				this.field3119[var24] = (byte)var23; // L: 122
 				--var20; // L: 123
 			}
 		}
@@ -217,7 +215,7 @@ public class MusicPatch extends Node {
 		var24 = 0; // L: 127
 
 		for (int var25 = 0; var25 < 128; ++var25) { // L: 128
-			if (this.field2975[var25] != 0) { // L: 129
+			if (this.field3118[var25] != 0) { // L: 129
 				if (var20 == 0) { // L: 130
 					if (var21 < var7.length) { // L: 131
 						var20 = var7[var21++];
@@ -228,20 +226,20 @@ public class MusicPatch extends Node {
 					var24 = var2.array[var8++] + 16 << 2; // L: 133
 				}
 
-				this.field2971[var25] = (byte)var24; // L: 135
+				this.field3115[var25] = (byte)var24; // L: 135
 				--var20; // L: 136
 			}
 		}
 
 		var20 = 0; // L: 138
 		var21 = 0; // L: 139
-		MusicPatchNode2 var40 = null; // L: 140
+		MusicPatchNode2 var38 = null; // L: 140
 
 		int var26;
 		for (var26 = 0; var26 < 128; ++var26) { // L: 141
-			if (this.field2975[var26] != 0) { // L: 142
+			if (this.field3118[var26] != 0) { // L: 142
 				if (var20 == 0) { // L: 143
-					var40 = var39[var38[var21]]; // L: 144
+					var38 = var37[var36[var21]]; // L: 144
 					if (var21 < var10.length) { // L: 145
 						var20 = var10[var21++];
 					} else {
@@ -249,7 +247,7 @@ public class MusicPatch extends Node {
 					}
 				}
 
-				this.field2976[var26] = var40; // L: 148
+				this.field3117[var26] = var38; // L: 148
 				--var20; // L: 149
 			}
 		}
@@ -267,37 +265,37 @@ public class MusicPatch extends Node {
 					var20 = -1; // L: 157
 				}
 
-				if (this.field2975[var27] > 0) { // L: 158
+				if (this.field3118[var27] > 0) { // L: 158
 					var26 = var2.readUnsignedByte() + 1;
 				}
 			}
 
-			this.field2974[var27] = (byte)var26; // L: 160
+			this.field3111[var27] = (byte)var26; // L: 160
 			--var20; // L: 161
 		}
 
-		this.field2973 = var2.readUnsignedByte() + 1; // L: 163
+		this.field3114 = var2.readUnsignedByte() + 1; // L: 163
 
 		int var29;
-		MusicPatchNode2 var41;
+		MusicPatchNode2 var39;
 		for (var27 = 0; var27 < var12; ++var27) { // L: 164
-			var41 = var39[var27]; // L: 165
-			if (var41.field2916 != null) { // L: 166
-				for (var29 = 1; var29 < var41.field2916.length; var29 += 2) { // L: 167
-					var41.field2916[var29] = var2.readByte();
+			var39 = var37[var27]; // L: 165
+			if (var39.field3056 != null) { // L: 166
+				for (var29 = 1; var29 < var39.field3056.length; var29 += 2) { // L: 167
+					var39.field3056[var29] = var2.readByte();
 				}
 			}
 
-			if (var41.field2914 != null) { // L: 169
-				for (var29 = 3; var29 < var41.field2914.length - 2; var29 += 2) { // L: 170
-					var41.field2914[var29] = var2.readByte();
+			if (var39.field3054 != null) { // L: 169
+				for (var29 = 3; var29 < var39.field3054.length - 2; var29 += 2) { // L: 170
+					var39.field3054[var29] = var2.readByte();
 				}
 			}
 		}
 
-		if (var44 != null) { // L: 173
-			for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 174
-				var44[var27] = var2.readByte();
+		if (var42 != null) { // L: 173
+			for (var27 = 1; var27 < var42.length; var27 += 2) { // L: 174
+				var42[var27] = var2.readByte();
 			}
 		}
 
@@ -308,25 +306,25 @@ public class MusicPatch extends Node {
 		}
 
 		for (var27 = 0; var27 < var12; ++var27) { // L: 179
-			var41 = var39[var27]; // L: 180
-			if (var41.field2914 != null) { // L: 181
+			var39 = var37[var27]; // L: 180
+			if (var39.field3054 != null) { // L: 181
 				var19 = 0; // L: 182
 
-				for (var29 = 2; var29 < var41.field2914.length; var29 += 2) { // L: 183
+				for (var29 = 2; var29 < var39.field3054.length; var29 += 2) { // L: 183
 					var19 = var19 + 1 + var2.readUnsignedByte(); // L: 184
-					var41.field2914[var29] = (byte)var19; // L: 185
+					var39.field3054[var29] = (byte)var19; // L: 185
 				}
 			}
 		}
 
 		for (var27 = 0; var27 < var12; ++var27) { // L: 189
-			var41 = var39[var27]; // L: 190
-			if (var41.field2916 != null) { // L: 191
+			var39 = var37[var27]; // L: 190
+			if (var39.field3056 != null) { // L: 191
 				var19 = 0; // L: 192
 
-				for (var29 = 2; var29 < var41.field2916.length; var29 += 2) { // L: 193
-					var19 = 1 + var19 + var2.readUnsignedByte(); // L: 194
-					var41.field2916[var29] = (byte)var19; // L: 195
+				for (var29 = 2; var29 < var39.field3056.length; var29 += 2) { // L: 193
+					var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194
+					var39.field3056[var29] = (byte)var19; // L: 195
 				}
 			}
 		}
@@ -335,372 +333,196 @@ public class MusicPatch extends Node {
 		int var32;
 		int var33;
 		int var34;
-		int var35;
-		int var36;
-		int var47;
-		byte var49;
-		if (var44 != null) { // L: 199
+		int var45;
+		byte var47;
+		if (var42 != null) { // L: 199
 			var19 = var2.readUnsignedByte(); // L: 200
-			var44[0] = (byte)var19; // L: 201
+			var42[0] = (byte)var19; // L: 201
 
-			for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 202
-				var19 = 1 + var19 + var2.readUnsignedByte(); // L: 203
-				var44[var27] = (byte)var19; // L: 204
+			for (var27 = 2; var27 < var42.length; var27 += 2) { // L: 202
+				var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203
+				var42[var27] = (byte)var19; // L: 204
 			}
 
-			var49 = var44[0]; // L: 206
-			byte var28 = var44[1]; // L: 207
+			var47 = var42[0]; // L: 206
+			byte var28 = var42[1]; // L: 207
 
-			for (var29 = 0; var29 < var49; ++var29) { // L: 208
-				this.field2974[var29] = (byte)(var28 * this.field2974[var29] + 32 >> 6);
+			for (var29 = 0; var29 < var47; ++var29) { // L: 208
+				this.field3111[var29] = (byte)(var28 * this.field3111[var29] + 32 >> 6);
 			}
 
-			for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 209 210 227
-				var30 = var44[var29]; // L: 211
-				byte var31 = var44[var29 + 1]; // L: 212
-				var32 = var28 * (var30 - var49) + (var30 - var49) / 2; // L: 213
-
-				for (var33 = var49; var33 < var30; ++var33) { // L: 214
-					var35 = var30 - var49; // L: 216
-					var36 = var32 >>> 31; // L: 218
-					var34 = (var32 + var36) / var35 - var36; // L: 219
-					this.field2974[var33] = (byte)(var34 * this.field2974[var33] + 32 >> 6); // L: 222
-					var32 += var31 - var28; // L: 223
+			for (var29 = 2; var29 < var42.length; var29 += 2) { // L: 209 210 221
+				var30 = var42[var29]; // L: 211
+				byte var31 = var42[var29 + 1]; // L: 212
+				var32 = var28 * (var30 - var47) + (var30 - var47) / 2; // L: 213
+
+				for (var33 = var47; var33 < var30; ++var33) { // L: 214
+					var34 = FaceNormal.method4142(var32, var30 - var47); // L: 215
+					this.field3111[var33] = (byte)(var34 * this.field3111[var33] + 32 >> 6); // L: 216
+					var32 += var31 - var28; // L: 217
 				}
 
-				var49 = var30; // L: 225
-				var28 = var31; // L: 226
+				var47 = var30; // L: 219
+				var28 = var31; // L: 220
 			}
 
-			for (var47 = var49; var47 < 128; ++var47) { // L: 229
-				this.field2974[var47] = (byte)(var28 * this.field2974[var47] + 32 >> 6);
+			for (var45 = var47; var45 < 128; ++var45) { // L: 223
+				this.field3111[var45] = (byte)(var28 * this.field3111[var45] + 32 >> 6);
 			}
 
-			var15 = null; // L: 230
+			var15 = null; // L: 224
 		}
 
-		if (var16 != null) { // L: 232
-			var19 = var2.readUnsignedByte(); // L: 233
-			var16[0] = (byte)var19; // L: 234
+		if (var16 != null) { // L: 226
+			var19 = var2.readUnsignedByte(); // L: 227
+			var16[0] = (byte)var19; // L: 228
 
-			for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 235
-				var19 = var19 + 1 + var2.readUnsignedByte(); // L: 236
-				var16[var27] = (byte)var19; // L: 237
+			for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 229
+				var19 = var19 + 1 + var2.readUnsignedByte(); // L: 230
+				var16[var27] = (byte)var19; // L: 231
 			}
 
-			var49 = var16[0]; // L: 239
-			int var46 = var16[1] << 1; // L: 240
+			var47 = var16[0]; // L: 233
+			int var44 = var16[1] << 1; // L: 234
 
-			for (var29 = 0; var29 < var49; ++var29) { // L: 241
-				var47 = var46 + (this.field2971[var29] & 255); // L: 242
-				if (var47 < 0) { // L: 243
-					var47 = 0;
+			for (var29 = 0; var29 < var47; ++var29) { // L: 235
+				var45 = var44 + (this.field3115[var29] & 255); // L: 236
+				if (var45 < 0) { // L: 237
+					var45 = 0;
 				}
 
-				if (var47 > 128) { // L: 244
-					var47 = 128;
+				if (var45 > 128) { // L: 238
+					var45 = 128;
 				}
 
-				this.field2971[var29] = (byte)var47; // L: 245
+				this.field3115[var29] = (byte)var45; // L: 239
 			}
 
-			int var48;
-			for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 247 248 268
-				var30 = var16[var29]; // L: 249
-				var48 = var16[var29 + 1] << 1; // L: 250
-				var32 = var46 * (var30 - var49) + (var30 - var49) / 2; // L: 251
-
-				for (var33 = var49; var33 < var30; ++var33) { // L: 252
-					var35 = var30 - var49; // L: 254
-					var36 = var32 >>> 31; // L: 256
-					var34 = (var36 + var32) / var35 - var36; // L: 257
-					int var37 = var34 + (this.field2971[var33] & 255); // L: 260
-					if (var37 < 0) { // L: 261
-						var37 = 0;
+			int var46;
+			for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 241 242 256
+				var30 = var16[var29]; // L: 243
+				var46 = var16[var29 + 1] << 1; // L: 244
+				var32 = var44 * (var30 - var47) + (var30 - var47) / 2; // L: 245
+
+				for (var33 = var47; var33 < var30; ++var33) { // L: 246
+					var34 = FaceNormal.method4142(var32, var30 - var47); // L: 247
+					int var35 = var34 + (this.field3115[var33] & 255); // L: 248
+					if (var35 < 0) { // L: 249
+						var35 = 0;
 					}
 
-					if (var37 > 128) { // L: 262
-						var37 = 128;
+					if (var35 > 128) { // L: 250
+						var35 = 128;
 					}
 
-					this.field2971[var33] = (byte)var37; // L: 263
-					var32 += var48 - var46; // L: 264
+					this.field3115[var33] = (byte)var35; // L: 251
+					var32 += var46 - var44; // L: 252
 				}
 
-				var49 = var30; // L: 266
-				var46 = var48; // L: 267
+				var47 = var30; // L: 254
+				var44 = var46; // L: 255
 			}
 
-			for (var47 = var49; var47 < 128; ++var47) { // L: 270
-				var48 = var46 + (this.field2971[var47] & 255); // L: 271
-				if (var48 < 0) { // L: 272
-					var48 = 0;
+			for (var45 = var47; var45 < 128; ++var45) { // L: 258
+				var46 = var44 + (this.field3115[var45] & 255); // L: 259
+				if (var46 < 0) { // L: 260
+					var46 = 0;
 				}
 
-				if (var48 > 128) { // L: 273
-					var48 = 128;
+				if (var46 > 128) { // L: 261
+					var46 = 128;
 				}
 
-				this.field2971[var47] = (byte)var48; // L: 274
+				this.field3115[var45] = (byte)var46; // L: 262
 			}
 
-			Object var45 = null; // L: 276
+			Object var43 = null; // L: 264
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 278
-			var39[var27].field2913 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 266
+			var37[var27].field3052 = var2.readUnsignedByte();
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 279
-			var41 = var39[var27]; // L: 280
-			if (var41.field2916 != null) { // L: 281
-				var41.field2918 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 267
+			var39 = var37[var27]; // L: 268
+			if (var39.field3056 != null) { // L: 269
+				var39.field3055 = var2.readUnsignedByte();
 			}
 
-			if (var41.field2914 != null) { // L: 282
-				var41.field2915 = var2.readUnsignedByte();
+			if (var39.field3054 != null) { // L: 270
+				var39.field3053 = var2.readUnsignedByte();
 			}
 
-			if (var41.field2913 > 0) { // L: 283
-				var41.field2912 = var2.readUnsignedByte();
+			if (var39.field3052 > 0) { // L: 271
+				var39.field3057 = var2.readUnsignedByte();
 			}
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 285
-			var39[var27].field2911 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 273
+			var37[var27].field3059 = var2.readUnsignedByte();
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 286
-			var41 = var39[var27]; // L: 287
-			if (var41.field2911 > 0) { // L: 288
-				var41.field2917 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 274
+			var39 = var37[var27]; // L: 275
+			if (var39.field3059 > 0) { // L: 276
+				var39.field3058 = var2.readUnsignedByte();
 			}
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 290
-			var41 = var39[var27]; // L: 291
-			if (var41.field2917 > 0) { // L: 292
-				var41.field2919 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 278
+			var39 = var37[var27]; // L: 279
+			if (var39.field3058 > 0) { // L: 280
+				var39.field3060 = var2.readUnsignedByte();
 			}
 		}
 
-	} // L: 294
+	} // L: 282
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lad;[B[II)Z",
-		garbageValue = "-1514106503"
+		descriptor = "(Laa;[B[II)Z",
+		garbageValue = "-1424242195"
 	)
-	boolean method4945(SoundCache var1, byte[] var2, int[] var3) {
-		boolean var4 = true; // L: 297
-		int var5 = 0; // L: 298
-		RawSound var6 = null; // L: 299
-
-		for (int var7 = 0; var7 < 128; ++var7) { // L: 300
-			if (var2 == null || var2[var7] != 0) { // L: 301
-				int var8 = this.field2975[var7]; // L: 302
-				if (var8 != 0) { // L: 303
-					if (var5 != var8) { // L: 304
-						var5 = var8--; // L: 305 306
-						if ((var8 & 1) == 0) { // L: 307
+	boolean method5253(SoundCache var1, byte[] var2, int[] var3) {
+		boolean var4 = true; // L: 285
+		int var5 = 0; // L: 286
+		RawSound var6 = null; // L: 287
+
+		for (int var7 = 0; var7 < 128; ++var7) { // L: 288
+			if (var2 == null || var2[var7] != 0) { // L: 289
+				int var8 = this.field3118[var7]; // L: 290
+				if (var8 != 0) { // L: 291
+					if (var5 != var8) { // L: 292
+						var5 = var8--; // L: 293 294
+						if ((var8 & 1) == 0) { // L: 295
 							var6 = var1.getSoundEffect(var8 >> 2, var3);
 						} else {
-							var6 = var1.getMusicSample(var8 >> 2, var3); // L: 308
+							var6 = var1.getMusicSample(var8 >> 2, var3); // L: 296
 						}
 
-						if (var6 == null) { // L: 309
+						if (var6 == null) { // L: 297
 							var4 = false;
 						}
 					}
 
-					if (var6 != null) { // L: 311
-						this.rawSounds[var7] = var6; // L: 312
-						this.field2975[var7] = 0; // L: 313
+					if (var6 != null) { // L: 299
+						this.rawSounds[var7] = var6; // L: 300
+						this.field3118[var7] = 0; // L: 301
 					}
 				}
 			}
 		}
 
-		return var4; // L: 317
+		return var4; // L: 305
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1852268477"
+		garbageValue = "-1962661090"
 	)
 	@Export("clear")
 	void clear() {
-		this.field2975 = null; // L: 321
-	} // L: 322
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "302724189"
-	)
-	@Export("loadWorlds")
-	static boolean loadWorlds() {
-		try {
-			if (class21.World_request == null) { // L: 31
-				class21.World_request = class320.urlRequester.request(new URL(BoundaryObject.field2618));
-			} else if (class21.World_request.isDone()) { // L: 33
-				byte[] var0 = class21.World_request.getResponse(); // L: 34
-				Buffer var1 = new Buffer(var0); // L: 35
-				var1.readInt(); // L: 36
-				World.World_count = var1.readUnsignedShort(); // L: 37
-				WorldMapEvent.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 = WorldMapEvent.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
-				}
-
-				ObjectSound.sortWorlds(WorldMapEvent.World_worlds, 0, WorldMapEvent.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2);
-				class21.World_request = null;
-				return true; // L: 51
-			}
-		} catch (Exception var4) { // L: 55
-			var4.printStackTrace(); // L: 56
-			class21.World_request = null; // L: 57
-		}
-
-		return false; // L: 59
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(IIIB)I",
-		garbageValue = "38"
-	)
-	public static int method4949(int var0, int var1, int var2) {
-		int var3 = class123.method2619(var2 - var1 + 1); // L: 48
-		var3 <<= var1; // L: 49
-		return var0 & ~var3; // L: 50
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "-51"
-	)
-	static int method4950(int var0, Script var1, boolean var2) {
-		Widget var3;
-		if (var0 >= 2000) { // L: 1018
-			var0 -= 1000; // L: 1019
-			var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1020
-		} else {
-			var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1022
-		}
-
-		String var4 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1023
-		int[] var5 = null; // L: 1024
-		if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1025
-			int var6 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1026
-			if (var6 > 0) { // L: 1027
-				for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]) { // L: 1028 1029
-				}
-			}
-
-			var4 = var4.substring(0, var4.length() - 1); // L: 1031
-		}
-
-		Object[] var8 = new Object[var4.length() + 1]; // L: 1033
-
-		int var7;
-		for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1034
-			if (var4.charAt(var7 - 1) == 's') { // L: 1035
-				var8[var7] = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize];
-			} else {
-				var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1036
-			}
-		}
-
-		var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1038
-		if (var7 != -1) { // L: 1039
-			var8[0] = new Integer(var7);
-		} else {
-			var8 = null; // L: 1040
-		}
-
-		if (var0 == ScriptOpcodes.CC_SETONCLICK) {
-			var3.onClick = var8; // L: 1041
-		} else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1042
-			var3.onHold = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1043
-			var3.onRelease = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1044
-			var3.onMouseOver = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1045
-			var3.onMouseLeave = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1046
-			var3.onDrag = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1047
-			var3.onTargetLeave = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1048
-			var3.onVarTransmit = var8; // L: 1049
-			var3.varTransmitTriggers = var5; // L: 1050
-		} else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1052
-			var3.onTimer = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1053
-			var3.onOp = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1054
-			var3.onDragComplete = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1055
-			var3.onClickRepeat = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1056
-			var3.onMouseRepeat = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1057
-			var3.onInvTransmit = var8; // L: 1058
-			var3.invTransmitTriggers = var5; // L: 1059
-		} else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1061
-			var3.onStatTransmit = var8; // L: 1062
-			var3.statTransmitTriggers = var5; // L: 1063
-		} else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1065
-			var3.onTargetEnter = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1066
-			var3.onScroll = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1067
-			var3.onChatTransmit = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1068
-			var3.onKey = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1069
-			var3.onFriendTransmit = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1070
-			var3.onClanTransmit = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1071
-			var3.onMiscTransmit = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1072
-			var3.onDialogAbort = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1073
-			var3.onSubChange = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1074
-			var3.onStockTransmit = var8;
-		} else if (var0 == 1426) { // L: 1075
-			var3.field3172 = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1076
-			var3.onResize = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1077
-			var3.field3056 = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1078
-			var3.field3166 = var8;
-		} else if (var0 == 1430) {
-			var3.field3161 = var8; // L: 1079
-		} else {
-			if (var0 != 1431) { // L: 1080
-				return 2; // L: 1081
-			}
-
-			var3.field3162 = var8;
-		}
-
-		var3.hasListener = true; // L: 1082
-		return 1; // L: 1083
-	}
+		this.field3118 = null; // L: 309
+	} // L: 310
 }
diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java
index ec5289ed19..400f44abf6 100644
--- a/runescape-client/src/main/java/MusicPatchNode.java
+++ b/runescape-client/src/main/java/MusicPatchNode.java
@@ -4,130 +4,258 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iu")
+@ObfuscatedName("jq")
 @Implements("MusicPatchNode")
 public class MusicPatchNode extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("ss")
 	@ObfuscatedGetter(
-		intValue = -765367779
+		intValue = -1089450297
 	)
-	int field2996;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lif;"
+	static int field3150;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 2120721647
 	)
-	MusicPatchNode2 field2988;
-	@ObfuscatedName("s")
+	int field3149;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Liy;"
+		descriptor = "Ljt;"
 	)
 	@Export("patch")
 	MusicPatch patch;
-	@ObfuscatedName("a")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Laz;"
+		descriptor = "Laj;"
 	)
 	@Export("rawSound")
 	RawSound rawSound;
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lil;"
+	)
+	MusicPatchNode2 field3131;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1956432115
+		intValue = -523823363
 	)
-	int field2989;
-	@ObfuscatedName("g")
+	int field3128;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -25523701
+		intValue = -1860888427
 	)
-	int field2990;
-	@ObfuscatedName("e")
+	int field3133;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1073862623
+		intValue = 549821861
 	)
-	int field2991;
-	@ObfuscatedName("p")
+	int field3132;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 483864743
+		intValue = 266246813
 	)
-	int field2992;
-	@ObfuscatedName("j")
+	int field3147;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1449376121
+		intValue = 761118797
 	)
-	int field2993;
-	@ObfuscatedName("b")
+	int field3136;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 154374579
+		intValue = -1410694573
 	)
-	int field2997;
-	@ObfuscatedName("x")
+	int field3137;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 875004827
+		intValue = -1347738891
 	)
-	int field2998;
-	@ObfuscatedName("y")
+	int field3138;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -282874889
+		intValue = 2102474829
 	)
-	int field2986;
-	@ObfuscatedName("k")
+	int field3139;
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1795067685
+		intValue = 899740579
 	)
-	int field3004;
-	@ObfuscatedName("t")
+	int field3140;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1488194149
+		intValue = 1668903755
 	)
-	int field2994;
-	@ObfuscatedName("l")
+	int field3141;
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 546562593
+		intValue = 707181103
 	)
-	int field2999;
-	@ObfuscatedName("u")
+	int field3142;
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -95307761
+		intValue = -1399619147
 	)
-	int field3000;
-	@ObfuscatedName("n")
+	int field3143;
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -828280659
+		intValue = 1374449229
 	)
-	int field3001;
-	@ObfuscatedName("z")
+	int field3144;
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -604585329
+		intValue = 1593408009
 	)
-	int field3002;
-	@ObfuscatedName("q")
+	int field3145;
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lax;"
+		descriptor = "Lat;"
 	)
 	@Export("stream")
 	RawPcmStream stream;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 630031751
+		intValue = 1680704123
 	)
-	int field2995;
-	@ObfuscatedName("m")
+	int field3134;
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -848603207
+		intValue = 125903423
 	)
-	int field3003;
+	int field3135;
 
 	MusicPatchNode() {
-	} // L: 31
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1075118408"
+	)
+	void method5292() {
+		this.patch = null;
+		this.rawSound = null;
+		this.field3131 = null; // L: 36
+		this.stream = null;
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "([BIII)Ljava/lang/String;",
+		garbageValue = "-1684371840"
+	)
+	public static String method5294(byte[] var0, int var1, int var2) {
+		char[] var3 = new char[var2]; // L: 30
+		int var4 = 0; // L: 31
+		int var5 = var1; // L: 32
+
+		int var8;
+		for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { // L: 33 34 65
+			int var7 = var0[var5++] & 255; // L: 35
+			if (var7 < 128) { // L: 37
+				if (var7 == 0) { // L: 38
+					var8 = 65533;
+				} else {
+					var8 = var7; // L: 39
+				}
+			} else if (var7 < 192) { // L: 41
+				var8 = 65533;
+			} else if (var7 < 224) { // L: 42
+				if (var5 < var6 && (var0[var5] & 192) == 128) { // L: 43
+					var8 = (var7 & 31) << 6 | var0[var5++] & 63; // L: 44
+					if (var8 < 128) { // L: 45
+						var8 = 65533;
+					}
+				} else {
+					var8 = 65533; // L: 47
+				}
+			} else if (var7 < 240) { // L: 49
+				if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { // L: 50
+					var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; // L: 51
+					if (var8 < 2048) { // L: 52
+						var8 = 65533;
+					}
+				} else {
+					var8 = 65533; // L: 54
+				}
+			} else if (var7 < 248) { // L: 56
+				if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { // L: 57
+					var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; // L: 58
+					if (var8 >= 65536 && var8 <= 1114111) { // L: 59
+						var8 = 65533; // L: 60
+					} else {
+						var8 = 65533;
+					}
+				} else {
+					var8 = 65533; // L: 62
+				}
+			} else {
+				var8 = 65533; // L: 64
+			}
+		}
 
-	@ObfuscatedName("i")
+		return new String(var3, 0, var4); // L: 67
+	}
+
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "0"
-	)
-	void method4992() {
-		this.patch = null; // L: 34
-		this.rawSound = null; // L: 35
-		this.field2988 = null; // L: 36
-		this.stream = null; // L: 37
-	} // L: 38
+		descriptor = "(Ljava/lang/CharSequence;IZB)I",
+		garbageValue = "-8"
+	)
+	public static int method5293(CharSequence var0, int var1, boolean var2) {
+		if (var1 >= 2 && var1 <= 36) { // L: 81
+			boolean var3 = false; // L: 82
+			boolean var4 = false; // L: 83
+			int var5 = 0; // L: 84
+			int var6 = var0.length(); // L: 85
+
+			for (int var7 = 0; var7 < var6; ++var7) { // L: 86
+				char var8 = var0.charAt(var7); // L: 87
+				if (var7 == 0) { // L: 88
+					if (var8 == '-') { // L: 89
+						var3 = true; // L: 90
+						continue;
+					}
+
+					if (var8 == '+') { // L: 93
+						continue;
+					}
+				}
+
+				int var10;
+				if (var8 >= '0' && var8 <= '9') { // L: 95
+					var10 = var8 - '0';
+				} else if (var8 >= 'A' && var8 <= 'Z') { // L: 96
+					var10 = var8 - '7';
+				} else {
+					if (var8 < 'a' || var8 > 'z') { // L: 97
+						throw new NumberFormatException(); // L: 98
+					}
+
+					var10 = var8 - 'W';
+				}
+
+				if (var10 >= var1) { // L: 99
+					throw new NumberFormatException();
+				}
+
+				if (var3) { // L: 100
+					var10 = -var10;
+				}
+
+				int var9 = var5 * var1 + var10; // L: 101
+				if (var9 / var1 != var5) { // L: 102
+					throw new NumberFormatException();
+				}
+
+				var5 = var9; // L: 103
+				var4 = true; // L: 104
+			}
+
+			if (!var4) { // L: 106
+				throw new NumberFormatException();
+			} else {
+				return var5; // L: 107
+			}
+		} else {
+			throw new IllegalArgumentException("" + var1);
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java
index 403a994ebb..13b7287a69 100644
--- a/runescape-client/src/main/java/MusicPatchNode2.java
+++ b/runescape-client/src/main/java/MusicPatchNode2.java
@@ -1,358 +1,94 @@
+import java.io.File;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("if")
+@ObfuscatedName("il")
 @Implements("MusicPatchNode2")
 public class MusicPatchNode2 {
-	@ObfuscatedName("i")
-	byte[] field2916;
-	@ObfuscatedName("w")
-	byte[] field2914;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
+	byte[] field3056;
+	@ObfuscatedName("b")
+	byte[] field3054;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1643718021
+		intValue = 1373142443
 	)
-	int field2913;
-	@ObfuscatedName("a")
+	int field3052;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 470925631
+		intValue = 354734067
 	)
-	int field2918;
-	@ObfuscatedName("o")
+	int field3055;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1577880969
+		intValue = -488769373
 	)
-	int field2915;
-	@ObfuscatedName("g")
+	int field3053;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1887609341
+		intValue = -1877607089
 	)
-	int field2912;
-	@ObfuscatedName("e")
+	int field3057;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1787645677
+		intValue = 843760969
 	)
-	int field2917;
-	@ObfuscatedName("p")
+	int field3058;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -311548265
+		intValue = 1302289953
 	)
-	int field2911;
-	@ObfuscatedName("j")
+	int field3059;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1107256975
+		intValue = -579671659
 	)
-	int field2919;
+	int field3060;
 
 	MusicPatchNode2() {
 	} // L: 14
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IZI)Ljava/lang/String;",
-		garbageValue = "2086723943"
+		descriptor = "(Ljava/io/File;B)V",
+		garbageValue = "-1"
 	)
-	@Export("intToString")
-	public static String intToString(int var0, boolean var1) {
-		return var1 && var0 >= 0 ? GrandExchangeEvent.method5448(var0, 10, var1) : Integer.toString(var0); // L: 114 115
-	}
+	public static void method5048(File var0) {
+		class125.FileSystem_cacheDir = var0; // L: 16
+		if (!class125.FileSystem_cacheDir.exists()) { // L: 17
+			throw new RuntimeException("");
+		} else {
+			FileSystem.FileSystem_hasPermissions = true; // L: 18
+		}
+	} // L: 19
 
-	@ObfuscatedName("hl")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIII)V",
-		garbageValue = "-1147573372"
+		descriptor = "(IIIS)I",
+		garbageValue = "3121"
 	)
-	@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: 7519
-			if (Client.isLowDetail && var0 != GrandExchangeOfferTotalQuantityComparator.Client_plane) { // L: 7520
-				return;
-			}
-
-			long var7 = 0L; // L: 7521
-			boolean var9 = true; // L: 7522
-			boolean var10 = false; // L: 7523
-			boolean var11 = false; // L: 7524
-			if (var1 == 0) { // L: 7525
-				var7 = GameBuild.scene.getBoundaryObjectTag(var0, var2, var3);
-			}
-
-			if (var1 == 1) { // L: 7526
-				var7 = GameBuild.scene.getWallDecorationTag(var0, var2, var3);
-			}
-
-			if (var1 == 2) { // L: 7527
-				var7 = GameBuild.scene.getGameObjectTag(var0, var2, var3);
-			}
-
-			if (var1 == 3) { // L: 7528
-				var7 = GameBuild.scene.getFloorDecorationTag(var0, var2, var3);
-			}
-
-			int var12;
-			if (0L != var7) { // L: 7529
-				var12 = GameBuild.scene.getObjectFlags(var0, var2, var3, var7); // L: 7530
-				int var38 = class21.Entity_unpackID(var7); // L: 7531
-				int var39 = var12 & 31; // L: 7532
-				int var40 = var12 >> 6 & 3; // L: 7533
-				ObjectComposition var13;
-				if (var1 == 0) { // L: 7534
-					GameBuild.scene.removeBoundaryObject(var0, var2, var3); // L: 7535
-					var13 = KitDefinition.getObjectDefinition(var38); // L: 7536
-					if (var13.interactType != 0) { // L: 7537
-						Client.collisionMaps[var0].method3470(var2, var3, var39, var40, var13.boolean1);
-					}
-				}
-
-				if (var1 == 1) { // L: 7539
-					GameBuild.scene.removeWallDecoration(var0, var2, var3);
-				}
-
-				if (var1 == 2) { // L: 7540
-					GameBuild.scene.removeGameObject(var0, var2, var3); // L: 7541
-					var13 = KitDefinition.getObjectDefinition(var38); // L: 7542
-					if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7543
-						return;
-					}
-
-					if (var13.interactType != 0) { // L: 7544
-						Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1);
-					}
-				}
-
-				if (var1 == 3) { // L: 7546
-					GameBuild.scene.removeFloorDecoration(var0, var2, var3); // L: 7547
-					var13 = KitDefinition.getObjectDefinition(var38); // L: 7548
-					if (var13.interactType == 1) { // L: 7549
-						Client.collisionMaps[var0].method3479(var2, var3);
-					}
-				}
-			}
-
-			if (var4 >= 0) { // L: 7552
-				var12 = var0; // L: 7553
-				if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7554
-					var12 = var0 + 1;
-				}
-
-				Scene var41 = GameBuild.scene; // L: 7555
-				CollisionMap var14 = Client.collisionMaps[var0]; // L: 7556
-				ObjectComposition var15 = KitDefinition.getObjectDefinition(var4); // L: 7558
-				int var16;
-				int var17;
-				if (var5 != 1 && var5 != 3) { // L: 7561
-					var16 = var15.sizeX; // L: 7566
-					var17 = var15.sizeY; // L: 7567
-				} else {
-					var16 = var15.sizeY; // L: 7562
-					var17 = var15.sizeX; // L: 7563
-				}
-
-				int var18;
-				int var19;
-				if (var16 + var2 <= 104) { // L: 7573
-					var18 = (var16 >> 1) + var2; // L: 7574
-					var19 = var2 + (var16 + 1 >> 1); // L: 7575
-				} else {
-					var18 = var2; // L: 7578
-					var19 = var2 + 1; // L: 7579
-				}
-
-				int var20;
-				int var21;
-				if (var3 + var17 <= 104) { // L: 7581
-					var20 = var3 + (var17 >> 1); // L: 7582
-					var21 = var3 + (var17 + 1 >> 1); // L: 7583
-				} else {
-					var20 = var3; // L: 7586
-					var21 = var3 + 1; // L: 7587
-				}
-
-				int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7589
-				int var23 = var22[var19][var21] + var22[var18][var20] + var22[var19][var20] + var22[var18][var21] >> 2; // L: 7590
-				int var24 = (var2 << 7) + (var16 << 6); // L: 7591
-				int var25 = (var3 << 7) + (var17 << 6); // L: 7592
-				long var26 = PacketBuffer.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7593
-				int var28 = (var5 << 6) + var6; // L: 7594
-				if (var15.int3 == 1) { // L: 7595
-					var28 += 256;
-				}
-
-				Object var36;
-				if (var6 == 22) { // L: 7596
-					if (var15.animationId == -1 && var15.transforms == null) { // L: 7598
-						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: 7599
-					}
-
-					var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7600
-					if (var15.interactType == 1) { // L: 7601
-						var14.setBlockedByFloorDec(var2, var3);
-					}
-				} else if (var6 != 10 && var6 != 11) { // L: 7604
-					if (var6 >= 12) { // L: 7612
-						if (var15.animationId == -1 && var15.transforms == null) { // L: 7614
-							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: 7615
-						}
-
-						var41.method4289(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7616
-						if (var15.interactType != 0) { // L: 7617
-							var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
-						}
-					} else if (var6 == 0) { // L: 7620
-						if (var15.animationId == -1 && var15.transforms == null) { // L: 7622
-							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: 7623
-						}
-
-						var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field964[var5], 0, var26, var28); // L: 7624
-						if (var15.interactType != 0) { // L: 7625
-							var14.method3465(var2, var3, var6, var5, var15.boolean1);
-						}
-					} else if (var6 == 1) { // L: 7628
-						if (var15.animationId == -1 && var15.transforms == null) { // L: 7630
-							var36 = var15.getModel(1, var5, var22, var24, var23, var25);
-						} else {
-							var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7631
-						}
-
-						var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field967[var5], 0, var26, var28); // L: 7632
-						if (var15.interactType != 0) { // L: 7633
-							var14.method3465(var2, var3, var6, var5, var15.boolean1);
-						}
-					} else {
-						int var29;
-						if (var6 == 2) { // L: 7636
-							var29 = var5 + 1 & 3; // L: 7637
-							Object var31;
-							Object var37;
-							if (var15.animationId == -1 && var15.transforms == null) { // L: 7640
-								var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7641
-								var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7642
-							} else {
-								var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7645
-								var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7646
-							}
-
-							var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field964[var5], Tiles.field964[var29], var26, var28); // L: 7648
-							if (var15.interactType != 0) { // L: 7649
-								var14.method3465(var2, var3, var6, var5, var15.boolean1);
-							}
-						} else if (var6 == 3) { // L: 7652
-							if (var15.animationId == -1 && var15.transforms == null) { // L: 7654
-								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: 7655
-							}
-
-							var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field967[var5], 0, var26, var28); // L: 7656
-							if (var15.interactType != 0) { // L: 7657
-								var14.method3465(var2, var3, var6, var5, var15.boolean1);
-							}
-						} else if (var6 == 9) { // L: 7660
-							if (var15.animationId == -1 && var15.transforms == null) { // L: 7662
-								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: 7663
-							}
-
-							var41.method4289(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7664
-							if (var15.interactType != 0) { // L: 7665
-								var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
-							}
-						} else if (var6 == 4) { // L: 7668
-							if (var15.animationId == -1 && var15.transforms == null) { // L: 7670
-								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: 7671
-							}
-
-							var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field964[var5], 0, 0, 0, var26, var28); // L: 7672
-						} else {
-							long var30;
-							Object var32;
-							if (var6 == 5) { // L: 7675
-								var29 = 16; // L: 7676
-								var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7677
-								if (0L != var30) { // L: 7678
-									var29 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var30)).int2;
-								}
-
-								if (var15.animationId == -1 && var15.transforms == null) { // L: 7680
-									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: 7681
-								}
-
-								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field964[var5], 0, var29 * Tiles.field966[var5], var29 * Tiles.field960[var5], var26, var28); // L: 7682
-							} else if (var6 == 6) { // L: 7685
-								var29 = 8; // L: 7686
-								var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7687
-								if (0L != var30) { // L: 7688
-									var29 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var30)).int2 / 2;
-								}
-
-								if (var15.animationId == -1 && var15.transforms == null) { // L: 7690
-									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: 7691
-								}
-
-								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field957[var5], var29 * Tiles.field970[var5], var26, var28); // L: 7692
-							} else if (var6 == 7) { // L: 7695
-								int var35 = var5 + 2 & 3; // L: 7697
-								if (var15.animationId == -1 && var15.transforms == null) { // L: 7698
-									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: 7699
-								}
-
-								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7700
-							} else if (var6 == 8) { // L: 7703
-								var29 = 8; // L: 7704
-								var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7705
-								if (var30 != 0L) { // L: 7706
-									var29 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var30)).int2 / 2;
-								}
-
-								int var34 = var5 + 2 & 3; // L: 7709
-								Object var33;
-								if (var15.animationId == -1 && var15.transforms == null) { // L: 7710
-									var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7711
-									var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7712
-								} else {
-									var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7715
-									var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.boolean3, (Renderable)null); // L: 7716
-								}
+	@Export("hslToRgb")
+	static final int hslToRgb(int var0, int var1, int var2) {
+		if (var2 > 179) { // L: 516
+			var1 /= 2;
+		}
 
-								var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field957[var5], var29 * Tiles.field970[var5], var26, var28); // L: 7718
-							}
-						}
-					}
-				} else {
-					if (var15.animationId == -1 && var15.transforms == null) { // L: 7606
-						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: 7607
-					}
+		if (var2 > 192) { // L: 517
+			var1 /= 2;
+		}
 
-					if (var36 != null) { // L: 7608
-						var41.method4289(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28);
-					}
+		if (var2 > 217) { // L: 518
+			var1 /= 2;
+		}
 
-					if (var15.interactType != 0) { // L: 7609
-						var14.addGameObject(var2, var3, var16, var17, var15.boolean1);
-					}
-				}
-			}
+		if (var2 > 243) { // L: 519
+			var1 /= 2;
 		}
 
-	} // L: 7723
+		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 520
+		return var3; // L: 521
+	}
 }
diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java
index bfe20b0070..24444b9d38 100644
--- a/runescape-client/src/main/java/MusicPatchPcmStream.java
+++ b/runescape-client/src/main/java/MusicPatchPcmStream.java
@@ -1,32 +1,34 @@
+import java.io.File;
+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("ij")
+@ObfuscatedName("jw")
 @Implements("MusicPatchPcmStream")
 public class MusicPatchPcmStream extends PcmStream {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Ljp;"
 	)
 	@Export("superStream")
 	MidiPcmStream superStream;
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("queue")
 	NodeDeque queue;
-	@ObfuscatedName("a")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Las;"
+		descriptor = "Lap;"
 	)
 	@Export("mixer")
 	PcmStreamMixer mixer;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lio;)V"
+		descriptor = "(Ljp;)V"
 	)
 	MusicPatchPcmStream(MidiPcmStream var1) {
 		this.queue = new NodeDeque(); // L: 11
@@ -34,48 +36,48 @@ public class MusicPatchPcmStream extends PcmStream {
 		this.superStream = var1; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Liu;[IIIII)V",
-		garbageValue = "-887110953"
+		descriptor = "(Ljq;[IIIII)V",
+		garbageValue = "-1616122568"
 	)
-	void method4974(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
-		if ((this.superStream.field2944[var1.field2996] & 4) != 0 && var1.field2999 < 0) { // L: 73
-			int var6 = this.superStream.field2946[var1.field2996] / UserComparator2.field4359; // L: 74
+	void method5262(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
+		if ((this.superStream.field3081[var1.field3149] & 4) != 0 && var1.field3142 < 0) { // L: 73
+			int var6 = this.superStream.field3086[var1.field3149] / class339.field4058; // L: 74
 
 			while (true) {
-				int var7 = (var6 + 1048575 - var1.field3003) / var6; // L: 76
+				int var7 = (var6 + 1048575 - var1.field3135) / var6; // L: 76
 				if (var7 > var4) { // L: 77
-					var1.field3003 += var6 * var4; // L: 99
+					var1.field3135 += var4 * var6; // L: 99
 					break;
 				}
 
 				var1.stream.fill(var2, var3, var7); // L: 78
 				var3 += var7; // L: 79
 				var4 -= var7; // L: 80
-				var1.field3003 += var6 * var7 - 1048576; // L: 81
-				int var8 = UserComparator2.field4359 / 100; // L: 82
+				var1.field3135 += var7 * var6 - 1048576; // L: 81
+				int var8 = class339.field4058 / 100; // L: 82
 				int var9 = 262144 / var6; // L: 83
 				if (var9 < var8) { // L: 84
 					var8 = var9;
 				}
 
 				RawPcmStream var10 = var1.stream; // L: 85
-				if (this.superStream.field2932[var1.field2996] == 0) { // L: 86
-					var1.stream = RawPcmStream.method817(var1.rawSound, var10.method832(), var10.method936(), var10.method824()); // L: 87
+				if (this.superStream.field3084[var1.field3149] == 0) { // L: 86
+					var1.stream = RawPcmStream.method943(var1.rawSound, var10.method855(), var10.method862(), var10.method847()); // L: 87
 				} else {
-					var1.stream = RawPcmStream.method817(var1.rawSound, var10.method832(), 0, var10.method824()); // L: 90
-					this.superStream.method4765(var1, var1.patch.field2972[var1.field2990] < 0); // L: 91
-					var1.stream.method941(var8, var10.method936()); // L: 92
+					var1.stream = RawPcmStream.method943(var1.rawSound, var10.method855(), 0, var10.method847()); // L: 90
+					this.superStream.method5083(var1, var1.patch.field3113[var1.field3133] < 0); // L: 91
+					var1.stream.method851(var8, var10.method862()); // L: 92
 				}
 
-				if (var1.patch.field2972[var1.field2990] < 0) { // L: 94
+				if (var1.patch.field3113[var1.field3133] < 0) { // L: 94
 					var1.stream.setNumLoops(-1);
 				}
 
-				var10.method830(var8); // L: 95
+				var10.method954(var8); // L: 95
 				var10.fill(var2, var3, var5 - var3); // L: 96
-				if (var10.method834()) { // L: 97
+				if (var10.method857()) { // L: 97
 					this.mixer.addSubStream(var10);
 				}
 			}
@@ -84,38 +86,38 @@ void method4974(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
 		var1.stream.fill(var2, var3, var4); // L: 101
 	} // L: 102
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Liu;IB)V",
-		garbageValue = "50"
+		descriptor = "(Ljq;II)V",
+		garbageValue = "2103540030"
 	)
-	void method4959(MusicPatchNode var1, int var2) {
-		if ((this.superStream.field2944[var1.field2996] & 4) != 0 && var1.field2999 < 0) { // L: 105
-			int var3 = this.superStream.field2946[var1.field2996] / UserComparator2.field4359; // L: 106
-			int var4 = (var3 + 1048575 - var1.field3003) / var3; // L: 107
-			var1.field3003 = var3 * var2 + var1.field3003 & 1048575; // L: 108
+	void method5263(MusicPatchNode var1, int var2) {
+		if ((this.superStream.field3081[var1.field3149] & 4) != 0 && var1.field3142 < 0) { // L: 105
+			int var3 = this.superStream.field3086[var1.field3149] / class339.field4058; // L: 106
+			int var4 = (var3 + 1048575 - var1.field3135) / var3; // L: 107
+			var1.field3135 = var3 * var2 + var1.field3135 & 1048575; // L: 108
 			if (var4 <= var2) { // L: 109
-				if (this.superStream.field2932[var1.field2996] == 0) { // L: 110
-					var1.stream = RawPcmStream.method817(var1.rawSound, var1.stream.method832(), var1.stream.method936(), var1.stream.method824()); // L: 111
+				if (this.superStream.field3084[var1.field3149] == 0) { // L: 110
+					var1.stream = RawPcmStream.method943(var1.rawSound, var1.stream.method855(), var1.stream.method862(), var1.stream.method847()); // L: 111
 				} else {
-					var1.stream = RawPcmStream.method817(var1.rawSound, var1.stream.method832(), 0, var1.stream.method824()); // L: 114
-					this.superStream.method4765(var1, var1.patch.field2972[var1.field2990] < 0); // L: 115
+					var1.stream = RawPcmStream.method943(var1.rawSound, var1.stream.method855(), 0, var1.stream.method847()); // L: 114
+					this.superStream.method5083(var1, var1.patch.field3113[var1.field3133] < 0); // L: 115
 				}
 
-				if (var1.patch.field2972[var1.field2990] < 0) { // L: 117
+				if (var1.patch.field3113[var1.field3133] < 0) { // L: 117
 					var1.stream.setNumLoops(-1);
 				}
 
-				var2 = var1.field3003 / var3; // L: 118
+				var2 = var1.field3135 / var3; // L: 118
 			}
 		}
 
 		var1.stream.skip(var2); // L: 121
 	} // L: 122
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("firstSubStream")
 	protected PcmStream firstSubStream() {
@@ -127,9 +129,9 @@ protected PcmStream firstSubStream() {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("nextSubStream")
 	protected PcmStream nextSubStream() {
@@ -144,58 +146,82 @@ protected PcmStream nextSubStream() {
 		return var1.stream;
 	}
 
-	@ObfuscatedName("p")
-	protected int vmethod4958() {
+	@ObfuscatedName("w")
+	protected int vmethod5260() {
 		return 0; // L: 34
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("fill")
 	protected void fill(int[] var1, int var2, int var3) {
 		this.mixer.fill(var1, var2, var3); // L: 40
 
 		for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41
-			if (!this.superStream.method4787(var6)) { // L: 42
-				int var4 = var2; // L: 43
-				int var5 = var3; // L: 44
+			if (!this.superStream.method5105(var6)) {
+				int var4 = var2;
+				int var5 = var3;
 
 				do {
-					if (var5 <= var6.field2995) { // L: 45
-						this.method4974(var6, var1, var4, var5, var5 + var4); // L: 51
-						var6.field2995 -= var5; // L: 52
+					if (var5 <= var6.field3134) {
+						this.method5262(var6, var1, var4, var5, var4 + var5);
+						var6.field3134 -= var5;
 						break;
 					}
 
-					this.method4974(var6, var1, var4, var6.field2995, var5 + var4); // L: 46
-					var4 += var6.field2995; // L: 47
-					var5 -= var6.field2995; // L: 48
-				} while(!this.superStream.method4788(var6, var1, var4, var5)); // L: 49
+					this.method5262(var6, var1, var4, var6.field3134, var5 + var4);
+					var4 += var6.field3134;
+					var5 -= var6.field3134;
+				} while(!this.superStream.method5106(var6, var1, var4, var5));
 			}
 		}
 
-	} // L: 54
+	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("skip")
 	protected void skip(int var1) {
 		this.mixer.skip(var1); // L: 58
 
 		for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59
-			if (!this.superStream.method4787(var3)) { // L: 60
+			if (!this.superStream.method5105(var3)) { // L: 60
 				int var2 = var1; // L: 61
 
 				do {
-					if (var2 <= var3.field2995) { // L: 62
-						this.method4959(var3, var2); // L: 67
-						var3.field2995 -= var2; // L: 68
+					if (var2 <= var3.field3134) { // L: 62
+						this.method5263(var3, var2); // L: 67
+						var3.field3134 -= var2; // L: 68
 						break;
 					}
 
-					this.method4959(var3, var3.field2995); // L: 63
-					var2 -= var3.field2995; // L: 64
-				} while(!this.superStream.method4788(var3, (int[])null, 0, var2)); // L: 65
+					this.method5263(var3, var3.field3134); // L: 63
+					var2 -= var3.field3134; // L: 64
+				} while(!this.superStream.method5106(var3, (int[])null, 0, var2)); // L: 65
 			}
 		}
 
 	} // L: 70
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/io/File;Ljava/io/File;I)V",
+		garbageValue = "1843091022"
+	)
+	public static void method5272(File var0, File var1) {
+		try {
+			AccessFile var2 = new AccessFile(Huffman.JagexCache_locationFile, "rw", 10000L); // L: 42
+			Buffer var3 = new Buffer(500); // L: 43
+			var3.writeByte(3); // L: 44
+			var3.writeByte(var1 != null ? 1 : 0); // L: 45
+			var3.writeCESU8(var0.getPath()); // L: 46
+			if (var1 != null) {
+				var3.writeCESU8(""); // L: 47
+			}
+
+			var2.write(var3.array, 0, var3.offset); // L: 48
+			var2.close(); // L: 49
+		} catch (IOException var4) { // L: 51
+			var4.printStackTrace(); // L: 52
+		}
+
+	} // L: 54
 }
diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java
index 8a077c1497..2392fe0e6e 100644
--- a/runescape-client/src/main/java/MusicTrack.java
+++ b/runescape-client/src/main/java/MusicTrack.java
@@ -3,21 +3,21 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iv")
+@ObfuscatedName("jk")
 @Implements("MusicTrack")
 public class MusicTrack extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("table")
 	NodeHashTable table;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("midi")
 	byte[] midi;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	MusicTrack(Buffer var1) {
 		var1.offset = var1.array.length - 3; // L: 22
@@ -196,7 +196,7 @@ public class MusicTrack extends Node {
 		int[] var59 = new int[128]; // L: 172
 		var28 = 0; // L: 173
 
-		label243:
+		label244:
 		for (int var60 = 0; var60 < var2; ++var60) { // L: 174
 			var51.writeInt(1297379947); // L: 175
 			var51.offset += 4; // L: 176
@@ -218,7 +218,7 @@ public class MusicTrack extends Node {
 						var51.writeByte(47); // L: 187
 						var51.writeByte(0); // L: 188
 						var51.writeLengthInt(var51.offset - var61); // L: 269
-						continue label243;
+						continue label244;
 					}
 
 					if (var64 == 23) { // L: 191
@@ -335,8 +335,8 @@ public class MusicTrack extends Node {
 
 	} // L: 271
 
-	@ObfuscatedName("w")
-	void method4981() {
+	@ObfuscatedName("b")
+	void method5280() {
 		if (this.table == null) { // L: 274
 			this.table = new NodeHashTable(16); // L: 275
 			int[] var1 = new int[16]; // L: 276
@@ -416,15 +416,15 @@ void method4981() {
 		}
 	} // L: 331
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("clear")
 	void clear() {
 		this.table = null; // L: 334
 	} // L: 335
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;II)Liv;"
+		descriptor = "(Lku;II)Ljk;"
 	)
 	@Export("readTrack")
 	public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) {
diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java
index e5c6cdac74..7f33e42b62 100644
--- a/runescape-client/src/main/java/NPC.java
+++ b/runescape-client/src/main/java/NPC.java
@@ -1,27 +1,32 @@
+import java.applet.Applet;
+import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import netscape.javascript.JSObject;
 
-@ObfuscatedName("cp")
+@ObfuscatedName("cr")
 @Implements("NPC")
 public final class NPC extends Actor {
-	@ObfuscatedName("pr")
+	@ObfuscatedName("b")
+	@Export("javaVersion")
+	public static String javaVersion;
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lpl;"
 	)
-	static class353 field1210;
-	@ObfuscatedName("n")
-	@Export("cacheParentPaths")
-	static String[] cacheParentPaths;
-	@ObfuscatedName("ol")
+	@Export("rightTitleSprite")
+	static SpritePixels rightTitleSprite;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "[Ljf;"
+		descriptor = "Lku;"
 	)
-	static Widget[] field1207;
-	@ObfuscatedName("i")
+	@Export("Widget_fontsArchive")
+	static AbstractArchive Widget_fontsArchive;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lfw;"
+		descriptor = "Lfi;"
 	)
 	@Export("definition")
 	NPCComposition definition;
@@ -29,12 +34,12 @@ public final class NPC extends Actor {
 	NPC() {
 	} // L: 12
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IBI)V",
-		garbageValue = "-1295452505"
+		descriptor = "(ILgj;I)V",
+		garbageValue = "1330012132"
 	)
-	final void method2258(int var1, byte var2) {
+	final void method2319(int var1, class185 var2) {
 		int var3 = super.pathX[0]; // L: 15
 		int var4 = super.pathY[0]; // L: 16
 		if (var1 == 0) { // L: 17
@@ -73,7 +78,7 @@ final void method2258(int var1, byte var2) {
 			--var4; // L: 35
 		}
 
-		if (super.sequence != -1 && MouseHandler.SequenceDefinition_get(super.sequence).field1956 == 1) { // L: 37
+		if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { // L: 37
 			super.sequence = -1;
 		}
 
@@ -84,38 +89,38 @@ final void method2258(int var1, byte var2) {
 		for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39
 			super.pathX[var5] = super.pathX[var5 - 1]; // L: 40
 			super.pathY[var5] = super.pathY[var5 - 1]; // L: 41
-			super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 42
+			super.field1153[var5] = super.field1153[var5 - 1]; // L: 42
 		}
 
-		super.pathX[0] = var3;
-		super.pathY[0] = var4;
-		super.pathTraversed[0] = var2;
-	}
+		super.pathX[0] = var3; // L: 44
+		super.pathY[0] = var4; // L: 45
+		super.field1153[0] = var2; // L: 46
+	} // L: 47
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lhl;",
-		garbageValue = "461766541"
+		descriptor = "(I)Lgo;",
+		garbageValue = "202861607"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		if (this.definition == null) { // L: 77
+		if (this.definition == null) {
 			return null;
 		} else {
-			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? MouseHandler.SequenceDefinition_get(super.sequence) : null; // L: 78
-			SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : MouseHandler.SequenceDefinition_get(super.movementSequence); // L: 79
-			Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80
+			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? UserComparator5.SequenceDefinition_get(super.sequence) : null; // L: 78
+			SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : UserComparator5.SequenceDefinition_get(super.movementSequence); // L: 79
+			Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
 			if (var3 == null) { // L: 81
 				return null;
 			} else {
-				var3.calculateBoundsCylinder(); // L: 82
-				super.defaultHeight = var3.height; // L: 83
+				var3.calculateBoundsCylinder();
+				super.defaultHeight = var3.height;
 				if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84
-					Model var4 = BZip2State.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85
-					if (var4 != null) { // L: 86
-						var4.offsetBy(0, -super.field1126, 0); // L: 87
+					Model var4 = AccessFile.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
+					if (var4 != null) {
+						var4.offsetBy(0, -super.field1131, 0); // L: 87
 						Model[] var5 = new Model[]{var3, var4}; // L: 88
-						var3 = new Model(var5, 2); // L: 89
+						var3 = new Model(var5, 2);
 					}
 				}
 
@@ -123,18 +128,27 @@ protected final Model getModel() {
 					var3.isSingleTile = true;
 				}
 
-				return var3; // L: 93
+				if (super.field1146 != 0 && Client.cycle >= super.field1141 && Client.cycle < super.field1140) { // L: 93
+					var3.field2494 = super.field1143;
+					var3.field2495 = super.field1144; // L: 95
+					var3.field2479 = super.field1095; // L: 96
+					var3.field2474 = super.field1146;
+				} else {
+					var3.field2474 = 0;
+				}
+
+				return var3;
 			}
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(IIZB)V",
-		garbageValue = "-124"
+		descriptor = "(IIZI)V",
+		garbageValue = "-2138088750"
 	)
-	final void method2249(int var1, int var2, boolean var3) {
-		if (super.sequence != -1 && MouseHandler.SequenceDefinition_get(super.sequence).field1956 == 1) { // L: 50
+	final void method2315(int var1, int var2, boolean var3) {
+		if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { // L: 50
 			super.sequence = -1;
 		}
 
@@ -146,97 +160,94 @@ final void method2249(int var1, int var2, boolean var3) {
 					++super.pathLength;
 				}
 
-				for (int var6 = super.pathLength; var6 > 0; --var6) { // L: 56
+				for (int var6 = super.pathLength; var6 > 0; --var6) {
 					super.pathX[var6] = super.pathX[var6 - 1]; // L: 57
 					super.pathY[var6] = super.pathY[var6 - 1];
-					super.pathTraversed[var6] = super.pathTraversed[var6 - 1];
+					super.field1153[var6] = super.field1153[var6 - 1];
 				}
 
-				super.pathX[0] = var1; // L: 61
+				super.pathX[0] = var1;
 				super.pathY[0] = var2;
-				super.pathTraversed[0] = 1; // L: 63
-				return; // L: 64
+				super.field1153[0] = class185.field2123; // L: 63
+				return;
 			}
 		}
 
-		super.pathLength = 0; // L: 67
-		super.field1144 = 0; // L: 68
-		super.field1085 = 0; // L: 69
+		super.pathLength = 0;
+		super.field1098 = 0;
+		super.field1117 = 0; // L: 69
 		super.pathX[0] = var1; // L: 70
-		super.pathY[0] = var2; // L: 71
-		super.x = super.pathX[0] * 128 + super.field1087 * 64; // L: 72
-		super.y = super.pathY[0] * 128 + super.field1087 * 64; // L: 73
-	} // L: 74
+		super.pathY[0] = var2;
+		super.x = super.field1120 * 64 + super.pathX[0] * 128; // L: 72
+		super.y = super.pathY[0] * 128 + super.field1120 * 64;
+	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-532391824"
+		descriptor = "(B)Z",
+		garbageValue = "1"
 	)
 	@Export("isVisible")
 	final boolean isVisible() {
-		return this.definition != null; // L: 97
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lnf;III)I",
-		garbageValue = "2110206967"
-	)
-	static int method2251(IterableNodeHashTable var0, int var1, int var2) {
-		if (var0 == null) {
-			return var2;
-		} else {
-			IntegerNode var3 = (IntegerNode)var0.get((long)var1);
-			return var3 == null ? var2 : var3.integer;
-		}
+		return this.definition != null;
 	}
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "569144046"
-	)
-	public static void method2248() {
-		if (MouseHandler.MouseHandler_instance != null) { // L: 44
-			synchronized(MouseHandler.MouseHandler_instance) { // L: 45
-				MouseHandler.MouseHandler_instance = null; // L: 46
-			} // L: 47
-		}
-
-	} // L: 49
-
-	@ObfuscatedName("u")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(III)Z",
-		garbageValue = "-1285705264"
+		descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z",
+		garbageValue = "68"
 	)
-	static final boolean method2265(int var0, int var1) {
-		ObjectComposition var2 = KitDefinition.getObjectDefinition(var0); // L: 601
-		if (var1 == 11) { // L: 602
-			var1 = 10;
-		}
-
-		if (var1 >= 5 && var1 <= 8) {
-			var1 = 4; // L: 603
-		}
-
-		return var2.method3305(var1); // L: 604
-	}
+	static boolean method2314(String var0, int var1, String var2) {
+		if (var1 == 0) { // L: 56
+			try {
+				if (!class29.field177.startsWith("win")) { // L: 58
+					throw new Exception();
+				} else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 59
+					throw new Exception();
+				} else {
+					String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 60
+
+					for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 61
+						if (var11.indexOf(var0.charAt(var4)) == -1) { // L: 62
+							throw new Exception();
+						}
+					}
 
-	@ObfuscatedName("ab")
-	@ObfuscatedSignature(
-		descriptor = "([BIS)I",
-		garbageValue = "-944"
-	)
-	public static int method2256(byte[] var0, int var1) {
-		int var3 = -1; // L: 58
+					Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 64
+					return true; // L: 65
+				}
+			} catch (Throwable var5) { // L: 67
+				return false; // L: 68
+			}
+		} else if (var1 == 1) { // L: 71
+			try {
+				Object var10 = class27.method433(class29.field172, var2, new Object[]{(new URL(class29.field172.getCodeBase(), var0)).toString()}); // L: 73
+				return var10 != null; // L: 74
+			} catch (Throwable var6) { // L: 76
+				return false; // L: 77
+			}
+		} else if (var1 == 2) { // L: 80
+			try {
+				class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_blank"); // L: 82
+				return true; // L: 83
+			} catch (Exception var7) { // L: 85
+				return false; // L: 86
+			}
+		} else if (var1 == 3) { // L: 89
+			try {
+				Applet var3 = class29.field172; // L: 91
+				JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 94
+			} catch (Throwable var9) { // L: 97
+			}
 
-		for (int var4 = 0; var4 < var1; ++var4) { // L: 59
-			var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 60
+			try {
+				class29.field172.getAppletContext().showDocument(new URL(class29.field172.getCodeBase(), var0), "_top"); // L: 99
+				return true; // L: 100
+			} catch (Exception var8) { // L: 102
+				return false; // L: 103
+			}
+		} else {
+			throw new IllegalArgumentException(); // L: 106
 		}
-
-		var3 = ~var3; // L: 62
-		return var3; // L: 65
 	}
 }
diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java
index 75492b37c5..f980a41dea 100644
--- a/runescape-client/src/main/java/NPCComposition.java
+++ b/runescape-client/src/main/java/NPCComposition.java
@@ -4,617 +4,606 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fw")
+@ObfuscatedName("fi")
 @Implements("NPCComposition")
 public class NPCComposition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("NpcDefinition_archive")
-	public static AbstractArchive NpcDefinition_archive;
-	@ObfuscatedName("w")
+	static AbstractArchive NpcDefinition_archive;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("NpcDefinition_modelArchive")
-	public static AbstractArchive NpcDefinition_modelArchive;
-	@ObfuscatedName("s")
+	static AbstractArchive NpcDefinition_modelArchive;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("NpcDefinition_cached")
 	public static EvictingDualNodeHashTable NpcDefinition_cached;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("NpcDefinition_cachedModels")
 	public static EvictingDualNodeHashTable NpcDefinition_cachedModels;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -644907951
+		intValue = -331797089
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1250402157
+		intValue = 1105192553
 	)
 	@Export("size")
 	public int size;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("models")
 	int[] models;
-	@ObfuscatedName("j")
-	int[] field1722;
-	@ObfuscatedName("b")
+	@ObfuscatedName("n")
+	int[] field1868;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -611299157
+		intValue = -1321910719
 	)
 	@Export("idleSequence")
 	public int idleSequence;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1914071611
+		intValue = -2126414353
 	)
 	@Export("turnLeftSequence")
 	public int turnLeftSequence;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 482215935
+		intValue = 193178951
 	)
 	@Export("turnRightSequence")
 	public int turnRightSequence;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1771727167
+		intValue = 1496902927
 	)
 	@Export("walkSequence")
 	public int walkSequence;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1040886561
+		intValue = 657119045
 	)
 	@Export("walkBackSequence")
 	public int walkBackSequence;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1898345849
+		intValue = -948360433
 	)
 	@Export("walkLeftSequence")
 	public int walkLeftSequence;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1312411327
+		intValue = -1137840563
 	)
 	@Export("walkRightSequence")
 	public int walkRightSequence;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("recolorFrom")
 	short[] recolorFrom;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("recolorTo")
 	short[] recolorTo;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("retextureFrom")
 	short[] retextureFrom;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("retextureTo")
 	short[] retextureTo;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("actions")
 	public String[] actions;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("drawMapDot")
 	public boolean drawMapDot;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1462580569
+		intValue = -73157727
 	)
 	@Export("combatLevel")
 	public int combatLevel;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 12207147
+		intValue = -1225342625
 	)
 	@Export("widthScale")
 	int widthScale;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 43942703
+		intValue = -1604465415
 	)
 	@Export("heightScale")
 	int heightScale;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@Export("isVisible")
 	public boolean isVisible;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 1242498855
+		intValue = 501191071
 	)
 	@Export("ambient")
 	int ambient;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 1010788091
+		intValue = 1972567083
 	)
 	@Export("contrast")
 	int contrast;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = 170889589
+		intValue = -1882963849
 	)
 	@Export("headIconPrayer")
 	public int headIconPrayer;
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 387314403
+		intValue = 2048479909
 	)
 	@Export("rotation")
 	public int rotation;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@Export("transforms")
 	public int[] transforms;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = -108342367
+		intValue = 463952331
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = 1806959031
+		intValue = -1210187925
 	)
 	@Export("transformVarp")
 	int transformVarp;
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@Export("isInteractable")
 	public boolean isInteractable;
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@Export("isClickable")
 	public boolean isClickable;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@Export("isFollower")
 	public boolean isFollower;
 	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Loz;"
 	)
 	@Export("params")
 	IterableNodeHashTable params;
 
 	static {
-		NpcDefinition_cached = new EvictingDualNodeHashTable(64); // L: 18
-		NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 19
+		NpcDefinition_cached = new EvictingDualNodeHashTable(64);
+		NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50);
 	}
 
 	NPCComposition() {
-		this.name = "null"; // L: 21
-		this.size = 1; // L: 22
+		this.name = "null";
+		this.size = 1;
 		this.idleSequence = -1;
 		this.turnLeftSequence = -1;
 		this.turnRightSequence = -1;
-		this.walkSequence = -1;
-		this.walkBackSequence = -1;
-		this.walkLeftSequence = -1;
-		this.walkRightSequence = -1;
-		this.actions = new String[5];
-		this.drawMapDot = true;
-		this.combatLevel = -1;
+		this.walkSequence = -1; // L: 28
+		this.walkBackSequence = -1; // L: 29
+		this.walkLeftSequence = -1; // L: 30
+		this.walkRightSequence = -1; // L: 31
+		this.actions = new String[5]; // L: 36
+		this.drawMapDot = true; // L: 37
+		this.combatLevel = -1; // L: 38
 		this.widthScale = 128; // L: 39
 		this.heightScale = 128; // L: 40
 		this.isVisible = false; // L: 41
 		this.ambient = 0; // L: 42
-		this.contrast = 0;
-		this.headIconPrayer = -1;
-		this.rotation = 32;
-		this.transformVarbit = -1;
-		this.transformVarp = -1;
-		this.isInteractable = true;
-		this.isClickable = true;
-		this.isFollower = false;
+		this.contrast = 0; // L: 43
+		this.headIconPrayer = -1; // L: 44
+		this.rotation = 32; // L: 45
+		this.transformVarbit = -1; // L: 47
+		this.transformVarp = -1; // L: 48
+		this.isInteractable = true; // L: 49
+		this.isClickable = true; // L: 50
+		this.isFollower = false; // L: 51
 	} // L: 54
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1919612079"
+		descriptor = "(B)V",
+		garbageValue = "5"
 	)
 	@Export("postDecode")
 	void postDecode() {
-	} // L: 68
+	} // L: 73
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1322212513"
+		descriptor = "(Lpi;S)V",
+		garbageValue = "-18007"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 72
-			if (var2 == 0) { // L: 73
-				return; // L: 76
+			int var2 = var1.readUnsignedByte(); // L: 77
+			if (var2 == 0) { // L: 78
+				return; // L: 81
 			}
 
-			this.decodeNext(var1, var2); // L: 74
+			this.decodeNext(var1, var2); // L: 79
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "2009660839"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-470679088"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		int var3;
 		int var4;
-		if (var2 == 1) { // L: 79
-			var3 = var1.readUnsignedByte(); // L: 80
-			this.models = new int[var3]; // L: 81
+		if (var2 == 1) { // L: 84
+			var3 = var1.readUnsignedByte(); // L: 85
+			this.models = new int[var3]; // L: 86
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 82
+			for (var4 = 0; var4 < var3; ++var4) { // L: 87
 				this.models[var4] = var1.readUnsignedShort();
 			}
-		} else if (var2 == 2) { // L: 84
+		} else if (var2 == 2) { // L: 89
 			this.name = var1.readStringCp1252NullTerminated();
-		} else if (var2 == 12) { // L: 85
+		} else if (var2 == 12) { // L: 90
 			this.size = var1.readUnsignedByte();
-		} else if (var2 == 13) { // L: 86
+		} else if (var2 == 13) { // L: 91
 			this.idleSequence = var1.readUnsignedShort();
-		} else if (var2 == 14) { // L: 87
+		} else if (var2 == 14) { // L: 92
 			this.walkSequence = var1.readUnsignedShort();
-		} else if (var2 == 15) { // L: 88
+		} else if (var2 == 15) { // L: 93
 			this.turnLeftSequence = var1.readUnsignedShort();
-		} else if (var2 == 16) { // L: 89
+		} else if (var2 == 16) { // L: 94
 			this.turnRightSequence = var1.readUnsignedShort();
-		} else if (var2 == 17) { // L: 90
-			this.walkSequence = var1.readUnsignedShort(); // L: 91
-			this.walkBackSequence = var1.readUnsignedShort(); // L: 92
-			this.walkLeftSequence = var1.readUnsignedShort(); // L: 93
-			this.walkRightSequence = var1.readUnsignedShort(); // L: 94
-		} else if (var2 == 18) { // L: 96
-			var1.readUnsignedShort(); // L: 97
-		} else if (var2 >= 30 && var2 < 35) { // L: 99
-			this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 100
-			if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 101
+		} else if (var2 == 17) { // L: 95
+			this.walkSequence = var1.readUnsignedShort(); // L: 96
+			this.walkBackSequence = var1.readUnsignedShort(); // L: 97
+			this.walkLeftSequence = var1.readUnsignedShort(); // L: 98
+			this.walkRightSequence = var1.readUnsignedShort(); // L: 99
+		} else if (var2 == 18) { // L: 101
+			var1.readUnsignedShort(); // L: 102
+		} else if (var2 >= 30 && var2 < 35) { // L: 104
+			this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 105
+			if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 106
 				this.actions[var2 - 30] = null;
 			}
-		} else if (var2 == 40) { // L: 103
-			var3 = var1.readUnsignedByte(); // L: 104
-			this.recolorFrom = new short[var3]; // L: 105
-			this.recolorTo = new short[var3]; // L: 106
-
-			for (var4 = 0; var4 < var3; ++var4) { // L: 107
-				this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 108
-				this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 109
+		} else if (var2 == 40) { // L: 108
+			var3 = var1.readUnsignedByte(); // L: 109
+			this.recolorFrom = new short[var3]; // L: 110
+			this.recolorTo = new short[var3]; // L: 111
+
+			for (var4 = 0; var4 < var3; ++var4) { // L: 112
+				this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 113
+				this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 114
 			}
-		} else if (var2 == 41) { // L: 112
-			var3 = var1.readUnsignedByte(); // L: 113
-			this.retextureFrom = new short[var3]; // L: 114
-			this.retextureTo = new short[var3]; // L: 115
-
-			for (var4 = 0; var4 < var3; ++var4) { // L: 116
-				this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 117
-				this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 118
+		} else if (var2 == 41) { // L: 117
+			var3 = var1.readUnsignedByte(); // L: 118
+			this.retextureFrom = new short[var3]; // L: 119
+			this.retextureTo = new short[var3]; // L: 120
+
+			for (var4 = 0; var4 < var3; ++var4) { // L: 121
+				this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 122
+				this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 123
 			}
-		} else if (var2 == 60) { // L: 121
-			var3 = var1.readUnsignedByte(); // L: 122
-			this.field1722 = new int[var3]; // L: 123
+		} else if (var2 == 60) { // L: 126
+			var3 = var1.readUnsignedByte(); // L: 127
+			this.field1868 = new int[var3]; // L: 128
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 124
-				this.field1722[var4] = var1.readUnsignedShort();
+			for (var4 = 0; var4 < var3; ++var4) { // L: 129
+				this.field1868[var4] = var1.readUnsignedShort();
 			}
-		} else if (var2 == 93) { // L: 126
+		} else if (var2 == 93) { // L: 131
 			this.drawMapDot = false;
-		} else if (var2 == 95) { // L: 127
+		} else if (var2 == 95) { // L: 132
 			this.combatLevel = var1.readUnsignedShort();
-		} else if (var2 == 97) { // L: 128
+		} else if (var2 == 97) { // L: 133
 			this.widthScale = var1.readUnsignedShort();
-		} else if (var2 == 98) { // L: 129
+		} else if (var2 == 98) { // L: 134
 			this.heightScale = var1.readUnsignedShort();
-		} else if (var2 == 99) { // L: 130
+		} else if (var2 == 99) { // L: 135
 			this.isVisible = true;
-		} else if (var2 == 100) { // L: 131
+		} else if (var2 == 100) { // L: 136
 			this.ambient = var1.readByte();
-		} else if (var2 == 101) { // L: 132
+		} else if (var2 == 101) { // L: 137
 			this.contrast = var1.readByte() * 5;
-		} else if (var2 == 102) { // L: 133
+		} else if (var2 == 102) { // L: 138
 			this.headIconPrayer = var1.readUnsignedShort();
-		} else if (var2 == 103) { // L: 134
+		} else if (var2 == 103) { // L: 139
 			this.rotation = var1.readUnsignedShort();
-		} else if (var2 != 106 && var2 != 118) { // L: 135
-			if (var2 == 107) { // L: 153
+		} else if (var2 != 106 && var2 != 118) { // L: 140
+			if (var2 == 107) { // L: 158
 				this.isInteractable = false;
-			} else if (var2 == 109) { // L: 154
+			} else if (var2 == 109) { // L: 159
 				this.isClickable = false;
-			} else if (var2 == 111) { // L: 155
+			} else if (var2 == 111) { // L: 160
 				this.isFollower = true;
-			} else if (var2 == 249) { // L: 156
-				this.params = class13.readStringIntParameters(var1, this.params);
+			} else if (var2 == 249) { // L: 161
+				this.params = Canvas.readStringIntParameters(var1, this.params);
 			}
 		} else {
-			this.transformVarbit = var1.readUnsignedShort(); // L: 136
-			if (this.transformVarbit == 65535) { // L: 137
-				this.transformVarbit = -1;
+			this.transformVarbit = var1.readUnsignedShort(); // L: 141
+			if (this.transformVarbit == 65535) {
+				this.transformVarbit = -1; // L: 142
 			}
 
-			this.transformVarp = var1.readUnsignedShort(); // L: 138
-			if (this.transformVarp == 65535) { // L: 139
+			this.transformVarp = var1.readUnsignedShort(); // L: 143
+			if (this.transformVarp == 65535) { // L: 144
 				this.transformVarp = -1;
 			}
 
-			var3 = -1; // L: 140
-			if (var2 == 118) { // L: 141
-				var3 = var1.readUnsignedShort(); // L: 142
-				if (var3 == 65535) { // L: 143
+			var3 = -1; // L: 145
+			if (var2 == 118) { // L: 146
+				var3 = var1.readUnsignedShort(); // L: 147
+				if (var3 == 65535) { // L: 148
 					var3 = -1;
 				}
 			}
 
-			var4 = var1.readUnsignedByte(); // L: 145
-			this.transforms = new int[var4 + 2]; // L: 146
+			var4 = var1.readUnsignedByte(); // L: 150
+			this.transforms = new int[var4 + 2]; // L: 151
 
-			for (int var5 = 0; var5 <= var4; ++var5) { // L: 147
-				this.transforms[var5] = var1.readUnsignedShort(); // L: 148
-				if (this.transforms[var5] == 65535) { // L: 149
+			for (int var5 = 0; var5 <= var4; ++var5) { // L: 152
+				this.transforms[var5] = var1.readUnsignedShort(); // L: 153
+				if (this.transforms[var5] == 65535) { // L: 154
 					this.transforms[var5] = -1;
 				}
 			}
 
-			this.transforms[var4 + 1] = var3; // L: 151
+			this.transforms[var4 + 1] = var3; // L: 156
 		}
 
-	} // L: 158
+	} // L: 163
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lfm;ILfm;IB)Lhl;",
-		garbageValue = "-111"
+		descriptor = "(Lgn;ILgn;II)Lgo;",
+		garbageValue = "-1893596657"
 	)
 	@Export("getModel")
 	public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
-		if (this.transforms != null) { // L: 161
-			NPCComposition var12 = this.transform(); // L: 162
-			return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 163 164
+		if (this.transforms != null) { // L: 166
+			NPCComposition var12 = this.transform(); // L: 167
+			return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 168
 		} else {
-			Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 166
-			if (var5 == null) { // L: 167
-				boolean var6 = false; // L: 168
+			Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id);
+			if (var5 == null) {
+				boolean var6 = false;
 
-				for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 169
+				for (int var7 = 0; var7 < this.models.length; ++var7) {
 					if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) {
 						var6 = true;
 					}
 				}
 
-				if (var6) { // L: 170
+				if (var6) { // L: 175
 					return null;
 				}
 
-				ModelData[] var8 = new ModelData[this.models.length]; // L: 172
+				ModelData[] var8 = new ModelData[this.models.length]; // L: 177
 
 				int var9;
-				for (var9 = 0; var9 < this.models.length; ++var9) { // L: 173
+				for (var9 = 0; var9 < this.models.length; ++var9) { // L: 178
 					var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0);
 				}
 
 				ModelData var10;
-				if (var8.length == 1) { // L: 174
+				if (var8.length == 1) { // L: 179
 					var10 = var8[0];
 				} else {
-					var10 = new ModelData(var8, var8.length); // L: 175
+					var10 = new ModelData(var8, var8.length); // L: 180
 				}
 
-				if (this.recolorFrom != null) { // L: 176
-					for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 177
-						var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 178
+				if (this.recolorFrom != null) { // L: 181
+					for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 182
+						var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 183
 					}
 				}
 
-				if (this.retextureFrom != null) { // L: 181
-					for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 182
-						var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 183
+				if (this.retextureFrom != null) { // L: 186
+					for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 187
+						var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 188
 					}
 				}
 
-				var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 186
-				NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 187
+				var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 191
+				NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 192
 			}
 
 			Model var11;
-			if (var1 != null && var3 != null) { // L: 190
+			if (var1 != null && var3 != null) { // L: 195
 				var11 = var1.applyTransformations(var5, var2, var3, var4);
-			} else if (var1 != null) { // L: 191
+			} else if (var1 != null) { // L: 196
 				var11 = var1.transformActorModel(var5, var2);
-			} else if (var3 != null) { // L: 192
+			} else if (var3 != null) { // L: 197
 				var11 = var3.transformActorModel(var5, var4);
 			} else {
-				var11 = var5.toSharedSequenceModel(true); // L: 193
+				var11 = var5.toSharedSequenceModel(true); // L: 198
 			}
 
-			if (this.widthScale != 128 || this.heightScale != 128) { // L: 194
+			if (this.widthScale != 128 || this.heightScale != 128) { // L: 199
 				var11.scale(this.widthScale, this.heightScale, this.widthScale);
 			}
 
-			return var11; // L: 195
+			return var11; // L: 200
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgk;",
-		garbageValue = "-100"
+		descriptor = "(I)Lge;",
+		garbageValue = "-1923550269"
 	)
 	@Export("getModelData")
 	public final ModelData getModelData() {
-		if (this.transforms != null) { // L: 199
-			NPCComposition var7 = this.transform(); // L: 200
-			return var7 == null ? null : var7.getModelData(); // L: 201 202
-		} else if (this.field1722 == null) { // L: 204
+		if (this.transforms != null) { // L: 204
+			NPCComposition var7 = this.transform(); // L: 205
+			return var7 == null ? null : var7.getModelData(); // L: 206 207
+		} else if (this.field1868 == null) { // L: 209
 			return null;
 		} else {
-			boolean var1 = false; // L: 205
+			boolean var1 = false; // L: 210
 
-			for (int var2 = 0; var2 < this.field1722.length; ++var2) { // L: 206
-				if (!NpcDefinition_modelArchive.tryLoadFile(this.field1722[var2], 0)) {
+			for (int var2 = 0; var2 < this.field1868.length; ++var2) { // L: 211
+				if (!NpcDefinition_modelArchive.tryLoadFile(this.field1868[var2], 0)) {
 					var1 = true;
 				}
 			}
 
-			if (var1) { // L: 207
+			if (var1) { // L: 212
 				return null;
 			} else {
-				ModelData[] var5 = new ModelData[this.field1722.length]; // L: 208
+				ModelData[] var5 = new ModelData[this.field1868.length]; // L: 213
 
-				for (int var3 = 0; var3 < this.field1722.length; ++var3) { // L: 209
-					var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1722[var3], 0);
+				for (int var3 = 0; var3 < this.field1868.length; ++var3) { // L: 214
+					var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1868[var3], 0);
 				}
 
 				ModelData var6;
 				if (var5.length == 1) {
-					var6 = var5[0]; // L: 211
+					var6 = var5[0]; // L: 216
 				} else {
-					var6 = new ModelData(var5, var5.length); // L: 212
+					var6 = new ModelData(var5, var5.length); // L: 217
 				}
 
 				int var4;
-				if (this.recolorFrom != null) { // L: 213
-					for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 214
-						var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 215
+				if (this.recolorFrom != null) { // L: 218
+					for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 219
+						var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 220
 					}
 				}
 
-				if (this.retextureFrom != null) { // L: 218
-					for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 219
-						var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 220
+				if (this.retextureFrom != null) { // L: 223
+					for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 224
+						var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 225
 					}
 				}
 
-				return var6; // L: 223
+				return var6; // L: 228
 			}
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lfw;",
-		garbageValue = "2130221153"
+		descriptor = "(I)Lfi;",
+		garbageValue = "-1327400638"
 	)
 	@Export("transform")
 	public final NPCComposition transform() {
-		int var1 = -1; // L: 227
-		if (this.transformVarbit != -1) { // L: 228
-			var1 = class119.getVarbit(this.transformVarbit);
-		} else if (this.transformVarp != -1) { // L: 229
+		int var1 = -1; // L: 232
+		if (this.transformVarbit != -1) { // L: 233
+			var1 = class273.getVarbit(this.transformVarbit);
+		} else if (this.transformVarp != -1) { // L: 234
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
 
 		int var2;
-		if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 231
-			var2 = this.transforms[var1]; // L: 232
+		if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 236
+			var2 = this.transforms[var1]; // L: 237
 		} else {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? ScriptFrame.getNpcDefinition(var2) : null; // L: 233 234
+		return var2 != -1 ? WorldMapLabelSize.getNpcDefinition(var2) : null; // L: 238 239
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-106692934"
+		garbageValue = "817839626"
 	)
 	@Export("transformIsVisible")
 	public boolean transformIsVisible() {
-		if (this.transforms == null) { // L: 238
+		if (this.transforms == null) { // L: 243
 			return true;
 		} else {
-			int var1 = -1; // L: 239
-			if (this.transformVarbit != -1) { // L: 240
-				var1 = class119.getVarbit(this.transformVarbit);
-			} else if (this.transformVarp != -1) { // L: 241
+			int var1 = -1; // L: 244
+			if (this.transformVarbit != -1) { // L: 245
+				var1 = class273.getVarbit(this.transformVarbit);
+			} else if (this.transformVarp != -1) { // L: 246
 				var1 = Varps.Varps_main[this.transformVarp];
 			}
 
-			if (var1 >= 0 && var1 < this.transforms.length) { // L: 242
-				return this.transforms[var1] != -1; // L: 243
+			if (var1 >= 0 && var1 < this.transforms.length) { // L: 247
+				return this.transforms[var1] != -1; // L: 248
 			} else {
 				return this.transforms[this.transforms.length - 1] != -1;
 			}
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "-1437927998"
+		garbageValue = "-2014377522"
 	)
 	@Export("getIntParam")
 	public int getIntParam(int var1, int var2) {
-		return NPC.method2251(this.params, var1, var2); // L: 247
+		return class12.method158(this.params, var1, var2); // L: 252
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-1913888789"
+		garbageValue = "-1575325257"
 	)
 	@Export("getStringParam")
 	public String getStringParam(int var1, String var2) {
-		return VarbitComposition.method3205(this.params, var1, var2); // L: 251
+		return Skeleton.method3948(this.params, var1, var2); // L: 256
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(ILop;B)Ley;",
-		garbageValue = "0"
-	)
-	public static class150 method3152(int var0, Buffer var1) {
-		int var2 = var1.readUnsignedByte(); // L: 24
-		boolean var3 = (var2 & 1) != 0; // L: 25
-		boolean var4 = (var2 & 2) != 0; // L: 26
-		class150 var5 = new class150(var0); // L: 27
-		int var6;
-		int[] var7;
-		boolean var8;
-		int var9;
-		short var10;
-		if (var3) { // L: 28
-			var6 = var1.readUnsignedByte(); // L: 29
-			var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32
-			var8 = var5.field1598 != null && var7.length == var5.field1598.length; // L: 33
-
-			for (var9 = 0; var9 < 2; ++var9) { // L: 34
-				if (var7[var9] != 15) { // L: 35
-					var10 = (short)var1.readUnsignedShort(); // L: 36
-					if (var8) { // L: 37
-						var5.field1598[var7[var9]] = var10; // L: 38
-					}
-				}
-			}
-		}
-
-		if (var4) { // L: 43
-			var6 = var1.readUnsignedByte(); // L: 44
-			var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47
-			var8 = var5.field1600 != null && var7.length == var5.field1600.length; // L: 48
+		descriptor = "(I[BLmy;I)V",
+		garbageValue = "1930490534"
+	)
+	static void method3321(int var0, byte[] var1, ArchiveDisk var2) {
+		ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18
+		var3.type = 0; // L: 19
+		var3.key = (long)var0; // L: 20
+		var3.data = var1; // L: 21
+		var3.archiveDisk = var2; // L: 22
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23
+			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24
+		} // L: 25
+
+		class174.method3383(); // L: 26
+	} // L: 27
 
-			for (var9 = 0; var9 < 2; ++var9) { // L: 49
-				if (var7[var9] != 15) { // L: 50
-					var10 = (short)var1.readUnsignedShort(); // L: 51
-					if (var8) { // L: 52
-						var5.field1600[var7[var9]] = var10; // L: 53
-					}
-				}
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "1572770567"
+	)
+	@Export("isKeyDown")
+	public static final boolean isKeyDown() {
+		synchronized(KeyHandler.KeyHandler_instance) { // L: 169
+			if (KeyHandler.field143 == KeyHandler.field145) { // L: 170
+				return false;
+			} else {
+				Players.field1247 = KeyHandler.field131[KeyHandler.field143]; // L: 171
+				ModeWhere.field3954 = KeyHandler.field137[KeyHandler.field143]; // L: 172
+				KeyHandler.field143 = KeyHandler.field143 + 1 & 127; // L: 173
+				return true; // L: 174
 			}
 		}
-
-		return var5; // L: 58
 	}
 }
diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java
index f8847587ea..f48f9b4ad5 100644
--- a/runescape-client/src/main/java/NanoClock.java
+++ b/runescape-client/src/main/java/NanoClock.java
@@ -4,12 +4,12 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ex")
+@ObfuscatedName("es")
 @Implements("NanoClock")
 public class NanoClock extends Clock {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = 3916314053745196243L
+		longValue = -2204843264126244721L
 	)
 	@Export("lastTimeNano")
 	long lastTimeNano;
@@ -18,20 +18,20 @@ public NanoClock() {
 		this.lastTimeNano = System.nanoTime(); // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1421350581"
+		descriptor = "(B)V",
+		garbageValue = "18"
 	)
 	@Export("mark")
 	public void mark() {
 		this.lastTimeNano = System.nanoTime(); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "1121035205"
+		garbageValue = "293215312"
 	)
 	@Export("wait")
 	public int wait(int var1, int var2) {
@@ -41,11 +41,11 @@ public int wait(int var1, int var2) {
 			var5 = var3;
 		}
 
-		FloorUnderlayDefinition.method3190(var5 / 1000000L); // L: 21
+		Bounds.method6608(var5 / 1000000L); // L: 21
 		long var7 = System.nanoTime(); // L: 22
 
 		int var9;
-		for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += (long)var1 * 1000000L) { // L: 23 24 26
+		for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26
 			++var9; // L: 25
 		}
 
diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java
index 9f4c69385d..fcb128973f 100644
--- a/runescape-client/src/main/java/NetCache.java
+++ b/runescape-client/src/main/java/NetCache.java
@@ -5,106 +5,106 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kk")
+@ObfuscatedName("kg")
 @Implements("NetCache")
 public class NetCache {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lmp;"
+		descriptor = "Lmd;"
 	)
 	@Export("NetCache_socket")
 	public static AbstractSocket NetCache_socket;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -656127147
+		intValue = -1178341403
 	)
 	@Export("NetCache_loadTime")
 	public static int NetCache_loadTime;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("NetCache_pendingPriorityWrites")
 	public static NodeHashTable NetCache_pendingPriorityWrites;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1571433569
+		intValue = 636484149
 	)
 	@Export("NetCache_pendingPriorityWritesCount")
 	public static int NetCache_pendingPriorityWritesCount;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("NetCache_pendingPriorityResponses")
 	public static NodeHashTable NetCache_pendingPriorityResponses;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1196232217
+		intValue = -2078228991
 	)
 	@Export("NetCache_pendingPriorityResponsesCount")
 	public static int NetCache_pendingPriorityResponsesCount;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lka;"
+		descriptor = "Lla;"
 	)
 	@Export("NetCache_pendingWritesQueue")
 	public static DualNodeDeque NetCache_pendingWritesQueue;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("NetCache_pendingWrites")
-	static NodeHashTable NetCache_pendingWrites;
-	@ObfuscatedName("b")
+	public static NodeHashTable NetCache_pendingWrites;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1794044669
+		intValue = 763623423
 	)
 	@Export("NetCache_pendingWritesCount")
 	public static int NetCache_pendingWritesCount;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("NetCache_pendingResponses")
 	public static NodeHashTable NetCache_pendingResponses;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1069606977
+		intValue = -253277095
 	)
 	@Export("NetCache_pendingResponsesCount")
 	public static int NetCache_pendingResponsesCount;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lop;"
+		descriptor = "Lpi;"
 	)
 	@Export("NetCache_responseHeaderBuffer")
 	public static Buffer NetCache_responseHeaderBuffer;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 862783157
+		intValue = 1635877227
 	)
-	public static int field3707;
-	@ObfuscatedName("q")
+	public static int field3863;
+	@ObfuscatedName("k")
 	@Export("NetCache_crc")
-	public static CRC32 NetCache_crc;
-	@ObfuscatedName("r")
+	static CRC32 NetCache_crc;
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "[Lkd;"
+		descriptor = "[Lkz;"
 	)
 	@Export("NetCache_archives")
-	public static Archive[] NetCache_archives;
-	@ObfuscatedName("m")
-	public static byte field3719;
-	@ObfuscatedName("c")
+	static Archive[] NetCache_archives;
+	@ObfuscatedName("q")
+	public static byte field3866;
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -883980279
+		intValue = -1421644025
 	)
 	@Export("NetCache_crcMismatches")
 	public static int NetCache_crcMismatches;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 735412947
+		intValue = -2029504039
 	)
 	@Export("NetCache_ioExceptions")
 	public static int NetCache_ioExceptions;
@@ -121,10 +121,10 @@ public class NetCache {
 		NetCache_pendingResponses = new NodeHashTable(4096); // L: 22
 		NetCache_pendingResponsesCount = 0; // L: 23
 		NetCache_responseHeaderBuffer = new Buffer(8); // L: 26
-		field3707 = 0; // L: 28
+		field3863 = 0; // L: 28
 		NetCache_crc = new CRC32(); // L: 30
 		NetCache_archives = new Archive[256]; // L: 32
-		field3719 = 0; // L: 33
+		field3866 = 0; // L: 33
 		NetCache_crcMismatches = 0; // L: 34
 		NetCache_ioExceptions = 0; // L: 35
 	}
diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java
index 39c03cf1a0..8b6634c144 100644
--- a/runescape-client/src/main/java/NetFileRequest.java
+++ b/runescape-client/src/main/java/NetFileRequest.java
@@ -3,42 +3,68 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("kj")
+@ObfuscatedName("kx")
 @Implements("NetFileRequest")
 public class NetFileRequest extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Lkz;"
 	)
 	@Export("archive")
-	public Archive archive;
-	@ObfuscatedName("w")
+	Archive archive;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1566075383
+		intValue = -341474055
 	)
 	@Export("crc")
-	public int crc;
-	@ObfuscatedName("s")
+	int crc;
+	@ObfuscatedName("p")
 	@Export("padding")
-	public byte padding;
+	byte padding;
 
 	NetFileRequest() {
 	} // L: 10
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(II)Log;",
-		garbageValue = "-1401189412"
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "-77"
 	)
-	public static class392 method5300(int var0) {
-		int var1 = class390.field4266[var0]; // L: 11
-		if (var1 == 1) { // L: 12
-			return class392.field4276; // L: 13
-		} else if (var1 == 2) { // L: 15
-			return class392.field4271; // L: 16
+	static int method5588(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1084
+		if (var0 == ScriptOpcodes.CC_GETX) { // L: 1085
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.x; // L: 1086
+			return 1; // L: 1087
+		} else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1089
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.y; // L: 1090
+			return 1; // L: 1091
+		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1093
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.width; // L: 1094
+			return 1; // L: 1095
+		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1097
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.height; // L: 1098
+			return 1; // L: 1099
+		} else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1101
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1102
+			return 1; // L: 1103
+		} else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1105
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.parentId; // L: 1106
+			return 1; // L: 1107
 		} else {
-			return var1 == 3 ? class392.field4270 : null; // L: 18 19 21
+			return 2; // L: 1109
 		}
 	}
+
+	@ObfuscatedName("fv")
+	@ObfuscatedSignature(
+		descriptor = "(Lkz;Ljava/lang/String;I)V",
+		garbageValue = "-1653414496"
+	)
+	static void method5587(Archive var0, String var1) {
+		ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 2153
+		Client.archiveLoaders.add(var2); // L: 2154
+		Client.field753 += var2.groupCount; // L: 2155
+	} // L: 2156
 }
diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java
index 1706dc7c4c..67778fbbd4 100644
--- a/runescape-client/src/main/java/NetSocket.java
+++ b/runescape-client/src/main/java/NetSocket.java
@@ -9,94 +9,94 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eb")
+@ObfuscatedName("ff")
 @Implements("NetSocket")
 public final class NetSocket extends AbstractSocket implements Runnable {
-	@ObfuscatedName("k")
+	@ObfuscatedName("er")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
+		descriptor = "Lkz;"
 	)
-	@Export("options_buttons_0Sprite")
-	static IndexedSprite options_buttons_0Sprite;
-	@ObfuscatedName("i")
-	@Export("outputStream")
-	OutputStream outputStream;
-	@ObfuscatedName("w")
+	@Export("archive9")
+	static Archive archive9;
+	@ObfuscatedName("c")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
+	@Export("outputStream")
+	OutputStream outputStream;
+	@ObfuscatedName("p")
 	@Export("socket")
 	Socket socket;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("isClosed")
 	boolean isClosed;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lew;"
+		descriptor = "Leb;"
 	)
 	@Export("taskHandler")
 	TaskHandler taskHandler;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lev;"
+		descriptor = "Lfk;"
 	)
 	@Export("task")
 	Task task;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("outBuffer")
 	byte[] outBuffer;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 23689551
+		intValue = -1984666421
 	)
 	@Export("outLength")
 	int outLength;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1817332035
+		intValue = 773716871
 	)
 	@Export("outOffset")
 	int outOffset;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("exceptionWriting")
 	boolean exceptionWriting;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 401992191
+		intValue = 1772673061
 	)
 	@Export("bufferLength")
 	final int bufferLength;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -955072145
+		intValue = -19944007
 	)
 	@Export("maxPacketLength")
 	final int maxPacketLength;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/net/Socket;Lew;I)V"
+		descriptor = "(Ljava/net/Socket;Leb;I)V"
 	)
 	public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException {
 		this.isClosed = false; // L: 16
 		this.outLength = 0; // L: 20
 		this.outOffset = 0; // L: 21
 		this.exceptionWriting = false; // L: 22
-		this.taskHandler = var2; // L: 28
+		this.taskHandler = var2;
 		this.socket = var1; // L: 29
 		this.bufferLength = var3; // L: 30
 		this.maxPacketLength = var3 - 100; // L: 31
-		this.socket.setSoTimeout(30000); // L: 32
-		this.socket.setTcpNoDelay(true); // L: 33
-		this.socket.setReceiveBufferSize(65536); // L: 34
-		this.socket.setSendBufferSize(65536); // L: 35
-		this.inputStream = this.socket.getInputStream(); // L: 36
-		this.outputStream = this.socket.getOutputStream(); // L: 37
+		this.socket.setSoTimeout(30000);
+		this.socket.setTcpNoDelay(true);
+		this.socket.setReceiveBufferSize(65536);
+		this.socket.setSendBufferSize(65536);
+		this.inputStream = this.socket.getInputStream();
+		this.outputStream = this.socket.getOutputStream();
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "1"
+		descriptor = "(I)V",
+		garbageValue = "-2099219864"
 	)
 	@Export("close")
 	public void close() {
@@ -108,7 +108,7 @@ public void close() {
 
 			if (this.task != null) { // L: 46
 				while (this.task.status == 0) { // L: 47
-					FloorUnderlayDefinition.method3190(1L); // L: 48
+					Bounds.method6608(1L); // L: 48
 				}
 
 				if (this.task.status == 1) { // L: 50
@@ -123,30 +123,30 @@ public void close() {
 		}
 	} // L: 58
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1953698452"
+		descriptor = "(B)I",
+		garbageValue = "-44"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1632705310"
+		garbageValue = "-1579083707"
 	)
 	@Export("available")
 	public int available() throws IOException {
 		return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-1771919747"
+		garbageValue = "1654551476"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
@@ -157,10 +157,10 @@ public boolean isAvailable(int var1) throws IOException {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "([BIII)I",
-		garbageValue = "-1246528305"
+		descriptor = "([BIIS)I",
+		garbageValue = "909"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
@@ -182,10 +182,10 @@ public int read(byte[] var1, int var2, int var3) throws IOException {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "([BIIB)V",
-		garbageValue = "0"
+		garbageValue = "-34"
 	)
 	@Export("write0")
 	void write0(byte[] var1, int var2, int var3) throws IOException {
@@ -202,7 +202,7 @@ void write0(byte[] var1, int var2, int var3) throws IOException {
 					for (int var5 = 0; var5 < var3; ++var5) { // L: 99
 						this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 100
 						this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 101
-						if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { // L: 102
+						if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { // L: 102
 							throw new IOException(); // L: 103
 						}
 					}
@@ -217,19 +217,15 @@ void write0(byte[] var1, int var2, int var3) throws IOException {
 		}
 	} // L: 111
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "-748791607"
+		garbageValue = "-1320460000"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
-		this.write0(var1, var2, var3); // L: 160
-	} // L: 161
-
-	protected void finalize() {
-		this.close(); // L: 61
-	} // L: 62
+		this.write0(var1, var2, var3); // L: 161
+	} // L: 162
 
 	public void run() {
 		try {
@@ -298,435 +294,36 @@ public void run() {
 				break;
 			}
 		} catch (Exception var12) { // L: 154
-			MilliClock.RunException_sendStackTrace((String)null, var12); // L: 155
+			AccessFile.RunException_sendStackTrace((String)null, var12); // L: 155
 		}
 
 	} // L: 157
 
-	@ObfuscatedName("i")
+	protected void finalize() {
+		this.close(); // L: 61
+	} // L: 62
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)J",
-		garbageValue = "965371090"
+		descriptor = "(CI)Z",
+		garbageValue = "320078998"
 	)
-	static long method2923(int var0, int var1, int var2) {
-		return (long)(var2 << 16 | var0 << 8 | var1); // L: 38
+	static final boolean method3119(char var0) {
+		return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 28
 	}
 
-	@ObfuscatedName("fp")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1408375765"
+		descriptor = "(Lku;IIIZI)V",
+		garbageValue = "1774445817"
 	)
-	@Export("load")
-	static void load() {
-		int var25;
-		if (Client.titleLoadingStage == 0) { // L: 2002
-			GameBuild.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 2003
-
-			for (var25 = 0; var25 < 4; ++var25) { // L: 2004
-				Client.collisionMaps[var25] = new CollisionMap(104, 104);
-			}
-
-			class10.sceneMinimapSprite = new SpritePixels(512, 512); // L: 2005
-			Login.Login_loadingText = "Starting game engine..."; // L: 2006
-			Login.Login_loadingPercent = 5; // L: 2007
-			Client.titleLoadingStage = 20; // L: 2008
-		} else if (Client.titleLoadingStage == 20) { // L: 2011
-			Login.Login_loadingText = "Prepared visibility map"; // L: 2012
-			Login.Login_loadingPercent = 10; // L: 2013
-			Client.titleLoadingStage = 30; // L: 2014
-		} else if (Client.titleLoadingStage == 30) { // L: 2017
-			InvDefinition.archive0 = UrlRequest.newArchive(0, false, true, true); // L: 2018
-			ApproximateRouteStrategy.archive1 = UrlRequest.newArchive(1, false, true, true); // L: 2019
-			class1.archive2 = UrlRequest.newArchive(2, true, false, true); // L: 2020
-			ParamComposition.archive3 = UrlRequest.newArchive(3, false, true, true); // L: 2021
-			class12.archive4 = UrlRequest.newArchive(4, false, true, true); // L: 2022
-			class11.archive5 = UrlRequest.newArchive(5, true, true, true); // L: 2023
-			Messages.archive6 = UrlRequest.newArchive(6, true, true, true); // L: 2024
-			HorizontalAlignment.archive7 = UrlRequest.newArchive(7, false, true, true); // L: 2025
-			GrandExchangeOfferOwnWorldComparator.archive8 = UrlRequest.newArchive(8, false, true, true); // L: 2026
-			SecureRandomFuture.archive9 = UrlRequest.newArchive(9, false, true, true); // L: 2027
-			ChatChannel.archive10 = UrlRequest.newArchive(10, false, true, true); // L: 2028
-			AbstractWorldMapIcon.archive11 = UrlRequest.newArchive(11, false, true, true); // L: 2029
-			class14.archive12 = UrlRequest.newArchive(12, false, true, true); // L: 2030
-			LoginScreenAnimation.archive13 = UrlRequest.newArchive(13, true, false, true); // L: 2031
-			SecureRandomCallable.archive14 = UrlRequest.newArchive(14, false, true, true); // L: 2032
-			Archive.archive15 = UrlRequest.newArchive(15, false, true, true); // L: 2033
-			Message.archive17 = UrlRequest.newArchive(17, true, true, true); // L: 2034
-			Messages.archive18 = UrlRequest.newArchive(18, false, true, true); // L: 2035
-			class111.archive19 = UrlRequest.newArchive(19, false, true, true); // L: 2036
-			GrandExchangeOfferOwnWorldComparator.archive20 = UrlRequest.newArchive(20, false, true, true); // L: 2037
-			Login.Login_loadingText = "Connecting to update server"; // L: 2038
-			Login.Login_loadingPercent = 20; // L: 2039
-			Client.titleLoadingStage = 40; // L: 2040
-		} else if (Client.titleLoadingStage == 40) { // L: 2043
-			byte var39 = 0; // L: 2044
-			var25 = var39 + InvDefinition.archive0.percentage() * 4 / 100; // L: 2045
-			var25 += ApproximateRouteStrategy.archive1.percentage() * 4 / 100; // L: 2046
-			var25 += class1.archive2.percentage() * 2 / 100; // L: 2047
-			var25 += ParamComposition.archive3.percentage() * 2 / 100; // L: 2048
-			var25 += class12.archive4.percentage() * 6 / 100; // L: 2049
-			var25 += class11.archive5.percentage() * 4 / 100; // L: 2050
-			var25 += Messages.archive6.percentage() * 2 / 100; // L: 2051
-			var25 += HorizontalAlignment.archive7.percentage() * 56 / 100; // L: 2052
-			var25 += GrandExchangeOfferOwnWorldComparator.archive8.percentage() * 2 / 100; // L: 2053
-			var25 += SecureRandomFuture.archive9.percentage() * 2 / 100; // L: 2054
-			var25 += ChatChannel.archive10.percentage() * 2 / 100; // L: 2055
-			var25 += AbstractWorldMapIcon.archive11.percentage() * 2 / 100; // L: 2056
-			var25 += class14.archive12.percentage() * 2 / 100; // L: 2057
-			var25 += LoginScreenAnimation.archive13.percentage() * 2 / 100; // L: 2058
-			var25 += SecureRandomCallable.archive14.percentage() * 2 / 100; // L: 2059
-			var25 += Archive.archive15.percentage() * 2 / 100; // L: 2060
-			var25 += class111.archive19.percentage() / 100; // L: 2061
-			var25 += Messages.archive18.percentage() / 100; // L: 2062
-			var25 += GrandExchangeOfferOwnWorldComparator.archive20.percentage() / 100; // L: 2063
-			var25 += Message.archive17.method5260() && Message.archive17.isFullyLoaded() ? 1 : 0; // L: 2064
-			if (var25 != 100) { // L: 2065
-				if (var25 != 0) { // L: 2066
-					Login.Login_loadingText = "Checking for updates - " + var25 + "%";
-				}
-
-				Login.Login_loadingPercent = 30; // L: 2067
-			} else {
-				UserComparator8.method2460(InvDefinition.archive0, "Animations"); // L: 2070
-				UserComparator8.method2460(ApproximateRouteStrategy.archive1, "Skeletons"); // L: 2071
-				UserComparator8.method2460(class12.archive4, "Sound FX"); // L: 2072
-				UserComparator8.method2460(class11.archive5, "Maps"); // L: 2073
-				UserComparator8.method2460(Messages.archive6, "Music Tracks"); // L: 2074
-				UserComparator8.method2460(HorizontalAlignment.archive7, "Models"); // L: 2075
-				UserComparator8.method2460(GrandExchangeOfferOwnWorldComparator.archive8, "Sprites"); // L: 2076
-				UserComparator8.method2460(AbstractWorldMapIcon.archive11, "Music Jingles"); // L: 2077
-				UserComparator8.method2460(SecureRandomCallable.archive14, "Music Samples"); // L: 2078
-				UserComparator8.method2460(Archive.archive15, "Music Patches"); // L: 2079
-				UserComparator8.method2460(class111.archive19, "World Map"); // L: 2080
-				UserComparator8.method2460(Messages.archive18, "World Map Geography"); // L: 2081
-				UserComparator8.method2460(GrandExchangeOfferOwnWorldComparator.archive20, "World Map Ground"); // L: 2082
-				class111.spriteIds = new GraphicsDefaults(); // L: 2083
-				class111.spriteIds.decode(Message.archive17); // L: 2084
-				Login.Login_loadingText = "Loaded update list"; // L: 2085
-				Login.Login_loadingPercent = 30; // L: 2086
-				Client.titleLoadingStage = 45; // L: 2087
-			}
-		} else {
-			Archive var27;
-			Archive var28;
-			Archive var29;
-			if (Client.titleLoadingStage == 45) { // L: 2090
-				boolean var38 = !Client.isLowDetail; // L: 2091
-				UserComparator2.field4359 = 22050; // L: 2094
-				PcmPlayer.PcmPlayer_stereo = var38; // L: 2095
-				PcmPlayer.field272 = 2; // L: 2096
-				MidiPcmStream var34 = new MidiPcmStream(); // L: 2098
-				var34.method4761(9, 128); // L: 2099
-				HealthBar.pcmPlayer0 = class112.method2522(GameEngine.taskHandler, 0, 22050); // L: 2100
-				HealthBar.pcmPlayer0.setStream(var34); // L: 2101
-				var27 = Archive.archive15; // L: 2102
-				var28 = SecureRandomCallable.archive14; // L: 2103
-				var29 = class12.archive4; // L: 2104
-				class247.musicPatchesArchive = var27; // L: 2106
-				class247.musicSamplesArchive = var28; // L: 2107
-				class408.soundEffectsArchive = var29; // L: 2108
-				class247.midiPcmStream = var34; // L: 2109
-				ScriptEvent.pcmPlayer1 = class112.method2522(GameEngine.taskHandler, 1, 2048); // L: 2111
-				BuddyRankComparator.pcmStreamMixer = new PcmStreamMixer(); // L: 2112
-				ScriptEvent.pcmPlayer1.setStream(BuddyRankComparator.pcmStreamMixer); // L: 2113
-				FontName.decimator = new Decimator(22050, UserComparator2.field4359); // L: 2114
-				Login.Login_loadingText = "Prepared sound engine"; // L: 2115
-				Login.Login_loadingPercent = 35; // L: 2116
-				Client.titleLoadingStage = 50; // L: 2117
-				MenuAction.WorldMapElement_fonts = new Fonts(GrandExchangeOfferOwnWorldComparator.archive8, LoginScreenAnimation.archive13); // L: 2118
-			} else {
-				int var1;
-				if (Client.titleLoadingStage == 50) { // L: 2121
-					FontName[] var33 = new FontName[]{FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; // L: 2124
-					var1 = var33.length; // L: 2126
-					Fonts var35 = MenuAction.WorldMapElement_fonts; // L: 2127
-					FontName[] var36 = new FontName[]{FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain12, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; // L: 2130
-					Client.fontsMap = var35.createMap(var36); // L: 2132
-					if (Client.fontsMap.size() < var1) { // L: 2133
-						Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 2134
-						Login.Login_loadingPercent = 40; // L: 2135
-					} else {
-						FriendLoginUpdate.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 2138
-						class6.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 2139
-						Login.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 2140
-						class54.platformInfo = Client.platformInfoProvider.get(); // L: 2141
-						Login.Login_loadingText = "Loaded fonts"; // L: 2142
-						Login.Login_loadingPercent = 40; // L: 2143
-						Client.titleLoadingStage = 60; // L: 2144
-					}
-				} else {
-					int var3;
-					int var4;
-					Archive var26;
-					if (Client.titleLoadingStage == 60) { // L: 2147
-						var26 = ChatChannel.archive10; // L: 2149
-						var27 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 2150
-						var3 = 0; // L: 2152
-						String[] var37 = Login.field885; // L: 2154
-
-						int var30;
-						String var31;
-						for (var30 = 0; var30 < var37.length; ++var30) { // L: 2155
-							var31 = var37[var30]; // L: 2156
-							if (var26.tryLoadFileByNames(var31, "")) { // L: 2158
-								++var3;
-							}
-						}
-
-						var37 = Login.field871; // L: 2163
-
-						for (var30 = 0; var30 < var37.length; ++var30) { // L: 2164
-							var31 = var37[var30]; // L: 2165
-							if (var27.tryLoadFileByNames(var31, "")) { // L: 2167
-								++var3;
-							}
-						}
-
-						var4 = ReflectionCheck.method1115(); // L: 2174
-						if (var3 < var4) { // L: 2175
-							Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var4 + "%"; // L: 2176
-							Login.Login_loadingPercent = 50; // L: 2177
-						} else {
-							Login.Login_loadingText = "Loaded title screen"; // L: 2180
-							Login.Login_loadingPercent = 50; // L: 2181
-							WorldMapData_1.updateGameState(5); // L: 2182
-							Client.titleLoadingStage = 70; // L: 2183
-						}
-					} else if (Client.titleLoadingStage == 70) { // L: 2186
-						if (!class1.archive2.isFullyLoaded()) { // L: 2187
-							Login.Login_loadingText = "Loading config - " + class1.archive2.loadPercent() + "%"; // L: 2188
-							Login.Login_loadingPercent = 60; // L: 2189
-						} else {
-							Archive var32 = class1.archive2; // L: 2192
-							FloorOverlayDefinition.FloorOverlayDefinition_archive = var32; // L: 2194
-							var26 = class1.archive2; // L: 2196
-							FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var26; // L: 2198
-							var27 = class1.archive2; // L: 2200
-							var28 = HorizontalAlignment.archive7; // L: 2201
-							KitDefinition.KitDefinition_archive = var27; // L: 2203
-							KitDefinition.KitDefinition_modelsArchive = var28; // L: 2204
-							class67.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 2205
-							var29 = class1.archive2; // L: 2207
-							Archive var5 = HorizontalAlignment.archive7; // L: 2208
-							boolean var6 = Client.isLowDetail; // L: 2209
-							ObjectComposition.ObjectDefinition_archive = var29; // L: 2211
-							ObjectComposition.ObjectDefinition_modelsArchive = var5; // L: 2212
-							ObjectComposition.ObjectDefinition_isLowDetail = var6; // L: 2213
-							Archive var7 = class1.archive2; // L: 2215
-							Archive var8 = HorizontalAlignment.archive7; // L: 2216
-							NPCComposition.NpcDefinition_archive = var7; // L: 2218
-							NPCComposition.NpcDefinition_modelArchive = var8; // L: 2219
-							class28.method405(class1.archive2); // L: 2221
-							Archive var9 = class1.archive2; // L: 2222
-							Archive var10 = HorizontalAlignment.archive7; // L: 2223
-							boolean var11 = Client.isMembersWorld; // L: 2224
-							Font var12 = FriendLoginUpdate.fontPlain11; // L: 2225
-							DirectByteArrayCopier.ItemDefinition_archive = var9; // L: 2227
-							HealthBarDefinition.ItemDefinition_modelArchive = var10; // L: 2228
-							BuddyRankComparator.ItemDefinition_inMembersWorld = var11; // L: 2229
-							class129.ItemDefinition_fileCount = DirectByteArrayCopier.ItemDefinition_archive.getGroupFileCount(10); // L: 2230
-							SoundSystem.ItemDefinition_fontPlain11 = var12; // L: 2231
-							Archive var13 = class1.archive2; // L: 2233
-							Archive var14 = InvDefinition.archive0; // L: 2234
-							Archive var15 = ApproximateRouteStrategy.archive1; // L: 2235
-							SequenceDefinition.SequenceDefinition_archive = var13; // L: 2237
-							SequenceDefinition.SequenceDefinition_animationsArchive = var14; // L: 2238
-							SequenceDefinition.SequenceDefinition_skeletonsArchive = var15; // L: 2239
-							Archive var16 = class1.archive2; // L: 2241
-							Archive var17 = HorizontalAlignment.archive7; // L: 2242
-							SpotAnimationDefinition.SpotAnimationDefinition_archive = var16; // L: 2244
-							class389.SpotAnimationDefinition_modelArchive = var17; // L: 2245
-							HealthBarUpdate.method2183(class1.archive2); // L: 2247
-							Players.method2327(class1.archive2); // L: 2248
-							class128.method2720(ParamComposition.archive3, HorizontalAlignment.archive7, GrandExchangeOfferOwnWorldComparator.archive8, LoginScreenAnimation.archive13); // L: 2249
-							Archive var18 = class1.archive2; // L: 2250
-							InvDefinition.InvDefinition_archive = var18; // L: 2252
-							UserComparator7.method2463(class1.archive2); // L: 2254
-							MouseRecorder.method2093(class1.archive2); // L: 2255
-							class28.method400(class1.archive2); // L: 2256
-							FileSystem.field1564 = new class387(RouteStrategy.field1986, 54, MouseHandler.clientLanguage, class1.archive2); // L: 2257
-							class240.HitSplatDefinition_cachedSprites = new class387(RouteStrategy.field1986, 47, MouseHandler.clientLanguage, class1.archive2); // L: 2258
-							Message.varcs = new Varcs(); // L: 2259
-							class20.method295(class1.archive2, GrandExchangeOfferOwnWorldComparator.archive8, LoginScreenAnimation.archive13); // L: 2260
-							Archive var19 = class1.archive2; // L: 2261
-							Archive var20 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 2262
-							HealthBarDefinition.HealthBarDefinition_archive = var19; // L: 2264
-							HealthBarDefinition.field1658 = var20; // L: 2265
-							Archive var21 = class1.archive2; // L: 2267
-							Archive var22 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 2268
-							WorldMapElement.WorldMapElement_archive = var22; // L: 2270
-							if (var21.isFullyLoaded()) { // L: 2271
-								WorldMapElement.WorldMapElement_count = var21.getGroupFileCount(35); // L: 2274
-								WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 2275
-
-								for (int var23 = 0; var23 < WorldMapElement.WorldMapElement_count; ++var23) { // L: 2276
-									byte[] var24 = var21.takeFile(35, var23); // L: 2277
-									WorldMapElement.WorldMapElement_cached[var23] = new WorldMapElement(var23); // L: 2278
-									if (var24 != null) { // L: 2279
-										WorldMapElement.WorldMapElement_cached[var23].decode(new Buffer(var24)); // L: 2280
-										WorldMapElement.WorldMapElement_cached[var23].method3008(); // L: 2281
-									}
-								}
-							}
-
-							Login.Login_loadingText = "Loaded config"; // L: 2285
-							Login.Login_loadingPercent = 60; // L: 2286
-							Client.titleLoadingStage = 80; // L: 2287
-						}
-					} else if (Client.titleLoadingStage == 80) { // L: 2290
-						var25 = 0; // L: 2291
-						if (class114.compass == null) { // L: 2292
-							class114.compass = WorldMapSection0.SpriteBuffer_getSprite(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.compass, 0);
-						} else {
-							++var25; // L: 2293
-						}
-
-						if (BoundaryObject.redHintArrowSprite == null) { // L: 2294
-							BoundaryObject.redHintArrowSprite = WorldMapSection0.SpriteBuffer_getSprite(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4008, 0);
-						} else {
-							++var25; // L: 2295
-						}
-
-						if (TriBool.mapSceneSprites == null) { // L: 2296
-							TriBool.mapSceneSprites = UserComparator5.method2478(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.mapScenes, 0);
-						} else {
-							++var25; // L: 2297
-						}
-
-						if (Client.headIconPkSprites == null) { // L: 2298
-							Client.headIconPkSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.headIconsPk, 0);
-						} else {
-							++var25; // L: 2299
-						}
-
-						if (ServerPacket.headIconPrayerSprites == null) { // L: 2300
-							ServerPacket.headIconPrayerSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4011, 0);
-						} else {
-							++var25; // L: 2301
-						}
-
-						if (DevicePcmPlayerProvider.headIconHintSprites == null) { // L: 2302
-							DevicePcmPlayerProvider.headIconHintSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4012, 0);
-						} else {
-							++var25; // L: 2303
-						}
-
-						if (WorldMapIcon_0.mapMarkerSprites == null) { // L: 2304
-							WorldMapIcon_0.mapMarkerSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4013, 0);
-						} else {
-							++var25; // L: 2305
-						}
-
-						if (UserComparator10.crossSprites == null) { // L: 2306
-							UserComparator10.crossSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4014, 0);
-						} else {
-							++var25; // L: 2307
-						}
-
-						if (class115.mapDotSprites == null) { // L: 2308
-							class115.mapDotSprites = class21.method312(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4010, 0);
-						} else {
-							++var25; // L: 2309
-						}
-
-						if (GameEngine.scrollBarSprites == null) { // L: 2310
-							GameEngine.scrollBarSprites = UserComparator5.method2478(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4018, 0);
-						} else {
-							++var25; // L: 2311
-						}
-
-						if (class7.modIconSprites == null) { // L: 2312
-							class7.modIconSprites = UserComparator5.method2478(GrandExchangeOfferOwnWorldComparator.archive8, class111.spriteIds.field4016, 0);
-						} else {
-							++var25; // L: 2313
-						}
-
-						if (var25 < 11) { // L: 2314
-							Login.Login_loadingText = "Loading sprites - " + var25 * 100 / 12 + "%"; // L: 2315
-							Login.Login_loadingPercent = 70; // L: 2316
-						} else {
-							AbstractFont.AbstractFont_modIconSprites = class7.modIconSprites; // L: 2319
-							BoundaryObject.redHintArrowSprite.normalize(); // L: 2320
-							var1 = (int)(Math.random() * 21.0D) - 10; // L: 2321
-							int var2 = (int)(Math.random() * 21.0D) - 10; // L: 2322
-							var3 = (int)(Math.random() * 21.0D) - 10; // L: 2323
-							var4 = (int)(Math.random() * 41.0D) - 20; // L: 2324
-							TriBool.mapSceneSprites[0].shiftColors(var1 + var4, var2 + var4, var4 + var3); // L: 2325
-							Login.Login_loadingText = "Loaded sprites"; // L: 2326
-							Login.Login_loadingPercent = 70; // L: 2327
-							Client.titleLoadingStage = 90; // L: 2328
-						}
-					} else if (Client.titleLoadingStage == 90) { // L: 2331
-						if (!SecureRandomFuture.archive9.isFullyLoaded()) { // L: 2332
-							Login.Login_loadingText = "Loading textures - " + "0%"; // L: 2333
-							Login.Login_loadingPercent = 90; // L: 2334
-						} else {
-							Varcs.textureProvider = new TextureProvider(SecureRandomFuture.archive9, GrandExchangeOfferOwnWorldComparator.archive8, 20, class408.clientPreferences.brightness, Client.isLowDetail ? 64 : 128); // L: 2337
-							Rasterizer3D.Rasterizer3D_setTextureLoader(Varcs.textureProvider); // L: 2338
-							Rasterizer3D.Rasterizer3D_setBrightness(class408.clientPreferences.brightness); // L: 2339
-							Client.titleLoadingStage = 100; // L: 2340
-						}
-					} else if (Client.titleLoadingStage == 100) { // L: 2343
-						var25 = Varcs.textureProvider.getLoadedPercentage(); // L: 2344
-						if (var25 < 100) { // L: 2345
-							Login.Login_loadingText = "Loading textures - " + var25 + "%"; // L: 2346
-							Login.Login_loadingPercent = 90; // L: 2347
-						} else {
-							Login.Login_loadingText = "Loaded textures"; // L: 2350
-							Login.Login_loadingPercent = 90; // L: 2351
-							Client.titleLoadingStage = 110; // L: 2352
-						}
-					} else if (Client.titleLoadingStage == 110) { // L: 2355
-						Interpreter.mouseRecorder = new MouseRecorder(); // L: 2356
-						GameEngine.taskHandler.newThreadTask(Interpreter.mouseRecorder, 10); // L: 2357
-						Login.Login_loadingText = "Loaded input handler"; // L: 2358
-						Login.Login_loadingPercent = 92; // L: 2359
-						Client.titleLoadingStage = 120; // L: 2360
-					} else if (Client.titleLoadingStage == 120) { // L: 2363
-						if (!ChatChannel.archive10.tryLoadFileByNames("huffman", "")) { // L: 2364
-							Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2365
-							Login.Login_loadingPercent = 94; // L: 2366
-						} else {
-							Huffman var0 = new Huffman(ChatChannel.archive10.takeFileByNames("huffman", "")); // L: 2369
-							ItemLayer.method4108(var0); // L: 2370
-							Login.Login_loadingText = "Loaded wordpack"; // L: 2371
-							Login.Login_loadingPercent = 94; // L: 2372
-							Client.titleLoadingStage = 130; // L: 2373
-						}
-					} else if (Client.titleLoadingStage == 130) { // L: 2376
-						if (!ParamComposition.archive3.isFullyLoaded()) { // L: 2377
-							Login.Login_loadingText = "Loading interfaces - " + ParamComposition.archive3.loadPercent() * 4 / 5 + "%"; // L: 2378
-							Login.Login_loadingPercent = 96; // L: 2379
-						} else if (!class14.archive12.isFullyLoaded()) { // L: 2382
-							Login.Login_loadingText = "Loading interfaces - " + (80 + class14.archive12.loadPercent() / 6) + "%"; // L: 2383
-							Login.Login_loadingPercent = 96; // L: 2384
-						} else if (!LoginScreenAnimation.archive13.isFullyLoaded()) { // L: 2387
-							Login.Login_loadingText = "Loading interfaces - " + (96 + LoginScreenAnimation.archive13.loadPercent() / 50) + "%"; // L: 2388
-							Login.Login_loadingPercent = 96; // L: 2389
-						} else {
-							Login.Login_loadingText = "Loaded interfaces"; // L: 2392
-							Login.Login_loadingPercent = 98; // L: 2393
-							Client.titleLoadingStage = 140; // L: 2394
-						}
-					} else if (Client.titleLoadingStage == 140) { // L: 2397
-						Login.Login_loadingPercent = 100; // L: 2398
-						if (!class111.archive19.tryLoadGroupByName(WorldMapCacheName.field2210.name)) { // L: 2399
-							Login.Login_loadingText = "Loading world map - " + class111.archive19.groupLoadPercentByName(WorldMapCacheName.field2210.name) / 10 + "%"; // L: 2400
-						} else {
-							if (class133.worldMap == null) { // L: 2403
-								class133.worldMap = new WorldMap(); // L: 2404
-								class133.worldMap.init(class111.archive19, Messages.archive18, GrandExchangeOfferOwnWorldComparator.archive20, Login.fontBold12, Client.fontsMap, TriBool.mapSceneSprites); // L: 2405
-							}
-
-							Login.Login_loadingText = "Loaded world map"; // L: 2407
-							Client.titleLoadingStage = 150; // L: 2408
-						}
-					} else if (Client.titleLoadingStage == 150) { // L: 2411
-						WorldMapData_1.updateGameState(10); // L: 2412
-					}
-				}
-			}
-		}
-	} // L: 2009 2015 2041 2068 2088 2119 2136 2145 2178 2184 2190 2288 2317 2329 2335 2341 2348 2353 2361 2367 2374 2380 2385 2390 2395 2401 2409 2413 2415
+	public static void method3118(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
+		class260.musicPlayerStatus = 1; // L: 32
+		class124.musicTrackArchive = var0; // L: 33
+		VarcInt.musicTrackGroupId = var1; // L: 34
+		class260.musicTrackFileId = var2; // L: 35
+		ChatChannel.musicTrackVolume = var3; // L: 36
+		DynamicObject.musicTrackBoolean = var4; // L: 37
+		class260.pcmSampleLength = 10000; // L: 38
+	} // L: 39
 }
diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java
index a46458f747..703dc59e96 100644
--- a/runescape-client/src/main/java/Node.java
+++ b/runescape-client/src/main/java/Node.java
@@ -3,26 +3,26 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ns")
+@ObfuscatedName("nw")
 @Implements("Node")
 public class Node {
-	@ObfuscatedName("ff")
+	@ObfuscatedName("fc")
 	@Export("key")
 	public long key;
-	@ObfuscatedName("fu")
+	@ObfuscatedName("fi")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("previous")
 	public Node previous;
-	@ObfuscatedName("fm")
+	@ObfuscatedName("fs")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("next")
 	public Node next;
 
-	@ObfuscatedName("ft")
+	@ObfuscatedName("fe")
 	@Export("remove")
 	public void remove() {
 		if (this.next != null) { // L: 9
@@ -33,7 +33,7 @@ public void remove() {
 		}
 	} // L: 14
 
-	@ObfuscatedName("fl")
+	@ObfuscatedName("fu")
 	@Export("hasNext")
 	public boolean hasNext() {
 		return this.next != null; // L: 17
diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java
index dbbd4457cc..a6721b9d47 100644
--- a/runescape-client/src/main/java/NodeDeque.java
+++ b/runescape-client/src/main/java/NodeDeque.java
@@ -3,18 +3,18 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kn")
+@ObfuscatedName("lh")
 @Implements("NodeDeque")
 public class NodeDeque {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("sentinel")
 	public Node sentinel;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("current")
 	Node current;
@@ -25,7 +25,7 @@ public NodeDeque() {
 		this.sentinel.next = this.sentinel; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("clear")
 	public void clear() {
 		while (true) {
@@ -39,9 +39,9 @@ public void clear() {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;)V"
+		descriptor = "(Lnw;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(Node var1) {
@@ -55,9 +55,9 @@ public void addFirst(Node var1) {
 		var1.previous.next = var1; // L: 28
 	} // L: 29
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;)V"
+		descriptor = "(Lnw;)V"
 	)
 	@Export("addLast")
 	public void addLast(Node var1) {
@@ -71,9 +71,9 @@ public void addLast(Node var1) {
 		var1.previous.next = var1; // L: 36
 	} // L: 37
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("removeLast")
 	public Node removeLast() {
@@ -86,9 +86,9 @@ public Node removeLast() {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("removeFirst")
 	public Node removeFirst() {
@@ -101,9 +101,9 @@ public Node removeFirst() {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("last")
 	public Node last() {
@@ -117,9 +117,9 @@ public Node last() {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("first")
 	public Node first() {
@@ -133,9 +133,9 @@ public Node first() {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("previous")
 	public Node previous() {
@@ -149,9 +149,9 @@ public Node previous() {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("next")
 	public Node next() {
@@ -165,9 +165,9 @@ public Node next() {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;Lns;)V"
+		descriptor = "(Lnw;Lnw;)V"
 	)
 	@Export("NodeDeque_addBefore")
 	public static void NodeDeque_addBefore(Node var0, Node var1) {
diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java
index 6f26583628..88aedca631 100644
--- a/runescape-client/src/main/java/NodeHashTable.java
+++ b/runescape-client/src/main/java/NodeHashTable.java
@@ -3,31 +3,31 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nq")
+@ObfuscatedName("on")
 @Implements("NodeHashTable")
 public final class NodeHashTable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("size")
 	int size;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "[Lns;"
+		descriptor = "[Lnw;"
 	)
 	@Export("buckets")
 	Node[] buckets;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("currentGet")
 	Node currentGet;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lns;"
+		descriptor = "Lnw;"
 	)
 	@Export("current")
 	Node current;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("index")
 	int index;
 
@@ -44,9 +44,9 @@ public NodeHashTable(int var1) {
 
 	} // L: 20
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(J)Lns;"
+		descriptor = "(J)Lnw;"
 	)
 	@Export("get")
 	public Node get(long var1) {
@@ -64,9 +64,9 @@ public Node get(long var1) {
 		return null; // L: 34
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;J)V"
+		descriptor = "(Lnw;J)V"
 	)
 	@Export("put")
 	public void put(Node var1, long var2) {
@@ -82,9 +82,9 @@ public void put(Node var1, long var2) {
 		var1.key = var2; // L: 44
 	} // L: 45
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("first")
 	public Node first() {
@@ -92,9 +92,9 @@ public Node first() {
 		return this.next(); // L: 49
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lns;"
+		descriptor = "()Lnw;"
 	)
 	@Export("next")
 	public Node next() {
diff --git a/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java b/runescape-client/src/main/java/OAuthTokens.java
similarity index 60%
rename from runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java
rename to runescape-client/src/main/java/OAuthTokens.java
index 83674ccf3a..ad0820e89f 100644
--- a/runescape-client/src/main/java/com/jagex/oldscape/pub/OAuthTokens.java
+++ b/runescape-client/src/main/java/OAuthTokens.java
@@ -1,8 +1,8 @@
-package com.jagex.oldscape.pub;
-
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedName;
 
 @Implements("OAuthTokens")
+@ObfuscatedName("com/jagex/oldscape/pub/OAuthTokens")
 public interface OAuthTokens {
 	void setOAuthTokens(String var1, String var2);
 }
diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java
index 5111222413..823bbc1bc4 100644
--- a/runescape-client/src/main/java/ObjectComposition.java
+++ b/runescape-client/src/main/java/ObjectComposition.java
@@ -4,266 +4,260 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fe")
+@ObfuscatedName("fm")
 @Implements("ObjectComposition")
 public class ObjectComposition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("ObjectDefinition_isLowDetail")
-	public static boolean ObjectDefinition_isLowDetail;
-	@ObfuscatedName("w")
+	static boolean ObjectDefinition_isLowDetail;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("ObjectDefinition_archive")
-	public static AbstractArchive ObjectDefinition_archive;
-	@ObfuscatedName("s")
+	static AbstractArchive ObjectDefinition_archive;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("ObjectDefinition_modelsArchive")
-	public static AbstractArchive ObjectDefinition_modelsArchive;
-	@ObfuscatedName("a")
+	static AbstractArchive ObjectDefinition_modelsArchive;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("ObjectDefinition_cached")
 	static EvictingDualNodeHashTable ObjectDefinition_cached;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("ObjectDefinition_cachedModelData")
 	public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("ObjectDefinition_cachedEntities")
 	static EvictingDualNodeHashTable ObjectDefinition_cachedEntities;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("ObjectDefinition_cachedModels")
 	static EvictingDualNodeHashTable ObjectDefinition_cachedModels;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "[Lgk;"
-	)
-	static ModelData[] field1829;
-	@ObfuscatedName("mm")
-	@ObfuscatedGetter(
-		intValue = 1556110033
+		descriptor = "[Lge;"
 	)
-	@Export("menuWidth")
-	static int menuWidth;
-	@ObfuscatedName("j")
+	static ModelData[] field1957;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 266284433
+		intValue = 1647057587
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("modelIds")
 	int[] modelIds;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("models")
 	int[] models;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("recolorFrom")
 	short[] recolorFrom;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("recolorTo")
 	short[] recolorTo;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("retextureFrom")
 	short[] retextureFrom;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("retextureTo")
 	short[] retextureTo;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -665807275
+		intValue = 1137467865
 	)
 	@Export("sizeX")
 	public int sizeX;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1733890263
+		intValue = -1768529089
 	)
 	@Export("sizeY")
 	public int sizeY;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 272562169
+		intValue = -1451649947
 	)
 	@Export("interactType")
 	public int interactType;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("boolean1")
 	public boolean boolean1;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1426026863
+		intValue = -1540011713
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -9261121
+		intValue = -265882401
 	)
 	@Export("clipType")
 	int clipType;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("nonFlatShading")
 	boolean nonFlatShading;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@Export("modelClipped")
 	public boolean modelClipped;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1497625237
+		intValue = 871756227
 	)
 	@Export("animationId")
 	public int animationId;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -596788999
+		intValue = -1086316431
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = -1818556987
+		intValue = -1455077273
 	)
 	@Export("ambient")
 	int ambient;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = -1437223427
+		intValue = -1294031067
 	)
 	@Export("contrast")
 	int contrast;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@Export("actions")
 	public String[] actions;
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 105622053
+		intValue = -448508509
 	)
 	@Export("mapIconId")
 	public int mapIconId;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = 1499014717
+		intValue = 2053056547
 	)
 	@Export("mapSceneId")
 	public int mapSceneId;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@Export("isRotated")
 	boolean isRotated;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@Export("clipped")
 	public boolean clipped;
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -1770929887
+		intValue = -769369891
 	)
 	@Export("modelSizeX")
 	int modelSizeX;
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = -525186249
+		intValue = -1944182615
 	)
 	@Export("modelHeight")
 	int modelHeight;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -353925583
+		intValue = 106475371
 	)
 	@Export("modelSizeY")
 	int modelSizeY;
 	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 604005373
+		intValue = -1795799807
 	)
 	@Export("offsetX")
 	int offsetX;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 891272171
+		intValue = -781177425
 	)
 	@Export("offsetHeight")
 	int offsetHeight;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = 1846835585
+		intValue = 786000943
 	)
 	@Export("offsetY")
 	int offsetY;
 	@ObfuscatedName("ar")
 	@Export("boolean2")
 	public boolean boolean2;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ag")
 	@Export("isSolid")
 	boolean isSolid;
-	@ObfuscatedName("an")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = 1647220279
+		intValue = -1807655607
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@Export("transforms")
 	public int[] transforms;
-	@ObfuscatedName("av")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 1979893859
+		intValue = -8791169
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -345965795
+		intValue = 1712452021
 	)
 	@Export("transformVarp")
 	int transformVarp;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = -19154525
+		intValue = -1791991343
 	)
 	@Export("ambientSoundId")
 	public int ambientSoundId;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 914150453
+		intValue = -112759563
 	)
 	@Export("int7")
 	public int int7;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = 1201364109
+		intValue = -1734862137
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = 1369348295
+		intValue = -536698059
 	)
 	@Export("int6")
 	public int int6;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ae")
 	@Export("soundEffectIds")
 	public int[] soundEffectIds;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ak")
 	@Export("boolean3")
 	public boolean boolean3;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Loz;"
 	)
 	@Export("params")
 	IterableNodeHashTable params;
@@ -274,7 +268,7 @@ public class ObjectComposition extends DualNode {
 		ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21
 		ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); // L: 22
 		ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 23
-		field1829 = new ModelData[4]; // L: 24
+		field1957 = new ModelData[4]; // L: 24
 	}
 
 	ObjectComposition() {
@@ -290,10 +284,10 @@ public class ObjectComposition extends DualNode {
 		this.animationId = -1; // L: 41
 		this.int2 = 16; // L: 42
 		this.ambient = 0; // L: 43
-		this.contrast = 0; // L: 44
-		this.actions = new String[5]; // L: 45
+		this.contrast = 0;
+		this.actions = new String[5];
 		this.mapIconId = -1; // L: 46
-		this.mapSceneId = -1; // L: 47
+		this.mapSceneId = -1;
 		this.isRotated = false; // L: 48
 		this.clipped = true; // L: 49
 		this.modelSizeX = 128; // L: 50
@@ -303,8 +297,8 @@ public class ObjectComposition extends DualNode {
 		this.offsetHeight = 0; // L: 54
 		this.offsetY = 0; // L: 55
 		this.boolean2 = false; // L: 56
-		this.isSolid = false; // L: 57
-		this.int3 = -1; // L: 58
+		this.isSolid = false;
+		this.int3 = -1;
 		this.transformVarbit = -1; // L: 60
 		this.transformVarp = -1; // L: 61
 		this.ambientSoundId = -1; // L: 62
@@ -314,648 +308,648 @@ public class ObjectComposition extends DualNode {
 		this.boolean3 = true; // L: 67
 	} // L: 70
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "2109950793"
+		garbageValue = "1045985975"
 	)
 	@Export("postDecode")
 	void postDecode() {
-		if (this.int1 == -1) { // L: 89
-			this.int1 = 0; // L: 90
-			if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 91
+		if (this.int1 == -1) { // L: 95
+			this.int1 = 0; // L: 96
+			if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 97
 				this.int1 = 1;
 			}
 
-			for (int var1 = 0; var1 < 5; ++var1) { // L: 92
+			for (int var1 = 0; var1 < 5; ++var1) { // L: 98
 				if (this.actions[var1] != null) {
 					this.int1 = 1;
 				}
 			}
 		}
 
-		if (this.int3 == -1) { // L: 94
+		if (this.int3 == -1) { // L: 100
 			this.int3 = this.interactType != 0 ? 1 : 0;
 		}
 
-	} // L: 95
+	} // L: 101
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1851511253"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "-51"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 99
-			if (var2 == 0) { // L: 100
-				return; // L: 103
+			int var2 = var1.readUnsignedByte(); // L: 105
+			if (var2 == 0) { // L: 106
+				return; // L: 109
 			}
 
-			this.decodeNext(var1, var2); // L: 101
+			this.decodeNext(var1, var2); // L: 107
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;IB)V",
-		garbageValue = "100"
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "1"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		int var3;
 		int var4;
-		if (var2 == 1) { // L: 106
-			var3 = var1.readUnsignedByte(); // L: 107
-			if (var3 > 0) { // L: 108
-				if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 109
-					var1.offset += var3 * 3; // L: 117
+		if (var2 == 1) { // L: 112
+			var3 = var1.readUnsignedByte(); // L: 113
+			if (var3 > 0) { // L: 114
+				if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 115
+					var1.offset += 3 * var3; // L: 123
 				} else {
-					this.models = new int[var3]; // L: 110
-					this.modelIds = new int[var3]; // L: 111
+					this.models = new int[var3]; // L: 116
+					this.modelIds = new int[var3]; // L: 117
 
-					for (var4 = 0; var4 < var3; ++var4) { // L: 112
-						this.modelIds[var4] = var1.readUnsignedShort(); // L: 113
-						this.models[var4] = var1.readUnsignedByte(); // L: 114
+					for (var4 = 0; var4 < var3; ++var4) { // L: 118
+						this.modelIds[var4] = var1.readUnsignedShort(); // L: 119
+						this.models[var4] = var1.readUnsignedByte(); // L: 120
 					}
 				}
 			}
-		} else if (var2 == 2) { // L: 120
+		} else if (var2 == 2) { // L: 126
 			this.name = var1.readStringCp1252NullTerminated();
-		} else if (var2 == 5) { // L: 121
-			var3 = var1.readUnsignedByte(); // L: 122
-			if (var3 > 0) { // L: 123
-				if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 124
-					var1.offset += 2 * var3; // L: 129
+		} else if (var2 == 5) { // L: 127
+			var3 = var1.readUnsignedByte(); // L: 128
+			if (var3 > 0) { // L: 129
+				if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 130
+					var1.offset += var3 * 2; // L: 135
 				} else {
-					this.models = null; // L: 125
-					this.modelIds = new int[var3]; // L: 126
+					this.models = null; // L: 131
+					this.modelIds = new int[var3]; // L: 132
 
-					for (var4 = 0; var4 < var3; ++var4) { // L: 127
+					for (var4 = 0; var4 < var3; ++var4) { // L: 133
 						this.modelIds[var4] = var1.readUnsignedShort();
 					}
 				}
 			}
-		} else if (var2 == 14) { // L: 132
+		} else if (var2 == 14) { // L: 138
 			this.sizeX = var1.readUnsignedByte();
-		} else if (var2 == 15) { // L: 133
+		} else if (var2 == 15) { // L: 139
 			this.sizeY = var1.readUnsignedByte();
-		} else if (var2 == 17) { // L: 134
-			this.interactType = 0; // L: 135
-			this.boolean1 = false; // L: 136
-		} else if (var2 == 18) { // L: 138
+		} else if (var2 == 17) { // L: 140
+			this.interactType = 0; // L: 141
+			this.boolean1 = false; // L: 142
+		} else if (var2 == 18) { // L: 144
 			this.boolean1 = false;
-		} else if (var2 == 19) { // L: 139
+		} else if (var2 == 19) { // L: 145
 			this.int1 = var1.readUnsignedByte();
-		} else if (var2 == 21) { // L: 140
+		} else if (var2 == 21) { // L: 146
 			this.clipType = 0;
-		} else if (var2 == 22) { // L: 141
+		} else if (var2 == 22) { // L: 147
 			this.nonFlatShading = true;
-		} else if (var2 == 23) { // L: 142
+		} else if (var2 == 23) { // L: 148
 			this.modelClipped = true;
-		} else if (var2 == 24) { // L: 143
-			this.animationId = var1.readUnsignedShort(); // L: 144
-			if (this.animationId == 65535) { // L: 145
+		} else if (var2 == 24) { // L: 149
+			this.animationId = var1.readUnsignedShort(); // L: 150
+			if (this.animationId == 65535) { // L: 151
 				this.animationId = -1;
 			}
-		} else if (var2 == 27) { // L: 147
+		} else if (var2 == 27) { // L: 153
 			this.interactType = 1;
-		} else if (var2 == 28) { // L: 148
+		} else if (var2 == 28) { // L: 154
 			this.int2 = var1.readUnsignedByte();
-		} else if (var2 == 29) { // L: 149
+		} else if (var2 == 29) { // L: 155
 			this.ambient = var1.readByte();
-		} else if (var2 == 39) { // L: 150
+		} else if (var2 == 39) { // L: 156
 			this.contrast = var1.readByte() * 25;
-		} else if (var2 >= 30 && var2 < 35) { // L: 151
-			this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 152
-			if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 153
+		} else if (var2 >= 30 && var2 < 35) { // L: 157
+			this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 158
+			if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 159
 				this.actions[var2 - 30] = null;
 			}
-		} else if (var2 == 40) { // L: 155
-			var3 = var1.readUnsignedByte(); // L: 156
-			this.recolorFrom = new short[var3]; // L: 157
-			this.recolorTo = new short[var3]; // L: 158
+		} else if (var2 == 40) { // L: 161
+			var3 = var1.readUnsignedByte(); // L: 162
+			this.recolorFrom = new short[var3]; // L: 163
+			this.recolorTo = new short[var3]; // L: 164
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 159
-				this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 160
-				this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 161
+			for (var4 = 0; var4 < var3; ++var4) { // L: 165
+				this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 166
+				this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 167
 			}
-		} else if (var2 == 41) { // L: 164
-			var3 = var1.readUnsignedByte(); // L: 165
-			this.retextureFrom = new short[var3]; // L: 166
-			this.retextureTo = new short[var3]; // L: 167
+		} else if (var2 == 41) { // L: 170
+			var3 = var1.readUnsignedByte(); // L: 171
+			this.retextureFrom = new short[var3]; // L: 172
+			this.retextureTo = new short[var3]; // L: 173
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 168
-				this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 169
-				this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 170
+			for (var4 = 0; var4 < var3; ++var4) { // L: 174
+				this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 175
+				this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 176
 			}
-		} else if (var2 == 61) { // L: 173
-			var1.readUnsignedShort(); // L: 174
-		} else if (var2 == 62) { // L: 176
+		} else if (var2 == 61) { // L: 179
+			var1.readUnsignedShort(); // L: 180
+		} else if (var2 == 62) { // L: 182
 			this.isRotated = true;
-		} else if (var2 == 64) { // L: 177
+		} else if (var2 == 64) { // L: 183
 			this.clipped = false;
-		} else if (var2 == 65) { // L: 178
+		} else if (var2 == 65) { // L: 184
 			this.modelSizeX = var1.readUnsignedShort();
-		} else if (var2 == 66) { // L: 179
+		} else if (var2 == 66) { // L: 185
 			this.modelHeight = var1.readUnsignedShort();
-		} else if (var2 == 67) { // L: 180
+		} else if (var2 == 67) { // L: 186
 			this.modelSizeY = var1.readUnsignedShort();
-		} else if (var2 == 68) { // L: 181
+		} else if (var2 == 68) { // L: 187
 			this.mapSceneId = var1.readUnsignedShort();
-		} else if (var2 == 69) { // L: 182
-			var1.readUnsignedByte(); // L: 183
-		} else if (var2 == 70) { // L: 185
+		} else if (var2 == 69) { // L: 188
+			var1.readUnsignedByte(); // L: 189
+		} else if (var2 == 70) { // L: 191
 			this.offsetX = var1.readShort();
-		} else if (var2 == 71) { // L: 186
+		} else if (var2 == 71) { // L: 192
 			this.offsetHeight = var1.readShort();
 		} else if (var2 == 72) {
-			this.offsetY = var1.readShort(); // L: 187
-		} else if (var2 == 73) { // L: 188
+			this.offsetY = var1.readShort(); // L: 193
+		} else if (var2 == 73) { // L: 194
 			this.boolean2 = true;
-		} else if (var2 == 74) { // L: 189
+		} else if (var2 == 74) { // L: 195
 			this.isSolid = true;
-		} else if (var2 == 75) { // L: 190
+		} else if (var2 == 75) { // L: 196
 			this.int3 = var1.readUnsignedByte();
-		} else if (var2 != 77 && var2 != 92) { // L: 191
-			if (var2 == 78) { // L: 209
-				this.ambientSoundId = var1.readUnsignedShort(); // L: 210
-				this.int7 = var1.readUnsignedByte(); // L: 211
-			} else if (var2 == 79) { // L: 213
-				this.int5 = var1.readUnsignedShort(); // L: 214
-				this.int6 = var1.readUnsignedShort(); // L: 215
-				this.int7 = var1.readUnsignedByte(); // L: 216
-				var3 = var1.readUnsignedByte(); // L: 217
-				this.soundEffectIds = new int[var3]; // L: 218
-
-				for (var4 = 0; var4 < var3; ++var4) { // L: 219
+		} else if (var2 != 77 && var2 != 92) { // L: 197
+			if (var2 == 78) { // L: 215
+				this.ambientSoundId = var1.readUnsignedShort(); // L: 216
+				this.int7 = var1.readUnsignedByte(); // L: 217
+			} else if (var2 == 79) { // L: 219
+				this.int5 = var1.readUnsignedShort(); // L: 220
+				this.int6 = var1.readUnsignedShort(); // L: 221
+				this.int7 = var1.readUnsignedByte(); // L: 222
+				var3 = var1.readUnsignedByte(); // L: 223
+				this.soundEffectIds = new int[var3]; // L: 224
+
+				for (var4 = 0; var4 < var3; ++var4) { // L: 225
 					this.soundEffectIds[var4] = var1.readUnsignedShort();
 				}
-			} else if (var2 == 81) { // L: 221
+			} else if (var2 == 81) { // L: 227
 				this.clipType = var1.readUnsignedByte() * 256;
-			} else if (var2 == 82) { // L: 222
+			} else if (var2 == 82) { // L: 228
 				this.mapIconId = var1.readUnsignedShort();
-			} else if (var2 == 89) { // L: 223
+			} else if (var2 == 89) { // L: 229
 				this.boolean3 = false;
-			} else if (var2 == 249) { // L: 224
-				this.params = class13.readStringIntParameters(var1, this.params);
+			} else if (var2 == 249) { // L: 230
+				this.params = Canvas.readStringIntParameters(var1, this.params);
 			}
 		} else {
-			this.transformVarbit = var1.readUnsignedShort(); // L: 192
-			if (this.transformVarbit == 65535) { // L: 193
+			this.transformVarbit = var1.readUnsignedShort(); // L: 198
+			if (this.transformVarbit == 65535) { // L: 199
 				this.transformVarbit = -1;
 			}
 
-			this.transformVarp = var1.readUnsignedShort(); // L: 194
-			if (this.transformVarp == 65535) { // L: 195
+			this.transformVarp = var1.readUnsignedShort(); // L: 200
+			if (this.transformVarp == 65535) { // L: 201
 				this.transformVarp = -1;
 			}
 
-			var3 = -1; // L: 196
-			if (var2 == 92) { // L: 197
-				var3 = var1.readUnsignedShort(); // L: 198
-				if (var3 == 65535) { // L: 199
+			var3 = -1; // L: 202
+			if (var2 == 92) { // L: 203
+				var3 = var1.readUnsignedShort(); // L: 204
+				if (var3 == 65535) { // L: 205
 					var3 = -1;
 				}
 			}
 
-			var4 = var1.readUnsignedByte(); // L: 201
-			this.transforms = new int[var4 + 2]; // L: 202
+			var4 = var1.readUnsignedByte(); // L: 207
+			this.transforms = new int[var4 + 2]; // L: 208
 
-			for (int var5 = 0; var5 <= var4; ++var5) { // L: 203
-				this.transforms[var5] = var1.readUnsignedShort(); // L: 204
-				if (this.transforms[var5] == 65535) { // L: 205
+			for (int var5 = 0; var5 <= var4; ++var5) { // L: 209
+				this.transforms[var5] = var1.readUnsignedShort(); // L: 210
+				if (this.transforms[var5] == 65535) { // L: 211
 					this.transforms[var5] = -1;
 				}
 			}
 
-			this.transforms[var4 + 1] = var3; // L: 207
+			this.transforms[var4 + 1] = var3; // L: 213
 		}
 
-	} // L: 226
+	} // L: 232
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-1619407121"
+		garbageValue = "-2022345468"
 	)
-	public final boolean method3305(int var1) {
-		if (this.models != null) { // L: 229
-			for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 239
-				if (this.models[var4] == var1) { // L: 240
+	public final boolean method3491(int var1) {
+		if (this.models != null) { // L: 235
+			for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 245
+				if (this.models[var4] == var1) { // L: 246
 					return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0);
 				}
 			}
 
-			return true; // L: 242
-		} else if (this.modelIds == null) { // L: 230
+			return true; // L: 248
+		} else if (this.modelIds == null) { // L: 236
 			return true;
-		} else if (var1 != 10) { // L: 231
+		} else if (var1 != 10) { // L: 237
 			return true;
 		} else {
-			boolean var2 = true; // L: 232
+			boolean var2 = true; // L: 238
 
-			for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 233
-				var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 234
+			for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 239
+				var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 240
 			}
 
-			return var2; // L: 236
+			return var2; // L: 242
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1274687843"
+		garbageValue = "1003661774"
 	)
 	@Export("needsModelFiles")
 	public final boolean needsModelFiles() {
-		if (this.modelIds == null) { // L: 247
+		if (this.modelIds == null) { // L: 253
 			return true;
 		} else {
-			boolean var1 = true; // L: 248
+			boolean var1 = true; // L: 254
 
-			for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 249
-				var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 250
+			for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 255
+				var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 256
 			}
 
-			return var1; // L: 252
+			return var1; // L: 258
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(II[[IIIIB)Lhj;",
-		garbageValue = "27"
+		descriptor = "(II[[IIIII)Lgt;",
+		garbageValue = "-1175131908"
 	)
 	@Export("getEntity")
 	public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
 		long var7;
-		if (this.models == null) { // L: 257
+		if (this.models == null) { // L: 263
 			var7 = (long)(var2 + (this.id << 10));
 		} else {
-			var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 258
+			var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 264
 		}
 
-		Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 259
-		if (var9 == null) { // L: 260
-			ModelData var10 = this.getModelData(var1, var2); // L: 261
-			if (var10 == null) { // L: 262
+		Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 265
+		if (var9 == null) { // L: 266
+			ModelData var10 = this.getModelData(var1, var2); // L: 267
+			if (var10 == null) { // L: 268
 				return null;
 			}
 
-			if (!this.nonFlatShading) { // L: 263
+			if (!this.nonFlatShading) { // L: 269
 				var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
 			} else {
-				var10.ambient = (short)(this.ambient + 64); // L: 265
-				var10.contrast = (short)(this.contrast + 768); // L: 266
-				var10.calculateVertexNormals(); // L: 267
-				var9 = var10; // L: 268
+				var10.ambient = (short)(this.ambient + 64); // L: 271
+				var10.contrast = (short)(this.contrast + 768); // L: 272
+				var10.calculateVertexNormals(); // L: 273
+				var9 = var10; // L: 274
 			}
 
-			ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 270
+			ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 276
 		}
 
-		if (this.nonFlatShading) { // L: 272
-			var9 = ((ModelData)var9).method4115(); // L: 273
+		if (this.nonFlatShading) { // L: 278
+			var9 = ((ModelData)var9).method3751(); // L: 279
 		}
 
-		if (this.clipType >= 0) { // L: 275
-			if (var9 instanceof Model) { // L: 276
+		if (this.clipType >= 0) { // L: 281
+			if (var9 instanceof Model) { // L: 282
 				var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType);
 			} else if (var9 instanceof ModelData) {
-				var9 = ((ModelData)var9).method4135(var3, var4, var5, var6, true, this.clipType); // L: 277
+				var9 = ((ModelData)var9).method3752(var3, var4, var5, var6, true, this.clipType); // L: 283
 			}
 		}
 
-		return (Renderable)var9; // L: 279
+		return (Renderable)var9; // L: 285
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(II[[IIIIB)Lhl;",
-		garbageValue = "66"
+		descriptor = "(II[[IIIII)Lgo;",
+		garbageValue = "-1632487468"
 	)
 	@Export("getModel")
 	public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
 		long var7;
-		if (this.models == null) { // L: 284
+		if (this.models == null) { // L: 290
 			var7 = (long)(var2 + (this.id << 10));
 		} else {
-			var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 285
+			var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 291
 		}
 
-		Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 286
-		if (var9 == null) { // L: 287
-			ModelData var10 = this.getModelData(var1, var2); // L: 288
-			if (var10 == null) { // L: 289
+		Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 292
+		if (var9 == null) { // L: 293
+			ModelData var10 = this.getModelData(var1, var2); // L: 294
+			if (var10 == null) { // L: 295
 				return null;
 			}
 
-			var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 290
-			ObjectDefinition_cachedModels.put(var9, var7); // L: 291
+			var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 296
+			ObjectDefinition_cachedModels.put(var9, var7); // L: 297
 		}
 
 		if (this.clipType >= 0) {
-			var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 293
+			var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 299
 		}
 
-		return var9; // L: 294
+		return var9; // L: 300
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(II[[IIIILfm;IB)Lhl;",
-		garbageValue = "-55"
+		descriptor = "(II[[IIIILgn;IB)Lgo;",
+		garbageValue = "7"
 	)
 	@Export("getModelDynamic")
 	public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) {
 		long var9;
-		if (this.models == null) { // L: 299
+		if (this.models == null) { // L: 305
 			var9 = (long)(var2 + (this.id << 10));
 		} else {
-			var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 300
+			var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 306
 		}
 
-		Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 301
-		if (var11 == null) { // L: 302
-			ModelData var12 = this.getModelData(var1, var2); // L: 303
-			if (var12 == null) { // L: 304
+		Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 307
+		if (var11 == null) { // L: 308
+			ModelData var12 = this.getModelData(var1, var2); // L: 309
+			if (var12 == null) { // L: 310
 				return null;
 			}
 
-			var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 305
-			ObjectDefinition_cachedModels.put(var11, var9); // L: 306
+			var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 311
+			ObjectDefinition_cachedModels.put(var11, var9); // L: 312
 		}
 
-		if (var7 == null && this.clipType == -1) { // L: 308
+		if (var7 == null && this.clipType == -1) { // L: 314
 			return var11;
 		} else {
-			if (var7 != null) { // L: 309
-				var11 = var7.transformObjectModel(var11, var8, var2);
+			if (var7 != null) { // L: 315
+				var11 = var7.transformObjectModel(var11, var8, var2); // L: 316
 			} else {
-				var11 = var11.toSharedSequenceModel(true); // L: 310
+				var11 = var11.toSharedSequenceModel(true); // L: 318
 			}
 
-			if (this.clipType >= 0) { // L: 311
+			if (this.clipType >= 0) { // L: 319
 				var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType);
 			}
 
-			return var11; // L: 312
+			return var11; // L: 320
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lgk;",
-		garbageValue = "1425580449"
+		descriptor = "(IIB)Lge;",
+		garbageValue = "-32"
 	)
 	@Export("getModelData")
 	final ModelData getModelData(int var1, int var2) {
-		ModelData var3 = null; // L: 316
+		ModelData var3 = null; // L: 324
 		boolean var4;
 		int var5;
 		int var7;
-		if (this.models == null) { // L: 317
-			if (var1 != 10) { // L: 318
+		if (this.models == null) { // L: 325
+			if (var1 != 10) { // L: 326
 				return null;
 			}
 
-			if (this.modelIds == null) { // L: 319
+			if (this.modelIds == null) { // L: 327
 				return null;
 			}
 
-			var4 = this.isRotated; // L: 320
-			if (var1 == 2 && var2 > 3) { // L: 321
+			var4 = this.isRotated; // L: 328
+			if (var1 == 2 && var2 > 3) { // L: 329
 				var4 = !var4;
 			}
 
-			var5 = this.modelIds.length; // L: 322
+			var5 = this.modelIds.length; // L: 330
 
-			for (int var6 = 0; var6 < var5; ++var6) { // L: 323
-				var7 = this.modelIds[var6]; // L: 324
-				if (var4) { // L: 325
+			for (int var6 = 0; var6 < var5; ++var6) { // L: 331
+				var7 = this.modelIds[var6]; // L: 332
+				if (var4) { // L: 333
 					var7 += 65536;
 				}
 
-				var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 326
-				if (var3 == null) { // L: 327
-					var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 328
-					if (var3 == null) { // L: 329
+				var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 334
+				if (var3 == null) { // L: 335
+					var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 336
+					if (var3 == null) { // L: 337
 						return null;
 					}
 
-					if (var4) { // L: 330
-						var3.method4125();
+					if (var4) { // L: 338
+						var3.method3761();
 					}
 
-					ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 331
+					ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 339
 				}
 
-				if (var5 > 1) { // L: 333
-					field1829[var6] = var3;
+				if (var5 > 1) { // L: 341
+					field1957[var6] = var3;
 				}
 			}
 
-			if (var5 > 1) { // L: 335
-				var3 = new ModelData(field1829, var5);
+			if (var5 > 1) { // L: 343
+				var3 = new ModelData(field1957, var5);
 			}
 		} else {
-			int var9 = -1; // L: 338
+			int var9 = -1; // L: 346
 
-			for (var5 = 0; var5 < this.models.length; ++var5) { // L: 339
-				if (this.models[var5] == var1) { // L: 340
-					var9 = var5; // L: 341
+			for (var5 = 0; var5 < this.models.length; ++var5) { // L: 347
+				if (this.models[var5] == var1) { // L: 348
+					var9 = var5; // L: 349
 					break;
 				}
 			}
 
-			if (var9 == -1) { // L: 345
+			if (var9 == -1) { // L: 353
 				return null;
 			}
 
-			var5 = this.modelIds[var9]; // L: 346
-			boolean var10 = this.isRotated ^ var2 > 3; // L: 347
-			if (var10) { // L: 348
+			var5 = this.modelIds[var9]; // L: 354
+			boolean var10 = this.isRotated ^ var2 > 3; // L: 355
+			if (var10) { // L: 356
 				var5 += 65536;
 			}
 
-			var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 349
-			if (var3 == null) { // L: 350
-				var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 351
-				if (var3 == null) { // L: 352
+			var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 357
+			if (var3 == null) { // L: 358
+				var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 359
+				if (var3 == null) { // L: 360
 					return null;
 				}
 
-				if (var10) { // L: 353
-					var3.method4125();
+				if (var10) { // L: 361
+					var3.method3761();
 				}
 
-				ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 354
+				ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 362
 			}
 		}
 
-		if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 358
-			var4 = false; // L: 359
+		if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 366
+			var4 = false; // L: 367
 		} else {
 			var4 = true;
 		}
 
 		boolean var11;
-		if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 361
-			var11 = false; // L: 362
+		if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 369
+			var11 = false; // L: 370
 		} else {
 			var11 = true;
 		}
 
-		ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); // L: 363
-		if (var1 == 4 && var2 > 3) { // L: 364
-			var8.method4111(256); // L: 365
-			var8.changeOffset(45, 0, -45); // L: 366
+		ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); // L: 371
+		if (var1 == 4 && var2 > 3) { // L: 372
+			var8.method3757(256); // L: 373
+			var8.changeOffset(45, 0, -45); // L: 374
 		}
 
-		var2 &= 3; // L: 368
-		if (var2 == 1) { // L: 369
-			var8.method4158();
-		} else if (var2 == 2) { // L: 370
-			var8.method4119();
-		} else if (var2 == 3) { // L: 371
-			var8.method4120();
+		var2 &= 3; // L: 376
+		if (var2 == 1) { // L: 377
+			var8.method3754();
+		} else if (var2 == 2) { // L: 378
+			var8.method3755();
+		} else if (var2 == 3) { // L: 379
+			var8.method3756();
 		}
 
-		if (this.recolorFrom != null) { // L: 372
-			for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 373
-				var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 374
+		if (this.recolorFrom != null) { // L: 380
+			for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 381
+				var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 382
 			}
 		}
 
-		if (this.retextureFrom != null) { // L: 377
-			for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 378
-				var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 379
+		if (this.retextureFrom != null) { // L: 385
+			for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 386
+				var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 387
 			}
 		}
 
-		if (var4) { // L: 382
+		if (var4) { // L: 390
 			var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY);
 		}
 
-		if (var11) { // L: 383
+		if (var11) { // L: 391
 			var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY);
 		}
 
-		return var8; // L: 384
+		return var8; // L: 392
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lfe;",
-		garbageValue = "13"
+		descriptor = "(I)Lfm;",
+		garbageValue = "-378569192"
 	)
 	@Export("transform")
 	public final ObjectComposition transform() {
-		int var1 = -1; // L: 388
-		if (this.transformVarbit != -1) { // L: 389
-			var1 = class119.getVarbit(this.transformVarbit);
-		} else if (this.transformVarp != -1) { // L: 390
+		int var1 = -1; // L: 396
+		if (this.transformVarbit != -1) { // L: 397
+			var1 = class273.getVarbit(this.transformVarbit);
+		} else if (this.transformVarp != -1) { // L: 398
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
 
 		int var2;
-		if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 392
-			var2 = this.transforms[var1]; // L: 393
+		if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 400
+			var2 = this.transforms[var1]; // L: 401
 		} else {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? KitDefinition.getObjectDefinition(var2) : null; // L: 394 395
+		return var2 != -1 ? class148.getObjectDefinition(var2) : null; // L: 402 403
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "778921669"
+		garbageValue = "-1420661129"
 	)
 	@Export("getIntParam")
 	public int getIntParam(int var1, int var2) {
-		return NPC.method2251(this.params, var1, var2); // L: 399
+		return class12.method158(this.params, var1, var2); // L: 407
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;S)Ljava/lang/String;",
-		garbageValue = "-26105"
+		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "1906647468"
 	)
 	@Export("getStringParam")
 	public String getStringParam(int var1, String var2) {
-		return VarbitComposition.method3205(this.params, var1, var2); // L: 403
+		return Skeleton.method3948(this.params, var1, var2); // L: 411
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1495997544"
+		garbageValue = "869604786"
 	)
 	@Export("hasSound")
 	public boolean hasSound() {
-		if (this.transforms == null) { // L: 414
+		if (this.transforms == null) { // L: 422
 			return this.ambientSoundId != -1 || this.soundEffectIds != null;
 		} else {
-			for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 415
-				if (this.transforms[var1] != -1) { // L: 416
-					ObjectComposition var2 = KitDefinition.getObjectDefinition(this.transforms[var1]); // L: 417
-					if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 418
+			for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 423
+				if (this.transforms[var1] != -1) { // L: 424
+					ObjectComposition var2 = class148.getObjectDefinition(this.transforms[var1]); // L: 425
+					if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 426
 						return true;
 					}
 				}
 			}
 
-			return false; // L: 421
+			return false; // L: 429
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(CS)Z",
-		garbageValue = "18256"
+		descriptor = "(I)V",
+		garbageValue = "109672406"
 	)
-	@Export("isAlphaNumeric")
-	public static boolean isAlphaNumeric(char var0) {
-		return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 162
-	}
+	static void method3540() {
+		for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 44
+			if (var0.obj != null) { // L: 45
+				var0.set();
+			}
+		}
+
+	} // L: 47
 
-	@ObfuscatedName("jz")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;Lff;IIZI)V",
-		garbageValue = "-1079376005"
-	)
-	@Export("addWidgetItemMenuItem")
-	static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) {
-		String[] var5 = var1.inventoryActions; // L: 10448
-		byte var6 = -1; // L: 10449
-		String var7 = null; // L: 10450
-		if (var5 != null && var5[var3] != null) { // L: 10451
-			if (var3 == 0) { // L: 10452
-				var6 = 33;
-			} else if (var3 == 1) { // L: 10453
-				var6 = 34;
-			} else if (var3 == 2) {
-				var6 = 35; // L: 10454
-			} else if (var3 == 3) { // L: 10455
-				var6 = 36;
-			} else {
-				var6 = 37; // L: 10456
-			}
+		descriptor = "(I)V",
+		garbageValue = "768656808"
+	)
+	public static void method3542() {
+		StructComposition.StructDefinition_cached.clear(); // L: 57
+	} // L: 58
 
-			var7 = var5[var3]; // L: 10457
-		} else if (var3 == 4) { // L: 10460
-			var6 = 37; // L: 10461
-			var7 = "Drop"; // L: 10462
+	@ObfuscatedName("lt")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;II)V",
+		garbageValue = "1543317182"
+	)
+	static void method3541(Buffer var0, int var1) {
+		byte[] var2 = var0.array; // L: 12644
+		if (Client.randomDatData == null) { // L: 12646
+			Client.randomDatData = new byte[24];
 		}
 
-		if (var6 != -1 && var7 != null) { // L: 10465
-			ModelData0.insertMenuItem(var7, MouseHandler.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10466
+		class333.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 12647
+		if (JagexCache.JagexCache_randomDat != null) { // L: 12650
+			try {
+				JagexCache.JagexCache_randomDat.seek(0L); // L: 12652
+				JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 12653
+			} catch (Exception var4) { // L: 12655
+			}
 		}
 
-	} // L: 10468
+	} // L: 12658
 }
diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java
index bb83f679cc..53832a483e 100644
--- a/runescape-client/src/main/java/ObjectNode.java
+++ b/runescape-client/src/main/java/ObjectNode.java
@@ -2,10 +2,10 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("nh")
+@ObfuscatedName("nx")
 @Implements("ObjectNode")
 public class ObjectNode extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("obj")
 	public final Object obj;
 
diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java
index 38ee035557..66af5e1da4 100644
--- a/runescape-client/src/main/java/ObjectSound.java
+++ b/runescape-client/src/main/java/ObjectSound.java
@@ -1,96 +1,98 @@
-import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.Reflection;
 
-@ObfuscatedName("br")
+@ObfuscatedName("bz")
 @Implements("ObjectSound")
 public final class ObjectSound extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("objectSounds")
 	static NodeDeque objectSounds;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1369151761
+		intValue = -1128926491
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -820509613
-	)
-	int field767;
-	@ObfuscatedName("a")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 933801989
+		intValue = -655443333
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -215846053
+		intValue = 1430356399
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 171593
+		intValue = 1572120169
 	)
 	@Export("maxX")
 	int maxX;
-	@ObfuscatedName("e")
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -1560179665
+	)
+	int field796;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -269879271
+		intValue = -1764781377
 	)
 	@Export("maxY")
 	int maxY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1161490471
+		intValue = 947571377
 	)
-	int field773;
-	@ObfuscatedName("j")
+	int field793;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -588798073
+		intValue = 209394291
 	)
 	@Export("soundEffectId")
 	int soundEffectId;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "Lfm;"
+	)
+	@Export("obj")
+	ObjectComposition obj;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lax;"
+		descriptor = "Lat;"
 	)
 	@Export("stream1")
 	RawPcmStream stream1;
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -418020261
+		intValue = 739694569
 	)
-	int field776;
-	@ObfuscatedName("y")
+	int field797;
+	@ObfuscatedName("d")
 	@Export("soundEffectIds")
 	int[] soundEffectIds;
-	@ObfuscatedName("k")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -668144329
+		intValue = -785584779
 	)
-	int field779;
-	@ObfuscatedName("t")
+	int field789;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lax;"
+		descriptor = "Lat;"
 	)
 	@Export("stream2")
 	RawPcmStream stream2;
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Lfe;"
-	)
-	@Export("obj")
-	ObjectComposition obj;
 
 	static {
 		objectSounds = new NodeDeque(); // L: 11
@@ -99,281 +101,169 @@ public final class ObjectSound extends Node {
 	ObjectSound() {
 	} // L: 27
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1086941780"
+		descriptor = "(B)V",
+		garbageValue = "20"
 	)
 	@Export("set")
 	void set() {
-		int var1 = this.soundEffectId;
-		ObjectComposition var2 = this.obj.transform();
-		if (var2 != null) {
-			this.soundEffectId = var2.ambientSoundId; // L: 39
-			this.field773 = var2.int7 * 128; // L: 40
-			this.field767 = var2.int5;
-			this.field776 = var2.int6;
-			this.soundEffectIds = var2.soundEffectIds;
+		int var1 = this.soundEffectId; // L: 50
+		ObjectComposition var2 = this.obj.transform(); // L: 51
+		if (var2 != null) { // L: 52
+			this.soundEffectId = var2.ambientSoundId; // L: 53
+			this.field793 = var2.int7 * 128; // L: 54
+			this.field796 = var2.int5; // L: 55
+			this.field797 = var2.int6; // L: 56
+			this.soundEffectIds = var2.soundEffectIds; // L: 57
 		} else {
-			this.soundEffectId = -1;
-			this.field773 = 0;
-			this.field767 = 0;
-			this.field776 = 0;
-			this.soundEffectIds = null;
+			this.soundEffectId = -1; // L: 60
+			this.field793 = 0; // L: 61
+			this.field796 = 0; // L: 62
+			this.field797 = 0; // L: 63
+			this.soundEffectIds = null; // L: 64
 		}
 
-		if (var1 != this.soundEffectId && this.stream1 != null) {
-			BuddyRankComparator.pcmStreamMixer.removeSubStream(this.stream1);
-			this.stream1 = null;
+		if (var1 != this.soundEffectId && this.stream1 != null) { // L: 66
+			class281.pcmStreamMixer.removeSubStream(this.stream1); // L: 67
+			this.stream1 = null; // L: 68
 		}
 
-	}
+	} // L: 70
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lfd;",
-		garbageValue = "1754222612"
+		descriptor = "(Lku;Lku;B)V",
+		garbageValue = "-45"
 	)
-	public static HealthBarDefinition method1772(int var0) {
-		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 32
-		if (var1 != null) { // L: 33
-			return var1;
-		} else {
-			byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 34
-			var1 = new HealthBarDefinition(); // L: 35
-			if (var2 != null) { // L: 36
-				var1.decode(new Buffer(var2));
-			}
-
-			HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 37
-			return var1;
-		}
-	}
+	public static void method1803(AbstractArchive var0, AbstractArchive var1) {
+		GrandExchangeOfferAgeComparator.HealthBarDefinition_archive = var0; // L: 32
+		HealthBarDefinition.field1802 = var1; // L: 33
+	} // L: 34
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)Lbp;",
-		garbageValue = "1477696022"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-88245414"
 	)
-	@Export("getWorldMapScript")
-	static Script getWorldMapScript(int var0, int var1, int var2) {
-		int var3 = LoginScreenAnimation.method2220(var1, var0); // L: 38
-		Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 41
-		Script var4;
-		if (var5 != null) { // L: 42
-			var4 = var5; // L: 43
-		} else {
-			String var6 = String.valueOf(var3); // L: 46
-			int var7 = class14.archive12.getGroupId(var6); // L: 47
-			if (var7 == -1) {
-				var4 = null;
-			} else {
-				label59: {
-					byte[] var8 = class14.archive12.takeFileFlat(var7); // L: 52
-					if (var8 != null) { // L: 53
-						if (var8.length <= 1) { // L: 54
-							var4 = null; // L: 55
-							break label59; // L: 56
+	@Export("readReflectionCheck")
+	public static void readReflectionCheck(Buffer var0, int var1) {
+		ReflectionCheck var2 = new ReflectionCheck(); // L: 123
+		var2.size = var0.readUnsignedByte(); // L: 124
+		var2.id = var0.readInt(); // L: 125
+		var2.operations = new int[var2.size]; // L: 126
+		var2.creationErrors = new int[var2.size]; // L: 127
+		var2.fields = new Field[var2.size]; // L: 128
+		var2.intReplaceValues = new int[var2.size]; // L: 129
+		var2.methods = new Method[var2.size]; // L: 130
+		var2.arguments = new byte[var2.size][][]; // L: 131
+
+		for (int var3 = 0; var3 < var2.size; ++var3) { // L: 132
+			try {
+				int var4 = var0.readUnsignedByte(); // L: 134
+				String var5;
+				String var6;
+				int var7;
+				if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 135
+					if (var4 == 3 || var4 == 4) { // L: 145
+						var5 = var0.readStringCp1252NullTerminated(); // L: 146
+						var6 = var0.readStringCp1252NullTerminated(); // L: 147
+						var7 = var0.readUnsignedByte(); // L: 148
+						String[] var8 = new String[var7]; // L: 149
+
+						for (int var9 = 0; var9 < var7; ++var9) { // L: 150
+							var8[var9] = var0.readStringCp1252NullTerminated();
 						}
 
-						var5 = class87.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
+						String var20 = var0.readStringCp1252NullTerminated(); // L: 151
+						byte[][] var10 = new byte[var7][]; // L: 152
+						int var12;
+						if (var4 == 3) { // L: 153
+							for (int var11 = 0; var11 < var7; ++var11) { // L: 154
+								var12 = var0.readInt(); // L: 155
+								var10[var11] = new byte[var12]; // L: 156
+								var0.readBytes(var10[var11], 0, var12); // L: 157
+							}
 						}
-					}
 
-					var4 = null; // L: 65
-				}
-			}
-		}
-
-		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);
-				int var10 = class14.archive12.getGroupId(var9);
-				if (var10 == -1) {
-					var13 = null;
-				} else {
-					byte[] var11 = class14.archive12.takeFileFlat(var10);
-					if (var11 != null) { // L: 90
-						if (var11.length <= 1) {
-							var13 = null;
-							return var13 != null ? var13 : null; // L: 108
-						}
+						var2.operations[var3] = var4; // L: 160
+						Class[] var21 = new Class[var7]; // L: 161
 
-						var14 = class87.newScript(var11);
-						if (var14 != null) {
-							Script.Script_cached.put(var14, (long)(var12 << 16));
-							var13 = var14; // L: 98
-							return var13 != null ? var13 : null;
+						for (var12 = 0; var12 < var7; ++var12) { // L: 162
+							var21[var12] = class4.loadClassFromDescriptor(var8[var12]);
 						}
-					}
-
-					var13 = null;
-				}
-			}
-
-			return var13 != null ? var13 : null;
-		}
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "([Lbw;II[I[II)V",
-		garbageValue = "1465012672"
-	)
-	@Export("sortWorlds")
-	static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
-		if (var1 < var2) { // L: 81
-			int var5 = var1 - 1; // L: 82
-			int var6 = var2 + 1; // L: 83
-			int var7 = (var2 + var1) / 2; // L: 84
-			World var8 = var0[var7]; // L: 85
-			var0[var7] = var0[var1]; // L: 86
-			var0[var1] = var8; // L: 87
 
-			while (var5 < var6) { // L: 88
-				boolean var9 = true; // L: 89
-
-				int var10;
-				int var11;
-				int var12;
-				do {
-					--var6; // L: 91
-
-					for (var10 = 0; var10 < 4; ++var10) { // L: 92
-						if (var3[var10] == 2) { // L: 95
-							var11 = var0[var6].index; // L: 96
-							var12 = var8.index; // L: 97
-						} else if (var3[var10] == 1) { // L: 99
-							var11 = var0[var6].population; // L: 100
-							var12 = var8.population; // L: 101
-							if (var11 == -1 && var4[var10] == 1) { // L: 102
-								var11 = 2001;
-							}
-
-							if (var12 == -1 && var4[var10] == 1) { // L: 103
-								var12 = 2001;
-							}
-						} else if (var3[var10] == 3) { // L: 105
-							var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106
-							var12 = var8.isMembersOnly() ? 1 : 0; // L: 107
-						} else {
-							var11 = var0[var6].id; // L: 110
-							var12 = var8.id; // L: 111
+						Class var22 = class4.loadClassFromDescriptor(var20); // L: 163
+						if (class4.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 164
+							throw new SecurityException();
 						}
 
-						if (var11 != var12) { // L: 113
-							if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117
-								var9 = false; // L: 119
+						Method[] var13 = class4.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 165
+						Method[] var14 = var13; // L: 167
+
+						for (int var15 = 0; var15 < var14.length; ++var15) { // L: 168
+							Method var16 = var14[var15]; // L: 169
+							if (Reflection.getMethodName(var16).equals(var6)) { // L: 171
+								Class[] var17 = Reflection.getParameterTypes(var16); // L: 172
+								if (var17.length == var21.length) { // L: 173
+									boolean var18 = true; // L: 174
+
+									for (int var19 = 0; var19 < var21.length; ++var19) { // L: 175
+										if (var17[var19] != var21[var19]) { // L: 176
+											var18 = false; // L: 177
+											break; // L: 178
+										}
+									}
+
+									if (var18 && var22 == var16.getReturnType()) { // L: 181
+										var2.methods[var3] = var16; // L: 182
+									}
+								}
 							}
-							break;
 						}
 
-						if (var10 == 3) { // L: 114
-							var9 = false;
-						}
+						var2.arguments[var3] = var10; // L: 189
+					}
+				} else {
+					var5 = var0.readStringCp1252NullTerminated(); // L: 136
+					var6 = var0.readStringCp1252NullTerminated(); // L: 137
+					var7 = 0; // L: 138
+					if (var4 == 1) { // L: 139
+						var7 = var0.readInt();
 					}
-				} while(var9);
-
-				var9 = true; // L: 124
-
-				do {
-					++var5; // L: 126
-
-					for (var10 = 0; var10 < 4; ++var10) { // L: 127
-						if (var3[var10] == 2) { // L: 130
-							var11 = var0[var5].index; // L: 131
-							var12 = var8.index; // L: 132
-						} else if (var3[var10] == 1) { // L: 134
-							var11 = var0[var5].population; // L: 135
-							var12 = var8.population; // L: 136
-							if (var11 == -1 && var4[var10] == 1) { // L: 137
-								var11 = 2001;
-							}
-
-							if (var12 == -1 && var4[var10] == 1) { // L: 138
-								var12 = 2001;
-							}
-						} else if (var3[var10] == 3) { // L: 140
-							var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141
-							var12 = var8.isMembersOnly() ? 1 : 0; // L: 142
-						} else {
-							var11 = var0[var5].id; // L: 145
-							var12 = var8.id; // L: 146
-						}
-
-						if (var12 != var11) { // L: 148
-							if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152
-								var9 = false; // L: 154
-							}
-							break;
-						}
 
-						if (var10 == 3) { // L: 149
-							var9 = false;
-						}
+					var2.operations[var3] = var4; // L: 140
+					var2.intReplaceValues[var3] = var7; // L: 141
+					if (class4.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 142
+						throw new SecurityException();
 					}
-				} while(var9);
 
-				if (var5 < var6) { // L: 159
-					World var13 = var0[var5]; // L: 160
-					var0[var5] = var0[var6]; // L: 161
-					var0[var6] = var13; // L: 162
+					var2.fields[var3] = Reflection.findField(class4.loadClassFromDescriptor(var5), var6); // L: 143
 				}
+			} catch (ClassNotFoundException var24) { // L: 192
+				var2.creationErrors[var3] = -1; // L: 193
+			} catch (SecurityException var25) { // L: 195
+				var2.creationErrors[var3] = -2; // L: 196
+			} catch (NullPointerException var26) { // L: 198
+				var2.creationErrors[var3] = -3;
+			} catch (Exception var27) {
+				var2.creationErrors[var3] = -4;
+			} catch (Throwable var28) { // L: 204
+				var2.creationErrors[var3] = -5; // L: 205
 			}
-
-			sortWorlds(var0, var1, var6, var3, var4); // L: 165
-			sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166
 		}
 
-	} // L: 168
+		class33.reflectionChecks.addFirst(var2); // L: 208
+	} // L: 209
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(B)[B",
-		garbageValue = "34"
+		descriptor = "(S)V",
+		garbageValue = "30466"
 	)
-	public static byte[] method1771() {
-		byte[] var0 = new byte[24]; // L: 277
-
-		try {
-			JagexCache.JagexCache_randomDat.seek(0L); // L: 279
-			JagexCache.JagexCache_randomDat.readFully(var0); // L: 280
-
-			int var1;
-			for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 281 282 283
-			}
-
-			if (var1 >= 24) {
-				throw new IOException(); // L: 285
-			}
-		} catch (Exception var4) {
-			for (int var2 = 0; var2 < 24; ++var2) { // L: 288
-				var0[var2] = -1;
-			}
-		}
-
-		return var0; // L: 290
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-1222610870"
-	)
-	@Export("Messages_getHistorySize")
-	static int Messages_getHistorySize(int var0) {
-		ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 48
-		return var1 == null ? 0 : var1.size(); // L: 49 50
-	}
+	public static void method1796() {
+		HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 199
+		HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 200
+		HitSplatDefinition.HealthBarDefinition_cached.clear(); // L: 201
+	} // L: 202
 }
diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java
index 94dd9fdb4b..11879a9bcc 100644
--- a/runescape-client/src/main/java/Occluder.java
+++ b/runescape-client/src/main/java/Occluder.java
@@ -1,291 +1,144 @@
-import java.applet.Applet;
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import netscape.javascript.JSObject;
 
-@ObfuscatedName("hw")
+@ObfuscatedName("gl")
 @Implements("Occluder")
 public final class Occluder {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1749152531
+		intValue = 1159040081
 	)
 	@Export("minTileX")
 	int minTileX;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 883383741
+		intValue = -342962923
 	)
 	@Export("maxTileX")
 	int maxTileX;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1136190305
+		intValue = 1018728031
 	)
 	@Export("minTileY")
 	int minTileY;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 678309221
+		intValue = -303087101
 	)
 	@Export("maxTileY")
 	int maxTileY;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -319994583
+		intValue = -1878203499
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1416943749
+		intValue = 1169287087
 	)
 	@Export("minX")
 	int minX;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1076426543
+		intValue = -1004767669
 	)
 	@Export("maxX")
 	int maxX;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -287892181
+		intValue = -596343551
 	)
 	@Export("minZ")
 	int minZ;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 2065946253
+		intValue = -1032991231
 	)
 	@Export("maxZ")
 	int maxZ;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -300779215
+		intValue = 973854413
 	)
 	@Export("minY")
 	int minY;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1201693205
+		intValue = 613174517
 	)
 	@Export("maxY")
 	int maxY;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 816323749
+		intValue = 2116164351
 	)
-	int field2464;
-	@ObfuscatedName("k")
+	int field2378;
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1338658645
+		intValue = -824345461
 	)
-	int field2469;
-	@ObfuscatedName("t")
+	int field2369;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -761560275
+		intValue = -1750638079
 	)
-	int field2463;
-	@ObfuscatedName("l")
+	int field2380;
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1793637339
+		intValue = 72228107
 	)
-	int field2471;
-	@ObfuscatedName("u")
+	int field2381;
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1091401787
+		intValue = -1522475315
 	)
-	int field2470;
-	@ObfuscatedName("n")
+	int field2368;
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1237604195
+		intValue = -1800993445
 	)
-	int field2473;
-	@ObfuscatedName("z")
+	int field2383;
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -559031051
+		intValue = 269877121
 	)
-	int field2472;
+	int field2367;
 
 	Occluder() {
 	} // L: 23
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("gt")
 	@ObfuscatedSignature(
-		descriptor = "(I)[Lju;",
-		garbageValue = "1814694549"
-	)
-	public static class283[] method4483() {
-		return new class283[]{class283.field3639, class283.field3638, class283.field3640, class283.field3637}; // L: 15
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)Z",
-		garbageValue = "466419387"
-	)
-	static boolean method4484(String var0) {
-		if (var0 == null) { // L: 191
-			return false;
-		} else {
-			try {
-				new URL(var0);
-				return true; // L: 198
-			} catch (MalformedURLException var2) { // L: 195
-				return false; // L: 196
-			}
-		}
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z",
-		garbageValue = "2027201546"
-	)
-	static boolean method4485(String var0, int var1, String var2) {
-		if (var1 == 0) { // L: 59
-			try {
-				if (!class29.field158.startsWith("win")) { // L: 61
-					throw new Exception();
-				} else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 62
-					throw new Exception();
-				} else {
-					String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 63
-
-					for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 64
-						if (var11.indexOf(var0.charAt(var4)) == -1) { // L: 65
-							throw new Exception();
-						}
-					}
-
-					Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 67
-					return true; // L: 68
-				}
-			} catch (Throwable var5) { // L: 70
-				return false; // L: 71
-			}
-		} else if (var1 == 1) { // L: 74
-			try {
-				Object var10 = class27.method394(class29.field157, var2, new Object[]{(new URL(class29.field157.getCodeBase(), var0)).toString()}); // L: 76
-				return var10 != null; // L: 77
-			} catch (Throwable var6) { // L: 79
-				return false; // L: 80
-			}
-		} else if (var1 == 2) { // L: 83
-			try {
-				class29.field157.getAppletContext().showDocument(new URL(class29.field157.getCodeBase(), var0), "_blank"); // L: 85
-				return true; // L: 86
-			} catch (Exception var7) { // L: 88
-				return false; // L: 89
-			}
-		} else if (var1 == 3) { // L: 92
-			try {
-				Applet var3 = class29.field157; // L: 94
-				JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 97
-			} catch (Throwable var9) { // L: 100
-			}
-
-			try {
-				class29.field157.getAppletContext().showDocument(new URL(class29.field157.getCodeBase(), var0), "_top"); // L: 102
-				return true; // L: 103
-			} catch (Exception var8) { // L: 105
-				return false; // L: 106
-			}
+		descriptor = "(IB)V",
+		garbageValue = "-69"
+	)
+	@Export("setWindowedMode")
+	static void setWindowedMode(int var0) {
+		Client.field514 = 0L; // L: 4973
+		if (var0 >= 2) { // L: 4974
+			Client.isResizable = true;
 		} else {
-			throw new IllegalArgumentException(); // L: 109
+			Client.isResizable = false; // L: 4975
 		}
-	}
 
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-20"
-	)
-	static void method4482() {
-		Login.Login_username = Login.Login_username.trim(); // L: 908
-		if (Login.Login_username.length() == 0) { // L: 909
-			class1.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 910
+		if (class143.getWindowedMode() == 1) { // L: 4976
+			class295.client.setMaxCanvasSize(765, 503); // L: 4977
 		} else {
-			long var1 = SoundCache.method807(); // L: 914
-			int var0;
-			if (0L == var1) { // L: 915
-				var0 = 5;
-			} else {
-				var0 = class1.method15(var1, Login.Login_username); // L: 916
-			}
-
-			switch(var0) { // L: 917
-			case 2:
-				class1.setLoginResponseString(Strings.field3595, Strings.field3634, Strings.field3597); // L: 928
-				class275.method5201(6); // L: 929
-				break; // L: 930
-			case 3:
-				class1.setLoginResponseString("", "Error connecting to server.", ""); // L: 935
-				break;
-			case 4:
-				class1.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 922
-				break; // L: 923
-			case 5:
-				class1.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 925
-				break; // L: 926
-			case 6:
-				class1.setLoginResponseString("", "Error connecting to server.", ""); // L: 919
-				break;
-			case 7:
-				class1.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: 932
-			}
-
+			class295.client.setMaxCanvasSize(7680, 2160); // L: 4980
 		}
-	} // L: 911 938
-
-	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1873535602"
-	)
-	@Export("getGcDuration")
-	protected static int getGcDuration() {
-		int var0 = 0; // L: 595
-		if (ClientPreferences.garbageCollector == null || !ClientPreferences.garbageCollector.isValid()) { // L: 596
-			try {
-				Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 598
-
-				while (var1.hasNext()) {
-					GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 599
-					if (var2.isValid()) { // L: 601
-						ClientPreferences.garbageCollector = var2; // L: 602
-						GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 603
-						GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 604
-					}
-				}
-			} catch (Throwable var11) { // L: 609
-			}
-		}
-
-		if (ClientPreferences.garbageCollector != null) { // L: 611
-			long var9 = class111.method2516(); // L: 612
-			long var3 = ClientPreferences.garbageCollector.getCollectionTime(); // L: 613
-			if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 614
-				long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 615
-				long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 616
-				if (var7 != 0L) { // L: 617
-					var0 = (int)(100L * var5 / var7);
-				}
-			}
 
-			GameEngine.garbageCollectorLastCollectionTime = var3; // L: 619
-			GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 620
+		if (Client.gameState >= 25) { // L: 4982
+			PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, Client.packetWriter.isaacCipher); // L: 4984
+			var1.packetBuffer.writeByte(class143.getWindowedMode()); // L: 4985
+			var1.packetBuffer.writeShort(class186.canvasWidth); // L: 4986
+			var1.packetBuffer.writeShort(BoundaryObject.canvasHeight); // L: 4987
+			Client.packetWriter.addNode(var1); // L: 4988
 		}
 
-		return var0; // L: 622
-	}
+	} // L: 4990
 }
diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java
index d09160e3b5..06e0c4bdcf 100644
--- a/runescape-client/src/main/java/PacketBuffer.java
+++ b/runescape-client/src/main/java/PacketBuffer.java
@@ -4,86 +4,86 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("oj")
+@ObfuscatedName("pj")
 @Implements("PacketBuffer")
 public class PacketBuffer extends Buffer {
-	@ObfuscatedName("w")
-	static final int[] field4292;
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
+	static final int[] field4469;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lpw;"
+		descriptor = "Lph;"
 	)
 	@Export("isaacCipher")
 	IsaacCipher isaacCipher;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1515692399
+		intValue = -359914493
 	)
 	@Export("bitIndex")
 	int bitIndex;
 
 	static {
-		field4292 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7
+		field4469 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7
 	}
 
 	public PacketBuffer(int var1) {
 		super(var1); // L: 11
 	} // L: 12
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([II)V",
-		garbageValue = "1979297082"
+		descriptor = "([IB)V",
+		garbageValue = "-83"
 	)
 	@Export("newIsaacCipher")
 	public void newIsaacCipher(int[] var1) {
 		this.isaacCipher = new IsaacCipher(var1); // L: 15
 	} // L: 16
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lpw;I)V",
-		garbageValue = "-1209531146"
+		descriptor = "(Lph;B)V",
+		garbageValue = "109"
 	)
 	@Export("setIsaacCipher")
 	public void setIsaacCipher(IsaacCipher var1) {
 		this.isaacCipher = var1; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1992268724"
+		garbageValue = "121178045"
 	)
 	@Export("writeByteIsaac")
 	public void writeByteIsaac(int var1) {
 		super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23
 	} // L: 24
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-20"
+		descriptor = "(I)I",
+		garbageValue = "112629238"
 	)
 	@Export("readByteIsaac")
 	public int readByteIsaac() {
 		return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(S)Z",
-		garbageValue = "28330"
+		descriptor = "(I)Z",
+		garbageValue = "-794374917"
 	)
-	public boolean method6912() {
-		int var1 = super.array[super.offset] - this.isaacCipher.method7540() & 255; // L: 31
+	public boolean method7311() {
+		int var1 = super.array[super.offset] - this.isaacCipher.method7874() & 255; // L: 31
 		return var1 >= 128; // L: 32
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "2024952267"
+		garbageValue = "1237962684"
 	)
 	@Export("readSmartByteShortIsaac")
 	public int readSmartByteShortIsaac() {
@@ -91,32 +91,32 @@ public int readSmartByteShortIsaac() {
 		return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "([BIII)V",
-		garbageValue = "1132021347"
+		descriptor = "([BIIB)V",
+		garbageValue = "58"
 	)
-	public void method6939(byte[] var1, int var2, int var3) {
+	public void method7312(byte[] var1, int var2, int var3) {
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 43
 			var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt());
 		}
 
 	} // L: 44
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1556588051"
+		garbageValue = "-1755218850"
 	)
 	@Export("importIndex")
 	public void importIndex() {
 		this.bitIndex = super.offset * 8; // L: 47
 	} // L: 48
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "2118631653"
+		garbageValue = "1980661572"
 	)
 	@Export("readBits")
 	public int readBits(int var1) {
@@ -125,65 +125,36 @@ public int readBits(int var1) {
 		int var4 = 0; // L: 53
 
 		for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58
-			var4 += (super.array[var2++] & field4292[var3]) << var1 - var3; // L: 56
+			var4 += (super.array[var2++] & field4469[var3]) << var1 - var3; // L: 56
 			var1 -= var3; // L: 57
 		}
 
 		if (var3 == var1) { // L: 60
-			var4 += super.array[var2] & field4292[var3];
+			var4 += super.array[var2] & field4469[var3];
 		} else {
-			var4 += super.array[var2] >> var3 - var1 & field4292[var1]; // L: 61
+			var4 += super.array[var2] >> var3 - var1 & field4469[var1]; // L: 61
 		}
 
 		return var4; // L: 62
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "-12237"
+		descriptor = "(I)V",
+		garbageValue = "-346490773"
 	)
 	@Export("exportIndex")
 	public void exportIndex() {
 		super.offset = (this.bitIndex + 7) / 8; // L: 66
 	} // L: 67
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "-87"
+		descriptor = "(II)I",
+		garbageValue = "-973403408"
 	)
 	@Export("bitsRemaining")
 	public int bitsRemaining(int var1) {
 		return var1 * 8 - this.bitIndex; // L: 70
 	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(IIIZIB)J",
-		garbageValue = "-95"
-	)
-	@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: 85
-		if (var3) { // L: 86
-			var5 |= 65536L;
-		}
-
-		return var5; // L: 87
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-383007822"
-	)
-	public static void method6913() {
-		class414.SpriteBuffer_xOffsets = null; // L: 259
-		class414.SpriteBuffer_yOffsets = null; // L: 260
-		UrlRequester.SpriteBuffer_spriteWidths = null; // L: 261
-		class414.SpriteBuffer_spriteHeights = null; // L: 262
-		HitSplatDefinition.SpriteBuffer_spritePalette = null; // L: 263
-		class295.SpriteBuffer_pixels = null; // L: 264
-	} // L: 265
 }
diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java
index 0a7b599839..cc1d32e15d 100644
--- a/runescape-client/src/main/java/PacketBufferNode.java
+++ b/runescape-client/src/main/java/PacketBufferNode.java
@@ -1,48 +1,52 @@
+import java.lang.management.GarbageCollectorMXBean;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ib")
+@ObfuscatedName("iw")
 @Implements("PacketBufferNode")
 public class PacketBufferNode extends Node {
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "[Lib;"
+		descriptor = "[Liw;"
 	)
 	@Export("PacketBufferNode_packetBufferNodes")
 	static PacketBufferNode[] PacketBufferNode_packetBufferNodes;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1045179261
+		intValue = 1440510259
 	)
 	@Export("PacketBufferNode_packetBufferNodeCount")
 	static int PacketBufferNode_packetBufferNodeCount;
-	@ObfuscatedName("i")
+	@ObfuscatedName("aq")
+	@Export("garbageCollector")
+	static GarbageCollectorMXBean garbageCollector;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lik;"
+		descriptor = "Liu;"
 	)
 	@Export("clientPacket")
-	public ClientPacket clientPacket;
-	@ObfuscatedName("w")
+	ClientPacket clientPacket;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -881664177
+		intValue = -2059632065
 	)
 	@Export("clientPacketLength")
-	public int clientPacketLength;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Loj;"
-	)
-	@Export("packetBuffer")
-	public PacketBuffer packetBuffer;
-	@ObfuscatedName("a")
+	int clientPacketLength;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1172776223
+		intValue = -531807865
 	)
 	@Export("index")
 	public int index;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lpj;"
+	)
+	@Export("packetBuffer")
+	public PacketBuffer packetBuffer;
 
 	static {
 		PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; // L: 13
@@ -52,15 +56,26 @@ public class PacketBufferNode extends Node {
 	PacketBufferNode() {
 	} // L: 19
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1705967924"
+		garbageValue = "817440472"
 	)
 	@Export("release")
 	public void release() {
-		if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 42
-			PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 43
+		if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 61
+			PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 62
+		}
+	} // L: 63
+
+	@ObfuscatedName("mk")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1828413921"
+	)
+	static void method5016(int var0) {
+		if (var0 != Client.loginState) { // L: 12733
+			Client.loginState = var0; // L: 12734
 		}
-	} // L: 44
+	} // L: 12735
 }
diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java
index 2d62a2e8d7..7b362e6bce 100644
--- a/runescape-client/src/main/java/PacketWriter.java
+++ b/runescape-client/src/main/java/PacketWriter.java
@@ -5,85 +5,91 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cv")
+@ObfuscatedName("ch")
 @Implements("PacketWriter")
 public class PacketWriter {
-	@ObfuscatedName("i")
+	@ObfuscatedName("rp")
 	@ObfuscatedSignature(
-		descriptor = "Lmp;"
+		descriptor = "Lar;"
+	)
+	@Export("pcmPlayer1")
+	static PcmPlayer pcmPlayer1;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lmd;"
 	)
 	@Export("socket")
 	AbstractSocket socket;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lkf;"
+		descriptor = "Llr;"
 	)
 	@Export("packetBufferNodes")
 	IterableNodeDeque packetBufferNodes;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 738275543
+		intValue = -1266642989
 	)
 	@Export("bufferSize")
 	int bufferSize;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lop;"
+		descriptor = "Lpi;"
 	)
 	@Export("buffer")
 	Buffer buffer;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lpw;"
+		descriptor = "Lph;"
 	)
 	@Export("isaacCipher")
 	public IsaacCipher isaacCipher;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Loj;"
+		descriptor = "Lpj;"
 	)
 	@Export("packetBuffer")
 	PacketBuffer packetBuffer;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
 	@Export("serverPacket")
 	ServerPacket serverPacket;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1382536787
+		intValue = 594259629
 	)
 	@Export("serverPacketLength")
 	int serverPacketLength;
-	@ObfuscatedName("j")
-	boolean field1280;
-	@ObfuscatedName("b")
+	@ObfuscatedName("n")
+	boolean field1278;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -284843695
+		intValue = 1553002221
 	)
-	int field1275;
-	@ObfuscatedName("x")
+	int field1287;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 2120666223
+		intValue = 1843561553
 	)
 	@Export("pendingWrites")
 	int pendingWrites;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	ServerPacket field1277;
-	@ObfuscatedName("k")
+	ServerPacket field1289;
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	ServerPacket field1284;
-	@ObfuscatedName("t")
+	ServerPacket field1290;
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	ServerPacket field1285;
+	ServerPacket field1291;
 
 	PacketWriter() {
 		this.packetBufferNodes = new IterableNodeDeque(); // L: 15
@@ -92,15 +98,15 @@ public class PacketWriter {
 		this.packetBuffer = new PacketBuffer(40000); // L: 19
 		this.serverPacket = null; // L: 20
 		this.serverPacketLength = 0; // L: 21
-		this.field1280 = true; // L: 22
-		this.field1275 = 0; // L: 23
+		this.field1278 = true; // L: 22
+		this.field1287 = 0; // L: 23
 		this.pendingWrites = 0; // L: 24
 	} // L: 29
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "480041256"
+		garbageValue = "750502280"
 	)
 	@Export("clearBuffer")
 	final void clearBuffer() {
@@ -108,10 +114,10 @@ final void clearBuffer() {
 		this.bufferSize = 0; // L: 33
 	} // L: 34
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-635097246"
+		garbageValue = "-148495881"
 	)
 	@Export("flush")
 	final void flush() throws IOException {
@@ -136,10 +142,10 @@ final void flush() throws IOException {
 
 	} // L: 52
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lib;B)V",
-		garbageValue = "-1"
+		descriptor = "(Liw;I)V",
+		garbageValue = "-1673237142"
 	)
 	@Export("addNode")
 	public final void addNode(PacketBufferNode var1) {
@@ -149,20 +155,20 @@ public final void addNode(PacketBufferNode var1) {
 		this.bufferSize += var1.index; // L: 58
 	} // L: 59
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lmp;I)V",
-		garbageValue = "-597928557"
+		descriptor = "(Lmd;I)V",
+		garbageValue = "1972212609"
 	)
 	@Export("setSocket")
 	void setSocket(AbstractSocket var1) {
 		this.socket = var1; // L: 62
 	} // L: 63
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "401992191"
+		garbageValue = "-1419164143"
 	)
 	@Export("close")
 	void close() {
@@ -173,40 +179,29 @@ void close() {
 
 	} // L: 70
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1183328030"
+		garbageValue = "-1910470967"
 	)
 	@Export("removeSocket")
 	void removeSocket() {
 		this.socket = null; // L: 73
 	} // L: 74
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lmp;",
-		garbageValue = "113"
+		descriptor = "(I)Lmd;",
+		garbageValue = "305203979"
 	)
 	@Export("getSocket")
 	AbstractSocket getSocket() {
 		return this.socket; // L: 77
 	}
 
-	@ObfuscatedName("w")
-	public static double method2425(double var0, double var2, double var4) {
-		return class112.method2517((var0 - var2) / var4) / var4; // L: 13
+	@ObfuscatedName("n")
+	@Export("Entity_unpackID")
+	public static int Entity_unpackID(long var0) {
+		return (int)(var0 >>> 17 & 4294967295L); // L: 85
 	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-459150971"
-	)
-	public static void method2401() {
-		Widget.Widget_cachedSprites.clear(); // L: 707
-		Widget.Widget_cachedModels.clear(); // L: 708
-		Widget.Widget_cachedFonts.clear(); // L: 709
-		Widget.Widget_cachedSpriteMasks.clear(); // L: 710
-	} // L: 711
 }
diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java
index f6a347113b..8574dd8cc6 100644
--- a/runescape-client/src/main/java/ParamComposition.java
+++ b/runescape-client/src/main/java/ParamComposition.java
@@ -3,47 +3,42 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("fn")
+@ObfuscatedName("fr")
 @Implements("ParamComposition")
 public class ParamComposition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("ur")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lmy;"
+	)
+	@Export("masterDisk")
+	static ArchiveDisk masterDisk;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
 	)
 	@Export("ParamDefinition_archive")
 	static AbstractArchive ParamDefinition_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("ParamDefinition_cached")
 	public static EvictingDualNodeHashTable ParamDefinition_cached;
-	@ObfuscatedName("eu")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive3")
-	static Archive archive3;
-	@ObfuscatedName("fj")
-	@ObfuscatedGetter(
-		intValue = -1783961739
-	)
-	@Export("js5Port")
-	static int js5Port;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("type")
 	char type;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1115055465
+		intValue = -871462947
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("autoDisable")
 	boolean autoDisable;
 
@@ -55,19 +50,19 @@ public class ParamComposition extends DualNode {
 		this.autoDisable = true; // L: 16
 	} // L: 18
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1854447416"
+		garbageValue = "630650762"
 	)
 	@Export("postDecode")
 	void postDecode() {
 	} // L: 35
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;B)V",
-		garbageValue = "2"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "-46"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -81,15 +76,15 @@ void decode(Buffer var1) {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;IB)V",
-		garbageValue = "-109"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-1961413058"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) { // L: 46
-			this.type = class274.method5199(var1.readByte()); // L: 47
+			this.type = class279.method5406(var1.readByte()); // L: 47
 		} else if (var2 == 2) { // L: 49
 			this.defaultInt = var1.readInt();
 		} else if (var2 == 4) {
@@ -100,36 +95,99 @@ void decodeNext(Buffer var1, int var2) {
 
 	} // L: 53
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1612444577"
+		garbageValue = "404236453"
 	)
 	@Export("isString")
 	public boolean isString() {
 		return this.type == 's'; // L: 56
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "8"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-893226045"
 	)
-	static void method3216() {
-		if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 313
-			Login.currentLoginField = 1; // L: 314
+	static int method3397(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1822
+			IsaacCipher.Interpreter_intStackSize -= 3; // L: 1823
+			LoginScreenAnimation.queueSoundEffect(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]); // L: 1824
+			return 1; // L: 1825
+		} else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1827
+			class18.playSong(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1828
+			return 1; // L: 1829
+		} else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1831
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 1832
+			class315.method5822(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize], Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 1833
+			return 1; // L: 1834
 		} else {
-			Login.currentLoginField = 0; // L: 317
-		}
+			int var3;
+			int var4;
+			if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1836
+				if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 1872
+					return var0 == 3211 ? 1 : 2; // L: 1906 1907 1909
+				} else {
+					var3 = 0; // L: 1873
+					var4 = 0; // L: 1874
+					if (var0 == 3210) { // L: 1875
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1876
+					} else if (var0 == 3182) { // L: 1878
+						var3 = 6; // L: 1879
+					} else if (var0 == 3204) { // L: 1881
+						var3 = 7; // L: 1882
+					} else if (var0 == 3206) { // L: 1884
+						var3 = 8; // L: 1885
+					} else if (var0 == 3208) { // L: 1887
+						var3 = 9; // L: 1888
+					}
 
-	} // L: 319
+					if (var3 == 6) { // L: 1890
+						float var5 = 200.0F * ((float)SecureRandomFuture.clientPreferences.brightness - 0.5F); // L: 1891
+						var4 = 100 - Math.round(var5); // L: 1892
+					} else if (var3 == 7) { // L: 1894
+						var4 = Math.round((float)SecureRandomFuture.clientPreferences.musicVolume / 2.55F); // L: 1895
+					} else if (var3 == 8) { // L: 1897
+						var4 = Math.round((float)SecureRandomFuture.clientPreferences.soundEffectsVolume / 1.27F); // L: 1898
+					} else if (var3 == 9) { // L: 1900
+						var4 = Math.round((float)SecureRandomFuture.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1901
+					}
 
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-329455950"
-	)
-	static final int method3229() {
-		return ViewportMouse.ViewportMouse_y; // L: 103
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4; // L: 1903
+					return 1; // L: 1904
+				}
+			} else {
+				var3 = 0; // L: 1837
+				var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1838
+				if (var0 == 3209) { // L: 1839
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1840
+				} else if (var0 == 3181) { // L: 1842
+					var3 = 6; // L: 1843
+				} else if (var0 == 3203) { // L: 1845
+					var3 = 7; // L: 1846
+				} else if (var0 == 3205) { // L: 1848
+					var3 = 8; // L: 1849
+				} else if (var0 == 3207) { // L: 1851
+					var3 = 9; // L: 1852
+				}
+
+				if (var3 == 6) { // L: 1854
+					var4 = 100 - Math.min(Math.max(var4, 0), 100); // L: 1855
+					InterfaceParent.method2142((double)(0.5F + (float)var4 / 200.0F)); // L: 1856
+				} else if (var3 == 7) { // L: 1858
+					var4 = Math.min(Math.max(var4, 0), 100); // L: 1859
+					Varcs.method2426(Math.round((float)var4 * 2.55F)); // L: 1860
+				} else if (var3 == 8) { // L: 1862
+					var4 = Math.min(Math.max(var4, 0), 100); // L: 1863
+					class20.updateSoundEffectVolume(Math.round((float)var4 * 1.27F)); // L: 1864
+				} else if (var3 == 9) { // L: 1866
+					var4 = Math.min(Math.max(var4, 0), 100); // L: 1867
+					Players.method2383(Math.round(1.27F * (float)var4)); // L: 1868
+				}
+
+				return 1; // L: 1870
+			}
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java
index 4c9bf8d858..af3191ab7b 100644
--- a/runescape-client/src/main/java/PcmPlayer.java
+++ b/runescape-client/src/main/java/PcmPlayer.java
@@ -1,567 +1,480 @@
+import java.util.concurrent.ScheduledExecutorService;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ak")
+@ObfuscatedName("ar")
 @Implements("PcmPlayer")
 public class PcmPlayer {
-	@ObfuscatedName("g")
-	@Export("PcmPlayer_stereo")
-	public static boolean PcmPlayer_stereo;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = 1710206631
+	@ObfuscatedName("w")
+	@Export("soundSystemExecutor")
+	static ScheduledExecutorService soundSystemExecutor;
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "Lal;"
 	)
-	public static int field272;
-	@ObfuscatedName("gl")
+	@Export("soundSystem")
+	static SoundSystem soundSystem;
+	@ObfuscatedName("hb")
 	@ObfuscatedSignature(
-		descriptor = "Lev;"
+		descriptor = "Lpl;"
 	)
-	@Export("socketTask")
-	static Task socketTask;
-	@ObfuscatedName("t")
+	@Export("redHintArrowSprite")
+	static SpritePixels redHintArrowSprite;
+	@ObfuscatedName("h")
 	@Export("samples")
 	protected int[] samples;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lav;"
+		descriptor = "Lai;"
 	)
 	@Export("stream")
 	PcmStream stream;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1114914311
+		intValue = 722877979
 	)
-	int field254;
-	@ObfuscatedName("n")
+	int field284;
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		longValue = -139627477628549521L
+		longValue = -5703185867842976777L
 	)
 	@Export("timeMs")
 	long timeMs;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -964657999
+		intValue = -2075578253
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -169687701
+		intValue = 114915137
 	)
-	int field264;
-	@ObfuscatedName("d")
+	int field298;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 275810673
+		intValue = -690684053
 	)
-	int field258;
-	@ObfuscatedName("r")
+	int field288;
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		longValue = 7412881241186270643L
+		longValue = 4521790688810739283L
 	)
-	long field259;
-	@ObfuscatedName("m")
+	long field280;
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1880549509
+		intValue = -702543021
 	)
-	int field251;
-	@ObfuscatedName("c")
+	int field290;
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 672902205
+		intValue = 1097572003
 	)
-	int field253;
-	@ObfuscatedName("f")
+	int field291;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -390982901
+		intValue = 1396809547
 	)
-	int field261;
-	@ObfuscatedName("h")
+	int field292;
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		longValue = -127582275051913285L
+		longValue = 3233827279749364883L
 	)
-	long field263;
-	@ObfuscatedName("v")
-	boolean field257;
-	@ObfuscatedName("ai")
+	long field293;
+	@ObfuscatedName("y")
+	boolean field294;
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = -1176592889
+		intValue = 204749631
 	)
-	int field267;
-	@ObfuscatedName("ah")
+	int field295;
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "[Lav;"
+		descriptor = "[Lai;"
 	)
-	PcmStream[] field268;
-	@ObfuscatedName("as")
+	PcmStream[] field296;
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "[Lav;"
+		descriptor = "[Lai;"
 	)
-	PcmStream[] field269;
+	PcmStream[] field285;
 
 	protected PcmPlayer() {
-		this.field254 = 32; // L: 22
-		this.timeMs = class111.method2516(); // L: 23
-		this.field259 = 0L; // L: 27
-		this.field251 = 0; // L: 28
-		this.field253 = 0; // L: 29
-		this.field261 = 0; // L: 30
-		this.field263 = 0L; // L: 31
-		this.field257 = true; // L: 32
-		this.field267 = 0; // L: 38
-		this.field268 = new PcmStream[8]; // L: 39
-		this.field269 = new PcmStream[8]; // L: 40
+		this.field284 = 32; // L: 22
+		this.timeMs = Ignored.method6459(); // L: 23
+		this.field280 = 0L; // L: 27
+		this.field290 = 0; // L: 28
+		this.field291 = 0; // L: 29
+		this.field292 = 0; // L: 30
+		this.field293 = 0L; // L: 31
+		this.field294 = true; // L: 32
+		this.field295 = 0; // L: 38
+		this.field296 = new PcmStream[8]; // L: 39
+		this.field285 = new PcmStream[8]; // L: 40
 	} // L: 42
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "54"
+		descriptor = "(I)V",
+		garbageValue = "-993652709"
 	)
 	@Export("init")
 	protected void init() throws Exception {
-	} // L: 273
+	} // L: 277
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "122369223"
+		garbageValue = "-865384228"
 	)
 	@Export("open")
 	protected void open(int var1) throws Exception {
-	} // L: 274
+	} // L: 278
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1689594693"
+		garbageValue = "2142020678"
 	)
 	@Export("position")
 	protected int position() throws Exception {
-		return this.capacity; // L: 277
+		return this.capacity; // L: 281
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("write")
 	protected void write() throws Exception {
-	} // L: 280
+	} // L: 284
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1440644043"
+		descriptor = "(B)V",
+		garbageValue = "-88"
 	)
 	@Export("close")
 	protected void close() {
-	} // L: 281
+	} // L: 285
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-98"
+		descriptor = "(I)V",
+		garbageValue = "-514018891"
 	)
 	@Export("discard")
 	protected void discard() throws Exception {
-	} // L: 282
+	} // L: 286
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(Lav;I)V",
-		garbageValue = "242678028"
+		descriptor = "(Lai;I)V",
+		garbageValue = "-193761027"
 	)
 	@Export("setStream")
 	public final synchronized void setStream(PcmStream var1) {
-		this.stream = var1; // L: 72
-	} // L: 73
+		this.stream = var1; // L: 76
+	} // L: 77
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "971942949"
+		garbageValue = "29619557"
 	)
 	@Export("run")
 	public final synchronized void run() {
-		if (this.samples != null) { // L: 76
-			long var1 = class111.method2516(); // L: 77
+		if (this.samples != null) { // L: 80
+			long var1 = Ignored.method6459(); // L: 81
 
 			try {
-				if (this.field259 != 0L) { // L: 79
-					if (var1 < this.field259) { // L: 80
+				if (0L != this.field280) { // L: 83
+					if (var1 < this.field280) { // L: 84
 						return;
 					}
 
-					this.open(this.capacity); // L: 81
-					this.field259 = 0L; // L: 82
-					this.field257 = true; // L: 83
+					this.open(this.capacity); // L: 85
+					this.field280 = 0L; // L: 86
+					this.field294 = true; // L: 87
 				}
 
-				int var3 = this.position(); // L: 85
-				if (this.field261 - var3 > this.field251) { // L: 86
-					this.field251 = this.field261 - var3;
+				int var3 = this.position(); // L: 89
+				if (this.field292 - var3 > this.field290) { // L: 90
+					this.field290 = this.field292 - var3;
 				}
 
-				int var4 = this.field258 + this.field264; // L: 87
-				if (var4 + 256 > 16384) { // L: 88
+				int var4 = this.field288 + this.field298; // L: 91
+				if (var4 + 256 > 16384) { // L: 92
 					var4 = 16128;
 				}
 
-				if (var4 + 256 > this.capacity) { // L: 89
-					this.capacity += 1024; // L: 90
-					if (this.capacity > 16384) { // L: 91
+				if (var4 + 256 > this.capacity) { // L: 93
+					this.capacity += 1024; // L: 94
+					if (this.capacity > 16384) { // L: 95
 						this.capacity = 16384;
 					}
 
-					this.close(); // L: 92
-					this.open(this.capacity); // L: 93
-					var3 = 0; // L: 94
-					this.field257 = true; // L: 95
-					if (var4 + 256 > this.capacity) { // L: 96
-						var4 = this.capacity - 256; // L: 97
-						this.field258 = var4 - this.field264; // L: 98
+					this.close(); // L: 96
+					this.open(this.capacity); // L: 97
+					var3 = 0; // L: 98
+					this.field294 = true; // L: 99
+					if (var4 + 256 > this.capacity) { // L: 100
+						var4 = this.capacity - 256; // L: 101
+						this.field288 = var4 - this.field298; // L: 102
 					}
 				}
 
-				while (var3 < var4) { // L: 101
-					this.fill(this.samples, 256); // L: 102
-					this.write(); // L: 103
-					var3 += 256; // L: 104
+				while (var3 < var4) { // L: 105
+					this.fill(this.samples, 256); // L: 106
+					this.write(); // L: 107
+					var3 += 256; // L: 108
 				}
 
-				if (var1 > this.field263) { // L: 106
-					if (!this.field257) { // L: 107
-						if (this.field251 == 0 && this.field253 == 0) { // L: 108
-							this.close(); // L: 109
-							this.field259 = var1 + 2000L; // L: 110
-							return; // L: 111
+				if (var1 > this.field293) { // L: 110
+					if (!this.field294) { // L: 111
+						if (this.field290 == 0 && this.field291 == 0) { // L: 112
+							this.close(); // L: 113
+							this.field280 = 2000L + var1; // L: 114
+							return; // L: 115
 						}
 
-						this.field258 = Math.min(this.field253, this.field251); // L: 113
-						this.field253 = this.field251; // L: 114
+						this.field288 = Math.min(this.field291, this.field290); // L: 117
+						this.field291 = this.field290; // L: 118
 					} else {
-						this.field257 = false; // L: 116
+						this.field294 = false; // L: 120
 					}
 
-					this.field251 = 0; // L: 117
-					this.field263 = var1 + 2000L; // L: 118
+					this.field290 = 0; // L: 121
+					this.field293 = 2000L + var1; // L: 122
 				}
 
-				this.field261 = var3; // L: 120
-			} catch (Exception var7) { // L: 122
-				this.close(); // L: 123
-				this.field259 = var1 + 2000L; // L: 124
+				this.field292 = var3; // L: 124
+			} catch (Exception var7) { // L: 126
+				this.close(); // L: 127
+				this.field280 = 2000L + var1; // L: 128
 			}
 
 			try {
-				if (var1 > this.timeMs + 500000L) { // L: 127
+				if (var1 > this.timeMs + 500000L) { // L: 131
 					var1 = this.timeMs;
 				}
 
-				while (var1 > this.timeMs + 5000L) { // L: 128
-					this.skip(256); // L: 129
-					this.timeMs += (long)(256000 / UserComparator2.field4359); // L: 130
+				while (var1 > 5000L + this.timeMs) { // L: 132
+					this.skip(256); // L: 133
+					this.timeMs += (long)(256000 / class339.field4058); // L: 134
 				}
-			} catch (Exception var6) { // L: 133
-				this.timeMs = var1; // L: 134
+			} catch (Exception var6) { // L: 137
+				this.timeMs = var1; // L: 138
 			}
 
 		}
-	} // L: 136
+	} // L: 140
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "2104373839"
+		garbageValue = "1599335992"
 	)
-	public final void method750() {
-		this.field257 = true; // L: 139
-	} // L: 140
+	public final void method747() {
+		this.field294 = true; // L: 143
+	} // L: 144
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "31692"
+		descriptor = "(I)V",
+		garbageValue = "-101835154"
 	)
 	@Export("tryDiscard")
 	public final synchronized void tryDiscard() {
-		this.field257 = true; // L: 143
+		this.field294 = true; // L: 147
 
 		try {
-			this.discard(); // L: 145
-		} catch (Exception var2) { // L: 147
-			this.close(); // L: 148
-			this.field259 = class111.method2516() + 2000L; // L: 149
+			this.discard(); // L: 149
+		} catch (Exception var2) { // L: 151
+			this.close(); // L: 152
+			this.field280 = Ignored.method6459() + 2000L; // L: 153
 		}
 
-	} // L: 151
+	} // L: 155
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1720419183"
+		garbageValue = "-917395831"
 	)
 	@Export("shutdown")
 	public final synchronized void shutdown() {
-		if (class122.soundSystem != null) { // L: 154
-			boolean var1 = true; // L: 155
+		if (soundSystem != null) { // L: 158
+			boolean var1 = true; // L: 159
 
-			for (int var2 = 0; var2 < 2; ++var2) { // L: 156
-				if (this == class122.soundSystem.players[var2]) { // L: 157
-					class122.soundSystem.players[var2] = null;
+			for (int var2 = 0; var2 < 2; ++var2) { // L: 160
+				if (this == soundSystem.players[var2]) { // L: 161
+					soundSystem.players[var2] = null;
 				}
 
-				if (class122.soundSystem.players[var2] != null) { // L: 158
+				if (soundSystem.players[var2] != null) { // L: 162
 					var1 = false;
 				}
 			}
 
-			if (var1) { // L: 160
-				class381.soundSystemExecutor.shutdownNow(); // L: 161
-				class381.soundSystemExecutor = null; // L: 162
-				class122.soundSystem = null; // L: 163
+			if (var1) { // L: 164
+				soundSystemExecutor.shutdownNow(); // L: 165
+				soundSystemExecutor = null; // L: 166
+				soundSystem = null; // L: 167
 			}
 		}
 
-		this.close(); // L: 166
-		this.samples = null; // L: 167
-	} // L: 168
+		this.close(); // L: 170
+		this.samples = null; // L: 171
+	} // L: 172
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1660525629"
+		garbageValue = "1441903742"
 	)
 	@Export("skip")
 	final void skip(int var1) {
-		this.field267 -= var1; // L: 171
-		if (this.field267 < 0) {
-			this.field267 = 0; // L: 172
+		this.field295 -= var1; // L: 175
+		if (this.field295 < 0) {
+			this.field295 = 0; // L: 176
 		}
 
 		if (this.stream != null) {
-			this.stream.skip(var1); // L: 173
+			this.stream.skip(var1); // L: 177
 		}
 
-	} // L: 174
+	} // L: 178
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ax")
 	@Export("fill")
 	final void fill(int[] var1, int var2) {
-		int var3 = var2; // L: 178
-		if (PcmPlayer_stereo) { // L: 179
+		int var3 = var2; // L: 182
+		if (SpriteMask.PcmPlayer_stereo) { // L: 183
 			var3 = var2 << 1;
 		}
 
-		class321.clearIntArray(var1, 0, var3); // L: 180
-		this.field267 -= var2; // L: 181
-		if (this.stream != null && this.field267 <= 0) { // L: 182
-			this.field267 += UserComparator2.field4359 >> 4; // L: 183
-			KitDefinition.PcmStream_disable(this.stream); // L: 184
-			this.method719(this.stream, this.stream.vmethod974()); // L: 185
-			int var4 = 0; // L: 186
-			int var5 = 255; // L: 187
+		class333.clearIntArray(var1, 0, var3); // L: 184
+		this.field295 -= var2; // L: 185
+		if (this.stream != null && this.field295 <= 0) { // L: 186
+			this.field295 += class339.field4058 >> 4; // L: 187
+			class10.PcmStream_disable(this.stream); // L: 188
+			this.method751(this.stream, this.stream.vmethod991()); // L: 189
+			int var4 = 0; // L: 190
+			int var5 = 255; // L: 191
 
 			int var6;
 			PcmStream var10;
 			label108:
-			for (var6 = 7; var5 != 0; --var6) { // L: 188
+			for (var6 = 7; var5 != 0; --var6) { // L: 192
 				int var7;
 				int var8;
-				if (var6 < 0) { // L: 191
-					var7 = var6 & 3; // L: 192
-					var8 = -(var6 >> 2); // L: 193
+				if (var6 < 0) { // L: 195
+					var7 = var6 & 3; // L: 196
+					var8 = -(var6 >> 2); // L: 197
 				} else {
-					var7 = var6; // L: 196
-					var8 = 0; // L: 197
+					var7 = var6; // L: 200
+					var8 = 0; // L: 201
 				}
 
-				for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 199 201
-					if ((var9 & 1) != 0) { // L: 204
-						var5 &= ~(1 << var7); // L: 207
-						var10 = null; // L: 208
-						PcmStream var11 = this.field268[var7]; // L: 209
+				for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 203 205
+					if ((var9 & 1) != 0) { // L: 208
+						var5 &= ~(1 << var7); // L: 211
+						var10 = null; // L: 212
+						PcmStream var11 = this.field296[var7]; // L: 213
 
 						label102:
 						while (true) {
 							while (true) {
-								if (var11 == null) { // L: 210
+								if (var11 == null) { // L: 214
 									break label102;
 								}
 
-								AbstractSound var12 = var11.sound; // L: 211
-								if (var12 != null && var12.position > var8) { // L: 212
-									var5 |= 1 << var7; // L: 213
-									var10 = var11; // L: 214
-									var11 = var11.after; // L: 215
+								AbstractSound var12 = var11.sound; // L: 215
+								if (var12 != null && var12.position > var8) { // L: 216
+									var5 |= 1 << var7; // L: 217
+									var10 = var11; // L: 218
+									var11 = var11.after; // L: 219
 								} else {
-									var11.active = true; // L: 218
-									int var13 = var11.vmethod4958(); // L: 219
-									var4 += var13; // L: 220
+									var11.active = true; // L: 222
+									int var13 = var11.vmethod5260(); // L: 223
+									var4 += var13; // L: 224
 									if (var12 != null) {
-										var12.position += var13; // L: 221
+										var12.position += var13; // L: 225
 									}
 
-									if (var4 >= this.field254) { // L: 222
+									if (var4 >= this.field284) { // L: 226
 										break label108;
 									}
 
-									PcmStream var14 = var11.firstSubStream(); // L: 223
-									if (var14 != null) { // L: 224
-										for (int var15 = var11.field320; var14 != null; var14 = var11.nextSubStream()) { // L: 225 226 228
-											this.method719(var14, var15 * var14.vmethod974() >> 8); // L: 227
+									PcmStream var14 = var11.firstSubStream(); // L: 227
+									if (var14 != null) { // L: 228
+										for (int var15 = var11.field346; var14 != null; var14 = var11.nextSubStream()) { // L: 229 230 232
+											this.method751(var14, var15 * var14.vmethod991() >> 8); // L: 231
 										}
 									}
 
-									PcmStream var18 = var11.after; // L: 231
-									var11.after = null; // L: 232
-									if (var10 == null) { // L: 233
-										this.field268[var7] = var18;
+									PcmStream var18 = var11.after; // L: 235
+									var11.after = null; // L: 236
+									if (var10 == null) { // L: 237
+										this.field296[var7] = var18;
 									} else {
-										var10.after = var18; // L: 234
+										var10.after = var18; // L: 238
 									}
 
-									if (var18 == null) { // L: 235
-										this.field269[var7] = var10;
+									if (var18 == null) { // L: 239
+										this.field285[var7] = var10;
 									}
 
-									var11 = var18; // L: 236
+									var11 = var18; // L: 240
 								}
 							}
 						}
 					}
 
-					var7 += 4; // L: 200
+					var7 += 4; // L: 204
 					++var8;
 				}
 			}
 
-			for (var6 = 0; var6 < 8; ++var6) { // L: 240
-				PcmStream var16 = this.field268[var6]; // L: 241
-				PcmStream[] var17 = this.field268; // L: 242
-				this.field269[var6] = null; // L: 244
+			for (var6 = 0; var6 < 8; ++var6) { // L: 244
+				PcmStream var16 = this.field296[var6]; // L: 245
+				PcmStream[] var17 = this.field296; // L: 246
+				this.field285[var6] = null; // L: 248
 
-				for (var17[var6] = null; var16 != null; var16 = var10) { // L: 245 246 249
-					var10 = var16.after; // L: 247
-					var16.after = null; // L: 248
+				for (var17[var6] = null; var16 != null; var16 = var10) { // L: 249 250 253
+					var10 = var16.after; // L: 251
+					var16.after = null; // L: 252
 				}
 			}
 		}
 
-		if (this.field267 < 0) { // L: 253
-			this.field267 = 0;
+		if (this.field295 < 0) { // L: 257
+			this.field295 = 0;
 		}
 
-		if (this.stream != null) {
-			this.stream.fill(var1, 0, var2); // L: 254
+		if (this.stream != null) { // L: 258
+			this.stream.fill(var1, 0, var2);
 		}
 
-		this.timeMs = class111.method2516(); // L: 255
-	} // L: 256
+		this.timeMs = Ignored.method6459(); // L: 259
+	} // L: 260
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(Lav;IS)V",
-		garbageValue = "2601"
+		descriptor = "(Lai;IB)V",
+		garbageValue = "-65"
 	)
-	final void method719(PcmStream var1, int var2) {
-		int var3 = var2 >> 5; // L: 265
-		PcmStream var4 = this.field269[var3]; // L: 266
-		if (var4 == null) { // L: 267
-			this.field268[var3] = var1;
+	final void method751(PcmStream var1, int var2) {
+		int var3 = var2 >> 5; // L: 269
+		PcmStream var4 = this.field285[var3]; // L: 270
+		if (var4 == null) { // L: 271
+			this.field296[var3] = var1;
 		} else {
-			var4.after = var1; // L: 268
-		}
-
-		this.field269[var3] = var1; // L: 269
-		var1.field320 = var2; // L: 270
-	} // L: 271
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(Lai;I)V",
-		garbageValue = "-1238015178"
-	)
-	static void method757(GameEngine var0) {
-		while (WorldMapElement.isKeyDown()) { // L: 1513
-			if (class12.field55 == 13) { // L: 1514
-				class10.method104(); // L: 1515
-				return; // L: 1516
-			}
-
-			if (class12.field55 == 96) { // L: 1518
-				if (Login.worldSelectPage > 0 && UserComparator6.worldSelectLeftSprite != null) { // L: 1519
-					--Login.worldSelectPage; // L: 1520
-				}
-			} else if (class12.field55 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && MouseRecorder.worldSelectRightSprite != null) { // L: 1523 1524
-				++Login.worldSelectPage; // L: 1525
-			}
-		}
-
-		if (MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1529
-			int var1 = Login.xPadding + 280; // L: 1530
-			if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1531
-				PlayerType.changeWorldSelectSorting(0, 0); // L: 1532
-				return; // L: 1533
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1535
-				PlayerType.changeWorldSelectSorting(0, 1); // L: 1536
-				return; // L: 1537
-			}
-
-			int var2 = Login.xPadding + 390; // L: 1539
-			if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1540
-				PlayerType.changeWorldSelectSorting(1, 0); // L: 1541
-				return; // L: 1542
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1544
-				PlayerType.changeWorldSelectSorting(1, 1); // L: 1545
-				return; // L: 1546
-			}
-
-			int var3 = Login.xPadding + 500; // L: 1548
-			if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1549
-				PlayerType.changeWorldSelectSorting(2, 0); // L: 1550
-				return; // L: 1551
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1553
-				PlayerType.changeWorldSelectSorting(2, 1); // L: 1554
-				return; // L: 1555
-			}
-
-			int var4 = Login.xPadding + 610; // L: 1557
-			if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1558
-				PlayerType.changeWorldSelectSorting(3, 0); // L: 1559
-				return; // L: 1560
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1562
-				PlayerType.changeWorldSelectSorting(3, 1); // L: 1563
-				return; // L: 1564
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1566
-				class10.method104(); // L: 1567
-				return; // L: 1568
-			}
-
-			if (Login.hoveredWorldIndex != -1) { // L: 1570
-				World var5 = WorldMapEvent.World_worlds[Login.hoveredWorldIndex]; // L: 1571
-				MidiPcmStream.changeWorld(var5); // L: 1572
-				class10.method104(); // L: 1573
-				return; // L: 1574
-			}
-
-			if (Login.worldSelectPage > 0 && UserComparator6.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= UserComparator6.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= KeyHandler.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= KeyHandler.canvasHeight / 2 + 50) { // L: 1576
-				--Login.worldSelectPage; // L: 1577
-			}
-
-			if (Login.worldSelectPage < Login.worldSelectPagesCount && MouseRecorder.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GameEngine.canvasWidth - MouseRecorder.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GameEngine.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= KeyHandler.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= KeyHandler.canvasHeight / 2 + 50) { // L: 1579
-				++Login.worldSelectPage; // L: 1580
-			}
+			var4.after = var1; // L: 272
 		}
 
-	} // L: 1583
+		this.field285[var3] = var1; // L: 273
+		var1.field346 = var2; // L: 274
+	} // L: 275
 }
diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java
index ab580a530d..9057fa0ea4 100644
--- a/runescape-client/src/main/java/PcmStream.java
+++ b/runescape-client/src/main/java/PcmStream.java
@@ -3,23 +3,23 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("av")
+@ObfuscatedName("ai")
 @Implements("PcmStream")
 public abstract class PcmStream extends Node {
 	@ObfuscatedName("w")
 	@Export("active")
 	volatile boolean active;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lav;"
+		descriptor = "Lai;"
 	)
 	@Export("after")
 	PcmStream after;
-	@ObfuscatedName("z")
-	int field320;
-	@ObfuscatedName("q")
+	@ObfuscatedName("u")
+	int field346;
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lbl;"
+		descriptor = "Lbq;"
 	)
 	@Export("sound")
 	AbstractSound sound;
@@ -28,37 +28,37 @@ protected PcmStream() {
 		this.active = true; // L: 11
 	} // L: 13
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("firstSubStream")
 	protected abstract PcmStream firstSubStream();
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("nextSubStream")
 	protected abstract PcmStream nextSubStream();
 
-	@ObfuscatedName("p")
-	protected abstract int vmethod4958();
+	@ObfuscatedName("w")
+	protected abstract int vmethod5260();
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("fill")
 	protected abstract void fill(int[] var1, int var2, int var3);
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("skip")
 	protected abstract void skip(int var1);
 
-	@ObfuscatedName("au")
-	int vmethod974() {
+	@ObfuscatedName("ac")
+	int vmethod991() {
 		return 255; // L: 16
 	}
 
-	@ObfuscatedName("fp")
+	@ObfuscatedName("fv")
 	@Export("update")
 	final void update(int[] var1, int var2, int var3) {
 		if (this.active) { // L: 24
diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java
index b4cd994920..199278a87b 100644
--- a/runescape-client/src/main/java/PcmStreamMixer.java
+++ b/runescape-client/src/main/java/PcmStreamMixer.java
@@ -3,152 +3,152 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("as")
+@ObfuscatedName("ap")
 @Implements("PcmStreamMixer")
 public class PcmStreamMixer extends PcmStream {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("subStreams")
 	NodeDeque subStreams;
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
-	NodeDeque field227;
-	@ObfuscatedName("a")
-	int field226;
-	@ObfuscatedName("o")
-	int field229;
+	NodeDeque field256;
+	@ObfuscatedName("p")
+	int field257;
+	@ObfuscatedName("m")
+	int field255;
 
 	public PcmStreamMixer() {
 		this.subStreams = new NodeDeque(); // L: 9
-		this.field227 = new NodeDeque(); // L: 10
-		this.field226 = 0; // L: 11
-		this.field229 = -1; // L: 12
+		this.field256 = new NodeDeque(); // L: 10
+		this.field257 = 0; // L: 11
+		this.field255 = -1; // L: 12
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lav;)V"
+		descriptor = "(Lai;)V"
 	)
 	@Export("addSubStream")
 	public final synchronized void addSubStream(PcmStream var1) {
 		this.subStreams.addLast(var1); // L: 15
 	} // L: 16
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lav;)V"
+		descriptor = "(Lai;)V"
 	)
 	@Export("removeSubStream")
 	public final synchronized void removeSubStream(PcmStream var1) {
 		var1.remove(); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("s")
-	void method663() {
-		if (this.field226 > 0) { // L: 23
-			for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field227.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field227.previous()) { // L: 24
-				var1.field368 -= this.field226; // L: 25
+	@ObfuscatedName("p")
+	void method691() {
+		if (this.field257 > 0) { // L: 23
+			for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field256.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field256.previous()) { // L: 24
+				var1.field393 -= this.field257; // L: 25
 			}
 
-			this.field229 -= this.field226; // L: 27
-			this.field226 = 0; // L: 28
+			this.field255 -= this.field257; // L: 27
+			this.field257 = 0; // L: 28
 		}
 
 	} // L: 30
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lns;Law;)V"
+		descriptor = "(Lnw;Lad;)V"
 	)
-	void method651(Node var1, PcmStreamMixerListener var2) {
-		while (this.field227.sentinel != var1 && ((PcmStreamMixerListener)var1).field368 <= var2.field368) { // L: 33
+	void method670(Node var1, PcmStreamMixerListener var2) {
+		while (this.field256.sentinel != var1 && ((PcmStreamMixerListener)var1).field393 <= var2.field393) { // L: 33
 			var1 = var1.previous;
 		}
 
 		NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34
-		this.field229 = ((PcmStreamMixerListener)this.field227.sentinel.previous).field368; // L: 35
+		this.field255 = ((PcmStreamMixerListener)this.field256.sentinel.previous).field393; // L: 35
 	} // L: 36
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Law;)V"
+		descriptor = "(Lad;)V"
 	)
-	void method633(PcmStreamMixerListener var1) {
+	void method671(PcmStreamMixerListener var1) {
 		var1.remove(); // L: 39
 		var1.remove2(); // L: 40
-		Node var2 = this.field227.sentinel.previous; // L: 41
-		if (var2 == this.field227.sentinel) {
-			this.field229 = -1; // L: 42
+		Node var2 = this.field256.sentinel.previous; // L: 41
+		if (var2 == this.field256.sentinel) {
+			this.field255 = -1; // L: 42
 		} else {
-			this.field229 = ((PcmStreamMixerListener)var2).field368; // L: 43
+			this.field255 = ((PcmStreamMixerListener)var2).field393; // L: 43
 		}
 
 	} // L: 44
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("firstSubStream")
 	protected PcmStream firstSubStream() {
 		return (PcmStream)this.subStreams.last(); // L: 47
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("nextSubStream")
 	protected PcmStream nextSubStream() {
 		return (PcmStream)this.subStreams.previous(); // L: 51
 	}
 
-	@ObfuscatedName("p")
-	protected int vmethod4958() {
+	@ObfuscatedName("w")
+	protected int vmethod5260() {
 		return 0; // L: 55
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("fill")
 	public final synchronized void fill(int[] var1, int var2, int var3) {
 		do {
-			if (this.field229 < 0) { // L: 60
+			if (this.field255 < 0) { // L: 60
 				this.updateSubStreams(var1, var2, var3); // L: 61
 				return; // L: 62
 			}
 
-			if (var3 + this.field226 < this.field229) { // L: 64
-				this.field226 += var3; // L: 65
+			if (var3 + this.field257 < this.field255) { // L: 64
+				this.field257 += var3; // L: 65
 				this.updateSubStreams(var1, var2, var3); // L: 66
 				return; // L: 67
 			}
 
-			int var4 = this.field229 - this.field226; // L: 69
+			int var4 = this.field255 - this.field257; // L: 69
 			this.updateSubStreams(var1, var2, var4); // L: 70
 			var2 += var4; // L: 71
 			var3 -= var4; // L: 72
-			this.field226 += var4; // L: 73
-			this.method663(); // L: 74
-			PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field227.last(); // L: 75
+			this.field257 += var4; // L: 73
+			this.method691(); // L: 74
+			PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field256.last(); // L: 75
 			synchronized(var5) { // L: 76
 				int var7 = var5.update(); // L: 77
 				if (var7 < 0) { // L: 78
-					var5.field368 = 0; // L: 79
-					this.method633(var5); // L: 80
+					var5.field393 = 0; // L: 79
+					this.method671(var5); // L: 80
 				} else {
-					var5.field368 = var7; // L: 83
-					this.method651(var5.previous, var5); // L: 84
+					var5.field393 = var7; // L: 83
+					this.method670(var5.previous, var5); // L: 84
 				}
 			}
 		} while(var3 != 0); // L: 87
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("updateSubStreams")
 	void updateSubStreams(int[] var1, int var2, int var3) {
 		for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92
@@ -157,42 +157,42 @@ void updateSubStreams(int[] var1, int var2, int var3) {
 
 	} // L: 95
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("skip")
 	public final synchronized void skip(int var1) {
 		do {
-			if (this.field229 < 0) { // L: 99
+			if (this.field255 < 0) { // L: 99
 				this.skipSubStreams(var1); // L: 100
 				return; // L: 101
 			}
 
-			if (this.field226 + var1 < this.field229) { // L: 103
-				this.field226 += var1; // L: 104
+			if (this.field257 + var1 < this.field255) { // L: 103
+				this.field257 += var1; // L: 104
 				this.skipSubStreams(var1); // L: 105
 				return; // L: 106
 			}
 
-			int var2 = this.field229 - this.field226; // L: 108
+			int var2 = this.field255 - this.field257; // L: 108
 			this.skipSubStreams(var2); // L: 109
 			var1 -= var2; // L: 110
-			this.field226 += var2; // L: 111
-			this.method663(); // L: 112
-			PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field227.last(); // L: 113
+			this.field257 += var2; // L: 111
+			this.method691(); // L: 112
+			PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field256.last(); // L: 113
 			synchronized(var3) { // L: 114
 				int var5 = var3.update(); // L: 115
 				if (var5 < 0) { // L: 116
-					var3.field368 = 0; // L: 117
-					this.method633(var3); // L: 118
+					var3.field393 = 0; // L: 117
+					this.method671(var3); // L: 118
 				} else {
-					var3.field368 = var5; // L: 121
-					this.method651(var3.previous, var3); // L: 122
+					var3.field393 = var5; // L: 121
+					this.method670(var3.previous, var3); // L: 122
 				}
 			}
 		} while(var1 != 0); // L: 125
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("skipSubStreams")
 	void skipSubStreams(int var1) {
 		for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130
diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java
index 7c2f530ed5..85747a9380 100644
--- a/runescape-client/src/main/java/PcmStreamMixerListener.java
+++ b/runescape-client/src/main/java/PcmStreamMixerListener.java
@@ -3,19 +3,19 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("aw")
+@ObfuscatedName("ad")
 @Implements("PcmStreamMixerListener")
 public abstract class PcmStreamMixerListener extends Node {
-	@ObfuscatedName("i")
-	int field368;
+	@ObfuscatedName("c")
+	int field393;
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("remove2")
 	abstract void remove2();
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Las;)I"
+		descriptor = "(Lap;)I"
 	)
 	@Export("update")
 	abstract int update();
diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java
index b4af4074c9..3ad5dc6203 100644
--- a/runescape-client/src/main/java/PendingSpawn.java
+++ b/runescape-client/src/main/java/PendingSpawn.java
@@ -4,75 +4,75 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cn")
+@ObfuscatedName("cg")
 @Implements("PendingSpawn")
 public final class PendingSpawn extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1526505763
+		intValue = 747226221
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1918488327
+		intValue = -1980117299
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1150411383
+		intValue = -554114639
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 471891205
+		intValue = 1191230763
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -2142358413
+		intValue = -748187349
 	)
 	@Export("objectId")
 	int objectId;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1726933753
+		intValue = 1874163139
 	)
-	int field1075;
-	@ObfuscatedName("e")
+	int field1087;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -2134886005
+		intValue = 474042509
 	)
-	int field1076;
-	@ObfuscatedName("p")
+	int field1080;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -821600297
+		intValue = -208489985
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1752810997
+		intValue = -104687109
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1311182743
+		intValue = 753624769
 	)
-	int field1082;
-	@ObfuscatedName("x")
+	int field1075;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -472158759
+		intValue = -2017319267
 	)
 	@Export("delay")
 	int delay;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1663724523
+		intValue = -1649420319
 	)
 	@Export("hitpoints")
 	int hitpoints;
@@ -82,64 +82,101 @@ public final class PendingSpawn extends Node {
 		this.hitpoints = -1; // L: 17
 	} // L: 19
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([BIILhf;[Lfq;I)V",
-		garbageValue = "-79780514"
+		descriptor = "([BIIB)Ljava/lang/String;",
+		garbageValue = "-94"
 	)
-	static final void method2162(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) {
-		Buffer var5 = new Buffer(var0); // L: 258
-		int var6 = -1; // L: 259
+	public static String method2224(byte[] var0, int var1, int var2) {
+		StringBuilder var3 = new StringBuilder(); // L: 58
 
-		while (true) {
-			int var7 = var5.method6981(); // L: 261
-			if (var7 == 0) { // L: 262
-				return; // L: 286
+		for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 59
+			int var5 = var0[var4] & 255; // L: 60
+			var3.append(class329.field4005[var5 >>> 2]); // L: 61
+			if (var4 < var2 - 1) { // L: 62
+				int var6 = var0[var4 + 1] & 255; // L: 63
+				var3.append(class329.field4005[(var5 & 3) << 4 | var6 >>> 4]); // L: 64
+				if (var4 < var2 - 2) { // L: 65
+					int var7 = var0[var4 + 2] & 255; // L: 66
+					var3.append(class329.field4005[(var6 & 15) << 2 | var7 >>> 6]).append(class329.field4005[var7 & 63]); // L: 67
+				} else {
+					var3.append(class329.field4005[(var6 & 15) << 2]).append("="); // L: 69
+				}
+			} else {
+				var3.append(class329.field4005[(var5 & 3) << 4]).append("=="); // L: 71
 			}
+		}
 
-			var6 += var7; // L: 263
-			int var8 = 0; // L: 264
+		return var3.toString(); // L: 73
+	}
 
-			while (true) {
-				int var9 = var5.readUShortSmart(); // L: 266
-				if (var9 == 0) { // L: 267
-					break;
-				}
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-2136768167"
+	)
+	static void method2225(int var0, int var1) {
+		long var2 = (long)((var0 << 16) + var1); // L: 246
+		NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 247
+		if (var4 != null) { // L: 248
+			NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 249
+		}
+	} // L: 250
 
-				var8 += var9 - 1; // L: 268
-				int var10 = var8 & 63; // L: 269
-				int var11 = var8 >> 6 & 63; // L: 270
-				int var12 = var8 >> 12; // L: 271
-				int var13 = var5.readUnsignedByte(); // L: 272
-				int var14 = var13 >> 2; // L: 273
-				int var15 = var13 & 3; // L: 274
-				int var16 = var11 + var1; // L: 275
-				int var17 = var10 + var2; // L: 276
-				if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 277
-					int var18 = var12; // L: 278
-					if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 279
-						var18 = var12 - 1;
-					}
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "([BIII)Ljava/lang/String;",
+		garbageValue = "-373054385"
+	)
+	@Export("decodeStringCp1252")
+	public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
+		char[] var3 = new char[var2]; // L: 152
+		int var4 = 0; // L: 153
 
-					CollisionMap var19 = null; // L: 280
-					if (var18 >= 0) { // L: 281
-						var19 = var4[var18];
+		for (int var5 = 0; var5 < var2; ++var5) { // L: 154
+			int var6 = var0[var5 + var1] & 255; // L: 155
+			if (var6 != 0) { // L: 156
+				if (var6 >= 128 && var6 < 160) { // L: 157
+					char var7 = class328.cp1252AsciiExtension[var6 - 128]; // L: 158
+					if (var7 == 0) { // L: 159
+						var7 = '?';
 					}
 
-					class92.method2276(var12, var16, var17, var6, var15, var14, var3, var19); // L: 282
+					var6 = var7; // L: 160
 				}
+
+				var3[var4++] = (char)var6; // L: 162
 			}
 		}
+
+		return new String(var3, 0, var4); // L: 164
 	}
 
-	@ObfuscatedName("lm")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;I)I",
-		garbageValue = "-1849354153"
+		descriptor = "(III)I",
+		garbageValue = "2133440883"
 	)
-	@Export("getWidgetFlags")
-	static int getWidgetFlags(Widget var0) {
-		IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 11879
-		return var1 != null ? var1.integer : var0.flags; // L: 11880 11881
+	static final int method2223(int var0, int var1) {
+		if (var0 == -2) { // L: 503
+			return 12345678;
+		} else if (var0 == -1) { // L: 504
+			if (var1 < 2) { // L: 505
+				var1 = 2;
+			} else if (var1 > 126) { // L: 506
+				var1 = 126;
+			}
+
+			return var1; // L: 507
+		} else {
+			var1 = (var0 & 127) * var1 / 128; // L: 509
+			if (var1 < 2) { // L: 510
+				var1 = 2;
+			} else if (var1 > 126) { // L: 511
+				var1 = 126;
+			}
+
+			return (var0 & 65408) + var1; // L: 512
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java
index db3db052e0..9ec79b6701 100644
--- a/runescape-client/src/main/java/PlatformInfo.java
+++ b/runescape-client/src/main/java/PlatformInfo.java
@@ -4,200 +4,200 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("np")
+@ObfuscatedName("nn")
 @Implements("PlatformInfo")
 public class PlatformInfo extends Node {
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -855312751
+		intValue = 1901271563
 	)
-	int field4092;
-	@ObfuscatedName("as")
-	boolean field4091;
-	@ObfuscatedName("at")
+	int field4276;
+	@ObfuscatedName("au")
+	boolean field4272;
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 934385817
+		intValue = -1729392719
 	)
-	int field4093;
-	@ObfuscatedName("az")
+	int field4297;
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -841511077
+		intValue = -1778133759
 	)
-	int field4095;
+	int field4277;
 	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = -88776347
+		intValue = -1484226765
 	)
-	int field4096;
-	@ObfuscatedName("ak")
+	int field4278;
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 1463853317
+		intValue = -1891325743
 	)
-	int field4094;
-	@ObfuscatedName("ab")
+	int field4295;
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = 117450165
+		intValue = 859155677
 	)
-	int field4103;
+	int field4280;
 	@ObfuscatedName("ar")
-	boolean field4086;
-	@ObfuscatedName("ad")
+	boolean field4281;
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 330580727
+		intValue = 1239922409
 	)
-	int field4100;
-	@ObfuscatedName("an")
+	int field4265;
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = -376982197
+		intValue = 657537983
 	)
-	int field4101;
-	@ObfuscatedName("av")
+	int field4283;
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 922950559
+		intValue = -1974722965
 	)
-	int field4102;
-	@ObfuscatedName("ap")
+	int field4284;
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -1991963229
+		intValue = 1148891367
 	)
-	int field4104;
-	@ObfuscatedName("au")
-	String field4098;
-	@ObfuscatedName("aj")
-	String field4099;
-	@ObfuscatedName("af")
-	String field4106;
+	int field4268;
+	@ObfuscatedName("ai")
+	String field4286;
+	@ObfuscatedName("aq")
+	String field4287;
 	@ObfuscatedName("aw")
-	String field4107;
-	@ObfuscatedName("ao")
+	String field4294;
+	@ObfuscatedName("ay")
+	String field4289;
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 1913673055
+		intValue = -1038767679
 	)
-	int field4108;
-	@ObfuscatedName("aa")
+	int field4274;
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = 1121209561
+		intValue = -757895191
 	)
-	int field4109;
-	@ObfuscatedName("ay")
+	int field4275;
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = -64925851
+		intValue = -268917115
 	)
-	int field4112;
-	@ObfuscatedName("bg")
+	int field4292;
+	@ObfuscatedName("bp")
 	@ObfuscatedGetter(
-		intValue = 933896169
+		intValue = -1908862077
 	)
-	int field4111;
-	@ObfuscatedName("bl")
-	String field4105;
-	@ObfuscatedName("bx")
-	String field4113;
+	int field4293;
 	@ObfuscatedName("bd")
-	int[] field4114;
-	@ObfuscatedName("bt")
+	String field4290;
+	@ObfuscatedName("ba")
+	String field4291;
+	@ObfuscatedName("bq")
+	int[] field4296;
+	@ObfuscatedName("bg")
 	@ObfuscatedGetter(
-		intValue = -194577267
+		intValue = -1223421039
 	)
-	int field4115;
-	@ObfuscatedName("bf")
-	String field4116;
+	int field4285;
+	@ObfuscatedName("br")
+	String field4298;
 
 	PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) {
-		this.field4114 = new int[3]; // L: 62
-		this.field4092 = var1; // L: 67
-		this.field4091 = var2; // L: 68
-		this.field4093 = var3; // L: 69
-		this.field4095 = var4; // L: 70
-		this.field4096 = var5; // L: 71
-		this.field4094 = var6; // L: 72
-		this.field4103 = var7; // L: 73
-		this.field4086 = var8; // L: 74
-		this.field4100 = var9; // L: 75
-		this.field4101 = var10; // L: 76
-		this.field4102 = var11; // L: 77
-		this.field4104 = var12; // L: 78
-		this.field4098 = var13; // L: 79
-		this.field4099 = var14; // L: 80
-		this.field4106 = var15; // L: 81
-		this.field4107 = var16; // L: 82
-		this.field4108 = var17; // L: 83
-		this.field4109 = var18; // L: 84
-		this.field4112 = var19; // L: 85
-		this.field4111 = var20; // L: 86
-		this.field4105 = var21; // L: 87
-		this.field4113 = var22; // L: 88
-		this.field4114 = var23; // L: 89
-		this.field4115 = var24; // L: 90
-		this.field4116 = var25; // L: 91
+		this.field4296 = new int[3]; // L: 62
+		this.field4276 = var1; // L: 67
+		this.field4272 = var2; // L: 68
+		this.field4297 = var3; // L: 69
+		this.field4277 = var4; // L: 70
+		this.field4278 = var5; // L: 71
+		this.field4295 = var6; // L: 72
+		this.field4280 = var7; // L: 73
+		this.field4281 = var8; // L: 74
+		this.field4265 = var9; // L: 75
+		this.field4283 = var10; // L: 76
+		this.field4284 = var11; // L: 77
+		this.field4268 = var12; // L: 78
+		this.field4286 = var13; // L: 79
+		this.field4287 = var14; // L: 80
+		this.field4294 = var15; // L: 81
+		this.field4289 = var16; // L: 82
+		this.field4274 = var17; // L: 83
+		this.field4275 = var18; // L: 84
+		this.field4292 = var19; // L: 85
+		this.field4293 = var20; // L: 86
+		this.field4290 = var21; // L: 87
+		this.field4291 = var22; // L: 88
+		this.field4296 = var23; // L: 89
+		this.field4285 = var24; // L: 90
+		this.field4298 = var25; // L: 91
 	} // L: 92
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "1363785145"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "-2015078153"
 	)
 	@Export("write")
 	public void write(Buffer var1) {
 		var1.writeByte(8); // L: 95
-		var1.writeByte(this.field4092); // L: 96
-		var1.writeByte(this.field4091 ? 1 : 0); // L: 97
-		var1.writeShort(this.field4093); // L: 98
-		var1.writeByte(this.field4095); // L: 99
-		var1.writeByte(this.field4096); // L: 100
-		var1.writeByte(this.field4094); // L: 101
-		var1.writeByte(this.field4103); // L: 102
-		var1.writeByte(this.field4086 ? 1 : 0); // L: 103
-		var1.writeShort(this.field4100); // L: 104
-		var1.writeByte(this.field4101); // L: 105
-		var1.writeMedium(this.field4102); // L: 106
-		var1.writeShort(this.field4104); // L: 107
-		var1.writeStringCp1252NullCircumfixed(this.field4098); // L: 108
-		var1.writeStringCp1252NullCircumfixed(this.field4099); // L: 109
-		var1.writeStringCp1252NullCircumfixed(this.field4106); // L: 110
-		var1.writeStringCp1252NullCircumfixed(this.field4107); // L: 111
-		var1.writeByte(this.field4109); // L: 112
-		var1.writeShort(this.field4108); // L: 113
-		var1.writeStringCp1252NullCircumfixed(this.field4105); // L: 114
-		var1.writeStringCp1252NullCircumfixed(this.field4113); // L: 115
-		var1.writeByte(this.field4112); // L: 116
-		var1.writeByte(this.field4111); // L: 117
+		var1.writeByte(this.field4276); // L: 96
+		var1.writeByte(this.field4272 ? 1 : 0); // L: 97
+		var1.writeShort(this.field4297); // L: 98
+		var1.writeByte(this.field4277); // L: 99
+		var1.writeByte(this.field4278); // L: 100
+		var1.writeByte(this.field4295); // L: 101
+		var1.writeByte(this.field4280); // L: 102
+		var1.writeByte(this.field4281 ? 1 : 0); // L: 103
+		var1.writeShort(this.field4265); // L: 104
+		var1.writeByte(this.field4283); // L: 105
+		var1.writeMedium(this.field4284); // L: 106
+		var1.writeShort(this.field4268); // L: 107
+		var1.writeStringCp1252NullCircumfixed(this.field4286); // L: 108
+		var1.writeStringCp1252NullCircumfixed(this.field4287); // L: 109
+		var1.writeStringCp1252NullCircumfixed(this.field4294); // L: 110
+		var1.writeStringCp1252NullCircumfixed(this.field4289); // L: 111
+		var1.writeByte(this.field4275); // L: 112
+		var1.writeShort(this.field4274); // L: 113
+		var1.writeStringCp1252NullCircumfixed(this.field4290); // L: 114
+		var1.writeStringCp1252NullCircumfixed(this.field4291); // L: 115
+		var1.writeByte(this.field4292); // L: 116
+		var1.writeByte(this.field4293); // L: 117
 
-		for (int var2 = 0; var2 < this.field4114.length; ++var2) { // L: 118
-			var1.writeInt(this.field4114[var2]);
+		for (int var2 = 0; var2 < this.field4296.length; ++var2) { // L: 118
+			var1.writeInt(this.field4296[var2]);
 		}
 
-		var1.writeInt(this.field4115); // L: 119
-		var1.writeStringCp1252NullCircumfixed(this.field4116); // L: 120
+		var1.writeInt(this.field4285); // L: 119
+		var1.writeStringCp1252NullCircumfixed(this.field4298); // L: 120
 	} // L: 121
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1151210729"
+		garbageValue = "-722999470"
 	)
 	@Export("size")
 	public int size() {
 		byte var1 = 39; // L: 124
-		String var4 = this.field4098; // L: 127
+		String var4 = this.field4286; // L: 127
 		int var3 = var4.length() + 2; // L: 129
-		int var23 = var1 + var3; // L: 131
-		String var7 = this.field4099; // L: 134
+		int var23 = var3 + var1; // L: 131
+		String var7 = this.field4287; // L: 134
 		int var6 = var7.length() + 2; // L: 136
 		var23 += var6; // L: 138
-		String var10 = this.field4106; // L: 141
+		String var10 = this.field4294; // L: 141
 		int var9 = var10.length() + 2; // L: 143
 		var23 += var9; // L: 145
-		String var13 = this.field4107; // L: 148
+		String var13 = this.field4289; // L: 148
 		int var12 = var13.length() + 2; // L: 150
 		var23 += var12; // L: 152
-		String var16 = this.field4105; // L: 155
+		String var16 = this.field4290; // L: 155
 		int var15 = var16.length() + 2; // L: 157
 		var23 += var15; // L: 159
-		String var19 = this.field4113; // L: 162
+		String var19 = this.field4291; // L: 162
 		int var18 = var19.length() + 2; // L: 164
 		var23 += var18; // L: 166
-		String var22 = this.field4116; // L: 169
+		String var22 = this.field4298; // L: 169
 		int var21 = var22.length() + 2; // L: 171
 		var23 += var21; // L: 173
 		return var23; // L: 174
diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java
index 494efc99b3..94ccf31f20 100644
--- a/runescape-client/src/main/java/PlatformInfoProvider.java
+++ b/runescape-client/src/main/java/PlatformInfoProvider.java
@@ -3,13 +3,13 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nm")
+@ObfuscatedName("nb")
 @Implements("PlatformInfoProvider")
 public interface PlatformInfoProvider {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lnp;",
-		garbageValue = "-1940365419"
+		descriptor = "(B)Lnn;",
+		garbageValue = "-12"
 	)
 	@Export("get")
 	PlatformInfo get();
diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java
index c74150d24b..e16f57faec 100644
--- a/runescape-client/src/main/java/Player.java
+++ b/runescape-client/src/main/java/Player.java
@@ -4,165 +4,165 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cx")
+@ObfuscatedName("ck")
 @Implements("Player")
 public final class Player extends Actor {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lpb;"
+		descriptor = "Lpo;"
 	)
 	@Export("username")
 	Username username;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lit;"
+		descriptor = "Ljo;"
 	)
 	@Export("appearance")
 	PlayerComposition appearance;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1696994265
+		intValue = -547248219
 	)
 	@Export("headIconPk")
 	int headIconPk;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -2126802757
+		intValue = -1687298057
 	)
 	@Export("headIconPrayer")
 	int headIconPrayer;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("actions")
 	String[] actions;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -937184137
+		intValue = 878255091
 	)
 	@Export("combatLevel")
 	int combatLevel;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1332697309
+		intValue = -423854961
 	)
 	@Export("skillLevel")
 	int skillLevel;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 337451977
+		intValue = 1513601945
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1425054189
+		intValue = 1398284239
 	)
 	@Export("animationCycleStart")
 	int animationCycleStart;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1458184293
+		intValue = -870222811
 	)
 	@Export("animationCycleEnd")
 	int animationCycleEnd;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 288875039
+		intValue = -1880432377
 	)
-	int field1042;
-	@ObfuscatedName("k")
+	int field1056;
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 332788461
+		intValue = 624676029
 	)
 	@Export("tileHeight2")
 	int tileHeight2;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 13115945
+		intValue = 1704388603
 	)
-	int field1052;
-	@ObfuscatedName("l")
+	int field1058;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lgo;"
 	)
 	@Export("model0")
 	Model model0;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1775444559
+		intValue = -1828058055
 	)
 	@Export("minX")
 	int minX;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1238271901
+		intValue = -252077857
 	)
 	@Export("minY")
 	int minY;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1266032001
+		intValue = -1520865497
 	)
 	@Export("maxX")
 	int maxX;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1322091437
+		intValue = 639738043
 	)
 	@Export("maxY")
 	int maxY;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("isUnanimated")
 	boolean isUnanimated;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -928304435
+		intValue = 826351973
 	)
 	@Export("team")
 	int team;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("isHidden")
 	boolean isHidden;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1357016489
+		intValue = 1303296439
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 416153075
+		intValue = 1488352927
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("isFriendTriBool")
 	TriBool isFriendTriBool;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("isInFriendsChat")
 	TriBool isInFriendsChat;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("isInClanChat")
 	TriBool isInClanChat;
-	@ObfuscatedName("ae")
-	boolean field1067;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ao")
+	boolean field1055;
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -308953969
+		intValue = -869781509
 	)
 	@Export("tileX")
 	int tileX;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = -699519147
+		intValue = 1571518459
 	)
 	@Export("tileY")
 	int tileY;
@@ -186,13 +186,13 @@ public final class Player extends Actor {
 		this.isFriendTriBool = TriBool.TriBool_unknown; // L: 47
 		this.isInFriendsChat = TriBool.TriBool_unknown; // L: 48
 		this.isInClanChat = TriBool.TriBool_unknown; // L: 49
-		this.field1067 = false; // L: 50
+		this.field1055 = false; // L: 50
 	} // L: 54
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1757625786"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "-1789639005"
 	)
 	@Export("read")
 	final void read(Buffer var1) {
@@ -220,7 +220,7 @@ final void read(Buffer var1) {
 				}
 
 				if (var4[var5] >= 512) { // L: 76
-					var8 = TaskHandler.ItemDefinition_get(var4[var5] - 512).team; // L: 77
+					var8 = UserComparator6.ItemDefinition_get(var4[var5] - 512).team; // L: 77
 					if (var8 != 0) { // L: 78
 						this.team = var8;
 					}
@@ -232,7 +232,7 @@ final void read(Buffer var1) {
 
 		for (var6 = 0; var6 < 5; ++var6) { // L: 82
 			var7 = var1.readUnsignedByte(); // L: 83
-			if (var7 < 0 || var7 >= class137.field1519[var6].length) { // L: 84
+			if (var7 < 0 || var7 >= class114.field1382[var6].length) { // L: 84
 				var7 = 0;
 			}
 
@@ -275,11 +275,11 @@ final void read(Buffer var1) {
 			super.runSequence = -1;
 		}
 
-		this.username = new Username(var1.readStringCp1252NullTerminated(), GrandExchangeOfferUnitPriceComparator.loginType); // L: 102
+		this.username = new Username(var1.readStringCp1252NullTerminated(), class194.loginType); // L: 102
 		this.clearIsFriend(); // L: 103
 		this.clearIsInFriendsChat(); // L: 104
-		this.method2105(); // L: 105
-		if (this == HealthBarDefinition.localPlayer) { // L: 106
+		this.method2186(); // L: 105
+		if (this == class340.localPlayer) { // L: 106
 			RunException.localPlayerName = this.username.getName();
 		}
 
@@ -290,18 +290,18 @@ final void read(Buffer var1) {
 			this.isHidden = false;
 		}
 
-		class150[] var12 = null; // L: 111
+		class160[] var12 = null; // L: 111
 		boolean var13 = false; // L: 112
 		if (var1.offset < var1.array.length) { // L: 113
 			var8 = var1.readUnsignedShort(); // L: 114
 			var13 = (var8 >> 15 & 1) == 1; // L: 115
 			if (var8 > 0 && var8 != 32768) { // L: 116
-				var12 = new class150[12]; // L: 117
+				var12 = new class160[12]; // L: 117
 
 				for (int var9 = 0; var9 < 12; ++var9) { // L: 118
 					int var10 = var8 >> 12 - var9 & 1; // L: 119
 					if (var10 == 1) { // L: 120
-						var12[var9] = NPCComposition.method3152(var4[var9] - 512, var1); // L: 121
+						var12[var9] = ClanChannelMember.method2777(var4[var9] - 512, var1); // L: 121
 					}
 				}
 			}
@@ -311,21 +311,21 @@ final void read(Buffer var1) {
 			this.appearance = new PlayerComposition();
 		}
 
-		this.appearance.method5062(var4, var12, var13, var11, var2 == 1, var3); // L: 127
+		this.appearance.method5368(var4, var12, var13, var11, var2 == 1, var3); // L: 127
 	} // L: 128
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lhl;",
-		garbageValue = "461766541"
+		descriptor = "(I)Lgo;",
+		garbageValue = "202861607"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
 		if (this.appearance == null) { // L: 189
 			return null;
 		} else {
-			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? MouseHandler.SequenceDefinition_get(super.sequence) : null; // L: 190
-			SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : MouseHandler.SequenceDefinition_get(super.movementSequence); // L: 191
+			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? UserComparator5.SequenceDefinition_get(super.sequence) : null; // L: 190
+			SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : UserComparator5.SequenceDefinition_get(super.movementSequence); // L: 191
 			Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 192
 			if (var3 == null) { // L: 193
 				return null;
@@ -335,9 +335,9 @@ protected final Model getModel() {
 				Model var4;
 				Model[] var5;
 				if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 196
-					var4 = BZip2State.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 197
+					var4 = AccessFile.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 197
 					if (var4 != null) { // L: 198
-						var4.offsetBy(0, -super.field1126, 0); // L: 199
+						var4.offsetBy(0, -super.field1131, 0); // L: 199
 						var5 = new Model[]{var3, var4}; // L: 200
 						var3 = new Model(var5, 2); // L: 201
 					}
@@ -350,7 +350,7 @@ protected final Model getModel() {
 
 					if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 206
 						var4 = this.model0; // L: 207
-						var4.offsetBy(this.field1042 - super.x, this.tileHeight2 - this.tileHeight, this.field1052 - super.y); // L: 208
+						var4.offsetBy(this.field1056 - super.x, this.tileHeight2 - this.tileHeight, this.field1058 - super.y); // L: 208
 						if (super.orientation == 512) { // L: 209
 							var4.rotateY90Ccw(); // L: 210
 							var4.rotateY90Ccw(); // L: 211
@@ -375,20 +375,29 @@ protected final Model getModel() {
 							var4.rotateY90Ccw(); // L: 229
 						}
 
-						var4.offsetBy(super.x - this.field1042, this.tileHeight - this.tileHeight2, super.y - this.field1052); // L: 231
+						var4.offsetBy(super.x - this.field1056, this.tileHeight - this.tileHeight2, super.y - this.field1058); // L: 231
 					}
 				}
 
 				var3.isSingleTile = true; // L: 234
-				return var3; // L: 235
+				if (super.field1146 != 0 && Client.cycle >= super.field1141 && Client.cycle < super.field1140) { // L: 235
+					var3.field2494 = super.field1143; // L: 236
+					var3.field2495 = super.field1144; // L: 237
+					var3.field2479 = super.field1095; // L: 238
+					var3.field2474 = super.field1146; // L: 239
+				} else {
+					var3.field2474 = 0; // L: 242
+				}
+
+				return var3; // L: 244
 			}
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "45"
+		descriptor = "(I)Z",
+		garbageValue = "-373800926"
 	)
 	@Export("isFriend")
 	boolean isFriend() {
@@ -399,30 +408,30 @@ boolean isFriend() {
 		return this.isFriendTriBool == TriBool.TriBool_true; // L: 134
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "426200775"
+		descriptor = "(B)V",
+		garbageValue = "7"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.isFriendTriBool = TriBool.TriBool_unknown; // L: 138
 	} // L: 139
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "942612760"
+		garbageValue = "1903452676"
 	)
 	@Export("checkIsFriend")
 	void checkIsFriend() {
-		this.isFriendTriBool = class112.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 142
+		this.isFriendTriBool = GameEngine.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 142
 	} // L: 143
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "220303243"
+		descriptor = "(B)Z",
+		garbageValue = "111"
 	)
 	@Export("isFriendsChatMember")
 	boolean isFriendsChatMember() {
@@ -433,35 +442,35 @@ boolean isFriendsChatMember() {
 		return this.isInFriendsChat == TriBool.TriBool_true; // L: 149
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-1"
+		descriptor = "(I)V",
+		garbageValue = "1186540924"
 	)
 	@Export("clearIsInFriendsChat")
 	void clearIsInFriendsChat() {
 		this.isInFriendsChat = TriBool.TriBool_unknown; // L: 153
 	} // L: 154
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "579888047"
+		descriptor = "(B)V",
+		garbageValue = "76"
 	)
 	@Export("updateIsInFriendsChat")
 	void updateIsInFriendsChat() {
-		this.isInFriendsChat = AbstractArchive.friendsChat != null && AbstractArchive.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 157
+		this.isInFriendsChat = Players.friendsChat != null && Players.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 157
 	} // L: 158
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-396296136"
+		garbageValue = "-1789868613"
 	)
 	@Export("updateIsInClanChat")
 	void updateIsInClanChat() {
 		for (int var1 = 0; var1 < 2; ++var1) { // L: 161
-			if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2649(this.username.getName()) != -1) { // L: 162
+			if (Client.currentClanSettings[var1] != null && Client.currentClanSettings[var1].method2881(this.username.getName()) != -1) { // L: 162
 				this.isInClanChat = TriBool.TriBool_true; // L: 163
 				return; // L: 164
 			}
@@ -470,19 +479,19 @@ void updateIsInClanChat() {
 		this.isInClanChat = TriBool.TriBool_false; // L: 167
 	} // L: 168
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "25"
+		descriptor = "(I)V",
+		garbageValue = "-782154637"
 	)
-	void method2105() {
+	void method2186() {
 		this.isInClanChat = TriBool.TriBool_unknown; // L: 171
 	} // L: 172
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "1"
+		descriptor = "(I)Z",
+		garbageValue = "98044476"
 	)
 	@Export("isClanMember")
 	boolean isClanMember() {
@@ -493,297 +502,34 @@ boolean isClanMember() {
 		return this.isInClanChat == TriBool.TriBool_true; // L: 178
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "82"
+		descriptor = "(I)I",
+		garbageValue = "1145675774"
 	)
 	@Export("transformedSize")
 	int transformedSize() {
-		return this.appearance != null && this.appearance.npcTransformId != -1 ? ScriptFrame.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 182 183 185
+		return this.appearance != null && this.appearance.npcTransformId != -1 ? WorldMapLabelSize.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 182 183 185
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(IIBI)V",
-		garbageValue = "-1013246003"
+		descriptor = "(IILgj;I)V",
+		garbageValue = "-1031926598"
 	)
-	final void method2109(int var1, int var2, byte var3) {
-		if (super.sequence != -1 && MouseHandler.SequenceDefinition_get(super.sequence).field1956 == 1) { // L: 239
+	final void method2175(int var1, int var2, class185 var3) {
+		if (super.sequence != -1 && UserComparator5.SequenceDefinition_get(super.sequence).field2097 == 1) { // L: 248
 			super.sequence = -1;
 		}
 
-		super.field1112 = -1; // L: 240
-		if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 241
-			if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 242
-				if (var3 == 2) { // L: 244
-					Player var4 = this; // L: 245
-					int var5 = super.pathX[0]; // L: 247
-					int var6 = super.pathY[0]; // L: 248
-					int var7 = this.transformedSize(); // L: 249
-					if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { // L: 250 251
-						int var9 = this.transformedSize(); // L: 253
-						Client.field743.approxDestinationX = var1; // L: 256
-						Client.field743.approxDestinationY = var2; // L: 257
-						Client.field743.approxDestinationSizeX = 1; // L: 258
-						Client.field743.approxDestinationSizeY = 1; // L: 259
-						ApproximateRouteStrategy var10 = Client.field743; // L: 260
-						ApproximateRouteStrategy var11 = var10; // L: 262
-						CollisionMap var12 = Client.collisionMaps[this.plane]; // L: 263
-						int[] var13 = Client.field538; // L: 264
-						int[] var14 = Client.field748; // L: 265
-						int var15 = 0;
-
-						label381:
-						while (true) {
-							int var16;
-							if (var15 >= 128) {
-								int var17;
-								int var18;
-								byte var20;
-								int var21;
-								int var22;
-								int var24;
-								int var26;
-								int var27;
-								int var28;
-								boolean var35;
-								int var37;
-								int var38;
-								int var40;
-								if (var9 == 1) { // L: 274
-									var17 = var5; // L: 277
-									var18 = var6; // L: 278
-									byte var19 = 64; // L: 279
-									var20 = 64; // L: 280
-									var21 = var5 - var19; // L: 281
-									var22 = var6 - var20; // L: 282
-									class174.directions[var19][var20] = 99; // L: 283
-									class174.distances[var19][var20] = 0; // L: 284
-									byte var23 = 0; // L: 285
-									var24 = 0; // L: 286
-									class174.bufferX[var23] = var5; // L: 287
-									var40 = var23 + 1;
-									class174.bufferY[var23] = var6; // L: 288
-									int[][] var25 = var12.flags; // L: 289
-
-									boolean var36;
-									while (true) {
-										if (var24 == var40) { // L: 292
-											RouteStrategy.field1979 = var17; // L: 364
-											class67.field845 = var18; // L: 365
-											var36 = false; // L: 366
-											break;
-										}
-
-										var17 = class174.bufferX[var24]; // L: 293
-										var18 = class174.bufferY[var24]; // L: 294
-										var24 = var24 + 1 & 4095; // L: 295
-										var37 = var17 - var21; // L: 296
-										var38 = var18 - var22; // L: 297
-										var26 = var17 - var12.xInset; // L: 298
-										var27 = var18 - var12.yInset; // L: 299
-										if (var11.hasArrived(1, var17, var18, var12)) { // L: 300
-											RouteStrategy.field1979 = var17; // L: 301
-											class67.field845 = var18; // L: 302
-											var36 = true; // L: 303
-											break;
-										}
-
-										var28 = class174.distances[var37][var38] + 1; // L: 306
-										if (var37 > 0 && class174.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136776) == 0) { // L: 307
-											class174.bufferX[var40] = var17 - 1; // L: 308
-											class174.bufferY[var40] = var18; // L: 309
-											var40 = var40 + 1 & 4095; // L: 310
-											class174.directions[var37 - 1][var38] = 2; // L: 311
-											class174.distances[var37 - 1][var38] = var28; // L: 312
-										}
-
-										if (var37 < 127 && class174.directions[var37 + 1][var38] == 0 && (var25[var26 + 1][var27] & 19136896) == 0) { // L: 314
-											class174.bufferX[var40] = var17 + 1; // L: 315
-											class174.bufferY[var40] = var18; // L: 316
-											var40 = var40 + 1 & 4095; // L: 317
-											class174.directions[var37 + 1][var38] = 8; // L: 318
-											class174.distances[var37 + 1][var38] = var28; // L: 319
-										}
-
-										if (var38 > 0 && class174.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 321
-											class174.bufferX[var40] = var17; // L: 322
-											class174.bufferY[var40] = var18 - 1; // L: 323
-											var40 = var40 + 1 & 4095; // L: 324
-											class174.directions[var37][var38 - 1] = 1; // L: 325
-											class174.distances[var37][var38 - 1] = var28; // L: 326
-										}
-
-										if (var38 < 127 && class174.directions[var37][var38 + 1] == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 328
-											class174.bufferX[var40] = var17; // L: 329
-											class174.bufferY[var40] = var18 + 1; // L: 330
-											var40 = var40 + 1 & 4095; // L: 331
-											class174.directions[var37][var38 + 1] = 4; // L: 332
-											class174.distances[var37][var38 + 1] = var28; // L: 333
-										}
-
-										if (var37 > 0 && var38 > 0 && class174.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 335
-											class174.bufferX[var40] = var17 - 1; // L: 336
-											class174.bufferY[var40] = var18 - 1; // L: 337
-											var40 = var40 + 1 & 4095; // L: 338
-											class174.directions[var37 - 1][var38 - 1] = 3; // L: 339
-											class174.distances[var37 - 1][var38 - 1] = var28; // L: 340
-										}
-
-										if (var37 < 127 && var38 > 0 && class174.directions[var37 + 1][var38 - 1] == 0 && (var25[var26 + 1][var27 - 1] & 19136899) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 - 1] & 19136770) == 0) { // L: 342
-											class174.bufferX[var40] = var17 + 1; // L: 343
-											class174.bufferY[var40] = var18 - 1; // L: 344
-											var40 = var40 + 1 & 4095; // L: 345
-											class174.directions[var37 + 1][var38 - 1] = 9; // L: 346
-											class174.distances[var37 + 1][var38 - 1] = var28; // L: 347
-										}
-
-										if (var37 > 0 && var38 < 127 && class174.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + 1] & 19136824) == 0 && (var25[var26 - 1][var27] & 19136776) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 349
-											class174.bufferX[var40] = var17 - 1; // L: 350
-											class174.bufferY[var40] = var18 + 1; // L: 351
-											var40 = var40 + 1 & 4095; // L: 352
-											class174.directions[var37 - 1][var38 + 1] = 6; // L: 353
-											class174.distances[var37 - 1][var38 + 1] = var28; // L: 354
-										}
-
-										if (var37 < 127 && var38 < 127 && class174.directions[var37 + 1][var38 + 1] == 0 && (var25[var26 + 1][var27 + 1] & 19136992) == 0 && (var25[var26 + 1][var27] & 19136896) == 0 && (var25[var26][var27 + 1] & 19136800) == 0) { // L: 356
-											class174.bufferX[var40] = var17 + 1; // L: 357
-											class174.bufferY[var40] = var18 + 1; // L: 358
-											var40 = var40 + 1 & 4095; // L: 359
-											class174.directions[var37 + 1][var38 + 1] = 12; // L: 360
-											class174.distances[var37 + 1][var38 + 1] = var28; // L: 361
-										}
-									}
-
-									var35 = var36; // L: 368
-								} else if (var9 == 2) { // L: 370
-									var35 = WorldMapRectangle.method3959(var5, var6, var10, var12);
-								} else {
-									var35 = class318.method5874(var5, var6, var9, var10, var12); // L: 371
-								}
-
-								int var8;
-								label404: {
-									var16 = var5 - 64; // L: 372
-									var17 = var6 - 64; // L: 373
-									var18 = RouteStrategy.field1979; // L: 374
-									var37 = class67.field845; // L: 375
-									if (!var35) { // L: 376
-										var38 = Integer.MAX_VALUE; // L: 378
-										var21 = Integer.MAX_VALUE; // L: 379
-										byte var39 = 10; // L: 380
-										var40 = var11.approxDestinationX; // L: 381
-										var24 = var11.approxDestinationY; // L: 382
-										int var34 = var11.approxDestinationSizeX; // L: 383
-										var26 = var11.approxDestinationSizeY; // L: 384
-
-										for (var27 = var40 - var39; var27 <= var39 + var40; ++var27) { // L: 385
-											for (var28 = var24 - var39; var28 <= var39 + var24; ++var28) { // L: 386
-												int var29 = var27 - var16; // L: 387
-												int var30 = var28 - var17; // L: 388
-												if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class174.distances[var29][var30] < 100) { // L: 389 390
-													int var31 = 0; // L: 391
-													if (var27 < var40) { // L: 392
-														var31 = var40 - var27;
-													} else if (var27 > var40 + var34 - 1) { // L: 393
-														var31 = var27 - (var40 + var34 - 1);
-													}
-
-													int var32 = 0; // L: 394
-													if (var28 < var24) { // L: 395
-														var32 = var24 - var28;
-													} else if (var28 > var26 + var24 - 1) { // L: 396
-														var32 = var28 - (var24 + var26 - 1);
-													}
-
-													int var33 = var31 * var31 + var32 * var32; // L: 397
-													if (var33 < var38 || var38 == var33 && class174.distances[var29][var30] < var21) { // L: 398
-														var38 = var33; // L: 399
-														var21 = class174.distances[var29][var30]; // L: 400
-														var18 = var27; // L: 401
-														var37 = var28; // L: 402
-													}
-												}
-											}
-										}
-
-										if (var38 == Integer.MAX_VALUE) { // L: 408
-											var8 = -1; // L: 409
-											break label404;
-										}
-									}
-
-									if (var18 == var5 && var37 == var6) { // L: 418
-										var8 = 0; // L: 419
-									} else {
-										var20 = 0; // L: 422
-										class174.bufferX[var20] = var18; // L: 425
-										var38 = var20 + 1;
-										class174.bufferY[var20] = var37; // L: 426
-
-										for (var21 = var22 = class174.directions[var18 - var16][var37 - var17]; var18 != var5 || var37 != var6; var21 = class174.directions[var18 - var16][var37 - var17]) { // L: 427 428 438
-											if (var22 != var21) { // L: 429
-												var22 = var21; // L: 430
-												class174.bufferX[var38] = var18; // L: 431
-												class174.bufferY[var38++] = var37; // L: 432
-											}
-
-											if ((var21 & 2) != 0) { // L: 434
-												++var18;
-											} else if ((var21 & 8) != 0) { // L: 435
-												--var18;
-											}
-
-											if ((var21 & 1) != 0) { // L: 436
-												++var37;
-											} else if ((var21 & 4) != 0) { // L: 437
-												--var37;
-											}
-										}
-
-										var40 = 0; // L: 440
-
-										while (var38-- > 0) { // L: 441
-											var13[var40] = class174.bufferX[var38]; // L: 442
-											var14[var40++] = class174.bufferY[var38]; // L: 443
-											if (var40 >= var13.length) { // L: 444
-												break;
-											}
-										}
-
-										var8 = var40; // L: 446
-									}
-								}
-
-								var15 = var8; // L: 448
-								if (var8 < 1) { // L: 449
-									break;
-								}
-
-								var16 = 0; // L: 450
-
-								while (true) {
-									if (var16 >= var15 - 1) {
-										break label381;
-									}
-
-									var4.method2111(Client.field538[var16], Client.field748[var16], (byte)2);
-									++var16;
-								}
-							}
-
-							for (var16 = 0; var16 < 128; ++var16) { // L: 268
-								class174.directions[var15][var16] = 0; // L: 269
-								class174.distances[var15][var16] = 99999999; // L: 270
-							}
-
-							++var15; // L: 267
-						}
-					}
+		super.field1122 = -1; // L: 249
+		if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 250
+			if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 251
+				if (var3 == class185.field2122) {
+					Archive.method5586(this, var1, var2, class185.field2122); // L: 253
 				}
 
-				this.method2111(var1, var2, var3); // L: 453
+				this.method2177(var1, var2, var3); // L: 254
 			} else {
 				this.resetPath(var1, var2);
 			}
@@ -791,98 +537,53 @@ final void method2109(int var1, int var2, byte var3) {
 			this.resetPath(var1, var2);
 		}
 
-	} // L: 455
+	} // L: 256
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "107443252"
+		garbageValue = "625623334"
 	)
 	@Export("resetPath")
 	void resetPath(int var1, int var2) {
-		super.pathLength = 0; // L: 458
-		super.field1144 = 0; // L: 459
-		super.field1085 = 0; // L: 460
-		super.pathX[0] = var1; // L: 461
-		super.pathY[0] = var2; // L: 462
-		int var3 = this.transformedSize(); // L: 463
-		super.x = var3 * 64 + super.pathX[0] * 128; // L: 464
-		super.y = super.pathY[0] * 128 + var3 * 64; // L: 465
-	} // L: 466
+		super.pathLength = 0; // L: 259
+		super.field1098 = 0; // L: 260
+		super.field1117 = 0; // L: 261
+		super.pathX[0] = var1; // L: 262
+		super.pathY[0] = var2; // L: 263
+		int var3 = this.transformedSize(); // L: 264
+		super.x = super.pathX[0] * 128 + var3 * 64; // L: 265
+		super.y = var3 * 64 + super.pathY[0] * 128; // L: 266
+	} // L: 267
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IIBI)V",
-		garbageValue = "1234210425"
+		descriptor = "(IILgj;I)V",
+		garbageValue = "1075045053"
 	)
-	final void method2111(int var1, int var2, byte var3) {
-		if (super.pathLength < 9) { // L: 469
+	final void method2177(int var1, int var2, class185 var3) {
+		if (super.pathLength < 9) { // L: 270
 			++super.pathLength;
 		}
 
-		for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 470
-			super.pathX[var4] = super.pathX[var4 - 1]; // L: 471
-			super.pathY[var4] = super.pathY[var4 - 1]; // L: 472
-			super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 473
+		for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 271
+			super.pathX[var4] = super.pathX[var4 - 1]; // L: 272
+			super.pathY[var4] = super.pathY[var4 - 1]; // L: 273
+			super.field1153[var4] = super.field1153[var4 - 1]; // L: 274
 		}
 
-		super.pathX[0] = var1; // L: 475
-		super.pathY[0] = var2; // L: 476
-		super.pathTraversed[0] = var3; // L: 477
-	} // L: 478
+		super.pathX[0] = var1; // L: 276
+		super.pathY[0] = var2; // L: 277
+		super.field1153[0] = var3; // L: 278
+	} // L: 279
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-532391824"
+		descriptor = "(B)Z",
+		garbageValue = "1"
 	)
 	@Export("isVisible")
 	final boolean isVisible() {
-		return this.appearance != null; // L: 481
+		return this.appearance != null; // L: 282
 	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(II)J",
-		garbageValue = "-665498236"
-	)
-	public static long method2159(int var0) {
-		return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 56
-	}
-
-	@ObfuscatedName("jr")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-763445745"
-	)
-	@Export("Widget_resetModelFrames")
-	static final void Widget_resetModelFrames(int var0) {
-		if (class174.loadInterface(var0)) { // L: 11304
-			Widget[] var1 = WorldMapSection1.Widget_interfaceComponents[var0]; // L: 11305
-
-			for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11306
-				Widget var3 = var1[var2]; // L: 11307
-				if (var3 != null) { // L: 11308
-					var3.modelFrame = 0; // L: 11309
-					var3.modelFrameCycle = 0; // L: 11310
-				}
-			}
-
-		}
-	} // L: 11312
-
-	@ObfuscatedName("kc")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "55"
-	)
-	@Export("clanKickUser")
-	static final void clanKickUser(String var0) {
-		if (AbstractArchive.friendsChat != null) { // L: 11804
-			PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2766, Client.packetWriter.isaacCipher); // L: 11805
-			var1.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var0)); // L: 11806
-			var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11807
-			Client.packetWriter.addNode(var1); // L: 11808
-		}
-	} // L: 11809
 }
diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java
index de5e217cc5..e163aba60a 100644
--- a/runescape-client/src/main/java/PlayerComposition.java
+++ b/runescape-client/src/main/java/PlayerComposition.java
@@ -1,131 +1,147 @@
+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("it")
+@ObfuscatedName("jo")
 @Implements("PlayerComposition")
 public class PlayerComposition {
-	@ObfuscatedName("k")
+	@ObfuscatedName("sr")
+	@ObfuscatedGetter(
+		intValue = -992290139
+	)
+	static int field3193;
+	@ObfuscatedName("n")
+	public static short[] field3197;
+	@ObfuscatedName("v")
+	public static short[][] field3203;
+	@ObfuscatedName("d")
 	@Export("equipmentIndices")
 	static final int[] equipmentIndices;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Liq;"
+	)
+	@Export("Widget_cachedSprites")
+	public static EvictingDualNodeHashTable Widget_cachedSprites;
+	@ObfuscatedName("hi")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "[Lpl;"
 	)
-	@Export("PlayerAppearance_cachedModels")
-	public static EvictingDualNodeHashTable PlayerAppearance_cachedModels;
-	@ObfuscatedName("i")
+	@Export("headIconPrayerSprites")
+	static SpritePixels[] headIconPrayerSprites;
+	@ObfuscatedName("c")
 	@Export("equipment")
 	int[] equipment;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("bodyColors")
 	int[] bodyColors;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("isFemale")
 	public boolean isFemale;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1446763331
+		intValue = -1676394061
 	)
 	@Export("npcTransformId")
 	public int npcTransformId;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		longValue = 3851484461593435505L
+		longValue = -8763548147665494793L
 	)
 	@Export("hash")
 	long hash;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		longValue = -8997402803958711599L
+		longValue = -4642626156461573715L
 	)
-	long field3021;
-	@ObfuscatedName("e")
+	long field3201;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "[Ley;"
+		descriptor = "[Lfe;"
 	)
-	class150[] field3027;
-	@ObfuscatedName("p")
-	boolean field3026;
+	class160[] field3199;
+	@ObfuscatedName("w")
+	boolean field3200;
 
 	static {
 		equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26
-		PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); // L: 27
+		Widget_cachedSprites = new EvictingDualNodeHashTable(260); // L: 27
 	}
 
 	public PlayerComposition() {
-		this.field3026 = false; // L: 21
+		this.field3200 = false; // L: 21
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([I[Ley;Z[IZII)V",
-		garbageValue = "-1612430375"
+		descriptor = "([I[Lfe;Z[IZII)V",
+		garbageValue = "1940992993"
 	)
-	public void method5062(int[] var1, class150[] var2, boolean var3, int[] var4, boolean var5, int var6) {
-		this.field3027 = var2; // L: 30
-		this.field3026 = var3; // L: 31
+	public void method5368(int[] var1, class160[] var2, boolean var3, int[] var4, boolean var5, int var6) {
+		this.field3199 = var2; // L: 30
+		this.field3200 = var3;
 		this.update(var1, var4, var5, var6); // L: 32
-	} // L: 33
+	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "([I[IZII)V",
-		garbageValue = "844245890"
+		garbageValue = "392643957"
 	)
 	@Export("update")
 	public void update(int[] var1, int[] var2, boolean var3, int var4) {
-		if (var1 == null) { // L: 36
-			var1 = new int[12]; // L: 37
-
-			for (int var5 = 0; var5 < 7; ++var5) { // L: 38
-				for (int var6 = 0; var6 < class67.KitDefinition_fileCount; ++var6) { // L: 39
-					KitDefinition var7 = ReflectionCheck.KitDefinition_get(var6); // L: 40
-					if (var7 != null && !var7.nonSelectable && var7.bodypartID == (var3 ? 7 : 0) + var5) { // L: 41
-						var1[equipmentIndices[var5]] = var6 + 256; // L: 42
-						break; // L: 43
+		if (var1 == null) {
+			var1 = new int[12];
+
+			for (int var5 = 0; var5 < 7; ++var5) {
+				for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) {
+					KitDefinition var7 = ArchiveDisk.KitDefinition_get(var6);
+					if (var7 != null && !var7.nonSelectable && (var3 ? 7 : 0) + var5 == var7.bodypartID) {
+						var1[equipmentIndices[var5]] = var6 + 256;
+						break;
 					}
 				}
 			}
 		}
 
 		this.equipment = var1; // L: 48
-		this.bodyColors = var2; // L: 49
-		this.isFemale = var3; // L: 50
-		this.npcTransformId = var4; // L: 51
+		this.bodyColors = var2;
+		this.isFemale = var3;
+		this.npcTransformId = var4;
 		this.setHash(); // L: 52
 	} // L: 53
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(IZI)V",
-		garbageValue = "1990205342"
+		garbageValue = "1060805445"
 	)
 	@Export("changeAppearance")
 	public void changeAppearance(int var1, boolean var2) {
-		if (var1 != 1 || !this.isFemale) { // L: 56
-			int var3 = this.equipment[equipmentIndices[var1]]; // L: 57
+		if (var1 != 1 || !this.isFemale) {
+			int var3 = this.equipment[equipmentIndices[var1]];
 			if (var3 != 0) { // L: 58
-				var3 -= 256; // L: 59
+				var3 -= 256;
 
 				KitDefinition var4;
 				do {
 					if (!var2) { // L: 61
 						--var3; // L: 62
 						if (var3 < 0) { // L: 63
-							var3 = class67.KitDefinition_fileCount - 1;
+							var3 = KitDefinition.KitDefinition_fileCount - 1;
 						}
 					} else {
 						++var3; // L: 66
-						if (var3 >= class67.KitDefinition_fileCount) {
-							var3 = 0; // L: 67
+						if (var3 >= KitDefinition.KitDefinition_fileCount) { // L: 67
+							var3 = 0;
 						}
 					}
 
-					var4 = ReflectionCheck.KitDefinition_get(var3); // L: 69
-				} while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); // L: 70
+					var4 = ArchiveDisk.KitDefinition_get(var3); // L: 69
+				} while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); // L: 70
 
 				this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72
 				this.setHash(); // L: 73
@@ -133,19 +149,19 @@ public void changeAppearance(int var1, boolean var2) {
 		}
 	} // L: 74
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IZB)V",
-		garbageValue = "-58"
+		descriptor = "(IZI)V",
+		garbageValue = "1596195653"
 	)
-	public void method5045(int var1, boolean var2) {
+	public void method5391(int var1, boolean var2) {
 		int var3 = this.bodyColors[var1]; // L: 77
 		boolean var4;
 		if (!var2) { // L: 78
 			do {
 				--var3; // L: 80
 				if (var3 < 0) { // L: 81
-					var3 = class137.field1519[var1].length - 1; // L: 82
+					var3 = class114.field1382[var1].length - 1; // L: 82
 				}
 
 				if (var1 == 4 && var3 >= 8) { // L: 86
@@ -157,7 +173,7 @@ public void method5045(int var1, boolean var2) {
 		} else {
 			do {
 				++var3; // L: 97
-				if (var3 >= class137.field1519[var1].length) { // L: 98
+				if (var3 >= class114.field1382[var1].length) { // L: 98
 					var3 = 0;
 				}
 
@@ -173,10 +189,10 @@ public void method5045(int var1, boolean var2) {
 		this.setHash(); // L: 111
 	} // L: 112
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "586785415"
+		descriptor = "(ZB)V",
+		garbageValue = "-86"
 	)
 	@Export("changeSex")
 	public void changeSex(boolean var1) {
@@ -185,10 +201,10 @@ public void changeSex(boolean var1) {
 		}
 	} // L: 117
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "462047294"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1350599640"
 	)
 	@Export("write")
 	public void write(Buffer var1) {
@@ -210,10 +226,10 @@ public void write(Buffer var1) {
 
 	} // L: 127
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-2147251395"
+		descriptor = "(B)V",
+		garbageValue = "81"
 	)
 	@Export("setHash")
 	void setHash() {
@@ -249,21 +265,21 @@ void setHash() {
 		this.hash += (long)(this.isFemale ? 1 : 0); // L: 147
 		this.equipment[5] = var3; // L: 148
 		this.equipment[9] = var4; // L: 149
-		if (0L != var1 && this.hash != var1 || this.field3026) { // L: 150
-			PlayerAppearance_cachedModels.remove(var1);
+		if (var1 != 0L && var1 != this.hash || this.field3200) { // L: 150
+			Widget_cachedSprites.remove(var1);
 		}
 
 	} // L: 151
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Lfm;ILfm;II)Lhl;",
-		garbageValue = "-1279646486"
+		descriptor = "(Lgn;ILgn;IB)Lgo;",
+		garbageValue = "-18"
 	)
 	@Export("getModel")
 	public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
 		if (this.npcTransformId != -1) { // L: 154
-			return ScriptFrame.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155
+			return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155
 		} else {
 			long var5 = this.hash; // L: 157
 			int[] var7 = this.equipment; // L: 158
@@ -285,25 +301,25 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3
 				}
 			}
 
-			Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 171
+			Model var18 = (Model)Widget_cachedSprites.get(var5); // L: 171
 			if (var18 == null) { // L: 172
 				boolean var9 = false; // L: 173
 
 				int var11;
 				for (int var10 = 0; var10 < 12; ++var10) { // L: 174
 					var11 = var7[var10]; // L: 175
-					if (var11 >= 256 && var11 < 512 && !ReflectionCheck.KitDefinition_get(var11 - 256).ready()) { // L: 176 177
+					if (var11 >= 256 && var11 < 512 && !ArchiveDisk.KitDefinition_get(var11 - 256).ready()) { // L: 176 177
 						var9 = true;
 					}
 
-					if (var11 >= 512 && !TaskHandler.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180
+					if (var11 >= 512 && !UserComparator6.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180
 						var9 = true;
 					}
 				}
 
 				if (var9) { // L: 183
-					if (this.field3021 != -1L) { // L: 184
-						var18 = (Model)PlayerAppearance_cachedModels.get(this.field3021);
+					if (this.field3201 != -1L) { // L: 184
+						var18 = (Model)Widget_cachedSprites.get(this.field3201);
 					}
 
 					if (var18 == null) { // L: 185
@@ -319,29 +335,29 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3
 					for (int var12 = 0; var12 < 12; ++var12) { // L: 190
 						var13 = var7[var12]; // L: 191
 						if (var13 >= 256 && var13 < 512) { // L: 192
-							ModelData var14 = ReflectionCheck.KitDefinition_get(var13 - 256).getModelData(); // L: 193
+							ModelData var14 = ArchiveDisk.KitDefinition_get(var13 - 256).getModelData(); // L: 193
 							if (var14 != null) { // L: 194
 								var19[var11++] = var14;
 							}
 						}
 
 						if (var13 >= 512) { // L: 196
-							ItemComposition var22 = TaskHandler.ItemDefinition_get(var13 - 512); // L: 197
-							ModelData var15 = var22.method3397(this.isFemale); // L: 198
+							ItemComposition var22 = UserComparator6.ItemDefinition_get(var13 - 512); // L: 197
+							ModelData var15 = var22.method3554(this.isFemale); // L: 198
 							if (var15 != null) { // L: 199
-								if (this.field3027 != null) { // L: 200
-									class150 var16 = this.field3027[var12]; // L: 201
+								if (this.field3199 != null) { // L: 200
+									class160 var16 = this.field3199[var12]; // L: 201
 									if (var16 != null) { // L: 202
 										int var17;
-										if (var16.field1598 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1598.length) { // L: 203
+										if (var16.field1732 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1732.length) { // L: 203
 											for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 204
-												var15.recolor(var22.recolorTo[var17], var16.field1598[var17]); // L: 205
+												var15.recolor(var22.recolorTo[var17], var16.field1732[var17]); // L: 205
 											}
 										}
 
-										if (var16.field1600 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1600.length) { // L: 208
+										if (var16.field1738 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1738.length) { // L: 208
 											for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 209
-												var15.retexture(var22.retextureTo[var17], var16.field1600[var17]); // L: 210
+												var15.retexture(var22.retextureTo[var17], var16.field1738[var17]); // L: 210
 											}
 										}
 									}
@@ -355,18 +371,18 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3
 					ModelData var20 = new ModelData(var19, var11); // L: 219
 
 					for (var13 = 0; var13 < 5; ++var13) { // L: 220
-						if (this.bodyColors[var13] < class137.field1519[var13].length) { // L: 221
-							var20.recolor(DesktopPlatformInfoProvider.field4081[var13], class137.field1519[var13][this.bodyColors[var13]]);
+						if (this.bodyColors[var13] < class114.field1382[var13].length) { // L: 221
+							var20.recolor(field3197[var13], class114.field1382[var13][this.bodyColors[var13]]);
 						}
 
-						if (this.bodyColors[var13] < ClanChannel.field1512[var13].length) { // L: 222
-							var20.recolor(Varps.field3013[var13], ClanChannel.field1512[var13][this.bodyColors[var13]]);
+						if (this.bodyColors[var13] < field3203[var13].length) { // L: 222
+							var20.recolor(class132.field1540[var13], field3203[var13][this.bodyColors[var13]]);
 						}
 					}
 
 					var18 = var20.toModel(64, 850, -30, -50, -30); // L: 224
-					PlayerAppearance_cachedModels.put(var18, var5); // L: 225
-					this.field3021 = var5; // L: 226
+					Widget_cachedSprites.put(var18, var5); // L: 225
+					this.field3201 = var5; // L: 226
 				}
 			}
 
@@ -387,26 +403,26 @@ public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgk;",
-		garbageValue = "1238658700"
+		descriptor = "(I)Lge;",
+		garbageValue = "1317025589"
 	)
 	@Export("getModelData")
 	ModelData getModelData() {
 		if (this.npcTransformId != -1) { // L: 238
-			return ScriptFrame.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239
+			return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239
 		} else {
 			boolean var1 = false; // L: 241
 
 			int var3;
 			for (int var2 = 0; var2 < 12; ++var2) { // L: 242
 				var3 = this.equipment[var2]; // L: 243
-				if (var3 >= 256 && var3 < 512 && !ReflectionCheck.KitDefinition_get(var3 - 256).method3053()) { // L: 244 245
+				if (var3 >= 256 && var3 < 512 && !ArchiveDisk.KitDefinition_get(var3 - 256).method3210()) { // L: 244 245
 					var1 = true;
 				}
 
-				if (var3 >= 512 && !TaskHandler.ItemDefinition_get(var3 - 512).method3342(this.isFemale)) { // L: 247 248
+				if (var3 >= 512 && !UserComparator6.ItemDefinition_get(var3 - 512).method3555(this.isFemale)) { // L: 247 248
 					var1 = true;
 				}
 			}
@@ -422,14 +438,14 @@ ModelData getModelData() {
 					var5 = this.equipment[var4]; // L: 255
 					ModelData var6;
 					if (var5 >= 256 && var5 < 512) { // L: 256
-						var6 = ReflectionCheck.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257
+						var6 = ArchiveDisk.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257
 						if (var6 != null) { // L: 258
 							var7[var3++] = var6;
 						}
 					}
 
 					if (var5 >= 512) { // L: 260
-						var6 = TaskHandler.ItemDefinition_get(var5 - 512).method3409(this.isFemale); // L: 261
+						var6 = UserComparator6.ItemDefinition_get(var5 - 512).method3601(this.isFemale); // L: 261
 						if (var6 != null) { // L: 262
 							var7[var3++] = var6;
 						}
@@ -439,12 +455,12 @@ ModelData getModelData() {
 				ModelData var8 = new ModelData(var7, var3); // L: 265
 
 				for (var5 = 0; var5 < 5; ++var5) { // L: 266
-					if (this.bodyColors[var5] < class137.field1519[var5].length) { // L: 267
-						var8.recolor(DesktopPlatformInfoProvider.field4081[var5], class137.field1519[var5][this.bodyColors[var5]]);
+					if (this.bodyColors[var5] < class114.field1382[var5].length) { // L: 267
+						var8.recolor(field3197[var5], class114.field1382[var5][this.bodyColors[var5]]);
 					}
 
-					if (this.bodyColors[var5] < ClanChannel.field1512[var5].length) { // L: 268
-						var8.recolor(Varps.field3013[var5], ClanChannel.field1512[var5][this.bodyColors[var5]]);
+					if (this.bodyColors[var5] < field3203[var5].length) { // L: 268
+						var8.recolor(class132.field1540[var5], field3203[var5][this.bodyColors[var5]]);
 					}
 				}
 
@@ -453,22 +469,64 @@ ModelData getModelData() {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-704245622"
+		garbageValue = "-656576529"
 	)
 	@Export("getChatHeadId")
 	public int getChatHeadId() {
-		return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + ScriptFrame.getNpcDefinition(this.npcTransformId).id; // L: 274 275
+		return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + WorldMapLabelSize.getNpcDefinition(this.npcTransformId).id; // L: 274 275
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "45"
+	)
+	@Export("loadWorlds")
+	static boolean loadWorlds() {
+		try {
+			if (HorizontalAlignment.World_request == null) { // L: 31
+				HorizontalAlignment.World_request = WorldMapData_1.urlRequester.request(new URL(AbstractWorldMapIcon.field2761));
+			} else if (HorizontalAlignment.World_request.isDone()) { // L: 33
+				byte[] var0 = HorizontalAlignment.World_request.getResponse(); // L: 34
+				Buffer var1 = new Buffer(var0); // L: 35
+				var1.readInt(); // L: 36
+				World.World_count = var1.readUnsignedShort(); // L: 37
+				class334.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 = class334.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();
+					var3.location = var1.readUnsignedByte();
+					var3.population = var1.readShort();
+				}
+
+				UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49
+				HorizontalAlignment.World_request = null; // L: 50
+				return true; // L: 51
+			}
+		} catch (Exception var4) { // L: 55
+			var4.printStackTrace(); // L: 56
+			HorizontalAlignment.World_request = null; // L: 57
+		}
+
+		return false; // L: 59
+	}
+
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "86"
+		descriptor = "(II)I",
+		garbageValue = "-1167234194"
 	)
-	public static boolean method5067(int var0) {
-		return (var0 >> 20 & 1) != 0; // L: 17
+	@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
 	}
 }
diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java
index 420f2167ae..30ffa2650a 100644
--- a/runescape-client/src/main/java/PlayerType.java
+++ b/runescape-client/src/main/java/PlayerType.java
@@ -4,77 +4,77 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jb")
+@ObfuscatedName("kw")
 @Implements("PlayerType")
 public enum PlayerType implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ljb;"
+		descriptor = "Lkw;"
 	)
 	@Export("PlayerType_normal")
 	PlayerType_normal(0, -1, true, false, true),
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Ljb;"
+		descriptor = "Lkw;"
 	)
 	@Export("PlayerType_playerModerator")
 	PlayerType_playerModerator(1, 0, true, true, true),
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Ljb;"
+		descriptor = "Lkw;"
 	)
 	@Export("PlayerType_jagexModerator")
 	PlayerType_jagexModerator(2, 1, true, true, false),
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Ljb;"
+		descriptor = "Lkw;"
 	)
 	@Export("PlayerType_ironman")
 	PlayerType_ironman(3, 2, false, false, true),
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Ljb;"
+		descriptor = "Lkw;"
 	)
 	@Export("PlayerType_ultimateIronman")
 	PlayerType_ultimateIronman(4, 3, false, false, true),
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Ljb;"
+		descriptor = "Lkw;"
 	)
 	@Export("PlayerType_hardcoreIronman")
 	PlayerType_hardcoreIronman(5, 10, false, false, true),
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Ljb;"
+		descriptor = "Lkw;"
 	)
-	field3652(6, 22, false, false, true),
-	@ObfuscatedName("p")
+	field3801(6, 22, false, false, true),
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Ljb;"
+		descriptor = "Lkw;"
 	)
-	field3649(7, 41, false, false, true),
-	@ObfuscatedName("j")
+	field3802(7, 41, false, false, true),
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Ljb;"
+		descriptor = "Lkw;"
 	)
-	field3650(8, 42, false, false, true);
+	field3795(8, 42, false, false, true);
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1222118175
+		intValue = -1858175947
 	)
 	@Export("id")
 	final int id;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 279346655
+		intValue = -1675383045
 	)
 	@Export("modIcon")
 	public final int modIcon;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("isPrivileged")
 	public final boolean isPrivileged;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("isUser")
 	public final boolean isUser;
 
@@ -85,48 +85,24 @@ public enum PlayerType implements MouseWheel {
 		this.isUser = var7; // L: 29
 	} // L: 30
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 33
+		return this.id; // L: 34
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "0"
+		descriptor = "(II)V",
+		garbageValue = "1177241334"
 	)
-	@Export("changeWorldSelectSorting")
-	static void changeWorldSelectSorting(int var0, int var1) {
-		int[] var2 = new int[4]; // L: 63
-		int[] var3 = new int[4]; // L: 64
-		var2[0] = var0; // L: 65
-		var3[0] = var1; // L: 66
-		int var4 = 1; // L: 67
-
-		for (int var5 = 0; var5 < 4; ++var5) { // L: 68
-			if (World.World_sortOption1[var5] != var0) { // L: 69
-				var2[var4] = World.World_sortOption1[var5]; // L: 70
-				var3[var4] = World.World_sortOption2[var5]; // L: 71
-				++var4; // L: 72
-			}
+	static void method5521(int var0) {
+		if (var0 != Login.loginIndex) { // L: 1986
+			Login.loginIndex = var0; // L: 1987
 		}
-
-		World.World_sortOption1 = var2; // L: 75
-		World.World_sortOption2 = var3; // L: 76
-		ObjectSound.sortWorlds(WorldMapEvent.World_worlds, 0, WorldMapEvent.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77
-	} // L: 78
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "268701760"
-	)
-	public static boolean method5239(int var0) {
-		return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 224 225
-	}
+	} // L: 1988
 }
diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java
index eff48cd654..3307023710 100644
--- a/runescape-client/src/main/java/Players.java
+++ b/runescape-client/src/main/java/Players.java
@@ -4,151 +4,115 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cc")
+@ObfuscatedName("cw")
 @Implements("Players")
 public class Players {
-	@ObfuscatedName("s")
-	static byte[] field1244;
-	@ObfuscatedName("a")
-	static byte[] field1241;
-	@ObfuscatedName("o")
+	@ObfuscatedName("qa")
 	@ObfuscatedSignature(
-		descriptor = "[Lop;"
+		descriptor = "Lmc;"
 	)
-	static Buffer[] field1242;
-	@ObfuscatedName("g")
+	@Export("friendsChat")
+	static FriendsChat friendsChat;
+	@ObfuscatedName("p")
+	static byte[] field1243;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "[Lgj;"
+	)
+	static class185[] field1246;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "[Lpi;"
+	)
+	static Buffer[] field1248;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1178638681
+		intValue = 60233761
 	)
 	@Export("Players_count")
 	static int Players_count;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("Players_indices")
 	static int[] Players_indices;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1076680873
+		intValue = -1857354621
 	)
 	@Export("Players_emptyIdxCount")
 	static int Players_emptyIdxCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("Players_emptyIndices")
 	static int[] Players_emptyIndices;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("Players_regions")
 	static int[] Players_regions;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("Players_orientations")
 	static int[] Players_orientations;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("Players_targetIndices")
 	static int[] Players_targetIndices;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1904641985
+		intValue = 1591161311
 	)
 	@Export("Players_pendingUpdateCount")
 	static int Players_pendingUpdateCount;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("Players_pendingUpdateIndices")
 	static int[] Players_pendingUpdateIndices;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lop;"
+		descriptor = "Lpi;"
+	)
+	static Buffer field1257;
+	@ObfuscatedName("cb")
+	@ObfuscatedGetter(
+		intValue = 1838137179
 	)
-	static Buffer field1240;
-	@ObfuscatedName("do")
-	static boolean field1254;
+	public static int field1247;
+	@ObfuscatedName("el")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive11")
+	static Archive archive11;
 
 	static {
-		field1244 = new byte[2048];
-		field1241 = new byte[2048];
-		field1242 = new Buffer[2048];
+		field1243 = new byte[2048]; // L: 18
+		field1246 = new class185[2048]; // L: 19
+		field1248 = new Buffer[2048]; // L: 20
 		Players_count = 0; // L: 21
 		Players_indices = new int[2048]; // L: 22
 		Players_emptyIdxCount = 0; // L: 23
 		Players_emptyIndices = new int[2048]; // L: 24
 		Players_regions = new int[2048]; // L: 25
-		Players_orientations = new int[2048]; // L: 26
-		Players_targetIndices = new int[2048]; // L: 27
-		Players_pendingUpdateCount = 0; // L: 28
-		Players_pendingUpdateIndices = new int[2048]; // L: 29
-		field1240 = new Buffer(new byte[5000]); // L: 30
+		Players_orientations = new int[2048];
+		Players_targetIndices = new int[2048];
+		Players_pendingUpdateCount = 0;
+		Players_pendingUpdateIndices = new int[2048];
+		field1257 = new Buffer(new byte[5000]); // L: 30
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;I)V",
-		garbageValue = "-678131121"
+		descriptor = "(Lku;Ljava/lang/String;Ljava/lang/String;IZI)V",
+		garbageValue = "2062230724"
 	)
-	public static void method2327(AbstractArchive var0) {
-		VarpDefinition.VarpDefinition_archive = var0; // L: 18
-		VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19
-	} // L: 20
+	public static void method2382(AbstractArchive var0, String var1, String var2, int var3, boolean var4) {
+		int var5 = var0.getGroupId(var1); // L: 26
+		int var6 = var0.getFileId(var5, var2); // L: 27
+		NetSocket.method3118(var0, var5, var6, var3, var4); // L: 28
+	} // L: 29
 
-	@ObfuscatedName("km")
+	@ObfuscatedName("kz")
 	@ObfuscatedSignature(
-		descriptor = "(Lcq;ZI)V",
-		garbageValue = "-1700143526"
+		descriptor = "(II)V",
+		garbageValue = "-733179789"
 	)
-	@Export("closeInterface")
-	static final void closeInterface(InterfaceParent var0, boolean var1) {
-		int var2 = var0.group; // L: 11555
-		int var3 = (int)var0.key; // L: 11556
-		var0.remove(); // L: 11557
-		int var5;
-		if (var1 && var2 != -1 && class132.Widget_loadedInterfaces[var2]) { // L: 11558 11559 11560
-			class283.Widget_archive.clearFilesGroup(var2); // L: 11561
-			if (WorldMapSection1.Widget_interfaceComponents[var2] != null) { // L: 11562
-				boolean var4 = true; // L: 11563
-
-				for (var5 = 0; var5 < WorldMapSection1.Widget_interfaceComponents[var2].length; ++var5) { // L: 11564
-					if (WorldMapSection1.Widget_interfaceComponents[var2][var5] != null) { // L: 11565
-						if (WorldMapSection1.Widget_interfaceComponents[var2][var5].type != 2) { // L: 11566
-							WorldMapSection1.Widget_interfaceComponents[var2][var5] = null;
-						} else {
-							var4 = false; // L: 11567
-						}
-					}
-				}
-
-				if (var4) { // L: 11570
-					WorldMapSection1.Widget_interfaceComponents[var2] = null;
-				}
-
-				class132.Widget_loadedInterfaces[var2] = false; // L: 11571
-			}
-		}
-
-		class316.method5839(var2); // L: 11573
-		Widget var7 = UserComparator9.getWidget(var3); // L: 11574
-		if (var7 != null) { // L: 11575
-			class184.invalidateWidget(var7);
-		}
-
-		for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 11577
-			if (class122.method2607(Client.menuOpcodes[var5])) { // L: 11578
-				if (var5 < Client.menuOptionsCount - 1) { // L: 11579
-					for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { // L: 11580
-						Client.menuActions[var6] = Client.menuActions[var6 + 1]; // L: 11581
-						Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; // L: 11582
-						Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; // L: 11583
-						Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; // L: 11584
-						Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; // L: 11585
-						Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; // L: 11586
-						Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; // L: 11587
-					}
-				}
-
-				--var5; // L: 11590
-				--Client.menuOptionsCount; // L: 11591
-			}
-		}
-
-		class262.method5136(); // L: 11594
-		if (Client.rootInterface != -1) { // L: 11596
-			ItemComposition.runIntfCloseListeners(Client.rootInterface, 1);
-		}
-
-	} // L: 11597
+	static final void method2383(int var0) {
+		var0 = Math.min(Math.max(var0, 0), 127); // L: 12155
+		SecureRandomFuture.clientPreferences.areaSoundEffectsVolume = var0; // L: 12156
+		class127.savePreferences(); // L: 12157
+	} // L: 12158
 }
diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java
index 9790325657..8673776d0e 100644
--- a/runescape-client/src/main/java/PrivateChatMode.java
+++ b/runescape-client/src/main/java/PrivateChatMode.java
@@ -3,37 +3,37 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("pz")
+@ObfuscatedName("pc")
 @Implements("PrivateChatMode")
 public class PrivateChatMode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lpz;"
+		descriptor = "Lpc;"
 	)
-	static final PrivateChatMode field4422;
-	@ObfuscatedName("w")
+	static final PrivateChatMode field4595;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lpz;"
+		descriptor = "Lpc;"
 	)
-	public static final PrivateChatMode field4425;
-	@ObfuscatedName("s")
+	public static final PrivateChatMode field4596;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lpz;"
+		descriptor = "Lpc;"
 	)
-	static final PrivateChatMode field4423;
-	@ObfuscatedName("a")
+	static final PrivateChatMode field4594;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -215884787
+		intValue = -38528809
 	)
-	public final int field4424;
+	public final int field4597;
 
 	static {
-		field4422 = new PrivateChatMode(0); // L: 5
-		field4425 = new PrivateChatMode(1); // L: 6
-		field4423 = new PrivateChatMode(2);
+		field4595 = new PrivateChatMode(0); // L: 5
+		field4596 = new PrivateChatMode(1); // L: 6
+		field4594 = new PrivateChatMode(2);
 	} // L: 7
 
 	PrivateChatMode(int var1) {
-		this.field4424 = var1; // L: 11
-	} // L: 12
+		this.field4597 = var1; // L: 15
+	} // L: 16
 }
diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java
index 0fd049b7e9..2d5bdc031a 100644
--- a/runescape-client/src/main/java/Projectile.java
+++ b/runescape-client/src/main/java/Projectile.java
@@ -3,148 +3,149 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bi")
+@ObfuscatedName("bt")
 @Implements("Projectile")
 public final class Projectile extends Renderable {
-	@ObfuscatedName("gp")
+	@ObfuscatedName("ql")
 	@ObfuscatedSignature(
-		descriptor = "Lmp;"
+		descriptor = "Lpc;"
 	)
-	static AbstractSocket field915;
-	@ObfuscatedName("i")
+	@Export("privateChatMode")
+	static PrivateChatMode privateChatMode;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -2098760211
+		intValue = 1101813917
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -391632779
+		intValue = -140525003
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 764309531
+		intValue = 636428157
 	)
 	@Export("sourceX")
 	int sourceX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -586694521
+		intValue = 1985391403
 	)
 	@Export("sourceY")
 	int sourceY;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1961022753
+		intValue = -376580603
 	)
 	@Export("sourceZ")
 	int sourceZ;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -787475925
+		intValue = 1994096823
 	)
 	@Export("endHeight")
 	int endHeight;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 196209817
+		intValue = 1387673175
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 321994179
+		intValue = 853821675
 	)
 	@Export("cycleEnd")
 	int cycleEnd;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 178012727
+		intValue = 947987743
 	)
 	@Export("slope")
 	int slope;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -736390091
+		intValue = -175033475
 	)
 	@Export("startHeight")
 	int startHeight;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1511364615
+		intValue = 1305386011
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("isMoving")
 	boolean isMoving;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("x")
 	double x;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("y")
 	double y;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("z")
 	double z;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("speedX")
 	double speedX;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("speedY")
 	double speedY;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("speed")
 	double speed;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("speedZ")
 	double speedZ;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("accelerationZ")
 	double accelerationZ;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1310821215
+		intValue = -38655435
 	)
 	@Export("yaw")
 	int yaw;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1676153713
+		intValue = -1967440557
 	)
 	@Export("pitch")
 	int pitch;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Lfm;"
+		descriptor = "Lgn;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1216775707
+		intValue = 1747879531
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1200268787
+		intValue = -43602097
 	)
-	@Export("frameCycle")
-	int frameCycle;
+	int field904;
 
 	Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
-		this.isMoving = false; // L: 20
+		this.isMoving = false;
 		this.frame = 0; // L: 32
-		this.frameCycle = 0; // L: 33
-		this.id = var1; // L: 36
-		this.plane = var2; // L: 37
-		this.sourceX = var3; // L: 38
+		this.field904 = 0;
+		this.id = var1;
+		this.plane = var2;
+		this.sourceX = var3;
 		this.sourceY = var4; // L: 39
-		this.sourceZ = var5; // L: 40
+		this.sourceZ = var5;
 		this.cycleStart = var6; // L: 41
 		this.cycleEnd = var7; // L: 42
 		this.slope = var8; // L: 43
@@ -152,19 +153,19 @@ public final class Projectile extends Renderable {
 		this.targetIndex = var10; // L: 45
 		this.endHeight = var11; // L: 46
 		this.isMoving = false; // L: 47
-		int var12 = BZip2State.SpotAnimationDefinition_get(this.id).sequence; // L: 48
+		int var12 = AccessFile.SpotAnimationDefinition_get(this.id).sequence; // L: 48
 		if (var12 != -1) { // L: 49
-			this.sequenceDefinition = MouseHandler.SequenceDefinition_get(var12);
+			this.sequenceDefinition = UserComparator5.SequenceDefinition_get(var12);
 		} else {
 			this.sequenceDefinition = null; // L: 50
 		}
 
 	} // L: 51
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "2083342033"
+		garbageValue = "1140642232"
 	)
 	@Export("setDestination")
 	final void setDestination(int var1, int var2, int var3, int var4) {
@@ -172,774 +173,167 @@ final void setDestination(int var1, int var2, int var3, int var4) {
 		if (!this.isMoving) { // L: 54
 			var5 = (double)(var1 - this.sourceX); // L: 55
 			double var7 = (double)(var2 - this.sourceY); // L: 56
-			double var9 = Math.sqrt(var7 * var7 + var5 * var5); // L: 57
-			this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9; // L: 58
-			this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; // L: 59
+			double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57
+			this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; // L: 58
+			this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; // L: 59
 			this.z = (double)this.sourceZ; // L: 60
 		}
 
-		var5 = (double)(this.cycleEnd + 1 - var4); // L: 62
-		this.speedX = ((double)var1 - this.x) / var5; // L: 63
+		var5 = (double)(this.cycleEnd + 1 - var4);
+		this.speedX = ((double)var1 - this.x) / var5;
 		this.speedY = ((double)var2 - this.y) / var5; // L: 64
 		this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); // L: 65
 		if (!this.isMoving) { // L: 66
 			this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope);
 		}
 
-		this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); // L: 67
+		this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); // L: 67
 	} // L: 68
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lhl;",
-		garbageValue = "461766541"
+		descriptor = "(I)Lgo;",
+		garbageValue = "202861607"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = BZip2State.SpotAnimationDefinition_get(this.id); // L: 92
-		Model var2 = var1.getModel(this.frame); // L: 93
-		if (var2 == null) { // L: 94
+		SpotAnimationDefinition var1 = AccessFile.SpotAnimationDefinition_get(this.id); // L: 101
+		Model var2 = var1.getModel(this.frame); // L: 102
+		if (var2 == null) { // L: 103
 			return null;
 		} else {
-			var2.rotateZ(this.pitch); // L: 95
-			return var2; // L: 96
+			var2.rotateZ(this.pitch); // L: 104
+			return var2; // L: 105
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1939244665"
+		garbageValue = "-1621806567"
 	)
 	@Export("advance")
 	final void advance(int var1) {
 		this.isMoving = true; // L: 71
 		this.x += this.speedX * (double)var1; // L: 72
-		this.y += (double)var1 * this.speedY; // L: 73
-		this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + (double)var1 * this.speedZ; // L: 74
-		this.speedZ += this.accelerationZ * (double)var1; // L: 75
+		this.y += this.speedY * (double)var1; // L: 73
+		this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; // L: 74
+		this.speedZ += (double)var1 * this.accelerationZ; // L: 75
 		this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; // L: 76
 		this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; // L: 77
 		if (this.sequenceDefinition != null) { // L: 78
-			this.frameCycle += var1; // L: 79
+			if (!this.sequenceDefinition.method3690()) { // L: 79
+				this.field904 += var1; // L: 80
 
-			while (true) {
-				do {
+				while (true) {
 					do {
-						if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 80
-							return; // L: 89
-						}
-
-						this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 81
-						++this.frame; // L: 82
-					} while(this.frame < this.sequenceDefinition.frameIds.length); // L: 83
-
-					this.frame -= this.sequenceDefinition.frameCount; // L: 84
-				} while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 85
-
-				this.frame = 0;
-			}
-		}
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(Loj;II)V",
-		garbageValue = "1062614166"
-	)
-	@Export("readPlayerUpdate")
-	static void readPlayerUpdate(PacketBuffer var0, int var1) {
-		boolean var2 = var0.readBits(1) == 1; // L: 360
-		if (var2) { // L: 361
-			Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
-		}
-
-		int var3 = var0.readBits(2); // L: 362
-		Player var4 = Client.players[var1]; // L: 363
-		if (var3 == 0) { // L: 364
-			if (var2) { // L: 365
-				var4.field1067 = false; // L: 366
-			} else if (Client.localPlayerIndex == var1) { // L: 369
-				throw new RuntimeException();
-			} else {
-				Players.Players_regions[var1] = (var4.plane << 28) + (class19.baseX + var4.pathX[0] >> 13 << 14) + (DefaultsGroup.baseY + var4.pathY[0] >> 13); // L: 370
-				if (var4.field1112 != -1) { // L: 371
-					Players.Players_orientations[var1] = var4.field1112;
-				} else {
-					Players.Players_orientations[var1] = var4.orientation; // L: 372
-				}
-
-				Players.Players_targetIndices[var1] = var4.targetIndex; // L: 373
-				Client.players[var1] = null; // L: 374
-				if (var0.readBits(1) != 0) { // L: 375
-					WorldMapData_0.updateExternalPlayer(var0, var1);
-				}
-
-			}
-		} else {
-			int var5;
-			int var6;
-			int var7;
-			if (var3 == 1) { // L: 378
-				var5 = var0.readBits(3); // L: 379
-				var6 = var4.pathX[0]; // L: 380
-				var7 = var4.pathY[0]; // L: 381
-				if (var5 == 0) { // L: 382
-					--var6; // L: 383
-					--var7; // L: 384
-				} else if (var5 == 1) { // L: 386
-					--var7;
-				} else if (var5 == 2) { // L: 387
-					++var6; // L: 388
-					--var7; // L: 389
-				} else if (var5 == 3) { // L: 391
-					--var6;
-				} else if (var5 == 4) { // L: 392
-					++var6;
-				} else if (var5 == 5) { // L: 393
-					--var6; // L: 394
-					++var7; // L: 395
-				} else if (var5 == 6) { // L: 397
-					++var7;
-				} else if (var5 == 7) { // L: 398
-					++var6; // L: 399
-					++var7; // L: 400
-				}
+						do {
+							if (this.field904 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 81
+								return; // L: 98
+							}
 
-				if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 402
-					var4.resetPath(var6, var7); // L: 403
-					var4.field1067 = false; // L: 404
-				} else if (var2) { // L: 406
-					var4.field1067 = true; // L: 407
-					var4.tileX = var6; // L: 408
-					var4.tileY = var7; // L: 409
-				} else {
-					var4.field1067 = false; // L: 412
-					var4.method2109(var6, var7, Players.field1241[var1]); // L: 413
-				}
+							this.field904 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 82
+							++this.frame; // L: 83
+						} while(this.frame < this.sequenceDefinition.frameIds.length); // L: 84
 
-			} else if (var3 == 2) { // L: 417
-				var5 = var0.readBits(4); // L: 418
-				var6 = var4.pathX[0]; // L: 419
-				var7 = var4.pathY[0]; // L: 420
-				if (var5 == 0) { // L: 421
-					var6 -= 2; // L: 422
-					var7 -= 2; // L: 423
-				} else if (var5 == 1) { // L: 425
-					--var6; // L: 426
-					var7 -= 2; // L: 427
-				} else if (var5 == 2) { // L: 429
-					var7 -= 2;
-				} else if (var5 == 3) { // L: 430
-					++var6; // L: 431
-					var7 -= 2; // L: 432
-				} else if (var5 == 4) { // L: 434
-					var6 += 2; // L: 435
-					var7 -= 2; // L: 436
-				} else if (var5 == 5) { // L: 438
-					var6 -= 2; // L: 439
-					--var7; // L: 440
-				} else if (var5 == 6) { // L: 442
-					var6 += 2; // L: 443
-					--var7; // L: 444
-				} else if (var5 == 7) { // L: 446
-					var6 -= 2;
-				} else if (var5 == 8) { // L: 447
-					var6 += 2;
-				} else if (var5 == 9) { // L: 448
-					var6 -= 2; // L: 449
-					++var7; // L: 450
-				} else if (var5 == 10) { // L: 452
-					var6 += 2; // L: 453
-					++var7; // L: 454
-				} else if (var5 == 11) { // L: 456
-					var6 -= 2; // L: 457
-					var7 += 2; // L: 458
-				} else if (var5 == 12) { // L: 460
-					--var6; // L: 461
-					var7 += 2; // L: 462
-				} else if (var5 == 13) { // L: 464
-					var7 += 2;
-				} else if (var5 == 14) { // L: 465
-					++var6; // L: 466
-					var7 += 2; // L: 467
-				} else if (var5 == 15) { // L: 469
-					var6 += 2; // L: 470
-					var7 += 2; // L: 471
-				}
+						this.frame -= this.sequenceDefinition.frameCount; // L: 85
+					} while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 86
 
-				if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 473
-					var4.resetPath(var6, var7); // L: 474
-					var4.field1067 = false; // L: 475
-				} else if (var2) { // L: 477
-					var4.field1067 = true; // L: 478
-					var4.tileX = var6; // L: 479
-					var4.tileY = var7; // L: 480
-				} else {
-					var4.field1067 = false; // L: 483
-					var4.method2109(var6, var7, Players.field1241[var1]); // L: 484
+					this.frame = 0;
 				}
-
 			} else {
-				var5 = var0.readBits(1); // L: 488
-				int var8;
-				int var9;
-				int var10;
-				int var11;
-				if (var5 == 0) { // L: 489
-					var6 = var0.readBits(12); // L: 490
-					var7 = var6 >> 10; // L: 491
-					var8 = var6 >> 5 & 31; // L: 492
-					if (var8 > 15) { // L: 493
-						var8 -= 32;
-					}
-
-					var9 = var6 & 31; // L: 494
-					if (var9 > 15) { // L: 495
-						var9 -= 32;
-					}
-
-					var10 = var8 + var4.pathX[0]; // L: 496
-					var11 = var9 + var4.pathY[0]; // L: 497
-					if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 498
-						if (var2) { // L: 502
-							var4.field1067 = true; // L: 503
-							var4.tileX = var10; // L: 504
-							var4.tileY = var11; // L: 505
-						} else {
-							var4.field1067 = false; // L: 508
-							var4.method2109(var10, var11, Players.field1241[var1]); // L: 509
-						}
-					} else {
-						var4.resetPath(var10, var11); // L: 499
-						var4.field1067 = false; // L: 500
-					}
-
-					var4.plane = (byte)(var7 + var4.plane & 3); // L: 511
-					if (Client.localPlayerIndex == var1) { // L: 512
-						GrandExchangeOfferTotalQuantityComparator.Client_plane = var4.plane;
-					}
-
-				} else {
-					var6 = var0.readBits(30); // L: 515
-					var7 = var6 >> 28; // L: 516
-					var8 = var6 >> 14 & 16383; // L: 517
-					var9 = var6 & 16383; // L: 518
-					var10 = (var8 + class19.baseX + var4.pathX[0] & 16383) - class19.baseX; // L: 519
-					var11 = (var9 + DefaultsGroup.baseY + var4.pathY[0] & 16383) - DefaultsGroup.baseY; // L: 520
-					if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 521
-						var4.resetPath(var10, var11); // L: 522
-						var4.field1067 = false; // L: 523
-					} else if (var2) { // L: 525
-						var4.field1067 = true; // L: 526
-						var4.tileX = var10; // L: 527
-						var4.tileY = var11; // L: 528
-					} else {
-						var4.field1067 = false; // L: 531
-						var4.method2109(var10, var11, Players.field1241[var1]); // L: 532
-					}
-
-					var4.plane = (byte)(var7 + var4.plane & 3); // L: 534
-					if (Client.localPlayerIndex == var1) { // L: 535
-						GrandExchangeOfferTotalQuantityComparator.Client_plane = var4.plane;
-					}
-
+				this.frame += var1; // L: 91
+				int var2 = this.sequenceDefinition.method3647(); // L: 92
+				if (this.frame >= var2) { // L: 93
+					this.frame = var2 - this.sequenceDefinition.frameCount; // L: 94
 				}
 			}
 		}
-	} // L: 367 376 415 486 513 536
 
-	@ObfuscatedName("gs")
+	}
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "1509830378"
+		descriptor = "([Ljava/lang/String;[SIIB)V",
+		garbageValue = "60"
 	)
-	@Export("drawEntities")
-	static final void drawEntities(int var0, int var1, int var2, int var3) {
-		++Client.viewportDrawCount; // L: 4666
-		if (HealthBarDefinition.localPlayer.x >> 7 == Client.destinationX && HealthBarDefinition.localPlayer.y >> 7 == Client.destinationY) { // L: 4668
-			Client.destinationX = 0; // L: 4669
-		}
-
-		VerticalAlignment.method3157(); // L: 4672
-		VertexNormal.method4623(); // L: 4673
-		ClanSettings.addNpcsToScene(true); // L: 4674
-		BuddyRankComparator.method2500(); // L: 4675
-		ClanSettings.addNpcsToScene(false); // L: 4676
-
-		int var6;
-		for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { // L: 4678 4679 4696
-			if (var4.plane == GrandExchangeOfferTotalQuantityComparator.Client_plane && Client.cycle <= var4.cycleEnd) { // L: 4680
-				if (Client.cycle >= var4.cycleStart) { // L: 4681
-					if (var4.targetIndex > 0) { // L: 4682
-						NPC var31 = Client.npcs[var4.targetIndex - 1]; // L: 4683
-						if (var31 != null && var31.x >= 0 && var31.x < 13312 && var31.y >= 0 && var31.y < 13312) { // L: 4684
-							var4.setDestination(var31.x, var31.y, class392.getTileHeight(var31.x, var31.y, var4.plane) - var4.endHeight, Client.cycle);
-						}
-					}
-
-					if (var4.targetIndex < 0) { // L: 4686
-						var6 = -var4.targetIndex - 1; // L: 4688
-						Player var34;
-						if (var6 == Client.localPlayerIndex) { // L: 4689
-							var34 = HealthBarDefinition.localPlayer;
-						} else {
-							var34 = Client.players[var6]; // L: 4690
-						}
-
-						if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { // L: 4691
-							var4.setDestination(var34.x, var34.y, class392.getTileHeight(var34.x, var34.y, var4.plane) - var4.endHeight, Client.cycle);
-						}
-					}
-
-					var4.advance(Client.field531); // L: 4693
-					GameBuild.scene.drawEntity(GrandExchangeOfferTotalQuantityComparator.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); // L: 4694
+	@Export("sortItemsByName")
+	static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
+		if (var2 < var3) { // L: 13
+			int var4 = (var3 + var2) / 2; // L: 14
+			int var5 = var2; // L: 15
+			String var6 = var0[var4]; // L: 16
+			var0[var4] = var0[var3]; // L: 17
+			var0[var3] = var6; // L: 18
+			short var7 = var1[var4]; // L: 19
+			var1[var4] = var1[var3]; // L: 20
+			var1[var3] = var7; // L: 21
+
+			for (int var8 = var2; var8 < var3; ++var8) { // L: 22
+				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 23
+					String var9 = var0[var8]; // L: 24
+					var0[var8] = var0[var5]; // L: 25
+					var0[var5] = var9; // L: 26
+					short var10 = var1[var8]; // L: 27
+					var1[var8] = var1[var5]; // L: 28
+					var1[var5++] = var10; // L: 29
 				}
-			} else {
-				var4.remove();
 			}
-		}
 
-		VarpDefinition.method3004(); // L: 4699
-		SpriteMask.setViewportShape(var0, var1, var2, var3, true); // L: 4700
-		var0 = Client.viewportOffsetX; // L: 4701
-		var1 = Client.viewportOffsetY; // L: 4702
-		var2 = Client.viewportWidth; // L: 4703
-		var3 = Client.viewportHeight; // L: 4704
-		Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4705
-		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4706
-		int var5;
-		int var7;
-		int var8;
-		int var11;
-		int var28;
-		if (!Client.isCameraLocked) { // L: 4707
-			var28 = Client.camAngleX; // L: 4708
-			if (Client.field556 / 256 > var28) { // L: 4709
-				var28 = Client.field556 / 256;
-			}
-
-			if (Client.field718[4] && Client.field598[4] + 128 > var28) { // L: 4710
-				var28 = Client.field598[4] + 128;
-			}
-
-			var5 = Client.camAngleY & 2047; // L: 4711
-			var6 = class320.oculusOrbFocalPointX; // L: 4712
-			var7 = DynamicObject.field942; // L: 4713
-			var8 = class18.oculusOrbFocalPointY; // L: 4714
-			var11 = var28 * 3 + 600; // L: 4719
-			method1957(var6, var7, var8, var28, var5, var11, var3); // L: 4721
+			var0[var3] = var0[var5]; // L: 33
+			var0[var5] = var6; // L: 34
+			var1[var3] = var1[var5]; // L: 35
+			var1[var5] = var7; // L: 36
+			sortItemsByName(var0, var1, var2, var5 - 1); // L: 37
+			sortItemsByName(var0, var1, var5 + 1, var3); // L: 38
 		}
 
-		int var9;
-		int var10;
-		int var12;
-		int var14;
-		if (!Client.isCameraLocked) { // L: 4724
-			if (class408.clientPreferences.roofsHidden) { // L: 4727
-				var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 4728
-			} else {
-				label596: {
-					var6 = 3; // L: 4731
-					if (class121.cameraPitch < 310) { // L: 4732
-						if (Client.oculusOrbState == 1) { // L: 4735
-							var7 = class320.oculusOrbFocalPointX >> 7; // L: 4736
-							var8 = class18.oculusOrbFocalPointY >> 7; // L: 4737
-						} else {
-							var7 = HealthBarDefinition.localPlayer.x >> 7; // L: 4740
-							var8 = HealthBarDefinition.localPlayer.y >> 7; // L: 4741
-						}
-
-						var9 = WorldMapSectionType.cameraX >> 7; // L: 4743
-						var10 = class65.cameraZ >> 7; // L: 4744
-						if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) { // L: 4745
-							var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 4746
-							break label596; // L: 4747
-						}
-
-						if (var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) { // L: 4749
-							var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 4750
-							break label596; // L: 4751
-						}
-
-						if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4753
-							var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane;
-						}
-
-						if (var7 > var9) { // L: 4755
-							var11 = var7 - var9;
-						} else {
-							var11 = var9 - var7; // L: 4756
-						}
+	} // L: 40
 
-						if (var8 > var10) { // L: 4758
-							var12 = var8 - var10;
-						} else {
-							var12 = var10 - var8; // L: 4759
-						}
-
-						int var13;
-						if (var11 > var12) { // L: 4760
-							var13 = var12 * 65536 / var11; // L: 4761
-							var14 = 32768; // L: 4762
-
-							while (var9 != var7) { // L: 4763
-								if (var9 < var7) { // L: 4764
-									++var9;
-								} else if (var9 > var7) { // L: 4765
-									--var9;
-								}
-
-								if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4766
-									var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane;
-								}
-
-								var14 += var13; // L: 4767
-								if (var14 >= 65536) { // L: 4768
-									var14 -= 65536; // L: 4769
-									if (var10 < var8) { // L: 4770
-										++var10;
-									} else if (var10 > var8) { // L: 4771
-										--var10;
-									}
-
-									if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4772
-										var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane;
-									}
-								}
-							}
-						} else if (var12 > 0) { // L: 4776
-							var13 = var11 * 65536 / var12; // L: 4777
-							var14 = 32768; // L: 4778
-
-							while (var8 != var10) { // L: 4779
-								if (var10 < var8) { // L: 4780
-									++var10;
-								} else if (var10 > var8) { // L: 4781
-									--var10;
-								}
-
-								if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4782
-									var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane;
-								}
-
-								var14 += var13; // L: 4783
-								if (var14 >= 65536) { // L: 4784
-									var14 -= 65536; // L: 4785
-									if (var9 < var7) { // L: 4786
-										++var9;
-									} else if (var9 > var7) { // L: 4787
-										--var9;
-									}
-
-									if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4788
-										var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane;
-									}
-								}
-							}
-						}
-					}
-
-					if (HealthBarDefinition.localPlayer.x >= 0 && HealthBarDefinition.localPlayer.y >= 0 && HealthBarDefinition.localPlayer.x < 13312 && HealthBarDefinition.localPlayer.y < 13312) { // L: 4793
-						if ((Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][HealthBarDefinition.localPlayer.x >> 7][HealthBarDefinition.localPlayer.y >> 7] & 4) != 0) { // L: 4797
-							var6 = GrandExchangeOfferTotalQuantityComparator.Client_plane;
-						}
-
-						var5 = var6; // L: 4798
-					} else {
-						var5 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 4794
-					}
-				}
-			}
-
-			var28 = var5; // L: 4800
-		} else {
-			var28 = class28.method404(); // L: 4802
-		}
-
-		var5 = WorldMapSectionType.cameraX; // L: 4803
-		var6 = class174.cameraY; // L: 4804
-		var7 = class65.cameraZ; // L: 4805
-		var8 = class121.cameraPitch; // L: 4806
-		var9 = WorldMapRegion.cameraYaw; // L: 4807
-
-		for (var10 = 0; var10 < 5; ++var10) { // L: 4808
-			if (Client.field718[var10]) { // L: 4809
-				var11 = (int)(Math.random() * (double)(Client.field719[var10] * 2 + 1) - (double)Client.field719[var10] + Math.sin((double)Client.field721[var10] / 100.0D * (double)Client.field722[var10]) * (double)Client.field598[var10]); // L: 4810
-				if (var10 == 0) { // L: 4811
-					WorldMapSectionType.cameraX += var11;
-				}
-
-				if (var10 == 1) { // L: 4812
-					class174.cameraY += var11;
-				}
-
-				if (var10 == 2) { // L: 4813
-					class65.cameraZ += var11;
-				}
-
-				if (var10 == 3) { // L: 4814
-					WorldMapRegion.cameraYaw = var11 + WorldMapRegion.cameraYaw & 2047;
-				}
-
-				if (var10 == 4) { // L: 4815
-					class121.cameraPitch += var11; // L: 4816
-					if (class121.cameraPitch < 128) { // L: 4817
-						class121.cameraPitch = 128;
-					}
-
-					if (class121.cameraPitch > 383) { // L: 4818
-						class121.cameraPitch = 383;
-					}
-				}
-			}
-		}
-
-		var10 = MouseHandler.MouseHandler_x; // L: 4822
-		var11 = MouseHandler.MouseHandler_y; // L: 4823
-		if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4824
-			var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4825
-			var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4826
-		}
-
-		if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4828
-			class185.method3872(var10 - var0, var11 - var1); // L: 4829
-		} else {
-			ViewportMouse.ViewportMouse_isInViewport = false; // L: 4833
-			ViewportMouse.ViewportMouse_entityCount = 0; // L: 4834
-		}
-
-		class14.playPcmPlayers(); // L: 4837
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4838
-		class14.playPcmPlayers(); // L: 4839
-		var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4840
-		Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4841
-		GameBuild.scene.draw(WorldMapSectionType.cameraX, class174.cameraY, class65.cameraZ, class121.cameraPitch, WorldMapRegion.cameraYaw, var28); // L: 4842
-		Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4843
-		class14.playPcmPlayers(); // L: 4844
-		GameBuild.scene.clearTempGameObjects(); // L: 4845
-		Client.overheadTextCount = 0; // L: 4847
-		boolean var32 = false; // L: 4848
-		var14 = -1; // L: 4849
-		int var15 = -1; // L: 4850
-		int var16 = Players.Players_count; // L: 4851
-		int[] var17 = Players.Players_indices; // L: 4852
-
-		int var18;
-		for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { // L: 4853
-			Object var30;
-			if (var18 < var16) { // L: 4855
-				var30 = Client.players[var17[var18]]; // L: 4856
-				if (var17[var18] == Client.combatTargetPlayerIndex) { // L: 4857
-					var32 = true; // L: 4858
-					var14 = var18; // L: 4859
-					continue;
-				}
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "1237382938"
+	)
+	public static boolean method2008() {
+		return class260.musicPlayerStatus != 0 ? true : class260.midiPcmStream.isReady(); // L: 62 63
+	}
 
-				if (var30 == HealthBarDefinition.localPlayer) { // L: 4862
-					var15 = var18; // L: 4863
-					continue; // L: 4864
-				}
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-674197725"
+	)
+	static int method2010(int var0, Script var1, boolean var2) {
+		Widget var5;
+		if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1362
+			var5 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1363
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.itemId; // L: 1364
+			return 1; // L: 1365
+		} else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1367
+			var5 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1368
+			if (var5.itemId != -1) { // L: 1369
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.itemQuantity;
 			} else {
-				var30 = Client.npcs[Client.npcIndices[var18 - var16]]; // L: 4867
-			}
-
-			LoginType.drawActor2d((Actor)var30, var18, var0, var1, var2, var3); // L: 4868
-		}
-
-		if (Client.renderSelf && var15 != -1) { // L: 4870
-			LoginType.drawActor2d(HealthBarDefinition.localPlayer, var15, var0, var1, var2, var3); // L: 4871
-		}
-
-		if (var32) { // L: 4873
-			LoginType.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); // L: 4874
-		}
-
-		for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { // L: 4876
-			int var19 = Client.overheadTextXs[var18]; // L: 4877
-			int var20 = Client.overheadTextYs[var18]; // L: 4878
-			int var21 = Client.overheadTextXOffsets[var18]; // L: 4879
-			int var22 = Client.overheadTextAscents[var18]; // L: 4880
-			boolean var23 = true; // L: 4881
-
-			while (var23) {
-				var23 = false; // L: 4883
-
-				for (int var29 = 0; var29 < var18; ++var29) { // L: 4884
-					if (var20 + 2 > Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] && var20 - var22 < Client.overheadTextYs[var29] + 2 && var19 - var21 < Client.overheadTextXOffsets[var29] + Client.overheadTextXs[var29] && var21 + var19 > Client.overheadTextXs[var29] - Client.overheadTextXOffsets[var29] && Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] < var20) { // L: 4885 4886
-						var20 = Client.overheadTextYs[var29] - Client.overheadTextAscents[var29]; // L: 4887
-						var23 = true; // L: 4888
-					}
-				}
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1370
 			}
 
-			Client.viewportTempX = Client.overheadTextXs[var18]; // L: 4893
-			Client.viewportTempY = Client.overheadTextYs[var18] = var20; // L: 4894
-			String var24 = Client.overheadText[var18]; // L: 4895
-			if (Client.chatEffects == 0) { // L: 4896
-				int var25 = 16776960; // L: 4897
-				if (Client.overheadTextColors[var18] < 6) { // L: 4898
-					var25 = Client.field689[Client.overheadTextColors[var18]];
-				}
-
-				if (Client.overheadTextColors[var18] == 6) { // L: 4899
-					var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
-				}
-
-				if (Client.overheadTextColors[var18] == 7) { // L: 4900
-					var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
-				}
-
-				if (Client.overheadTextColors[var18] == 8) { // L: 4901
-					var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
-				}
-
-				int var26;
-				if (Client.overheadTextColors[var18] == 9) { // L: 4902
-					var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4903
-					if (var26 < 50) { // L: 4904
-						var25 = var26 * 1280 + 16711680;
-					} else if (var26 < 100) { // L: 4905
-						var25 = 16776960 - (var26 - 50) * 327680;
-					} else if (var26 < 150) { // L: 4906
-						var25 = (var26 - 100) * 5 + 65280;
-					}
-				}
-
-				if (Client.overheadTextColors[var18] == 10) { // L: 4908
-					var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4909
-					if (var26 < 50) { // L: 4910
-						var25 = var26 * 5 + 16711680;
-					} else if (var26 < 100) { // L: 4911
-						var25 = 16711935 - (var26 - 50) * 327680;
-					} else if (var26 < 150) { // L: 4912
-						var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5;
-					}
-				}
-
-				if (Client.overheadTextColors[var18] == 11) { // L: 4914
-					var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4915
-					if (var26 < 50) { // L: 4916
-						var25 = 16777215 - var26 * 327685;
-					} else if (var26 < 100) { // L: 4917
-						var25 = (var26 - 50) * 327685 + 65280;
-					} else if (var26 < 150) { // L: 4918
-						var25 = 16777215 - (var26 - 100) * 327680;
-					}
-				}
-
-				if (Client.overheadTextEffects[var18] == 0) { // L: 4920
-					Login.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0);
-				}
-
-				if (Client.overheadTextEffects[var18] == 1) { // L: 4921
-					Login.fontBold12.drawCenteredWave(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount);
-				}
-
-				if (Client.overheadTextEffects[var18] == 2) { // L: 4922
-					Login.fontBold12.drawCenteredWave2(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount);
-				}
-
-				if (Client.overheadTextEffects[var18] == 3) { // L: 4923
-					Login.fontBold12.drawCenteredShake(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]);
-				}
-
-				if (Client.overheadTextEffects[var18] == 4) { // L: 4924
-					var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (Login.fontBold12.stringWidth(var24) + 100) / 150; // L: 4925
-					Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4926
-					Login.fontBold12.draw(var24, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); // L: 4927
-					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4928
-				}
-
-				if (Client.overheadTextEffects[var18] == 5) { // L: 4930
-					var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4931
-					int var27 = 0; // L: 4932
-					if (var26 < 25) { // L: 4933
-						var27 = var26 - 25;
-					} else if (var26 > 125) { // L: 4934
-						var27 = var26 - 125;
-					}
-
-					Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - Login.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4935
-					Login.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); // L: 4936
-					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4937
-				}
+			return 1; // L: 1371
+		} else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1373
+			int var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1374
+			InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1375
+			if (var4 != null) { // L: 1376
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1;
 			} else {
-				Login.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4941
-			}
-		}
-
-		if (Client.hintArrowType == 2) { // L: 4946
-			DefaultsGroup.worldToScreen((Client.hintArrowX - class19.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - DefaultsGroup.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4947
-			if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4948
-				DevicePcmPlayerProvider.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
-			}
-		}
-
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field531); // L: 4950
-		class393.method6885(var0, var1, var2, var3); // L: 4951
-		WorldMapSectionType.cameraX = var5; // L: 4952
-		class174.cameraY = var6; // L: 4953
-		class65.cameraZ = var7; // L: 4954
-		class121.cameraPitch = var8; // L: 4955
-		WorldMapRegion.cameraYaw = var9; // L: 4956
-		if (Client.isLoading) { // L: 4957
-			byte var33 = 0; // L: 4960
-			var14 = var33 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4961
-			if (var14 == 0) { // L: 4965
-				Client.isLoading = false;
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1377
 			}
-		}
-
-		if (Client.isLoading) { // L: 4967
-			Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4968
-			class91.drawLoadingMessage("Loading - please wait.", false); // L: 4969
-		}
-
-	} // L: 4971
 
-	@ObfuscatedName("hx")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIII)V",
-		garbageValue = "2132181355"
-	)
-	static final void method1957(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		var5 = class150.method2971(var5, var6); // L: 5664
-		int var7 = 2048 - var3 & 2047; // L: 5665
-		int var8 = 2048 - var4 & 2047; // L: 5666
-		int var9 = 0; // L: 5667
-		int var10 = 0; // L: 5668
-		int var11 = var5; // L: 5669
-		int var12;
-		int var13;
-		int var14;
-		if (var7 != 0) { // L: 5670
-			var12 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 5671
-			var13 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 5672
-			var14 = var13 * var10 - var12 * var5 >> 16; // L: 5673
-			var11 = var12 * var10 + var5 * var13 >> 16; // L: 5674
-			var10 = var14; // L: 5675
-		}
-
-		if (var8 != 0) { // L: 5677
-			var12 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5678
-			var13 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5679
-			var14 = var9 * var13 + var12 * var11 >> 16; // L: 5680
-			var11 = var13 * var11 - var12 * var9 >> 16; // L: 5681
-			var9 = var14; // L: 5682
-		}
-
-		WorldMapSectionType.cameraX = var0 - var9; // L: 5684
-		class174.cameraY = var1 - var10; // L: 5685
-		class65.cameraZ = var2 - var11; // L: 5686
-		class121.cameraPitch = var3; // L: 5687
-		WorldMapRegion.cameraYaw = var4; // L: 5688
-		if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class320.oculusOrbFocalPointX >> 7 != HealthBarDefinition.localPlayer.x >> 7 || class18.oculusOrbFocalPointY >> 7 != HealthBarDefinition.localPlayer.y >> 7)) { // L: 5689 5690
-			var12 = HealthBarDefinition.localPlayer.plane; // L: 5691
-			var13 = (class320.oculusOrbFocalPointX >> 7) + class19.baseX; // L: 5692
-			var14 = (class18.oculusOrbFocalPointY >> 7) + DefaultsGroup.baseY; // L: 5693
-			InvDefinition.method2986(var13, var14, var12, true); // L: 5694
+			return 1; // L: 1378
+		} else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1380
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1381
+			return 1; // L: 1382
+		} else {
+			return 2; // L: 1384
 		}
-
-	} // L: 5697
+	}
 }
diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java
index 5ebba57f0a..cc426cb4cb 100644
--- a/runescape-client/src/main/java/RasterProvider.java
+++ b/runescape-client/src/main/java/RasterProvider.java
@@ -14,13 +14,13 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("am")
+@ObfuscatedName("ax")
 @Implements("RasterProvider")
 public final class RasterProvider extends AbstractRasterProvider {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("component")
 	Component component;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("image")
 	Image image;
 
@@ -36,66 +36,66 @@ public final class RasterProvider extends AbstractRasterProvider {
 		this.apply(); // L: 31
 	} // L: 32
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/awt/Component;I)V",
-		garbageValue = "109132547"
+		garbageValue = "-1836317147"
 	)
 	@Export("setComponent")
 	final void setComponent(Component var1) {
 		this.component = var1; // L: 35
 	} // L: 36
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "1712436925"
+		descriptor = "(IIB)V",
+		garbageValue = "0"
 	)
 	@Export("drawFull")
 	public final void drawFull(int var1, int var2) {
-		this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39
-	} // L: 40
+		this.drawFull0(this.component.getGraphics(), var1, var2); // L: 40
+	} // L: 41
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "-419314546"
+		garbageValue = "1782361529"
 	)
 	@Export("draw")
 	public final void draw(int var1, int var2, int var3, int var4) {
-		this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 43
-	} // L: 44
+		this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 45
+	} // L: 46
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/awt/Graphics;III)V",
-		garbageValue = "1962607429"
+		garbageValue = "1589721591"
 	)
 	@Export("drawFull0")
 	final void drawFull0(Graphics var1, int var2, int var3) {
 		try {
-			var1.drawImage(this.image, var2, var3, this.component); // L: 48
-		} catch (Exception var5) { // L: 50
-			this.component.repaint(); // L: 51
+			var1.drawImage(this.image, var2, var3, this.component); // L: 50
+		} catch (Exception var5) { // L: 52
+			this.component.repaint(); // L: 53
 		}
 
-	} // L: 53
+	} // L: 55
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/awt/Graphics;IIIIB)V",
-		garbageValue = "-18"
+		descriptor = "(Ljava/awt/Graphics;IIIII)V",
+		garbageValue = "1916847882"
 	)
 	@Export("draw0")
 	final void draw0(Graphics var1, int var2, int var3, int var4, int var5) {
 		try {
-			Shape var6 = var1.getClip(); // L: 57
-			var1.clipRect(var2, var3, var4, var5); // L: 58
-			var1.drawImage(this.image, 0, 0, this.component); // L: 59
-			var1.setClip(var6); // L: 60
-		} catch (Exception var7) { // L: 62
-			this.component.repaint(); // L: 63
+			Shape var6 = var1.getClip(); // L: 59
+			var1.clipRect(var2, var3, var4, var5); // L: 60
+			var1.drawImage(this.image, 0, 0, this.component); // L: 61
+			var1.setClip(var6); // L: 62
+		} catch (Exception var7) { // L: 64
+			this.component.repaint(); // L: 65
 		}
 
-	} // L: 65
+	} // L: 67
 }
diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java
index 7b087bd14c..9013a76db4 100644
--- a/runescape-client/src/main/java/Rasterizer2D.java
+++ b/runescape-client/src/main/java/Rasterizer2D.java
@@ -3,28 +3,28 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ob")
+@ObfuscatedName("pw")
 @Implements("Rasterizer2D")
 public class Rasterizer2D extends DualNode {
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@Export("Rasterizer2D_pixels")
 	public static int[] Rasterizer2D_pixels;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@Export("Rasterizer2D_width")
 	public static int Rasterizer2D_width;
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@Export("Rasterizer2D_height")
 	public static int Rasterizer2D_height;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@Export("Rasterizer2D_yClipStart")
 	public static int Rasterizer2D_yClipStart;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@Export("Rasterizer2D_yClipEnd")
 	public static int Rasterizer2D_yClipEnd;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@Export("Rasterizer2D_xClipStart")
 	public static int Rasterizer2D_xClipStart;
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@Export("Rasterizer2D_xClipEnd")
 	public static int Rasterizer2D_xClipEnd;
 
@@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode {
 	protected Rasterizer2D() {
 	} // L: 16
 
-	@ObfuscatedName("dw")
+	@ObfuscatedName("cq")
 	@Export("Rasterizer2D_replace")
 	public static void Rasterizer2D_replace(int[] var0, int var1, int var2) {
 		Rasterizer2D_pixels = var0; // L: 19
@@ -47,7 +47,7 @@ public static void Rasterizer2D_replace(int[] var0, int var1, int var2) {
 		Rasterizer2D_setClip(0, 0, var1, var2); // L: 22
 	} // L: 23
 
-	@ObfuscatedName("dn")
+	@ObfuscatedName("cf")
 	@Export("Rasterizer2D_resetClip")
 	public static void Rasterizer2D_resetClip() {
 		Rasterizer2D_xClipStart = 0; // L: 26
@@ -56,7 +56,7 @@ public static void Rasterizer2D_resetClip() {
 		Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29
 	} // L: 30
 
-	@ObfuscatedName("dc")
+	@ObfuscatedName("cu")
 	@Export("Rasterizer2D_setClip")
 	public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) {
 		if (var0 < 0) { // L: 33
@@ -81,7 +81,7 @@ public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3)
 		Rasterizer2D_yClipEnd = var3; // L: 40
 	} // L: 41
 
-	@ObfuscatedName("dh")
+	@ObfuscatedName("cx")
 	@Export("Rasterizer2D_expandClip")
 	public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) {
 		if (Rasterizer2D_xClipStart < var0) { // L: 44
@@ -102,7 +102,7 @@ public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var
 
 	} // L: 48
 
-	@ObfuscatedName("du")
+	@ObfuscatedName("cm")
 	@Export("Rasterizer2D_getClipArray")
 	public static void Rasterizer2D_getClipArray(int[] var0) {
 		var0[0] = Rasterizer2D_xClipStart; // L: 51
@@ -111,7 +111,7 @@ public static void Rasterizer2D_getClipArray(int[] var0) {
 		var0[3] = Rasterizer2D_yClipEnd; // L: 54
 	} // L: 55
 
-	@ObfuscatedName("db")
+	@ObfuscatedName("dm")
 	@Export("Rasterizer2D_setClipArray")
 	public static void Rasterizer2D_setClipArray(int[] var0) {
 		Rasterizer2D_xClipStart = var0[0]; // L: 58
@@ -120,7 +120,7 @@ public static void Rasterizer2D_setClipArray(int[] var0) {
 		Rasterizer2D_yClipEnd = var0[3]; // L: 61
 	} // L: 62
 
-	@ObfuscatedName("dp")
+	@ObfuscatedName("dr")
 	@Export("Rasterizer2D_clear")
 	public static void Rasterizer2D_clear() {
 		int var0 = 0; // L: 65
@@ -141,7 +141,7 @@ public static void Rasterizer2D_clear() {
 
 	} // L: 79
 
-	@ObfuscatedName("dj")
+	@ObfuscatedName("ds")
 	@Export("drawCircle")
 	static void drawCircle(int var0, int var1, int var2, int var3) {
 		if (var2 == 0) { // L: 82
@@ -225,8 +225,8 @@ static void drawCircle(int var0, int var1, int var2, int var3) {
 
 				var14 = var12 + var6 * Rasterizer2D_width; // L: 127
 
-				for (var15 = var12; var15 <= var13; ++var15) {
-					Rasterizer2D_pixels[var14++] = var3; // L: 128
+				for (var15 = var12; var15 <= var13; ++var15) { // L: 128
+					Rasterizer2D_pixels[var14++] = var3;
 				}
 
 				++var6; // L: 129
@@ -236,7 +236,7 @@ static void drawCircle(int var0, int var1, int var2, int var3) {
 		}
 	} // L: 84 133
 
-	@ObfuscatedName("dt")
+	@ObfuscatedName("dv")
 	@Export("Rasterizer2D_drawCircleAlpha")
 	public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) {
 		if (var4 != 0) { // L: 136
@@ -349,7 +349,7 @@ public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, in
 		}
 	} // L: 139 207
 
-	@ObfuscatedName("dy")
+	@ObfuscatedName("df")
 	@Export("Rasterizer2D_fillRectangleAlpha")
 	public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
 		if (var0 < Rasterizer2D_xClipStart) { // L: 210
@@ -387,7 +387,7 @@ public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2,
 
 	} // L: 232
 
-	@ObfuscatedName("ds")
+	@ObfuscatedName("dh")
 	@Export("Rasterizer2D_fillRectangle")
 	public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) {
 		if (var0 < Rasterizer2D_xClipStart) { // L: 235
@@ -421,7 +421,7 @@ public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int
 
 	} // L: 253
 
-	@ObfuscatedName("de")
+	@ObfuscatedName("dn")
 	@Export("Rasterizer2D_fillRectangleGradient")
 	public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) {
 		if (var2 > 0 && var3 > 0) { // L: 256
@@ -465,7 +465,7 @@ public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int va
 		}
 	} // L: 282
 
-	@ObfuscatedName("dg")
+	@ObfuscatedName("dx")
 	@Export("Rasterizer2D_fillRectangleGradientAlpha")
 	public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var2 > 0 && var3 > 0) { // L: 285
@@ -523,7 +523,7 @@ public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, i
 		}
 	} // L: 326
 
-	@ObfuscatedName("di")
+	@ObfuscatedName("dp")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIII[BIZ)V",
 		garbageValue = "1"
@@ -604,7 +604,7 @@ public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2,
 		}
 	} // L: 380
 
-	@ObfuscatedName("do")
+	@ObfuscatedName("dc")
 	@Export("Rasterizer2D_drawRectangle")
 	public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) {
 		Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383
@@ -613,7 +613,7 @@ public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int
 		Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386
 	} // L: 387
 
-	@ObfuscatedName("dr")
+	@ObfuscatedName("dq")
 	@Export("Rasterizer2D_drawRectangleAlpha")
 	public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
 		Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); // L: 390
@@ -625,7 +625,7 @@ public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2,
 
 	} // L: 396
 
-	@ObfuscatedName("dz")
+	@ObfuscatedName("db")
 	@Export("Rasterizer2D_drawHorizontalLine")
 	public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) {
 		if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399
@@ -647,7 +647,7 @@ public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2,
 		}
 	} // L: 407
 
-	@ObfuscatedName("dx")
+	@ObfuscatedName("dj")
 	@Export("Rasterizer2D_drawHorizontalLineAlpha")
 	static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
 		if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410
@@ -699,7 +699,7 @@ public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, i
 		}
 	} // L: 442
 
-	@ObfuscatedName("dl")
+	@ObfuscatedName("du")
 	@Export("Rasterizer2D_drawVerticalLineAlpha")
 	static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
 		if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445
@@ -730,7 +730,7 @@ static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int
 		}
 	} // L: 467
 
-	@ObfuscatedName("dm")
+	@ObfuscatedName("dl")
 	@Export("Rasterizer2D_drawLine")
 	public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) {
 		var2 -= var0; // L: 470
@@ -812,7 +812,7 @@ public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3,
 		}
 	} // L: 475 480 524
 
-	@ObfuscatedName("dk")
+	@ObfuscatedName("dw")
 	@Export("Rasterizer2D_setPixel")
 	static void Rasterizer2D_setPixel(int var0, int var1, int var2) {
 		if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527
@@ -820,7 +820,7 @@ static void Rasterizer2D_setPixel(int var0, int var1, int var2) {
 		}
 	} // L: 529
 
-	@ObfuscatedName("dv")
+	@ObfuscatedName("dg")
 	@Export("Rasterizer2D_fillMaskedRectangle")
 	public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) {
 		int var5 = var0 + Rasterizer2D_width * var1; // L: 532
diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java
index 1ede735140..513daf1d20 100644
--- a/runescape-client/src/main/java/Rasterizer3D.java
+++ b/runescape-client/src/main/java/Rasterizer3D.java
@@ -3,92 +3,92 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hx")
+@ObfuscatedName("gp")
 @Implements("Rasterizer3D")
 public class Rasterizer3D extends Rasterizer2D {
-	@ObfuscatedName("i")
-	static boolean field2365;
-	@ObfuscatedName("w")
-	static boolean field2344;
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
+	static boolean field2253;
+	@ObfuscatedName("b")
+	static boolean field2251;
+	@ObfuscatedName("p")
 	@Export("Rasterizer3D_isLowDetailTexture")
 	static boolean Rasterizer3D_isLowDetailTexture;
-	@ObfuscatedName("a")
-	public static boolean field2367;
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
+	public static boolean field2276;
+	@ObfuscatedName("t")
 	@Export("Rasterizer3D_alpha")
 	static int Rasterizer3D_alpha;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("Rasterizer3D_zoom")
 	public static int Rasterizer3D_zoom;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("Rasterizer3D_clipMidX")
 	static int Rasterizer3D_clipMidX;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("Rasterizer3D_clipMidY")
 	static int Rasterizer3D_clipMidY;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("Rasterizer3D_clipWidth")
 	static int Rasterizer3D_clipWidth;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("Rasterizer3D_clipHeight")
 	static int Rasterizer3D_clipHeight;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("Rasterizer3D_clipNegativeMidX")
 	static int Rasterizer3D_clipNegativeMidX;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("Rasterizer3D_clipMidX2")
 	static int Rasterizer3D_clipMidX2;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("Rasterizer3D_clipNegativeMidY")
 	static int Rasterizer3D_clipNegativeMidY;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("Rasterizer3D_clipMidY2")
 	static int Rasterizer3D_clipMidY2;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("Rasterizer3D_rowOffsets")
 	static int[] Rasterizer3D_rowOffsets;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("Rasterizer3D_colorPalette")
 	public static int[] Rasterizer3D_colorPalette;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Lht;"
+		descriptor = "Lhj;"
 	)
 	@Export("Rasterizer3D_textureLoader")
 	public static TextureLoader Rasterizer3D_textureLoader;
-	@ObfuscatedName("f")
-	static int[] field2366;
-	@ObfuscatedName("h")
-	static int[] field2347;
-	@ObfuscatedName("v")
+	@ObfuscatedName("z")
+	static int[] field2273;
+	@ObfuscatedName("i")
+	static int[] field2271;
+	@ObfuscatedName("y")
 	@Export("Rasterizer3D_sine")
 	public static int[] Rasterizer3D_sine;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@Export("Rasterizer3D_cosine")
 	public static int[] Rasterizer3D_cosine;
 
 	static {
-		field2365 = false; // L: 8
-		field2344 = false; // L: 9
+		field2253 = false; // L: 8
+		field2251 = false; // L: 9
 		Rasterizer3D_isLowDetailTexture = false; // L: 10
-		field2367 = true; // L: 11
+		field2276 = true; // L: 11
 		Rasterizer3D_alpha = 0; // L: 12
 		Rasterizer3D_zoom = 512; // L: 19
 		Rasterizer3D_rowOffsets = new int[1024]; // L: 28
 		Rasterizer3D_colorPalette = new int[65536]; // L: 29
-		field2366 = new int[512]; // L: 31
-		field2347 = new int[2048]; // L: 32
+		field2273 = new int[512]; // L: 31
+		field2271 = new int[2048]; // L: 32
 		Rasterizer3D_sine = new int[2048]; // L: 33
 		Rasterizer3D_cosine = new int[2048]; // L: 34
 
 		int var0;
 		for (var0 = 1; var0 < 512; ++var0) { // L: 37
-			field2366[var0] = 32768 / var0; // L: 38
+			field2273[var0] = 32768 / var0; // L: 38
 		}
 
 		for (var0 = 1; var0 < 2048; ++var0) { // L: 40
-			field2347[var0] = 65536 / var0; // L: 41
+			field2271[var0] = 65536 / var0; // L: 41
 		}
 
 		for (var0 = 0; var0 < 2048; ++var0) { // L: 43
@@ -98,678 +98,668 @@ public class Rasterizer3D extends Rasterizer2D {
 
 	} // L: 47
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("Rasterizer3D_setClipFromRasterizer2D")
 	public static final void Rasterizer3D_setClipFromRasterizer2D() {
 		Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54
 	} // L: 55
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("Rasterizer3D_setClip")
 	static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) {
 		Rasterizer3D_clipWidth = var2 - var0; // L: 58
 		Rasterizer3D_clipHeight = var3 - var1; // L: 59
 		Rasterizer3D_method3(); // L: 60
-		int var4;
-		int var5;
 		if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61
-			var5 = Rasterizer3D_clipHeight; // L: 63
-			--var5; // L: 65
-			var5 |= var5 >>> 1; // L: 66
-			var5 |= var5 >>> 2; // L: 67
-			var5 |= var5 >>> 4; // L: 68
-			var5 |= var5 >>> 8; // L: 69
-			var5 |= var5 >>> 16; // L: 70
-			var4 = var5 + 1; // L: 71
-			Rasterizer3D_rowOffsets = new int[var4]; // L: 73
+			Rasterizer3D_rowOffsets = new int[SpotAnimationDefinition.method3362(Rasterizer3D_clipHeight)];
 		}
 
-		var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 75
+		int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62
 
-		for (var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 76
-			Rasterizer3D_rowOffsets[var5] = var4; // L: 77
-			var4 += Rasterizer2D.Rasterizer2D_width; // L: 78
+		for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 63
+			Rasterizer3D_rowOffsets[var5] = var4; // L: 64
+			var4 += Rasterizer2D.Rasterizer2D_width; // L: 65
 		}
 
-	} // L: 80
+	} // L: 67
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("Rasterizer3D_method3")
 	public static final void Rasterizer3D_method3() {
-		Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 83
-		Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 84
-		Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 85
-		Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 86
-		Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 87
-		Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 88
-	} // L: 89
+		Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70
+		Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 71
+		Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 72
+		Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 73
+		Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 74
+		Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75
+	} // L: 76
 
-	@ObfuscatedName("a")
-	public static final void method4205(int var0, int var1) {
-		int var2 = Rasterizer3D_rowOffsets[0]; // L: 92
-		int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 93
-		int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 94
-		Rasterizer3D_clipMidX = var0 - var4; // L: 95
-		Rasterizer3D_clipMidY = var1 - var3; // L: 96
-		Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 97
-		Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 98
-		Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 99
-		Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 100
-	} // L: 101
+	@ObfuscatedName("m")
+	public static final void method3913(int var0, int var1) {
+		int var2 = Rasterizer3D_rowOffsets[0]; // L: 79
+		int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80
+		int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81
+		Rasterizer3D_clipMidX = var0 - var4; // L: 82
+		Rasterizer3D_clipMidY = var1 - var3; // L: 83
+		Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 84
+		Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 85
+		Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 86
+		Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87
+	} // L: 88
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lht;)V"
+		descriptor = "(Lhj;)V"
 	)
 	@Export("Rasterizer3D_setTextureLoader")
 	public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) {
-		Rasterizer3D_textureLoader = var0; // L: 104
-	} // L: 105
+		Rasterizer3D_textureLoader = var0; // L: 91
+	} // L: 92
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("Rasterizer3D_setBrightness")
 	public static final void Rasterizer3D_setBrightness(double var0) {
-		Rasterizer3D_buildPalette(var0, 0, 512); // L: 108
-	} // L: 109
+		Rasterizer3D_buildPalette(var0, 0, 512); // L: 95
+	} // L: 96
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("Rasterizer3D_buildPalette")
 	static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) {
-		int var4 = var2 * 128; // L: 112
-
-		for (int var5 = var2; var5 < var3; ++var5) { // L: 113
-			double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; // L: 114
-			double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; // L: 115
-
-			for (int var10 = 0; var10 < 128; ++var10) { // L: 116
-				double var11 = (double)var10 / 128.0D; // L: 117
-				double var13 = var11; // L: 118
-				double var15 = var11; // L: 119
-				double var17 = var11; // L: 120
-				if (var8 != 0.0D) { // L: 121
+		int var4 = var2 * 128; // L: 99
+
+		for (int var5 = var2; var5 < var3; ++var5) { // L: 100
+			double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; // L: 101
+			double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; // L: 102
+
+			for (int var10 = 0; var10 < 128; ++var10) { // L: 103
+				double var11 = (double)var10 / 128.0D; // L: 104
+				double var13 = var11; // L: 105
+				double var15 = var11; // L: 106
+				double var17 = var11; // L: 107
+				if (var8 != 0.0D) { // L: 108
 					double var19;
-					if (var11 < 0.5D) { // L: 123
+					if (var11 < 0.5D) { // L: 110
 						var19 = var11 * (1.0D + var8);
 					} else {
-						var19 = var11 + var8 - var11 * var8; // L: 124
+						var19 = var11 + var8 - var11 * var8; // L: 111
 					}
 
-					double var21 = 2.0D * var11 - var19; // L: 125
-					double var23 = var6 + 0.3333333333333333D; // L: 126
-					if (var23 > 1.0D) { // L: 127
+					double var21 = 2.0D * var11 - var19; // L: 112
+					double var23 = var6 + 0.3333333333333333D; // L: 113
+					if (var23 > 1.0D) { // L: 114
 						--var23;
 					}
 
-					double var27 = var6 - 0.3333333333333333D; // L: 129
-					if (var27 < 0.0D) { // L: 130
+					double var27 = var6 - 0.3333333333333333D; // L: 116
+					if (var27 < 0.0D) { // L: 117
 						++var27;
 					}
 
-					if (6.0D * var23 < 1.0D) { // L: 131
+					if (6.0D * var23 < 1.0D) { // L: 118
 						var13 = var21 + (var19 - var21) * 6.0D * var23;
-					} else if (2.0D * var23 < 1.0D) { // L: 132
+					} else if (2.0D * var23 < 1.0D) { // L: 119
 						var13 = var19;
-					} else if (3.0D * var23 < 2.0D) { // L: 133
+					} else if (3.0D * var23 < 2.0D) { // L: 120
 						var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D;
 					} else {
-						var13 = var21; // L: 134
+						var13 = var21; // L: 121
 					}
 
-					if (6.0D * var6 < 1.0D) { // L: 135
+					if (6.0D * var6 < 1.0D) { // L: 122
 						var15 = var21 + (var19 - var21) * 6.0D * var6;
-					} else if (2.0D * var6 < 1.0D) { // L: 136
+					} else if (2.0D * var6 < 1.0D) { // L: 123
 						var15 = var19;
-					} else if (3.0D * var6 < 2.0D) { // L: 137
+					} else if (3.0D * var6 < 2.0D) { // L: 124
 						var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D;
 					} else {
-						var15 = var21; // L: 138
+						var15 = var21; // L: 125
 					}
 
-					if (6.0D * var27 < 1.0D) { // L: 139
+					if (6.0D * var27 < 1.0D) { // L: 126
 						var17 = var21 + (var19 - var21) * 6.0D * var27;
-					} else if (2.0D * var27 < 1.0D) { // L: 140
+					} else if (2.0D * var27 < 1.0D) { // L: 127
 						var17 = var19;
-					} else if (3.0D * var27 < 2.0D) { // L: 141
+					} else if (3.0D * var27 < 2.0D) { // L: 128
 						var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D;
 					} else {
-						var17 = var21; // L: 142
+						var17 = var21; // L: 129
 					}
 				}
 
-				int var29 = (int)(var13 * 256.0D); // L: 144
-				int var20 = (int)(var15 * 256.0D); // L: 145
-				int var30 = (int)(var17 * 256.0D); // L: 146
-				int var22 = var30 + (var20 << 8) + (var29 << 16); // L: 147
-				var22 = Rasterizer3D_brighten(var22, var0); // L: 148
-				if (var22 == 0) { // L: 149
+				int var29 = (int)(var13 * 256.0D); // L: 131
+				int var20 = (int)(var15 * 256.0D); // L: 132
+				int var30 = (int)(var17 * 256.0D); // L: 133
+				int var22 = var30 + (var20 << 8) + (var29 << 16); // L: 134
+				var22 = Rasterizer3D_brighten(var22, var0); // L: 135
+				if (var22 == 0) { // L: 136
 					var22 = 1;
 				}
 
-				Rasterizer3D_colorPalette[var4++] = var22; // L: 150
+				Rasterizer3D_colorPalette[var4++] = var22; // L: 137
 			}
 		}
 
-	} // L: 153
+	} // L: 140
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("Rasterizer3D_brighten")
 	static int Rasterizer3D_brighten(int var0, double var1) {
-		double var3 = (double)(var0 >> 16) / 256.0D; // L: 156
-		double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 157
-		double var7 = (double)(var0 & 255) / 256.0D; // L: 158
-		var3 = Math.pow(var3, var1); // L: 159
-		var5 = Math.pow(var5, var1); // L: 160
-		var7 = Math.pow(var7, var1); // L: 161
-		int var9 = (int)(var3 * 256.0D); // L: 162
-		int var10 = (int)(var5 * 256.0D); // L: 163
-		int var11 = (int)(var7 * 256.0D); // L: 164
-		return var11 + (var10 << 8) + (var9 << 16); // L: 165
+		double var3 = (double)(var0 >> 16) / 256.0D; // L: 143
+		double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 144
+		double var7 = (double)(var0 & 255) / 256.0D; // L: 145
+		var3 = Math.pow(var3, var1); // L: 146
+		var5 = Math.pow(var5, var1); // L: 147
+		var7 = Math.pow(var7, var1); // L: 148
+		int var9 = (int)(var3 * 256.0D); // L: 149
+		int var10 = (int)(var5 * 256.0D); // L: 150
+		int var11 = (int)(var7 * 256.0D); // L: 151
+		return var11 + (var10 << 8) + (var9 << 16); // L: 152
 	}
 
-	@ObfuscatedName("j")
-	public static void method4210(int var0, int var1, int var2) {
-		field2365 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 169
-	} // L: 170
+	@ObfuscatedName("n")
+	public static void method3853(int var0, int var1, int var2) {
+		field2253 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156
+	} // L: 157
 
-	@ObfuscatedName("b")
-	static final void method4211(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		int var9 = var4 - var3; // L: 173
-		int var10 = var1 - var0; // L: 174
-		int var11 = var5 - var3; // L: 175
-		int var12 = var2 - var0; // L: 176
-		int var13 = var7 - var6; // L: 177
-		int var14 = var8 - var6; // L: 178
+	@ObfuscatedName("r")
+	static final void method3854(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+		int var9 = var4 - var3; // L: 160
+		int var10 = var1 - var0; // L: 161
+		int var11 = var5 - var3; // L: 162
+		int var12 = var2 - var0; // L: 163
+		int var13 = var7 - var6; // L: 164
+		int var14 = var8 - var6; // L: 165
 		int var15;
-		if (var2 != var1) { // L: 180
+		if (var2 != var1) { // L: 167
 			var15 = (var5 - var4 << 14) / (var2 - var1);
 		} else {
-			var15 = 0; // L: 181
+			var15 = 0; // L: 168
 		}
 
 		int var16;
-		if (var0 != var1) { // L: 183
+		if (var0 != var1) { // L: 170
 			var16 = (var9 << 14) / var10;
 		} else {
-			var16 = 0; // L: 184
+			var16 = 0; // L: 171
 		}
 
 		int var17;
-		if (var0 != var2) { // L: 186
+		if (var0 != var2) { // L: 173
 			var17 = (var11 << 14) / var12;
 		} else {
-			var17 = 0; // L: 187
+			var17 = 0; // L: 174
 		}
 
-		int var18 = var9 * var12 - var11 * var10; // L: 188
-		if (var18 != 0) { // L: 189
-			int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 190
-			int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 191
-			if (var0 <= var1 && var0 <= var2) { // L: 192
-				if (var0 < Rasterizer3D_clipHeight) { // L: 193
-					if (var1 > Rasterizer3D_clipHeight) { // L: 194
+		int var18 = var9 * var12 - var11 * var10; // L: 175
+		if (var18 != 0) { // L: 176
+			int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 177
+			int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 178
+			if (var0 <= var1 && var0 <= var2) { // L: 179
+				if (var0 < Rasterizer3D_clipHeight) { // L: 180
+					if (var1 > Rasterizer3D_clipHeight) { // L: 181
 						var1 = Rasterizer3D_clipHeight;
 					}
 
-					if (var2 > Rasterizer3D_clipHeight) { // L: 195
+					if (var2 > Rasterizer3D_clipHeight) { // L: 182
 						var2 = Rasterizer3D_clipHeight;
 					}
 
-					var6 = var19 + ((var6 << 8) - var3 * var19); // L: 196
-					if (var1 < var2) { // L: 197
-						var5 = var3 <<= 14; // L: 198
-						if (var0 < 0) { // L: 199
-							var5 -= var0 * var17; // L: 200
-							var3 -= var0 * var16; // L: 201
-							var6 -= var0 * var20; // L: 202
-							var0 = 0; // L: 203
+					var6 = var19 + ((var6 << 8) - var3 * var19); // L: 183
+					if (var1 < var2) { // L: 184
+						var5 = var3 <<= 14; // L: 185
+						if (var0 < 0) { // L: 186
+							var5 -= var0 * var17; // L: 187
+							var3 -= var0 * var16; // L: 188
+							var6 -= var0 * var20; // L: 189
+							var0 = 0; // L: 190
 						}
 
-						var4 <<= 14; // L: 205
-						if (var1 < 0) { // L: 206
-							var4 -= var15 * var1; // L: 207
-							var1 = 0; // L: 208
+						var4 <<= 14; // L: 192
+						if (var1 < 0) { // L: 193
+							var4 -= var15 * var1; // L: 194
+							var1 = 0; // L: 195
 						}
 
-						if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { // L: 210
-							var2 -= var1; // L: 231
-							var1 -= var0; // L: 232
-							var0 = Rasterizer3D_rowOffsets[var0]; // L: 233
+						if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { // L: 197
+							var2 -= var1; // L: 218
+							var1 -= var0; // L: 219
+							var0 = Rasterizer3D_rowOffsets[var0]; // L: 220
 
 							while (true) {
-								--var1; // L: 234
+								--var1; // L: 221
 								if (var1 < 0) {
 									while (true) {
-										--var2; // L: 241
+										--var2; // L: 228
 										if (var2 < 0) {
-											return; // L: 248
+											return; // L: 235
 										}
 
-										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); // L: 242
-										var5 += var17; // L: 243
-										var4 += var15; // L: 244
-										var6 += var20; // L: 245
-										var0 += Rasterizer2D.Rasterizer2D_width; // L: 246
+										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); // L: 229
+										var5 += var17; // L: 230
+										var4 += var15; // L: 231
+										var6 += var20; // L: 232
+										var0 += Rasterizer2D.Rasterizer2D_width; // L: 233
 									}
 								}
 
-								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 235
-								var5 += var17; // L: 236
-								var3 += var16; // L: 237
-								var6 += var20; // L: 238
-								var0 += Rasterizer2D.Rasterizer2D_width; // L: 239
+								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 222
+								var5 += var17; // L: 223
+								var3 += var16; // L: 224
+								var6 += var20; // L: 225
+								var0 += Rasterizer2D.Rasterizer2D_width; // L: 226
 							}
 						} else {
-							var2 -= var1; // L: 211
-							var1 -= var0; // L: 212
-							var0 = Rasterizer3D_rowOffsets[var0]; // L: 213
+							var2 -= var1; // L: 198
+							var1 -= var0; // L: 199
+							var0 = Rasterizer3D_rowOffsets[var0]; // L: 200
 
 							while (true) {
-								--var1; // L: 214
+								--var1; // L: 201
 								if (var1 < 0) {
 									while (true) {
-										--var2; // L: 221
+										--var2; // L: 208
 										if (var2 < 0) {
-											return; // L: 228
+											return; // L: 215
 										}
 
-										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); // L: 222
-										var5 += var17; // L: 223
-										var4 += var15; // L: 224
-										var6 += var20; // L: 225
-										var0 += Rasterizer2D.Rasterizer2D_width; // L: 226
+										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); // L: 209
+										var5 += var17; // L: 210
+										var4 += var15; // L: 211
+										var6 += var20; // L: 212
+										var0 += Rasterizer2D.Rasterizer2D_width; // L: 213
 									}
 								}
 
-								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 215
-								var5 += var17; // L: 216
-								var3 += var16; // L: 217
-								var6 += var20; // L: 218
-								var0 += Rasterizer2D.Rasterizer2D_width; // L: 219
+								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 202
+								var5 += var17; // L: 203
+								var3 += var16; // L: 204
+								var6 += var20; // L: 205
+								var0 += Rasterizer2D.Rasterizer2D_width; // L: 206
 							}
 						}
 					} else {
-						var4 = var3 <<= 14; // L: 252
-						if (var0 < 0) { // L: 253
-							var4 -= var0 * var17; // L: 254
-							var3 -= var0 * var16; // L: 255
-							var6 -= var0 * var20; // L: 256
-							var0 = 0; // L: 257
+						var4 = var3 <<= 14; // L: 239
+						if (var0 < 0) { // L: 240
+							var4 -= var0 * var17; // L: 241
+							var3 -= var0 * var16; // L: 242
+							var6 -= var0 * var20; // L: 243
+							var0 = 0; // L: 244
 						}
 
-						var5 <<= 14; // L: 259
-						if (var2 < 0) { // L: 260
-							var5 -= var15 * var2; // L: 261
-							var2 = 0; // L: 262
+						var5 <<= 14; // L: 246
+						if (var2 < 0) { // L: 247
+							var5 -= var15 * var2; // L: 248
+							var2 = 0; // L: 249
 						}
 
-						if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { // L: 264
-							var1 -= var2; // L: 265
-							var2 -= var0; // L: 266
-							var0 = Rasterizer3D_rowOffsets[var0]; // L: 267
+						if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { // L: 251
+							var1 -= var2; // L: 252
+							var2 -= var0; // L: 253
+							var0 = Rasterizer3D_rowOffsets[var0]; // L: 254
 
 							while (true) {
-								--var2; // L: 268
+								--var2; // L: 255
 								if (var2 < 0) {
 									while (true) {
-										--var1; // L: 275
+										--var1; // L: 262
 										if (var1 < 0) {
-											return; // L: 282
+											return; // L: 269
 										}
 
-										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 276
-										var5 += var15; // L: 277
-										var3 += var16; // L: 278
-										var6 += var20; // L: 279
-										var0 += Rasterizer2D.Rasterizer2D_width; // L: 280
+										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 263
+										var5 += var15; // L: 264
+										var3 += var16; // L: 265
+										var6 += var20; // L: 266
+										var0 += Rasterizer2D.Rasterizer2D_width; // L: 267
 									}
 								}
 
-								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); // L: 269
-								var4 += var17; // L: 270
-								var3 += var16; // L: 271
-								var6 += var20; // L: 272
-								var0 += Rasterizer2D.Rasterizer2D_width; // L: 273
+								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); // L: 256
+								var4 += var17; // L: 257
+								var3 += var16; // L: 258
+								var6 += var20; // L: 259
+								var0 += Rasterizer2D.Rasterizer2D_width; // L: 260
 							}
 						} else {
-							var1 -= var2; // L: 285
-							var2 -= var0; // L: 286
-							var0 = Rasterizer3D_rowOffsets[var0]; // L: 287
+							var1 -= var2; // L: 272
+							var2 -= var0; // L: 273
+							var0 = Rasterizer3D_rowOffsets[var0]; // L: 274
 
 							while (true) {
-								--var2; // L: 288
+								--var2; // L: 275
 								if (var2 < 0) {
 									while (true) {
-										--var1; // L: 295
+										--var1; // L: 282
 										if (var1 < 0) {
-											return; // L: 302
+											return; // L: 289
 										}
 
-										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 296
-										var5 += var15; // L: 297
-										var3 += var16; // L: 298
-										var6 += var20; // L: 299
-										var0 += Rasterizer2D.Rasterizer2D_width; // L: 300
+										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 283
+										var5 += var15; // L: 284
+										var3 += var16; // L: 285
+										var6 += var20; // L: 286
+										var0 += Rasterizer2D.Rasterizer2D_width; // L: 287
 									}
 								}
 
-								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); // L: 289
-								var4 += var17; // L: 290
-								var3 += var16; // L: 291
-								var6 += var20; // L: 292
-								var0 += Rasterizer2D.Rasterizer2D_width; // L: 293
+								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); // L: 276
+								var4 += var17; // L: 277
+								var3 += var16; // L: 278
+								var6 += var20; // L: 279
+								var0 += Rasterizer2D.Rasterizer2D_width; // L: 280
 							}
 						}
 					}
 				}
-			} else if (var1 <= var2) { // L: 306
-				if (var1 < Rasterizer3D_clipHeight) { // L: 307
-					if (var2 > Rasterizer3D_clipHeight) { // L: 308
+			} else if (var1 <= var2) { // L: 293
+				if (var1 < Rasterizer3D_clipHeight) { // L: 294
+					if (var2 > Rasterizer3D_clipHeight) { // L: 295
 						var2 = Rasterizer3D_clipHeight;
 					}
 
-					if (var0 > Rasterizer3D_clipHeight) { // L: 309
+					if (var0 > Rasterizer3D_clipHeight) { // L: 296
 						var0 = Rasterizer3D_clipHeight;
 					}
 
-					var7 = var19 + ((var7 << 8) - var19 * var4); // L: 310
-					if (var2 < var0) { // L: 311
-						var3 = var4 <<= 14; // L: 312
-						if (var1 < 0) { // L: 313
-							var3 -= var16 * var1; // L: 314
-							var4 -= var15 * var1; // L: 315
-							var7 -= var20 * var1; // L: 316
-							var1 = 0; // L: 317
+					var7 = var19 + ((var7 << 8) - var19 * var4); // L: 297
+					if (var2 < var0) { // L: 298
+						var3 = var4 <<= 14; // L: 299
+						if (var1 < 0) { // L: 300
+							var3 -= var16 * var1; // L: 301
+							var4 -= var15 * var1; // L: 302
+							var7 -= var20 * var1; // L: 303
+							var1 = 0; // L: 304
 						}
 
-						var5 <<= 14; // L: 319
-						if (var2 < 0) { // L: 320
-							var5 -= var17 * var2; // L: 321
-							var2 = 0; // L: 322
+						var5 <<= 14; // L: 306
+						if (var2 < 0) { // L: 307
+							var5 -= var17 * var2; // L: 308
+							var2 = 0; // L: 309
 						}
 
-						if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { // L: 324
-							var0 -= var2; // L: 345
-							var2 -= var1; // L: 346
-							var1 = Rasterizer3D_rowOffsets[var1]; // L: 347
+						if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { // L: 311
+							var0 -= var2; // L: 332
+							var2 -= var1; // L: 333
+							var1 = Rasterizer3D_rowOffsets[var1]; // L: 334
 
 							while (true) {
-								--var2; // L: 348
+								--var2; // L: 335
 								if (var2 < 0) {
 									while (true) {
-										--var0; // L: 355
+										--var0; // L: 342
 										if (var0 < 0) {
-											return; // L: 362
+											return; // L: 349
 										}
 
-										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); // L: 356
-										var3 += var16; // L: 357
-										var5 += var17; // L: 358
-										var7 += var20; // L: 359
-										var1 += Rasterizer2D.Rasterizer2D_width; // L: 360
+										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); // L: 343
+										var3 += var16; // L: 344
+										var5 += var17; // L: 345
+										var7 += var20; // L: 346
+										var1 += Rasterizer2D.Rasterizer2D_width; // L: 347
 									}
 								}
 
-								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 349
-								var3 += var16; // L: 350
-								var4 += var15; // L: 351
-								var7 += var20; // L: 352
-								var1 += Rasterizer2D.Rasterizer2D_width; // L: 353
+								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 336
+								var3 += var16; // L: 337
+								var4 += var15; // L: 338
+								var7 += var20; // L: 339
+								var1 += Rasterizer2D.Rasterizer2D_width; // L: 340
 							}
 						} else {
-							var0 -= var2; // L: 325
-							var2 -= var1; // L: 326
-							var1 = Rasterizer3D_rowOffsets[var1]; // L: 327
+							var0 -= var2; // L: 312
+							var2 -= var1; // L: 313
+							var1 = Rasterizer3D_rowOffsets[var1]; // L: 314
 
 							while (true) {
-								--var2; // L: 328
+								--var2; // L: 315
 								if (var2 < 0) {
 									while (true) {
-										--var0; // L: 335
+										--var0; // L: 322
 										if (var0 < 0) {
-											return; // L: 342
+											return; // L: 329
 										}
 
-										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); // L: 336
-										var3 += var16; // L: 337
-										var5 += var17; // L: 338
-										var7 += var20; // L: 339
-										var1 += Rasterizer2D.Rasterizer2D_width; // L: 340
+										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); // L: 323
+										var3 += var16; // L: 324
+										var5 += var17; // L: 325
+										var7 += var20; // L: 326
+										var1 += Rasterizer2D.Rasterizer2D_width; // L: 327
 									}
 								}
 
-								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 329
-								var3 += var16; // L: 330
-								var4 += var15; // L: 331
-								var7 += var20; // L: 332
-								var1 += Rasterizer2D.Rasterizer2D_width; // L: 333
+								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 316
+								var3 += var16; // L: 317
+								var4 += var15; // L: 318
+								var7 += var20; // L: 319
+								var1 += Rasterizer2D.Rasterizer2D_width; // L: 320
 							}
 						}
 					} else {
-						var5 = var4 <<= 14; // L: 366
-						if (var1 < 0) { // L: 367
-							var5 -= var16 * var1; // L: 368
-							var4 -= var15 * var1; // L: 369
-							var7 -= var20 * var1; // L: 370
-							var1 = 0; // L: 371
+						var5 = var4 <<= 14; // L: 353
+						if (var1 < 0) { // L: 354
+							var5 -= var16 * var1; // L: 355
+							var4 -= var15 * var1; // L: 356
+							var7 -= var20 * var1; // L: 357
+							var1 = 0; // L: 358
 						}
 
-						var3 <<= 14; // L: 373
-						if (var0 < 0) { // L: 374
-							var3 -= var0 * var17; // L: 375
-							var0 = 0; // L: 376
+						var3 <<= 14; // L: 360
+						if (var0 < 0) { // L: 361
+							var3 -= var0 * var17; // L: 362
+							var0 = 0; // L: 363
 						}
 
-						if (var16 < var15) { // L: 378
-							var2 -= var0; // L: 379
-							var0 -= var1; // L: 380
-							var1 = Rasterizer3D_rowOffsets[var1]; // L: 381
+						if (var16 < var15) { // L: 365
+							var2 -= var0; // L: 366
+							var0 -= var1; // L: 367
+							var1 = Rasterizer3D_rowOffsets[var1]; // L: 368
 
 							while (true) {
-								--var0; // L: 382
+								--var0; // L: 369
 								if (var0 < 0) {
 									while (true) {
-										--var2; // L: 389
+										--var2; // L: 376
 										if (var2 < 0) {
-											return; // L: 396
+											return; // L: 383
 										}
 
-										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 390
-										var3 += var17; // L: 391
-										var4 += var15; // L: 392
-										var7 += var20; // L: 393
-										var1 += Rasterizer2D.Rasterizer2D_width; // L: 394
+										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 377
+										var3 += var17; // L: 378
+										var4 += var15; // L: 379
+										var7 += var20; // L: 380
+										var1 += Rasterizer2D.Rasterizer2D_width; // L: 381
 									}
 								}
 
-								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); // L: 383
-								var5 += var16; // L: 384
-								var4 += var15; // L: 385
-								var7 += var20; // L: 386
-								var1 += Rasterizer2D.Rasterizer2D_width; // L: 387
+								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); // L: 370
+								var5 += var16; // L: 371
+								var4 += var15; // L: 372
+								var7 += var20; // L: 373
+								var1 += Rasterizer2D.Rasterizer2D_width; // L: 374
 							}
 						} else {
-							var2 -= var0; // L: 399
-							var0 -= var1; // L: 400
-							var1 = Rasterizer3D_rowOffsets[var1]; // L: 401
+							var2 -= var0; // L: 386
+							var0 -= var1; // L: 387
+							var1 = Rasterizer3D_rowOffsets[var1]; // L: 388
 
 							while (true) {
-								--var0; // L: 402
+								--var0; // L: 389
 								if (var0 < 0) {
 									while (true) {
-										--var2; // L: 409
+										--var2; // L: 396
 										if (var2 < 0) {
-											return; // L: 416
+											return; // L: 403
 										}
 
-										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 410
-										var3 += var17; // L: 411
-										var4 += var15; // L: 412
-										var7 += var20; // L: 413
-										var1 += Rasterizer2D.Rasterizer2D_width; // L: 414
+										Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 397
+										var3 += var17; // L: 398
+										var4 += var15; // L: 399
+										var7 += var20; // L: 400
+										var1 += Rasterizer2D.Rasterizer2D_width; // L: 401
 									}
 								}
 
-								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); // L: 403
-								var5 += var16; // L: 404
-								var4 += var15; // L: 405
-								var7 += var20; // L: 406
-								var1 += Rasterizer2D.Rasterizer2D_width; // L: 407
+								Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); // L: 390
+								var5 += var16; // L: 391
+								var4 += var15; // L: 392
+								var7 += var20; // L: 393
+								var1 += Rasterizer2D.Rasterizer2D_width; // L: 394
 							}
 						}
 					}
 				}
-			} else if (var2 < Rasterizer3D_clipHeight) { // L: 421
-				if (var0 > Rasterizer3D_clipHeight) { // L: 422
+			} else if (var2 < Rasterizer3D_clipHeight) { // L: 408
+				if (var0 > Rasterizer3D_clipHeight) { // L: 409
 					var0 = Rasterizer3D_clipHeight;
 				}
 
-				if (var1 > Rasterizer3D_clipHeight) { // L: 423
+				if (var1 > Rasterizer3D_clipHeight) { // L: 410
 					var1 = Rasterizer3D_clipHeight;
 				}
 
-				var8 = var19 + ((var8 << 8) - var5 * var19); // L: 424
-				if (var0 < var1) { // L: 425
-					var4 = var5 <<= 14; // L: 426
-					if (var2 < 0) { // L: 427
-						var4 -= var15 * var2; // L: 428
-						var5 -= var17 * var2; // L: 429
-						var8 -= var20 * var2; // L: 430
-						var2 = 0; // L: 431
+				var8 = var19 + ((var8 << 8) - var5 * var19); // L: 411
+				if (var0 < var1) { // L: 412
+					var4 = var5 <<= 14; // L: 413
+					if (var2 < 0) { // L: 414
+						var4 -= var15 * var2; // L: 415
+						var5 -= var17 * var2; // L: 416
+						var8 -= var20 * var2; // L: 417
+						var2 = 0; // L: 418
 					}
 
-					var3 <<= 14; // L: 433
-					if (var0 < 0) { // L: 434
-						var3 -= var0 * var16; // L: 435
-						var0 = 0; // L: 436
+					var3 <<= 14; // L: 420
+					if (var0 < 0) { // L: 421
+						var3 -= var0 * var16; // L: 422
+						var0 = 0; // L: 423
 					}
 
-					if (var15 < var17) { // L: 438
-						var1 -= var0; // L: 439
-						var0 -= var2; // L: 440
-						var2 = Rasterizer3D_rowOffsets[var2]; // L: 441
+					if (var15 < var17) { // L: 425
+						var1 -= var0; // L: 426
+						var0 -= var2; // L: 427
+						var2 = Rasterizer3D_rowOffsets[var2]; // L: 428
 
 						while (true) {
-							--var0; // L: 442
+							--var0; // L: 429
 							if (var0 < 0) {
 								while (true) {
-									--var1; // L: 449
+									--var1; // L: 436
 									if (var1 < 0) {
-										return; // L: 456
+										return; // L: 443
 									}
 
-									Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); // L: 450
-									var4 += var15; // L: 451
-									var3 += var16; // L: 452
-									var8 += var20; // L: 453
-									var2 += Rasterizer2D.Rasterizer2D_width; // L: 454
+									Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); // L: 437
+									var4 += var15; // L: 438
+									var3 += var16; // L: 439
+									var8 += var20; // L: 440
+									var2 += Rasterizer2D.Rasterizer2D_width; // L: 441
 								}
 							}
 
-							Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 443
-							var4 += var15; // L: 444
-							var5 += var17; // L: 445
-							var8 += var20; // L: 446
-							var2 += Rasterizer2D.Rasterizer2D_width; // L: 447
+							Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 430
+							var4 += var15; // L: 431
+							var5 += var17; // L: 432
+							var8 += var20; // L: 433
+							var2 += Rasterizer2D.Rasterizer2D_width; // L: 434
 						}
 					} else {
-						var1 -= var0; // L: 459
-						var0 -= var2; // L: 460
-						var2 = Rasterizer3D_rowOffsets[var2]; // L: 461
+						var1 -= var0; // L: 446
+						var0 -= var2; // L: 447
+						var2 = Rasterizer3D_rowOffsets[var2]; // L: 448
 
 						while (true) {
-							--var0; // L: 462
+							--var0; // L: 449
 							if (var0 < 0) {
 								while (true) {
-									--var1; // L: 469
+									--var1; // L: 456
 									if (var1 < 0) {
-										return; // L: 476
+										return; // L: 463
 									}
 
-									Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); // L: 470
-									var4 += var15; // L: 471
-									var3 += var16; // L: 472
-									var8 += var20; // L: 473
-									var2 += Rasterizer2D.Rasterizer2D_width; // L: 474
+									Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); // L: 457
+									var4 += var15; // L: 458
+									var3 += var16; // L: 459
+									var8 += var20; // L: 460
+									var2 += Rasterizer2D.Rasterizer2D_width; // L: 461
 								}
 							}
 
-							Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 463
-							var4 += var15; // L: 464
-							var5 += var17; // L: 465
-							var8 += var20; // L: 466
-							var2 += Rasterizer2D.Rasterizer2D_width; // L: 467
+							Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 450
+							var4 += var15; // L: 451
+							var5 += var17; // L: 452
+							var8 += var20; // L: 453
+							var2 += Rasterizer2D.Rasterizer2D_width; // L: 454
 						}
 					}
 				} else {
-					var3 = var5 <<= 14; // L: 480
-					if (var2 < 0) { // L: 481
-						var3 -= var15 * var2; // L: 482
-						var5 -= var17 * var2; // L: 483
-						var8 -= var20 * var2; // L: 484
-						var2 = 0; // L: 485
+					var3 = var5 <<= 14; // L: 467
+					if (var2 < 0) { // L: 468
+						var3 -= var15 * var2; // L: 469
+						var5 -= var17 * var2; // L: 470
+						var8 -= var20 * var2; // L: 471
+						var2 = 0; // L: 472
 					}
 
-					var4 <<= 14; // L: 487
-					if (var1 < 0) { // L: 488
-						var4 -= var16 * var1; // L: 489
-						var1 = 0; // L: 490
+					var4 <<= 14; // L: 474
+					if (var1 < 0) { // L: 475
+						var4 -= var16 * var1; // L: 476
+						var1 = 0; // L: 477
 					}
 
-					if (var15 < var17) { // L: 492
-						var0 -= var1; // L: 493
-						var1 -= var2; // L: 494
-						var2 = Rasterizer3D_rowOffsets[var2]; // L: 495
+					if (var15 < var17) { // L: 479
+						var0 -= var1; // L: 480
+						var1 -= var2; // L: 481
+						var2 = Rasterizer3D_rowOffsets[var2]; // L: 482
 
 						while (true) {
-							--var1; // L: 496
+							--var1; // L: 483
 							if (var1 < 0) {
 								while (true) {
-									--var0; // L: 503
+									--var0; // L: 490
 									if (var0 < 0) {
-										return; // L: 510
+										return; // L: 497
 									}
 
-									Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 504
-									var4 += var16; // L: 505
-									var5 += var17; // L: 506
-									var8 += var20; // L: 507
-									var2 += Rasterizer2D.Rasterizer2D_width; // L: 508
+									Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 491
+									var4 += var16; // L: 492
+									var5 += var17; // L: 493
+									var8 += var20; // L: 494
+									var2 += Rasterizer2D.Rasterizer2D_width; // L: 495
 								}
 							}
 
-							Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); // L: 497
-							var3 += var15; // L: 498
-							var5 += var17; // L: 499
-							var8 += var20; // L: 500
-							var2 += Rasterizer2D.Rasterizer2D_width; // L: 501
+							Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); // L: 484
+							var3 += var15; // L: 485
+							var5 += var17; // L: 486
+							var8 += var20; // L: 487
+							var2 += Rasterizer2D.Rasterizer2D_width; // L: 488
 						}
 					} else {
-						var0 -= var1; // L: 513
-						var1 -= var2; // L: 514
-						var2 = Rasterizer3D_rowOffsets[var2]; // L: 515
+						var0 -= var1; // L: 500
+						var1 -= var2; // L: 501
+						var2 = Rasterizer3D_rowOffsets[var2]; // L: 502
 
 						while (true) {
-							--var1; // L: 516
+							--var1; // L: 503
 							if (var1 < 0) {
 								while (true) {
-									--var0; // L: 523
+									--var0; // L: 510
 									if (var0 < 0) {
-										return; // L: 530
+										return; // L: 517
 									}
 
-									Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 524
-									var4 += var16; // L: 525
-									var5 += var17; // L: 526
-									var8 += var20; // L: 527
-									var2 += Rasterizer2D.Rasterizer2D_width; // L: 528
+									Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 511
+									var4 += var16; // L: 512
+									var5 += var17; // L: 513
+									var8 += var20; // L: 514
+									var2 += Rasterizer2D.Rasterizer2D_width; // L: 515
 								}
 							}
 
-							Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); // L: 517
-							var3 += var15; // L: 518
-							var5 += var17; // L: 519
-							var8 += var20; // L: 520
-							var2 += Rasterizer2D.Rasterizer2D_width; // L: 521
+							Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); // L: 504
+							var3 += var15; // L: 505
+							var5 += var17; // L: 506
+							var8 += var20; // L: 507
+							var2 += Rasterizer2D.Rasterizer2D_width; // L: 508
 						}
 					}
 				}
@@ -777,1305 +767,1305 @@ static final void method4211(int var0, int var1, int var2, int var3, int var4, i
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("Rasterizer3D_vertAlpha")
 	static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		if (field2365) { // L: 537
-			if (var5 > Rasterizer3D_clipWidth) { // L: 538
+		if (field2253) { // L: 524
+			if (var5 > Rasterizer3D_clipWidth) { // L: 525
 				var5 = Rasterizer3D_clipWidth;
 			}
 
-			if (var4 < 0) { // L: 539
+			if (var4 < 0) { // L: 526
 				var4 = 0;
 			}
 		}
 
-		if (var4 < var5) { // L: 541
-			var1 += var4; // L: 542
-			var6 += var4 * var7; // L: 543
+		if (var4 < var5) { // L: 528
+			var1 += var4; // L: 529
+			var6 += var4 * var7; // L: 530
 			int var8;
 			int var9;
 			int var10;
 			int var11;
-			if (field2367) { // L: 544
-				var3 = var5 - var4 >> 2; // L: 545
-				var7 <<= 2; // L: 546
-				if (Rasterizer3D_alpha == 0) { // L: 547
-					if (var3 > 0) { // L: 548
+			if (field2276) { // L: 531
+				var3 = var5 - var4 >> 2; // L: 532
+				var7 <<= 2; // L: 533
+				if (Rasterizer3D_alpha == 0) { // L: 534
+					if (var3 > 0) { // L: 535
 						do {
-							var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 550
-							var2 = Rasterizer3D_colorPalette[var8]; // L: 551
-							var6 += var7; // L: 552
-							var0[var1++] = var2; // L: 553
-							var0[var1++] = var2; // L: 554
-							var0[var1++] = var2; // L: 555
-							var0[var1++] = var2; // L: 556
-							--var3; // L: 557
+							var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 537
+							var2 = Rasterizer3D_colorPalette[var8]; // L: 538
+							var6 += var7; // L: 539
+							var0[var1++] = var2; // L: 540
+							var0[var1++] = var2; // L: 541
+							var0[var1++] = var2; // L: 542
+							var0[var1++] = var2; // L: 543
+							--var3; // L: 544
 						} while(var3 > 0);
 					}
 
-					var3 = var5 - var4 & 3; // L: 559
-					if (var3 > 0) { // L: 560
-						var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 561
-						var2 = Rasterizer3D_colorPalette[var8]; // L: 562
+					var3 = var5 - var4 & 3; // L: 546
+					if (var3 > 0) { // L: 547
+						var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 548
+						var2 = Rasterizer3D_colorPalette[var8]; // L: 549
 
 						do {
-							var0[var1++] = var2; // L: 564
-							--var3; // L: 565
+							var0[var1++] = var2; // L: 551
+							--var3; // L: 552
 						} while(var3 > 0);
 					}
 				} else {
-					var8 = Rasterizer3D_alpha; // L: 569
-					var9 = 256 - Rasterizer3D_alpha; // L: 570
-					if (var3 > 0) { // L: 571
+					var8 = Rasterizer3D_alpha; // L: 556
+					var9 = 256 - Rasterizer3D_alpha; // L: 557
+					if (var3 > 0) { // L: 558
 						do {
-							var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 573
-							var2 = Rasterizer3D_colorPalette[var10]; // L: 574
-							var6 += var7; // L: 575
-							var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 576
-							var11 = var0[var1]; // L: 577
-							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 578
-							var11 = var0[var1]; // L: 579
-							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 580
-							var11 = var0[var1]; // L: 581
-							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 582
-							var11 = var0[var1]; // L: 583
-							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 584
-							--var3; // L: 585
+							var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 560
+							var2 = Rasterizer3D_colorPalette[var10]; // L: 561
+							var6 += var7; // L: 562
+							var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 563
+							var11 = var0[var1]; // L: 564
+							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 565
+							var11 = var0[var1]; // L: 566
+							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 567
+							var11 = var0[var1]; // L: 568
+							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 569
+							var11 = var0[var1]; // L: 570
+							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 571
+							--var3; // L: 572
 						} while(var3 > 0);
 					}
 
-					var3 = var5 - var4 & 3; // L: 587
-					if (var3 > 0) { // L: 588
-						var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 589
-						var2 = Rasterizer3D_colorPalette[var10]; // L: 590
-						var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 591
+					var3 = var5 - var4 & 3; // L: 574
+					if (var3 > 0) { // L: 575
+						var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 576
+						var2 = Rasterizer3D_colorPalette[var10]; // L: 577
+						var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 578
 
 						do {
-							var11 = var0[var1]; // L: 593
-							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 594
-							--var3; // L: 595
+							var11 = var0[var1]; // L: 580
+							var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 581
+							--var3; // L: 582
 						} while(var3 > 0);
 					}
 				}
 
 			} else {
-				var3 = var5 - var4; // L: 601
-				if (Rasterizer3D_alpha == 0) { // L: 602
+				var3 = var5 - var4; // L: 588
+				if (Rasterizer3D_alpha == 0) { // L: 589
 					do {
-						var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 604
-						var0[var1++] = Rasterizer3D_colorPalette[var8]; // L: 605
-						var6 += var7; // L: 606
-						--var3; // L: 607
+						var8 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 591
+						var0[var1++] = Rasterizer3D_colorPalette[var8]; // L: 592
+						var6 += var7; // L: 593
+						--var3; // L: 594
 					} while(var3 > 0);
 				} else {
-					var8 = Rasterizer3D_alpha; // L: 610
-					var9 = 256 - Rasterizer3D_alpha; // L: 611
+					var8 = Rasterizer3D_alpha; // L: 597
+					var9 = 256 - Rasterizer3D_alpha; // L: 598
 
 					do {
-						var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 613
-						var2 = Rasterizer3D_colorPalette[var10]; // L: 614
-						var6 += var7; // L: 615
-						var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 616
-						var11 = var0[var1]; // L: 617
-						var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 618
-						--var3; // L: 619
+						var10 = (var6 & (var6 >> 31 & 1) - 1) >> 8; // L: 600
+						var2 = Rasterizer3D_colorPalette[var10]; // L: 601
+						var6 += var7; // L: 602
+						var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 603
+						var11 = var0[var1]; // L: 604
+						var0[var1++] = ((var11 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var11 & 65280) >> 8 & 65280); // L: 605
+						--var3; // L: 606
 					} while(var3 > 0);
 				}
 
 			}
 		}
-	} // L: 598 621
+	} // L: 585 608
 
-	@ObfuscatedName("y")
-	public static final void method4213(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		int var7 = 0; // L: 626
-		if (var0 != var1) { // L: 627
+	@ObfuscatedName("v")
+	public static final void method3856(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		int var7 = 0; // L: 613
+		if (var0 != var1) { // L: 614
 			var7 = (var4 - var3 << 14) / (var1 - var0);
 		}
 
-		int var8 = 0; // L: 628
-		if (var2 != var1) { // L: 629
+		int var8 = 0; // L: 615
+		if (var2 != var1) { // L: 616
 			var8 = (var5 - var4 << 14) / (var2 - var1);
 		}
 
-		int var9 = 0; // L: 630
-		if (var0 != var2) { // L: 631
+		int var9 = 0; // L: 617
+		if (var0 != var2) { // L: 618
 			var9 = (var3 - var5 << 14) / (var0 - var2);
 		}
 
-		if (var0 <= var1 && var0 <= var2) { // L: 632
-			if (var0 < Rasterizer3D_clipHeight) { // L: 633
-				if (var1 > Rasterizer3D_clipHeight) { // L: 634
+		if (var0 <= var1 && var0 <= var2) { // L: 619
+			if (var0 < Rasterizer3D_clipHeight) { // L: 620
+				if (var1 > Rasterizer3D_clipHeight) { // L: 621
 					var1 = Rasterizer3D_clipHeight;
 				}
 
-				if (var2 > Rasterizer3D_clipHeight) { // L: 635
+				if (var2 > Rasterizer3D_clipHeight) { // L: 622
 					var2 = Rasterizer3D_clipHeight;
 				}
 
-				if (var1 < var2) { // L: 636
-					var5 = var3 <<= 14; // L: 637
-					if (var0 < 0) { // L: 638
-						var5 -= var0 * var9; // L: 639
-						var3 -= var0 * var7; // L: 640
-						var0 = 0; // L: 641
+				if (var1 < var2) { // L: 623
+					var5 = var3 <<= 14; // L: 624
+					if (var0 < 0) { // L: 625
+						var5 -= var0 * var9; // L: 626
+						var3 -= var0 * var7; // L: 627
+						var0 = 0; // L: 628
 					}
 
-					var4 <<= 14; // L: 643
-					if (var1 < 0) { // L: 644
-						var4 -= var8 * var1; // L: 645
-						var1 = 0; // L: 646
+					var4 <<= 14; // L: 630
+					if (var1 < 0) { // L: 631
+						var4 -= var8 * var1; // L: 632
+						var1 = 0; // L: 633
 					}
 
-					if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 648
-						var2 -= var1; // L: 649
-						var1 -= var0; // L: 650
-						var0 = Rasterizer3D_rowOffsets[var0]; // L: 651
+					if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 635
+						var2 -= var1; // L: 636
+						var1 -= var0; // L: 637
+						var0 = Rasterizer3D_rowOffsets[var0]; // L: 638
 
 						while (true) {
-							--var1; // L: 652
+							--var1; // L: 639
 							if (var1 < 0) {
 								while (true) {
-									--var2; // L: 658
+									--var2; // L: 645
 									if (var2 < 0) {
-										return; // L: 664
+										return; // L: 651
 									}
 
-									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); // L: 659
-									var5 += var9; // L: 660
-									var4 += var8; // L: 661
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 662
+									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); // L: 646
+									var5 += var9; // L: 647
+									var4 += var8; // L: 648
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 649
 								}
 							}
 
-							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 653
-							var5 += var9; // L: 654
-							var3 += var7; // L: 655
-							var0 += Rasterizer2D.Rasterizer2D_width; // L: 656
+							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 640
+							var5 += var9; // L: 641
+							var3 += var7; // L: 642
+							var0 += Rasterizer2D.Rasterizer2D_width; // L: 643
 						}
 					} else {
-						var2 -= var1; // L: 667
-						var1 -= var0; // L: 668
-						var0 = Rasterizer3D_rowOffsets[var0]; // L: 669
+						var2 -= var1; // L: 654
+						var1 -= var0; // L: 655
+						var0 = Rasterizer3D_rowOffsets[var0]; // L: 656
 
 						while (true) {
-							--var1; // L: 670
+							--var1; // L: 657
 							if (var1 < 0) {
 								while (true) {
-									--var2; // L: 676
+									--var2; // L: 663
 									if (var2 < 0) {
-										return; // L: 682
+										return; // L: 669
 									}
 
-									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); // L: 677
-									var5 += var9; // L: 678
-									var4 += var8; // L: 679
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 680
+									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); // L: 664
+									var5 += var9; // L: 665
+									var4 += var8; // L: 666
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 667
 								}
 							}
 
-							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 671
-							var5 += var9; // L: 672
-							var3 += var7; // L: 673
-							var0 += Rasterizer2D.Rasterizer2D_width; // L: 674
+							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 658
+							var5 += var9; // L: 659
+							var3 += var7; // L: 660
+							var0 += Rasterizer2D.Rasterizer2D_width; // L: 661
 						}
 					}
 				} else {
-					var4 = var3 <<= 14; // L: 686
-					if (var0 < 0) { // L: 687
-						var4 -= var0 * var9; // L: 688
-						var3 -= var0 * var7; // L: 689
-						var0 = 0; // L: 690
+					var4 = var3 <<= 14; // L: 673
+					if (var0 < 0) { // L: 674
+						var4 -= var0 * var9; // L: 675
+						var3 -= var0 * var7; // L: 676
+						var0 = 0; // L: 677
 					}
 
-					var5 <<= 14; // L: 692
-					if (var2 < 0) { // L: 693
-						var5 -= var8 * var2; // L: 694
-						var2 = 0; // L: 695
+					var5 <<= 14; // L: 679
+					if (var2 < 0) { // L: 680
+						var5 -= var8 * var2; // L: 681
+						var2 = 0; // L: 682
 					}
 
-					if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { // L: 697
-						var1 -= var2; // L: 716
-						var2 -= var0; // L: 717
-						var0 = Rasterizer3D_rowOffsets[var0]; // L: 718
+					if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { // L: 684
+						var1 -= var2; // L: 685
+						var2 -= var0; // L: 686
+						var0 = Rasterizer3D_rowOffsets[var0]; // L: 687
 
 						while (true) {
-							--var2; // L: 719
+							--var2; // L: 688
 							if (var2 < 0) {
 								while (true) {
-									--var1; // L: 725
+									--var1; // L: 694
 									if (var1 < 0) {
-										return; // L: 731
+										return; // L: 700
 									}
 
-									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 726
-									var5 += var8; // L: 727
-									var3 += var7; // L: 728
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 729
+									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 695
+									var5 += var8; // L: 696
+									var3 += var7; // L: 697
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 698
 								}
 							}
 
-							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 720
-							var4 += var9; // L: 721
-							var3 += var7; // L: 722
-							var0 += Rasterizer2D.Rasterizer2D_width; // L: 723
+							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 689
+							var4 += var9; // L: 690
+							var3 += var7; // L: 691
+							var0 += Rasterizer2D.Rasterizer2D_width; // L: 692
 						}
 					} else {
-						var1 -= var2; // L: 698
-						var2 -= var0; // L: 699
-						var0 = Rasterizer3D_rowOffsets[var0]; // L: 700
+						var1 -= var2; // L: 703
+						var2 -= var0; // L: 704
+						var0 = Rasterizer3D_rowOffsets[var0]; // L: 705
 
 						while (true) {
-							--var2; // L: 701
+							--var2; // L: 706
 							if (var2 < 0) {
 								while (true) {
-									--var1; // L: 707
+									--var1; // L: 712
 									if (var1 < 0) {
-										return; // L: 713
+										return; // L: 718
 									}
 
-									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 708
-									var5 += var8; // L: 709
-									var3 += var7; // L: 710
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 711
+									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 713
+									var5 += var8; // L: 714
+									var3 += var7; // L: 715
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 716
 								}
 							}
 
-							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 702
-							var4 += var9; // L: 703
-							var3 += var7; // L: 704
-							var0 += Rasterizer2D.Rasterizer2D_width; // L: 705
+							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 707
+							var4 += var9; // L: 708
+							var3 += var7; // L: 709
+							var0 += Rasterizer2D.Rasterizer2D_width; // L: 710
 						}
 					}
 				}
 			}
-		} else if (var1 <= var2) { // L: 735
-			if (var1 < Rasterizer3D_clipHeight) { // L: 736
-				if (var2 > Rasterizer3D_clipHeight) { // L: 737
+		} else if (var1 <= var2) { // L: 722
+			if (var1 < Rasterizer3D_clipHeight) { // L: 723
+				if (var2 > Rasterizer3D_clipHeight) { // L: 724
 					var2 = Rasterizer3D_clipHeight;
 				}
 
-				if (var0 > Rasterizer3D_clipHeight) { // L: 738
+				if (var0 > Rasterizer3D_clipHeight) { // L: 725
 					var0 = Rasterizer3D_clipHeight;
 				}
 
-				if (var2 < var0) { // L: 739
-					var3 = var4 <<= 14; // L: 740
-					if (var1 < 0) { // L: 741
-						var3 -= var7 * var1; // L: 742
-						var4 -= var8 * var1; // L: 743
-						var1 = 0; // L: 744
+				if (var2 < var0) { // L: 726
+					var3 = var4 <<= 14; // L: 727
+					if (var1 < 0) { // L: 728
+						var3 -= var7 * var1; // L: 729
+						var4 -= var8 * var1; // L: 730
+						var1 = 0; // L: 731
 					}
 
-					var5 <<= 14; // L: 746
-					if (var2 < 0) { // L: 747
-						var5 -= var9 * var2; // L: 748
-						var2 = 0; // L: 749
+					var5 <<= 14; // L: 733
+					if (var2 < 0) { // L: 734
+						var5 -= var9 * var2; // L: 735
+						var2 = 0; // L: 736
 					}
 
-					if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 751
-						var0 -= var2; // L: 752
-						var2 -= var1; // L: 753
-						var1 = Rasterizer3D_rowOffsets[var1]; // L: 754
+					if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 738
+						var0 -= var2; // L: 739
+						var2 -= var1; // L: 740
+						var1 = Rasterizer3D_rowOffsets[var1]; // L: 741
 
 						while (true) {
-							--var2; // L: 755
+							--var2; // L: 742
 							if (var2 < 0) {
 								while (true) {
-									--var0; // L: 761
+									--var0; // L: 748
 									if (var0 < 0) {
-										return; // L: 767
+										return; // L: 754
 									}
 
-									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); // L: 762
-									var3 += var7; // L: 763
-									var5 += var9; // L: 764
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 765
+									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); // L: 749
+									var3 += var7; // L: 750
+									var5 += var9; // L: 751
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 752
 								}
 							}
 
-							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 756
-							var3 += var7; // L: 757
-							var4 += var8; // L: 758
-							var1 += Rasterizer2D.Rasterizer2D_width; // L: 759
+							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 743
+							var3 += var7; // L: 744
+							var4 += var8; // L: 745
+							var1 += Rasterizer2D.Rasterizer2D_width; // L: 746
 						}
 					} else {
-						var0 -= var2; // L: 770
-						var2 -= var1; // L: 771
-						var1 = Rasterizer3D_rowOffsets[var1]; // L: 772
+						var0 -= var2; // L: 757
+						var2 -= var1; // L: 758
+						var1 = Rasterizer3D_rowOffsets[var1]; // L: 759
 
 						while (true) {
-							--var2; // L: 773
+							--var2; // L: 760
 							if (var2 < 0) {
 								while (true) {
-									--var0; // L: 779
+									--var0; // L: 766
 									if (var0 < 0) {
-										return; // L: 785
+										return; // L: 772
 									}
 
-									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); // L: 780
-									var3 += var7; // L: 781
-									var5 += var9; // L: 782
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 783
+									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); // L: 767
+									var3 += var7; // L: 768
+									var5 += var9; // L: 769
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 770
 								}
 							}
 
-							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 774
-							var3 += var7; // L: 775
-							var4 += var8; // L: 776
-							var1 += Rasterizer2D.Rasterizer2D_width; // L: 777
+							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 761
+							var3 += var7; // L: 762
+							var4 += var8; // L: 763
+							var1 += Rasterizer2D.Rasterizer2D_width; // L: 764
 						}
 					}
 				} else {
-					var5 = var4 <<= 14; // L: 789
-					if (var1 < 0) { // L: 790
-						var5 -= var7 * var1; // L: 791
-						var4 -= var8 * var1; // L: 792
-						var1 = 0; // L: 793
+					var5 = var4 <<= 14; // L: 776
+					if (var1 < 0) { // L: 777
+						var5 -= var7 * var1; // L: 778
+						var4 -= var8 * var1; // L: 779
+						var1 = 0; // L: 780
 					}
 
-					var3 <<= 14; // L: 795
-					if (var0 < 0) { // L: 796
-						var3 -= var0 * var9; // L: 797
-						var0 = 0; // L: 798
+					var3 <<= 14; // L: 782
+					if (var0 < 0) { // L: 783
+						var3 -= var0 * var9; // L: 784
+						var0 = 0; // L: 785
 					}
 
-					if (var7 < var8) { // L: 800
-						var2 -= var0; // L: 801
-						var0 -= var1; // L: 802
-						var1 = Rasterizer3D_rowOffsets[var1]; // L: 803
+					if (var7 < var8) { // L: 787
+						var2 -= var0; // L: 788
+						var0 -= var1; // L: 789
+						var1 = Rasterizer3D_rowOffsets[var1]; // L: 790
 
 						while (true) {
-							--var0; // L: 804
+							--var0; // L: 791
 							if (var0 < 0) {
 								while (true) {
-									--var2; // L: 810
+									--var2; // L: 797
 									if (var2 < 0) {
-										return; // L: 816
+										return; // L: 803
 									}
 
-									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 811
-									var3 += var9; // L: 812
-									var4 += var8; // L: 813
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 814
+									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 798
+									var3 += var9; // L: 799
+									var4 += var8; // L: 800
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 801
 								}
 							}
 
-							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 805
-							var5 += var7; // L: 806
-							var4 += var8; // L: 807
-							var1 += Rasterizer2D.Rasterizer2D_width; // L: 808
+							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 792
+							var5 += var7; // L: 793
+							var4 += var8; // L: 794
+							var1 += Rasterizer2D.Rasterizer2D_width; // L: 795
 						}
 					} else {
-						var2 -= var0; // L: 819
-						var0 -= var1; // L: 820
-						var1 = Rasterizer3D_rowOffsets[var1]; // L: 821
+						var2 -= var0; // L: 806
+						var0 -= var1; // L: 807
+						var1 = Rasterizer3D_rowOffsets[var1]; // L: 808
 
 						while (true) {
-							--var0; // L: 822
+							--var0; // L: 809
 							if (var0 < 0) {
 								while (true) {
-									--var2; // L: 828
+									--var2; // L: 815
 									if (var2 < 0) {
-										return; // L: 834
+										return; // L: 821
 									}
 
-									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 829
-									var3 += var9; // L: 830
-									var4 += var8; // L: 831
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 832
+									Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 816
+									var3 += var9; // L: 817
+									var4 += var8; // L: 818
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 819
 								}
 							}
 
-							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 823
-							var5 += var7; // L: 824
-							var4 += var8; // L: 825
-							var1 += Rasterizer2D.Rasterizer2D_width; // L: 826
+							Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 810
+							var5 += var7; // L: 811
+							var4 += var8; // L: 812
+							var1 += Rasterizer2D.Rasterizer2D_width; // L: 813
 						}
 					}
 				}
 			}
-		} else if (var2 < Rasterizer3D_clipHeight) { // L: 839
-			if (var0 > Rasterizer3D_clipHeight) { // L: 840
+		} else if (var2 < Rasterizer3D_clipHeight) { // L: 826
+			if (var0 > Rasterizer3D_clipHeight) { // L: 827
 				var0 = Rasterizer3D_clipHeight;
 			}
 
-			if (var1 > Rasterizer3D_clipHeight) { // L: 841
+			if (var1 > Rasterizer3D_clipHeight) { // L: 828
 				var1 = Rasterizer3D_clipHeight;
 			}
 
-			if (var0 < var1) { // L: 842
-				var4 = var5 <<= 14; // L: 843
-				if (var2 < 0) { // L: 844
-					var4 -= var8 * var2; // L: 845
-					var5 -= var9 * var2; // L: 846
-					var2 = 0; // L: 847
+			if (var0 < var1) { // L: 829
+				var4 = var5 <<= 14; // L: 830
+				if (var2 < 0) { // L: 831
+					var4 -= var8 * var2; // L: 832
+					var5 -= var9 * var2; // L: 833
+					var2 = 0; // L: 834
 				}
 
-				var3 <<= 14; // L: 849
-				if (var0 < 0) { // L: 850
-					var3 -= var0 * var7; // L: 851
-					var0 = 0; // L: 852
+				var3 <<= 14; // L: 836
+				if (var0 < 0) { // L: 837
+					var3 -= var0 * var7; // L: 838
+					var0 = 0; // L: 839
 				}
 
-				if (var8 < var9) { // L: 854
-					var1 -= var0; // L: 855
-					var0 -= var2; // L: 856
-					var2 = Rasterizer3D_rowOffsets[var2]; // L: 857
+				if (var8 < var9) { // L: 841
+					var1 -= var0; // L: 842
+					var0 -= var2; // L: 843
+					var2 = Rasterizer3D_rowOffsets[var2]; // L: 844
 
 					while (true) {
-						--var0; // L: 858
+						--var0; // L: 845
 						if (var0 < 0) {
 							while (true) {
-								--var1; // L: 864
+								--var1; // L: 851
 								if (var1 < 0) {
-									return; // L: 870
+									return; // L: 857
 								}
 
-								Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); // L: 865
-								var4 += var8; // L: 866
-								var3 += var7; // L: 867
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 868
+								Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); // L: 852
+								var4 += var8; // L: 853
+								var3 += var7; // L: 854
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 855
 							}
 						}
 
-						Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 859
-						var4 += var8; // L: 860
-						var5 += var9; // L: 861
-						var2 += Rasterizer2D.Rasterizer2D_width; // L: 862
+						Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 846
+						var4 += var8; // L: 847
+						var5 += var9; // L: 848
+						var2 += Rasterizer2D.Rasterizer2D_width; // L: 849
 					}
 				} else {
-					var1 -= var0; // L: 873
-					var0 -= var2; // L: 874
-					var2 = Rasterizer3D_rowOffsets[var2]; // L: 875
+					var1 -= var0; // L: 860
+					var0 -= var2; // L: 861
+					var2 = Rasterizer3D_rowOffsets[var2]; // L: 862
 
 					while (true) {
-						--var0; // L: 876
+						--var0; // L: 863
 						if (var0 < 0) {
 							while (true) {
-								--var1; // L: 882
+								--var1; // L: 869
 								if (var1 < 0) {
-									return; // L: 888
+									return; // L: 875
 								}
 
-								Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); // L: 883
-								var4 += var8; // L: 884
-								var3 += var7; // L: 885
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 886
+								Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); // L: 870
+								var4 += var8; // L: 871
+								var3 += var7; // L: 872
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 873
 							}
 						}
 
-						Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 877
-						var4 += var8; // L: 878
-						var5 += var9; // L: 879
-						var2 += Rasterizer2D.Rasterizer2D_width; // L: 880
+						Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 864
+						var4 += var8; // L: 865
+						var5 += var9; // L: 866
+						var2 += Rasterizer2D.Rasterizer2D_width; // L: 867
 					}
 				}
 			} else {
-				var3 = var5 <<= 14; // L: 892
-				if (var2 < 0) { // L: 893
-					var3 -= var8 * var2; // L: 894
-					var5 -= var9 * var2; // L: 895
-					var2 = 0; // L: 896
+				var3 = var5 <<= 14; // L: 879
+				if (var2 < 0) { // L: 880
+					var3 -= var8 * var2; // L: 881
+					var5 -= var9 * var2; // L: 882
+					var2 = 0; // L: 883
 				}
 
-				var4 <<= 14; // L: 898
-				if (var1 < 0) { // L: 899
-					var4 -= var7 * var1; // L: 900
-					var1 = 0; // L: 901
+				var4 <<= 14; // L: 885
+				if (var1 < 0) { // L: 886
+					var4 -= var7 * var1; // L: 887
+					var1 = 0; // L: 888
 				}
 
-				if (var8 < var9) { // L: 903
-					var0 -= var1; // L: 904
-					var1 -= var2; // L: 905
-					var2 = Rasterizer3D_rowOffsets[var2]; // L: 906
+				if (var8 < var9) { // L: 890
+					var0 -= var1; // L: 891
+					var1 -= var2; // L: 892
+					var2 = Rasterizer3D_rowOffsets[var2]; // L: 893
 
 					while (true) {
-						--var1; // L: 907
+						--var1; // L: 894
 						if (var1 < 0) {
 							while (true) {
-								--var0; // L: 913
+								--var0; // L: 900
 								if (var0 < 0) {
-									return; // L: 919
+									return; // L: 906
 								}
 
-								Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 914
-								var4 += var7; // L: 915
-								var5 += var9; // L: 916
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 917
+								Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 901
+								var4 += var7; // L: 902
+								var5 += var9; // L: 903
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 904
 							}
 						}
 
-						Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 908
-						var3 += var8; // L: 909
-						var5 += var9; // L: 910
-						var2 += Rasterizer2D.Rasterizer2D_width; // L: 911
+						Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 895
+						var3 += var8; // L: 896
+						var5 += var9; // L: 897
+						var2 += Rasterizer2D.Rasterizer2D_width; // L: 898
 					}
 				} else {
-					var0 -= var1; // L: 922
-					var1 -= var2; // L: 923
-					var2 = Rasterizer3D_rowOffsets[var2]; // L: 924
+					var0 -= var1; // L: 909
+					var1 -= var2; // L: 910
+					var2 = Rasterizer3D_rowOffsets[var2]; // L: 911
 
 					while (true) {
-						--var1; // L: 925
+						--var1; // L: 912
 						if (var1 < 0) {
 							while (true) {
-								--var0; // L: 931
+								--var0; // L: 918
 								if (var0 < 0) {
-									return; // L: 937
+									return; // L: 924
 								}
 
-								Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 932
-								var4 += var7; // L: 933
-								var5 += var9; // L: 934
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 935
+								Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 919
+								var4 += var7; // L: 920
+								var5 += var9; // L: 921
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 922
 							}
 						}
 
-						Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 926
-						var3 += var8; // L: 927
-						var5 += var9; // L: 928
-						var2 += Rasterizer2D.Rasterizer2D_width; // L: 929
+						Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 913
+						var3 += var8; // L: 914
+						var5 += var9; // L: 915
+						var2 += Rasterizer2D.Rasterizer2D_width; // L: 916
 					}
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("Rasterizer3D_horizAlpha")
 	static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) {
-		if (field2365) { // L: 944
-			if (var5 > Rasterizer3D_clipWidth) { // L: 945
+		if (field2253) { // L: 931
+			if (var5 > Rasterizer3D_clipWidth) { // L: 932
 				var5 = Rasterizer3D_clipWidth;
 			}
 
-			if (var4 < 0) { // L: 946
+			if (var4 < 0) { // L: 933
 				var4 = 0;
 			}
 		}
 
-		if (var4 < var5) { // L: 948
-			var1 += var4; // L: 949
-			var3 = var5 - var4 >> 2; // L: 950
-			if (Rasterizer3D_alpha != 0) { // L: 951
-				if (Rasterizer3D_alpha == 254) { // L: 963
+		if (var4 < var5) { // L: 935
+			var1 += var4; // L: 936
+			var3 = var5 - var4 >> 2; // L: 937
+			if (Rasterizer3D_alpha != 0) { // L: 938
+				if (Rasterizer3D_alpha == 254) { // L: 950
 					while (true) {
-						--var3; // L: 964
+						--var3; // L: 951
 						if (var3 < 0) {
-							var3 = var5 - var4 & 3; // L: 970
+							var3 = var5 - var4 & 3; // L: 957
 
 							while (true) {
-								--var3; // L: 971
+								--var3; // L: 958
 								if (var3 < 0) {
-									return; // L: 995
+									return; // L: 982
 								}
 
-								var0[var1++] = var0[var1]; // L: 972
+								var0[var1++] = var0[var1]; // L: 959
 							}
 						}
 
-						var0[var1++] = var0[var1]; // L: 965
-						var0[var1++] = var0[var1]; // L: 966
-						var0[var1++] = var0[var1]; // L: 967
-						var0[var1++] = var0[var1]; // L: 968
+						var0[var1++] = var0[var1]; // L: 952
+						var0[var1++] = var0[var1]; // L: 953
+						var0[var1++] = var0[var1]; // L: 954
+						var0[var1++] = var0[var1]; // L: 955
 					}
 				} else {
-					int var6 = Rasterizer3D_alpha; // L: 976
-					int var7 = 256 - Rasterizer3D_alpha; // L: 977
-					var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 978
+					int var6 = Rasterizer3D_alpha; // L: 963
+					int var7 = 256 - Rasterizer3D_alpha; // L: 964
+					var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 965
 
 					while (true) {
-						--var3; // L: 979
+						--var3; // L: 966
 						int var8;
 						if (var3 < 0) {
-							var3 = var5 - var4 & 3; // L: 989
+							var3 = var5 - var4 & 3; // L: 976
 
 							while (true) {
-								--var3; // L: 990
+								--var3; // L: 977
 								if (var3 < 0) {
 									return;
 								}
 
-								var8 = var0[var1]; // L: 991
-								var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 992
+								var8 = var0[var1]; // L: 978
+								var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 979
 							}
 						}
 
-						var8 = var0[var1]; // L: 980
-						var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 981
-						var8 = var0[var1]; // L: 982
-						var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 983
-						var8 = var0[var1]; // L: 984
-						var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 985
-						var8 = var0[var1]; // L: 986
-						var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 987
+						var8 = var0[var1]; // L: 967
+						var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 968
+						var8 = var0[var1]; // L: 969
+						var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 970
+						var8 = var0[var1]; // L: 971
+						var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 972
+						var8 = var0[var1]; // L: 973
+						var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 974
 					}
 				}
 			} else {
 				while (true) {
-					--var3; // L: 952
+					--var3; // L: 939
 					if (var3 < 0) {
-						var3 = var5 - var4 & 3; // L: 958
+						var3 = var5 - var4 & 3; // L: 945
 
 						while (true) {
-							--var3; // L: 959
+							--var3; // L: 946
 							if (var3 < 0) {
 								return;
 							}
 
-							var0[var1++] = var2; // L: 960
+							var0[var1++] = var2; // L: 947
 						}
 					}
 
-					var0[var1++] = var2; // L: 953
-					var0[var1++] = var2; // L: 954
-					var0[var1++] = var2; // L: 955
-					var0[var1++] = var2; // L: 956
+					var0[var1++] = var2; // L: 940
+					var0[var1++] = var2; // L: 941
+					var0[var1++] = var2; // L: 942
+					var0[var1++] = var2; // L: 943
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("t")
-	static final void method4215(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
-		int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 998
+	@ObfuscatedName("h")
+	static final void method3876(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
+		int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 985
 		int var20;
-		if (var19 == null) { // L: 999
-			var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1000
-			method4211(var0, var1, var2, var3, var4, var5, method4246(var20, var6), method4246(var20, var7), method4246(var20, var8)); // L: 1001
+		if (var19 == null) { // L: 986
+			var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 987
+			method3854(var0, var1, var2, var3, var4, var5, method3862(var20, var6), method3862(var20, var7), method3862(var20, var8)); // L: 988
 		} else {
-			Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1004
-			field2344 = Rasterizer3D_textureLoader.vmethod4636(var18); // L: 1005
-			var20 = var4 - var3; // L: 1006
-			int var21 = var1 - var0; // L: 1007
-			int var22 = var5 - var3; // L: 1008
-			int var23 = var2 - var0; // L: 1009
-			int var24 = var7 - var6; // L: 1010
-			int var25 = var8 - var6; // L: 1011
-			int var26 = 0; // L: 1012
-			if (var0 != var1) { // L: 1013
+			Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 991
+			field2251 = Rasterizer3D_textureLoader.vmethod4324(var18); // L: 992
+			var20 = var4 - var3; // L: 993
+			int var21 = var1 - var0; // L: 994
+			int var22 = var5 - var3; // L: 995
+			int var23 = var2 - var0; // L: 996
+			int var24 = var7 - var6; // L: 997
+			int var25 = var8 - var6; // L: 998
+			int var26 = 0; // L: 999
+			if (var0 != var1) { // L: 1000
 				var26 = (var4 - var3 << 14) / (var1 - var0);
 			}
 
-			int var27 = 0; // L: 1014
-			if (var2 != var1) { // L: 1015
+			int var27 = 0; // L: 1001
+			if (var2 != var1) { // L: 1002
 				var27 = (var5 - var4 << 14) / (var2 - var1);
 			}
 
-			int var28 = 0; // L: 1016
-			if (var0 != var2) { // L: 1017
+			int var28 = 0; // L: 1003
+			if (var0 != var2) { // L: 1004
 				var28 = (var3 - var5 << 14) / (var0 - var2);
 			}
 
-			int var29 = var20 * var23 - var22 * var21; // L: 1018
-			if (var29 != 0) { // L: 1019
-				int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1020
-				int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1021
-				var10 = var9 - var10; // L: 1022
-				var13 = var12 - var13; // L: 1023
-				var16 = var15 - var16; // L: 1024
-				var11 -= var9; // L: 1025
-				var14 -= var12; // L: 1026
-				var17 -= var15; // L: 1027
-				int var32 = var11 * var12 - var9 * var14 << 14; // L: 1028
-				int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1029
-				int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1030
-				int var35 = var10 * var12 - var13 * var9 << 14; // L: 1031
-				int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1032
-				int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1033
-				int var38 = var13 * var11 - var10 * var14 << 14; // L: 1034
-				int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1035
-				int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1036
+			int var29 = var20 * var23 - var22 * var21; // L: 1005
+			if (var29 != 0) { // L: 1006
+				int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1007
+				int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1008
+				var10 = var9 - var10; // L: 1009
+				var13 = var12 - var13; // L: 1010
+				var16 = var15 - var16; // L: 1011
+				var11 -= var9; // L: 1012
+				var14 -= var12; // L: 1013
+				var17 -= var15; // L: 1014
+				int var32 = var11 * var12 - var9 * var14 << 14; // L: 1015
+				int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1016
+				int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1017
+				int var35 = var10 * var12 - var13 * var9 << 14; // L: 1018
+				int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1019
+				int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1020
+				int var38 = var13 * var11 - var10 * var14 << 14; // L: 1021
+				int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1022
+				int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1023
 				int var41;
-				if (var0 <= var1 && var0 <= var2) { // L: 1037
-					if (var0 < Rasterizer3D_clipHeight) { // L: 1038
-						if (var1 > Rasterizer3D_clipHeight) { // L: 1039
+				if (var0 <= var1 && var0 <= var2) { // L: 1024
+					if (var0 < Rasterizer3D_clipHeight) { // L: 1025
+						if (var1 > Rasterizer3D_clipHeight) { // L: 1026
 							var1 = Rasterizer3D_clipHeight;
 						}
 
-						if (var2 > Rasterizer3D_clipHeight) { // L: 1040
+						if (var2 > Rasterizer3D_clipHeight) { // L: 1027
 							var2 = Rasterizer3D_clipHeight;
 						}
 
-						var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1041
-						if (var1 < var2) { // L: 1042
-							var5 = var3 <<= 14; // L: 1043
-							if (var0 < 0) { // L: 1044
-								var5 -= var0 * var28; // L: 1045
-								var3 -= var0 * var26; // L: 1046
-								var6 -= var0 * var31; // L: 1047
-								var0 = 0; // L: 1048
+						var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1028
+						if (var1 < var2) { // L: 1029
+							var5 = var3 <<= 14; // L: 1030
+							if (var0 < 0) { // L: 1031
+								var5 -= var0 * var28; // L: 1032
+								var3 -= var0 * var26; // L: 1033
+								var6 -= var0 * var31; // L: 1034
+								var0 = 0; // L: 1035
 							}
 
-							var4 <<= 14; // L: 1050
-							if (var1 < 0) { // L: 1051
-								var4 -= var27 * var1; // L: 1052
-								var1 = 0; // L: 1053
+							var4 <<= 14; // L: 1037
+							if (var1 < 0) { // L: 1038
+								var4 -= var27 * var1; // L: 1039
+								var1 = 0; // L: 1040
 							}
 
-							var41 = var0 - Rasterizer3D_clipMidY; // L: 1055
-							var32 += var34 * var41; // L: 1056
-							var35 += var37 * var41; // L: 1057
-							var38 += var40 * var41; // L: 1058
-							if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1059
-								var2 -= var1; // L: 1086
-								var1 -= var0; // L: 1087
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1088
+							var41 = var0 - Rasterizer3D_clipMidY; // L: 1042
+							var32 += var34 * var41; // L: 1043
+							var35 += var37 * var41; // L: 1044
+							var38 += var40 * var41; // L: 1045
+							if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1046
+								var2 -= var1; // L: 1073
+								var1 -= var0; // L: 1074
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1075
 
 								while (true) {
-									--var1; // L: 1089
+									--var1; // L: 1076
 									if (var1 < 0) {
 										while (true) {
-											--var2; // L: 1099
+											--var2; // L: 1086
 											if (var2 < 0) {
-												return; // L: 1109
+												return; // L: 1096
 											}
 
-											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1100
-											var5 += var28; // L: 1101
-											var4 += var27; // L: 1102
-											var6 += var31; // L: 1103
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1104
-											var32 += var34; // L: 1105
-											var35 += var37; // L: 1106
-											var38 += var40; // L: 1107
+											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1087
+											var5 += var28; // L: 1088
+											var4 += var27; // L: 1089
+											var6 += var31; // L: 1090
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1091
+											var32 += var34; // L: 1092
+											var35 += var37; // L: 1093
+											var38 += var40; // L: 1094
 										}
 									}
 
-									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1090
-									var5 += var28; // L: 1091
-									var3 += var26; // L: 1092
-									var6 += var31; // L: 1093
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1094
-									var32 += var34; // L: 1095
-									var35 += var37; // L: 1096
-									var38 += var40; // L: 1097
+									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1077
+									var5 += var28; // L: 1078
+									var3 += var26; // L: 1079
+									var6 += var31; // L: 1080
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1081
+									var32 += var34; // L: 1082
+									var35 += var37; // L: 1083
+									var38 += var40; // L: 1084
 								}
 							} else {
-								var2 -= var1; // L: 1060
-								var1 -= var0; // L: 1061
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1062
+								var2 -= var1; // L: 1047
+								var1 -= var0; // L: 1048
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1049
 
 								while (true) {
-									--var1; // L: 1063
+									--var1; // L: 1050
 									if (var1 < 0) {
 										while (true) {
-											--var2; // L: 1073
+											--var2; // L: 1060
 											if (var2 < 0) {
-												return; // L: 1083
+												return; // L: 1070
 											}
 
-											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1074
-											var5 += var28; // L: 1075
-											var4 += var27; // L: 1076
-											var6 += var31; // L: 1077
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1078
-											var32 += var34; // L: 1079
-											var35 += var37; // L: 1080
-											var38 += var40; // L: 1081
+											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1061
+											var5 += var28; // L: 1062
+											var4 += var27; // L: 1063
+											var6 += var31; // L: 1064
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1065
+											var32 += var34; // L: 1066
+											var35 += var37; // L: 1067
+											var38 += var40; // L: 1068
 										}
 									}
 
-									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1064
-									var5 += var28; // L: 1065
-									var3 += var26; // L: 1066
-									var6 += var31; // L: 1067
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1068
-									var32 += var34; // L: 1069
-									var35 += var37; // L: 1070
-									var38 += var40; // L: 1071
+									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1051
+									var5 += var28; // L: 1052
+									var3 += var26; // L: 1053
+									var6 += var31; // L: 1054
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1055
+									var32 += var34; // L: 1056
+									var35 += var37; // L: 1057
+									var38 += var40; // L: 1058
 								}
 							}
 						} else {
-							var4 = var3 <<= 14; // L: 1113
-							if (var0 < 0) { // L: 1114
-								var4 -= var0 * var28; // L: 1115
-								var3 -= var0 * var26; // L: 1116
-								var6 -= var0 * var31; // L: 1117
-								var0 = 0; // L: 1118
+							var4 = var3 <<= 14; // L: 1100
+							if (var0 < 0) { // L: 1101
+								var4 -= var0 * var28; // L: 1102
+								var3 -= var0 * var26; // L: 1103
+								var6 -= var0 * var31; // L: 1104
+								var0 = 0; // L: 1105
 							}
 
-							var5 <<= 14; // L: 1120
-							if (var2 < 0) { // L: 1121
-								var5 -= var27 * var2; // L: 1122
-								var2 = 0; // L: 1123
+							var5 <<= 14; // L: 1107
+							if (var2 < 0) { // L: 1108
+								var5 -= var27 * var2; // L: 1109
+								var2 = 0; // L: 1110
 							}
 
-							var41 = var0 - Rasterizer3D_clipMidY; // L: 1125
-							var32 += var34 * var41; // L: 1126
-							var35 += var37 * var41; // L: 1127
-							var38 += var40 * var41; // L: 1128
-							if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1129
-								var1 -= var2; // L: 1130
-								var2 -= var0; // L: 1131
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1132
+							var41 = var0 - Rasterizer3D_clipMidY; // L: 1112
+							var32 += var34 * var41; // L: 1113
+							var35 += var37 * var41; // L: 1114
+							var38 += var40 * var41; // L: 1115
+							if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1116
+								var1 -= var2; // L: 1143
+								var2 -= var0; // L: 1144
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1145
 
 								while (true) {
-									--var2; // L: 1133
+									--var2; // L: 1146
 									if (var2 < 0) {
 										while (true) {
-											--var1; // L: 1143
+											--var1; // L: 1156
 											if (var1 < 0) {
-												return; // L: 1153
+												return; // L: 1166
 											}
 
-											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1144
-											var5 += var27; // L: 1145
-											var3 += var26; // L: 1146
-											var6 += var31; // L: 1147
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1148
-											var32 += var34; // L: 1149
-											var35 += var37; // L: 1150
-											var38 += var40; // L: 1151
+											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1157
+											var5 += var27; // L: 1158
+											var3 += var26; // L: 1159
+											var6 += var31; // L: 1160
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1161
+											var32 += var34; // L: 1162
+											var35 += var37; // L: 1163
+											var38 += var40; // L: 1164
 										}
 									}
 
-									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1134
-									var4 += var28; // L: 1135
-									var3 += var26; // L: 1136
-									var6 += var31; // L: 1137
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1138
-									var32 += var34; // L: 1139
-									var35 += var37; // L: 1140
-									var38 += var40; // L: 1141
+									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1147
+									var4 += var28; // L: 1148
+									var3 += var26; // L: 1149
+									var6 += var31; // L: 1150
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1151
+									var32 += var34; // L: 1152
+									var35 += var37; // L: 1153
+									var38 += var40; // L: 1154
 								}
 							} else {
-								var1 -= var2; // L: 1156
-								var2 -= var0; // L: 1157
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1158
+								var1 -= var2; // L: 1117
+								var2 -= var0; // L: 1118
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1119
 
 								while (true) {
-									--var2; // L: 1159
+									--var2; // L: 1120
 									if (var2 < 0) {
 										while (true) {
-											--var1; // L: 1169
+											--var1; // L: 1130
 											if (var1 < 0) {
-												return; // L: 1179
+												return; // L: 1140
 											}
 
-											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1170
-											var5 += var27; // L: 1171
-											var3 += var26; // L: 1172
-											var6 += var31; // L: 1173
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1174
-											var32 += var34; // L: 1175
-											var35 += var37; // L: 1176
-											var38 += var40; // L: 1177
+											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1131
+											var5 += var27; // L: 1132
+											var3 += var26; // L: 1133
+											var6 += var31; // L: 1134
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1135
+											var32 += var34; // L: 1136
+											var35 += var37; // L: 1137
+											var38 += var40; // L: 1138
 										}
 									}
 
-									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1160
-									var4 += var28; // L: 1161
-									var3 += var26; // L: 1162
-									var6 += var31; // L: 1163
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1164
-									var32 += var34; // L: 1165
-									var35 += var37; // L: 1166
-									var38 += var40; // L: 1167
+									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1121
+									var4 += var28; // L: 1122
+									var3 += var26; // L: 1123
+									var6 += var31; // L: 1124
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1125
+									var32 += var34; // L: 1126
+									var35 += var37; // L: 1127
+									var38 += var40; // L: 1128
 								}
 							}
 						}
 					}
-				} else if (var1 <= var2) { // L: 1183
-					if (var1 < Rasterizer3D_clipHeight) { // L: 1184
-						if (var2 > Rasterizer3D_clipHeight) { // L: 1185
+				} else if (var1 <= var2) { // L: 1170
+					if (var1 < Rasterizer3D_clipHeight) { // L: 1171
+						if (var2 > Rasterizer3D_clipHeight) { // L: 1172
 							var2 = Rasterizer3D_clipHeight;
 						}
 
-						if (var0 > Rasterizer3D_clipHeight) { // L: 1186
+						if (var0 > Rasterizer3D_clipHeight) { // L: 1173
 							var0 = Rasterizer3D_clipHeight;
 						}
 
-						var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1187
-						if (var2 < var0) { // L: 1188
-							var3 = var4 <<= 14; // L: 1189
-							if (var1 < 0) { // L: 1190
-								var3 -= var26 * var1; // L: 1191
-								var4 -= var27 * var1; // L: 1192
-								var7 -= var31 * var1; // L: 1193
-								var1 = 0; // L: 1194
+						var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1174
+						if (var2 < var0) { // L: 1175
+							var3 = var4 <<= 14; // L: 1176
+							if (var1 < 0) { // L: 1177
+								var3 -= var26 * var1; // L: 1178
+								var4 -= var27 * var1; // L: 1179
+								var7 -= var31 * var1; // L: 1180
+								var1 = 0; // L: 1181
 							}
 
-							var5 <<= 14; // L: 1196
-							if (var2 < 0) { // L: 1197
-								var5 -= var28 * var2; // L: 1198
-								var2 = 0; // L: 1199
+							var5 <<= 14; // L: 1183
+							if (var2 < 0) { // L: 1184
+								var5 -= var28 * var2; // L: 1185
+								var2 = 0; // L: 1186
 							}
 
-							var41 = var1 - Rasterizer3D_clipMidY; // L: 1201
-							var32 += var34 * var41; // L: 1202
-							var35 += var37 * var41; // L: 1203
-							var38 += var40 * var41; // L: 1204
-							if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 1205
-								var0 -= var2; // L: 1232
-								var2 -= var1; // L: 1233
-								var1 = Rasterizer3D_rowOffsets[var1]; // L: 1234
+							var41 = var1 - Rasterizer3D_clipMidY; // L: 1188
+							var32 += var34 * var41; // L: 1189
+							var35 += var37 * var41; // L: 1190
+							var38 += var40 * var41; // L: 1191
+							if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 1192
+								var0 -= var2; // L: 1193
+								var2 -= var1; // L: 1194
+								var1 = Rasterizer3D_rowOffsets[var1]; // L: 1195
 
 								while (true) {
-									--var2; // L: 1235
+									--var2; // L: 1196
 									if (var2 < 0) {
 										while (true) {
-											--var0; // L: 1245
+											--var0; // L: 1206
 											if (var0 < 0) {
-												return; // L: 1255
+												return; // L: 1216
 											}
 
-											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1246
-											var3 += var26; // L: 1247
-											var5 += var28; // L: 1248
-											var7 += var31; // L: 1249
-											var1 += Rasterizer2D.Rasterizer2D_width; // L: 1250
-											var32 += var34; // L: 1251
-											var35 += var37; // L: 1252
-											var38 += var40; // L: 1253
+											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1207
+											var3 += var26; // L: 1208
+											var5 += var28; // L: 1209
+											var7 += var31; // L: 1210
+											var1 += Rasterizer2D.Rasterizer2D_width; // L: 1211
+											var32 += var34; // L: 1212
+											var35 += var37; // L: 1213
+											var38 += var40; // L: 1214
 										}
 									}
 
-									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1236
-									var3 += var26; // L: 1237
-									var4 += var27; // L: 1238
-									var7 += var31; // L: 1239
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 1240
-									var32 += var34; // L: 1241
-									var35 += var37; // L: 1242
-									var38 += var40; // L: 1243
+									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1197
+									var3 += var26; // L: 1198
+									var4 += var27; // L: 1199
+									var7 += var31; // L: 1200
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 1201
+									var32 += var34; // L: 1202
+									var35 += var37; // L: 1203
+									var38 += var40; // L: 1204
 								}
 							} else {
-								var0 -= var2; // L: 1206
-								var2 -= var1; // L: 1207
-								var1 = Rasterizer3D_rowOffsets[var1]; // L: 1208
+								var0 -= var2; // L: 1219
+								var2 -= var1; // L: 1220
+								var1 = Rasterizer3D_rowOffsets[var1]; // L: 1221
 
 								while (true) {
-									--var2; // L: 1209
+									--var2; // L: 1222
 									if (var2 < 0) {
 										while (true) {
-											--var0; // L: 1219
+											--var0; // L: 1232
 											if (var0 < 0) {
-												return; // L: 1229
+												return; // L: 1242
 											}
 
-											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1220
-											var3 += var26; // L: 1221
-											var5 += var28; // L: 1222
-											var7 += var31; // L: 1223
-											var1 += Rasterizer2D.Rasterizer2D_width; // L: 1224
-											var32 += var34; // L: 1225
-											var35 += var37; // L: 1226
-											var38 += var40; // L: 1227
+											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1233
+											var3 += var26; // L: 1234
+											var5 += var28; // L: 1235
+											var7 += var31; // L: 1236
+											var1 += Rasterizer2D.Rasterizer2D_width; // L: 1237
+											var32 += var34; // L: 1238
+											var35 += var37; // L: 1239
+											var38 += var40; // L: 1240
 										}
 									}
 
-									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1210
-									var3 += var26; // L: 1211
-									var4 += var27; // L: 1212
-									var7 += var31; // L: 1213
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 1214
-									var32 += var34; // L: 1215
-									var35 += var37; // L: 1216
-									var38 += var40; // L: 1217
+									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1223
+									var3 += var26; // L: 1224
+									var4 += var27; // L: 1225
+									var7 += var31; // L: 1226
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 1227
+									var32 += var34; // L: 1228
+									var35 += var37; // L: 1229
+									var38 += var40; // L: 1230
 								}
 							}
 						} else {
-							var5 = var4 <<= 14; // L: 1259
-							if (var1 < 0) { // L: 1260
-								var5 -= var26 * var1; // L: 1261
-								var4 -= var27 * var1; // L: 1262
-								var7 -= var31 * var1; // L: 1263
-								var1 = 0; // L: 1264
+							var5 = var4 <<= 14; // L: 1246
+							if (var1 < 0) { // L: 1247
+								var5 -= var26 * var1; // L: 1248
+								var4 -= var27 * var1; // L: 1249
+								var7 -= var31 * var1; // L: 1250
+								var1 = 0; // L: 1251
 							}
 
-							var3 <<= 14; // L: 1266
-							if (var0 < 0) { // L: 1267
-								var3 -= var0 * var28; // L: 1268
-								var0 = 0; // L: 1269
+							var3 <<= 14; // L: 1253
+							if (var0 < 0) { // L: 1254
+								var3 -= var0 * var28; // L: 1255
+								var0 = 0; // L: 1256
 							}
 
-							var41 = var1 - Rasterizer3D_clipMidY; // L: 1271
-							var32 += var34 * var41; // L: 1272
-							var35 += var37 * var41; // L: 1273
-							var38 += var40 * var41; // L: 1274
-							if (var26 < var27) { // L: 1275
-								var2 -= var0; // L: 1276
-								var0 -= var1; // L: 1277
-								var1 = Rasterizer3D_rowOffsets[var1]; // L: 1278
+							var41 = var1 - Rasterizer3D_clipMidY; // L: 1258
+							var32 += var34 * var41; // L: 1259
+							var35 += var37 * var41; // L: 1260
+							var38 += var40 * var41; // L: 1261
+							if (var26 < var27) { // L: 1262
+								var2 -= var0; // L: 1263
+								var0 -= var1; // L: 1264
+								var1 = Rasterizer3D_rowOffsets[var1]; // L: 1265
 
 								while (true) {
-									--var0; // L: 1279
+									--var0; // L: 1266
 									if (var0 < 0) {
 										while (true) {
-											--var2; // L: 1289
+											--var2; // L: 1276
 											if (var2 < 0) {
-												return; // L: 1299
+												return; // L: 1286
 											}
 
-											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1290
-											var3 += var28; // L: 1291
-											var4 += var27; // L: 1292
-											var7 += var31; // L: 1293
-											var1 += Rasterizer2D.Rasterizer2D_width; // L: 1294
-											var32 += var34; // L: 1295
-											var35 += var37; // L: 1296
-											var38 += var40; // L: 1297
+											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1277
+											var3 += var28; // L: 1278
+											var4 += var27; // L: 1279
+											var7 += var31; // L: 1280
+											var1 += Rasterizer2D.Rasterizer2D_width; // L: 1281
+											var32 += var34; // L: 1282
+											var35 += var37; // L: 1283
+											var38 += var40; // L: 1284
 										}
 									}
 
-									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1280
-									var5 += var26; // L: 1281
-									var4 += var27; // L: 1282
-									var7 += var31; // L: 1283
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 1284
-									var32 += var34; // L: 1285
-									var35 += var37; // L: 1286
-									var38 += var40; // L: 1287
+									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1267
+									var5 += var26; // L: 1268
+									var4 += var27; // L: 1269
+									var7 += var31; // L: 1270
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 1271
+									var32 += var34; // L: 1272
+									var35 += var37; // L: 1273
+									var38 += var40; // L: 1274
 								}
 							} else {
-								var2 -= var0; // L: 1302
-								var0 -= var1; // L: 1303
-								var1 = Rasterizer3D_rowOffsets[var1]; // L: 1304
+								var2 -= var0; // L: 1289
+								var0 -= var1; // L: 1290
+								var1 = Rasterizer3D_rowOffsets[var1]; // L: 1291
 
 								while (true) {
-									--var0; // L: 1305
+									--var0; // L: 1292
 									if (var0 < 0) {
 										while (true) {
-											--var2; // L: 1315
+											--var2; // L: 1302
 											if (var2 < 0) {
-												return; // L: 1325
+												return; // L: 1312
 											}
 
-											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1316
-											var3 += var28; // L: 1317
-											var4 += var27; // L: 1318
-											var7 += var31; // L: 1319
-											var1 += Rasterizer2D.Rasterizer2D_width; // L: 1320
-											var32 += var34; // L: 1321
-											var35 += var37; // L: 1322
-											var38 += var40; // L: 1323
+											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1303
+											var3 += var28; // L: 1304
+											var4 += var27; // L: 1305
+											var7 += var31; // L: 1306
+											var1 += Rasterizer2D.Rasterizer2D_width; // L: 1307
+											var32 += var34; // L: 1308
+											var35 += var37; // L: 1309
+											var38 += var40; // L: 1310
 										}
 									}
 
-									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1306
-									var5 += var26; // L: 1307
-									var4 += var27; // L: 1308
-									var7 += var31; // L: 1309
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 1310
-									var32 += var34; // L: 1311
-									var35 += var37; // L: 1312
-									var38 += var40; // L: 1313
+									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1293
+									var5 += var26; // L: 1294
+									var4 += var27; // L: 1295
+									var7 += var31; // L: 1296
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 1297
+									var32 += var34; // L: 1298
+									var35 += var37; // L: 1299
+									var38 += var40; // L: 1300
 								}
 							}
 						}
 					}
-				} else if (var2 < Rasterizer3D_clipHeight) { // L: 1330
-					if (var0 > Rasterizer3D_clipHeight) { // L: 1331
+				} else if (var2 < Rasterizer3D_clipHeight) { // L: 1317
+					if (var0 > Rasterizer3D_clipHeight) { // L: 1318
 						var0 = Rasterizer3D_clipHeight;
 					}
 
-					if (var1 > Rasterizer3D_clipHeight) { // L: 1332
+					if (var1 > Rasterizer3D_clipHeight) { // L: 1319
 						var1 = Rasterizer3D_clipHeight;
 					}
 
-					var8 = (var8 << 9) - var5 * var30 + var30; // L: 1333
-					if (var0 < var1) { // L: 1334
-						var4 = var5 <<= 14; // L: 1335
-						if (var2 < 0) { // L: 1336
-							var4 -= var27 * var2; // L: 1337
-							var5 -= var28 * var2; // L: 1338
-							var8 -= var31 * var2; // L: 1339
-							var2 = 0; // L: 1340
+					var8 = (var8 << 9) - var5 * var30 + var30; // L: 1320
+					if (var0 < var1) { // L: 1321
+						var4 = var5 <<= 14; // L: 1322
+						if (var2 < 0) { // L: 1323
+							var4 -= var27 * var2; // L: 1324
+							var5 -= var28 * var2; // L: 1325
+							var8 -= var31 * var2; // L: 1326
+							var2 = 0; // L: 1327
 						}
 
-						var3 <<= 14; // L: 1342
-						if (var0 < 0) { // L: 1343
-							var3 -= var0 * var26; // L: 1344
-							var0 = 0; // L: 1345
+						var3 <<= 14; // L: 1329
+						if (var0 < 0) { // L: 1330
+							var3 -= var0 * var26; // L: 1331
+							var0 = 0; // L: 1332
 						}
 
-						var41 = var2 - Rasterizer3D_clipMidY; // L: 1347
-						var32 += var34 * var41; // L: 1348
-						var35 += var37 * var41; // L: 1349
-						var38 += var40 * var41; // L: 1350
-						if (var27 < var28) { // L: 1351
-							var1 -= var0; // L: 1352
-							var0 -= var2; // L: 1353
-							var2 = Rasterizer3D_rowOffsets[var2]; // L: 1354
+						var41 = var2 - Rasterizer3D_clipMidY; // L: 1334
+						var32 += var34 * var41; // L: 1335
+						var35 += var37 * var41; // L: 1336
+						var38 += var40 * var41; // L: 1337
+						if (var27 < var28) { // L: 1338
+							var1 -= var0; // L: 1339
+							var0 -= var2; // L: 1340
+							var2 = Rasterizer3D_rowOffsets[var2]; // L: 1341
 
 							while (true) {
-								--var0; // L: 1355
+								--var0; // L: 1342
 								if (var0 < 0) {
 									while (true) {
-										--var1; // L: 1365
+										--var1; // L: 1352
 										if (var1 < 0) {
-											return; // L: 1375
+											return; // L: 1362
 										}
 
-										Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1366
-										var4 += var27; // L: 1367
-										var3 += var26; // L: 1368
-										var8 += var31; // L: 1369
-										var2 += Rasterizer2D.Rasterizer2D_width; // L: 1370
-										var32 += var34; // L: 1371
-										var35 += var37; // L: 1372
-										var38 += var40; // L: 1373
+										Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1353
+										var4 += var27; // L: 1354
+										var3 += var26; // L: 1355
+										var8 += var31; // L: 1356
+										var2 += Rasterizer2D.Rasterizer2D_width; // L: 1357
+										var32 += var34; // L: 1358
+										var35 += var37; // L: 1359
+										var38 += var40; // L: 1360
 									}
 								}
 
-								Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1356
-								var4 += var27; // L: 1357
-								var5 += var28; // L: 1358
-								var8 += var31; // L: 1359
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 1360
-								var32 += var34; // L: 1361
-								var35 += var37; // L: 1362
-								var38 += var40; // L: 1363
+								Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1343
+								var4 += var27; // L: 1344
+								var5 += var28; // L: 1345
+								var8 += var31; // L: 1346
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 1347
+								var32 += var34; // L: 1348
+								var35 += var37; // L: 1349
+								var38 += var40; // L: 1350
 							}
 						} else {
-							var1 -= var0; // L: 1378
-							var0 -= var2; // L: 1379
-							var2 = Rasterizer3D_rowOffsets[var2]; // L: 1380
+							var1 -= var0; // L: 1365
+							var0 -= var2; // L: 1366
+							var2 = Rasterizer3D_rowOffsets[var2]; // L: 1367
 
 							while (true) {
-								--var0; // L: 1381
+								--var0; // L: 1368
 								if (var0 < 0) {
 									while (true) {
-										--var1; // L: 1391
+										--var1; // L: 1378
 										if (var1 < 0) {
-											return; // L: 1401
+											return; // L: 1388
 										}
 
-										Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1392
-										var4 += var27; // L: 1393
-										var3 += var26; // L: 1394
-										var8 += var31; // L: 1395
-										var2 += Rasterizer2D.Rasterizer2D_width; // L: 1396
-										var32 += var34; // L: 1397
-										var35 += var37; // L: 1398
-										var38 += var40; // L: 1399
+										Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1379
+										var4 += var27; // L: 1380
+										var3 += var26; // L: 1381
+										var8 += var31; // L: 1382
+										var2 += Rasterizer2D.Rasterizer2D_width; // L: 1383
+										var32 += var34; // L: 1384
+										var35 += var37; // L: 1385
+										var38 += var40; // L: 1386
 									}
 								}
 
-								Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1382
-								var4 += var27; // L: 1383
-								var5 += var28; // L: 1384
-								var8 += var31; // L: 1385
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 1386
-								var32 += var34; // L: 1387
-								var35 += var37; // L: 1388
-								var38 += var40; // L: 1389
+								Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1369
+								var4 += var27; // L: 1370
+								var5 += var28; // L: 1371
+								var8 += var31; // L: 1372
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 1373
+								var32 += var34; // L: 1374
+								var35 += var37; // L: 1375
+								var38 += var40; // L: 1376
 							}
 						}
 					} else {
-						var3 = var5 <<= 14; // L: 1405
-						if (var2 < 0) { // L: 1406
-							var3 -= var27 * var2; // L: 1407
-							var5 -= var28 * var2; // L: 1408
-							var8 -= var31 * var2; // L: 1409
-							var2 = 0; // L: 1410
+						var3 = var5 <<= 14; // L: 1392
+						if (var2 < 0) { // L: 1393
+							var3 -= var27 * var2; // L: 1394
+							var5 -= var28 * var2; // L: 1395
+							var8 -= var31 * var2; // L: 1396
+							var2 = 0; // L: 1397
 						}
 
-						var4 <<= 14; // L: 1412
-						if (var1 < 0) { // L: 1413
-							var4 -= var26 * var1; // L: 1414
-							var1 = 0; // L: 1415
+						var4 <<= 14; // L: 1399
+						if (var1 < 0) { // L: 1400
+							var4 -= var26 * var1; // L: 1401
+							var1 = 0; // L: 1402
 						}
 
-						var41 = var2 - Rasterizer3D_clipMidY; // L: 1417
-						var32 += var34 * var41; // L: 1418
-						var35 += var37 * var41; // L: 1419
-						var38 += var40 * var41; // L: 1420
-						if (var27 < var28) { // L: 1421
-							var0 -= var1; // L: 1422
-							var1 -= var2; // L: 1423
-							var2 = Rasterizer3D_rowOffsets[var2]; // L: 1424
+						var41 = var2 - Rasterizer3D_clipMidY; // L: 1404
+						var32 += var34 * var41; // L: 1405
+						var35 += var37 * var41; // L: 1406
+						var38 += var40 * var41; // L: 1407
+						if (var27 < var28) { // L: 1408
+							var0 -= var1; // L: 1409
+							var1 -= var2; // L: 1410
+							var2 = Rasterizer3D_rowOffsets[var2]; // L: 1411
 
 							while (true) {
-								--var1; // L: 1425
+								--var1; // L: 1412
 								if (var1 < 0) {
 									while (true) {
-										--var0; // L: 1435
+										--var0; // L: 1422
 										if (var0 < 0) {
-											return; // L: 1445
+											return; // L: 1432
 										}
 
-										Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1436
-										var4 += var26; // L: 1437
-										var5 += var28; // L: 1438
-										var8 += var31; // L: 1439
-										var2 += Rasterizer2D.Rasterizer2D_width; // L: 1440
-										var32 += var34; // L: 1441
-										var35 += var37; // L: 1442
-										var38 += var40; // L: 1443
+										Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1423
+										var4 += var26; // L: 1424
+										var5 += var28; // L: 1425
+										var8 += var31; // L: 1426
+										var2 += Rasterizer2D.Rasterizer2D_width; // L: 1427
+										var32 += var34; // L: 1428
+										var35 += var37; // L: 1429
+										var38 += var40; // L: 1430
 									}
 								}
 
-								Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1426
-								var3 += var27; // L: 1427
-								var5 += var28; // L: 1428
-								var8 += var31; // L: 1429
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 1430
-								var32 += var34; // L: 1431
-								var35 += var37; // L: 1432
-								var38 += var40; // L: 1433
+								Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1413
+								var3 += var27; // L: 1414
+								var5 += var28; // L: 1415
+								var8 += var31; // L: 1416
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 1417
+								var32 += var34; // L: 1418
+								var35 += var37; // L: 1419
+								var38 += var40; // L: 1420
 							}
 						} else {
-							var0 -= var1; // L: 1448
-							var1 -= var2; // L: 1449
-							var2 = Rasterizer3D_rowOffsets[var2]; // L: 1450
+							var0 -= var1; // L: 1435
+							var1 -= var2; // L: 1436
+							var2 = Rasterizer3D_rowOffsets[var2]; // L: 1437
 
 							while (true) {
-								--var1; // L: 1451
+								--var1; // L: 1438
 								if (var1 < 0) {
 									while (true) {
-										--var0; // L: 1461
+										--var0; // L: 1448
 										if (var0 < 0) {
-											return; // L: 1471
+											return; // L: 1458
 										}
 
-										Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1462
-										var4 += var26; // L: 1463
-										var5 += var28; // L: 1464
-										var8 += var31; // L: 1465
-										var2 += Rasterizer2D.Rasterizer2D_width; // L: 1466
-										var32 += var34; // L: 1467
-										var35 += var37; // L: 1468
-										var38 += var40; // L: 1469
+										Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1449
+										var4 += var26; // L: 1450
+										var5 += var28; // L: 1451
+										var8 += var31; // L: 1452
+										var2 += Rasterizer2D.Rasterizer2D_width; // L: 1453
+										var32 += var34; // L: 1454
+										var35 += var37; // L: 1455
+										var38 += var40; // L: 1456
 									}
 								}
 
-								Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1452
-								var3 += var27; // L: 1453
-								var5 += var28; // L: 1454
-								var8 += var31; // L: 1455
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 1456
-								var32 += var34; // L: 1457
-								var35 += var37; // L: 1458
-								var38 += var40; // L: 1459
+								Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1439
+								var3 += var27; // L: 1440
+								var5 += var28; // L: 1441
+								var8 += var31; // L: 1442
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 1443
+								var32 += var34; // L: 1444
+								var35 += var37; // L: 1445
+								var38 += var40; // L: 1446
 							}
 						}
 					}
 				}
 			}
 		}
-	} // L: 1002
+	} // L: 989
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("Rasterizer3D_iDontKnow")
 	static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) {
-		if (field2365) { // L: 1480
-			if (var6 > Rasterizer3D_clipWidth) { // L: 1481
+		if (field2253) { // L: 1467
+			if (var6 > Rasterizer3D_clipWidth) { // L: 1468
 				var6 = Rasterizer3D_clipWidth;
 			}
 
-			if (var5 < 0) { // L: 1482
+			if (var5 < 0) { // L: 1469
 				var5 = 0;
 			}
 		}
 
-		if (var5 < var6) { // L: 1484
-			var4 += var5; // L: 1485
-			var7 += var5 * var8; // L: 1486
-			int var17 = var6 - var5; // L: 1487
+		if (var5 < var6) { // L: 1471
+			var4 += var5; // L: 1472
+			var7 += var5 * var8; // L: 1473
+			int var17 = var6 - var5; // L: 1474
 			int var15;
 			int var16;
 			int var10000;
@@ -2085,1040 +2075,1040 @@ static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int v
 			int var21;
 			int var22;
 			int var23;
-			if (Rasterizer3D_isLowDetailTexture) { // L: 1488
-				var23 = var5 - Rasterizer3D_clipMidX; // L: 1494
-				var9 += var23 * (var12 >> 3); // L: 1495
-				var10 += (var13 >> 3) * var23; // L: 1496
-				var11 += var23 * (var14 >> 3); // L: 1497
-				var22 = var11 >> 12; // L: 1498
-				if (var22 != 0) { // L: 1499
-					var18 = var9 / var22; // L: 1500
-					var19 = var10 / var22; // L: 1501
-					if (var18 < 0) { // L: 1502
+			if (Rasterizer3D_isLowDetailTexture) { // L: 1475
+				var23 = var5 - Rasterizer3D_clipMidX; // L: 1481
+				var9 += var23 * (var12 >> 3); // L: 1482
+				var10 += (var13 >> 3) * var23; // L: 1483
+				var11 += var23 * (var14 >> 3); // L: 1484
+				var22 = var11 >> 12; // L: 1485
+				if (var22 != 0) { // L: 1486
+					var18 = var9 / var22; // L: 1487
+					var19 = var10 / var22; // L: 1488
+					if (var18 < 0) { // L: 1489
 						var18 = 0;
-					} else if (var18 > 4032) { // L: 1503
+					} else if (var18 > 4032) { // L: 1490
 						var18 = 4032;
 					}
 				} else {
-					var18 = 0; // L: 1506
-					var19 = 0; // L: 1507
+					var18 = 0; // L: 1493
+					var19 = 0; // L: 1494
 				}
 
-				var9 += var12; // L: 1509
-				var10 += var13; // L: 1510
-				var11 += var14; // L: 1511
-				var22 = var11 >> 12; // L: 1512
-				if (var22 != 0) { // L: 1513
-					var20 = var9 / var22; // L: 1514
-					var21 = var10 / var22; // L: 1515
-					if (var20 < 0) { // L: 1516
+				var9 += var12; // L: 1496
+				var10 += var13; // L: 1497
+				var11 += var14; // L: 1498
+				var22 = var11 >> 12; // L: 1499
+				if (var22 != 0) { // L: 1500
+					var20 = var9 / var22; // L: 1501
+					var21 = var10 / var22; // L: 1502
+					if (var20 < 0) { // L: 1503
 						var20 = 0;
-					} else if (var20 > 4032) { // L: 1517
+					} else if (var20 > 4032) { // L: 1504
 						var20 = 4032;
 					}
 				} else {
-					var20 = 0; // L: 1520
-					var21 = 0; // L: 1521
+					var20 = 0; // L: 1507
+					var21 = 0; // L: 1508
 				}
 
-				var2 = (var18 << 20) + var19; // L: 1523
-				var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1524
-				var17 >>= 3; // L: 1525
-				var8 <<= 3; // L: 1526
-				var15 = var7 >> 8; // L: 1527
-				if (field2344) { // L: 1528
-					if (var17 > 0) { // L: 1529
+				var2 = (var18 << 20) + var19; // L: 1510
+				var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1511
+				var17 >>= 3; // L: 1512
+				var8 <<= 3; // L: 1513
+				var15 = var7 >> 8; // L: 1514
+				if (field2251) { // L: 1515
+					if (var17 > 0) { // L: 1516
 						do {
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1531
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1532
-							var2 += var16; // L: 1533
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1534
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1535
-							var2 += var16; // L: 1536
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1537
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1538
-							var2 += var16; // L: 1539
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1540
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1541
-							var2 += var16; // L: 1542
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1543
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1544
-							var2 += var16; // L: 1545
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1546
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1547
-							var2 += var16; // L: 1548
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1549
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1550
-							var2 += var16; // L: 1551
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1552
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1553
-							var10000 = var16 + var2; // L: 1554
-							var18 = var20; // L: 1555
-							var19 = var21; // L: 1556
-							var9 += var12; // L: 1557
-							var10 += var13; // L: 1558
-							var11 += var14; // L: 1559
-							var22 = var11 >> 12; // L: 1560
-							if (var22 != 0) { // L: 1561
-								var20 = var9 / var22; // L: 1562
-								var21 = var10 / var22; // L: 1563
-								if (var20 < 0) { // L: 1564
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1518
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1519
+							var2 += var16; // L: 1520
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1521
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1522
+							var2 += var16; // L: 1523
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1524
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1525
+							var2 += var16; // L: 1526
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1527
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1528
+							var2 += var16; // L: 1529
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1530
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1531
+							var2 += var16; // L: 1532
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1533
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1534
+							var2 += var16; // L: 1535
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1536
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1537
+							var2 += var16; // L: 1538
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1539
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1540
+							var10000 = var16 + var2; // L: 1541
+							var18 = var20; // L: 1542
+							var19 = var21; // L: 1543
+							var9 += var12; // L: 1544
+							var10 += var13; // L: 1545
+							var11 += var14; // L: 1546
+							var22 = var11 >> 12; // L: 1547
+							if (var22 != 0) { // L: 1548
+								var20 = var9 / var22; // L: 1549
+								var21 = var10 / var22; // L: 1550
+								if (var20 < 0) { // L: 1551
 									var20 = 0;
-								} else if (var20 > 4032) { // L: 1565
+								} else if (var20 > 4032) { // L: 1552
 									var20 = 4032;
 								}
 							} else {
-								var20 = 0; // L: 1568
-								var21 = 0; // L: 1569
+								var20 = 0; // L: 1555
+								var21 = 0; // L: 1556
 							}
 
-							var2 = (var18 << 20) + var19; // L: 1571
-							var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1572
-							var7 += var8; // L: 1573
-							var15 = var7 >> 8; // L: 1574
-							--var17; // L: 1575
+							var2 = (var18 << 20) + var19; // L: 1558
+							var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1559
+							var7 += var8; // L: 1560
+							var15 = var7 >> 8; // L: 1561
+							--var17; // L: 1562
 						} while(var17 > 0);
 					}
 
-					var17 = var6 - var5 & 7; // L: 1577
-					if (var17 > 0) { // L: 1578
+					var17 = var6 - var5 & 7; // L: 1564
+					if (var17 > 0) { // L: 1565
 						do {
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1580
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1581
-							var2 += var16; // L: 1582
-							--var17; // L: 1583
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1567
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1568
+							var2 += var16; // L: 1569
+							--var17; // L: 1570
 						} while(var17 > 0);
 					}
 				} else {
-					if (var17 > 0) { // L: 1587
+					if (var17 > 0) { // L: 1574
 						do {
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1589
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1590
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1576
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1577
 							}
 
-							++var4; // L: 1592
-							var2 += var16; // L: 1593
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1594
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1595
+							++var4; // L: 1579
+							var2 += var16; // L: 1580
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1581
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1582
 							}
 
-							++var4; // L: 1597
-							var2 += var16; // L: 1598
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1599
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1600
+							++var4; // L: 1584
+							var2 += var16; // L: 1585
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1586
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1587
 							}
 
-							++var4; // L: 1602
-							var2 += var16; // L: 1603
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1604
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1605
+							++var4; // L: 1589
+							var2 += var16; // L: 1590
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1591
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1592
 							}
 
-							++var4; // L: 1607
-							var2 += var16; // L: 1608
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1609
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1610
+							++var4; // L: 1594
+							var2 += var16; // L: 1595
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1596
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1597
 							}
 
-							++var4; // L: 1612
-							var2 += var16; // L: 1613
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1614
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1615
+							++var4; // L: 1599
+							var2 += var16; // L: 1600
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1601
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1602
 							}
 
-							++var4; // L: 1617
-							var2 += var16; // L: 1618
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1619
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1620
+							++var4; // L: 1604
+							var2 += var16; // L: 1605
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1606
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1607
 							}
 
-							++var4; // L: 1622
-							var2 += var16; // L: 1623
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1624
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1625
+							++var4; // L: 1609
+							var2 += var16; // L: 1610
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1611
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1612
 							}
 
-							++var4; // L: 1627
-							var10000 = var16 + var2; // L: 1628
-							var18 = var20; // L: 1629
-							var19 = var21; // L: 1630
-							var9 += var12; // L: 1631
-							var10 += var13; // L: 1632
-							var11 += var14; // L: 1633
-							var22 = var11 >> 12; // L: 1634
-							if (var22 != 0) { // L: 1635
-								var20 = var9 / var22; // L: 1636
-								var21 = var10 / var22; // L: 1637
-								if (var20 < 0) { // L: 1638
+							++var4; // L: 1614
+							var10000 = var16 + var2; // L: 1615
+							var18 = var20; // L: 1616
+							var19 = var21; // L: 1617
+							var9 += var12; // L: 1618
+							var10 += var13; // L: 1619
+							var11 += var14; // L: 1620
+							var22 = var11 >> 12; // L: 1621
+							if (var22 != 0) { // L: 1622
+								var20 = var9 / var22; // L: 1623
+								var21 = var10 / var22; // L: 1624
+								if (var20 < 0) { // L: 1625
 									var20 = 0;
-								} else if (var20 > 4032) { // L: 1639
+								} else if (var20 > 4032) { // L: 1626
 									var20 = 4032;
 								}
 							} else {
-								var20 = 0; // L: 1642
-								var21 = 0; // L: 1643
+								var20 = 0; // L: 1629
+								var21 = 0; // L: 1630
 							}
 
-							var2 = (var18 << 20) + var19; // L: 1645
-							var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1646
-							var7 += var8; // L: 1647
-							var15 = var7 >> 8; // L: 1648
-							--var17; // L: 1649
+							var2 = (var18 << 20) + var19; // L: 1632
+							var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1633
+							var7 += var8; // L: 1634
+							var15 = var7 >> 8; // L: 1635
+							--var17; // L: 1636
 						} while(var17 > 0);
 					}
 
-					var17 = var6 - var5 & 7; // L: 1651
-					if (var17 > 0) { // L: 1652
+					var17 = var6 - var5 & 7; // L: 1638
+					if (var17 > 0) { // L: 1639
 						do {
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1654
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1655
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1641
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1642
 							}
 
-							++var4; // L: 1657
-							var2 += var16; // L: 1658
-							--var17; // L: 1659
+							++var4; // L: 1644
+							var2 += var16; // L: 1645
+							--var17; // L: 1646
 						} while(var17 > 0);
 					}
 				}
 			} else {
-				var23 = var5 - Rasterizer3D_clipMidX; // L: 1669
-				var9 += var23 * (var12 >> 3); // L: 1670
-				var10 += (var13 >> 3) * var23; // L: 1671
-				var11 += var23 * (var14 >> 3); // L: 1672
-				var22 = var11 >> 14; // L: 1673
-				if (var22 != 0) { // L: 1674
-					var18 = var9 / var22; // L: 1675
-					var19 = var10 / var22; // L: 1676
-					if (var18 < 0) { // L: 1677
+				var23 = var5 - Rasterizer3D_clipMidX; // L: 1656
+				var9 += var23 * (var12 >> 3); // L: 1657
+				var10 += (var13 >> 3) * var23; // L: 1658
+				var11 += var23 * (var14 >> 3); // L: 1659
+				var22 = var11 >> 14; // L: 1660
+				if (var22 != 0) { // L: 1661
+					var18 = var9 / var22; // L: 1662
+					var19 = var10 / var22; // L: 1663
+					if (var18 < 0) { // L: 1664
 						var18 = 0;
-					} else if (var18 > 16256) { // L: 1678
+					} else if (var18 > 16256) { // L: 1665
 						var18 = 16256;
 					}
 				} else {
-					var18 = 0; // L: 1681
-					var19 = 0; // L: 1682
+					var18 = 0; // L: 1668
+					var19 = 0; // L: 1669
 				}
 
-				var9 += var12; // L: 1684
-				var10 += var13; // L: 1685
-				var11 += var14; // L: 1686
-				var22 = var11 >> 14; // L: 1687
-				if (var22 != 0) { // L: 1688
-					var20 = var9 / var22; // L: 1689
-					var21 = var10 / var22; // L: 1690
-					if (var20 < 0) { // L: 1691
+				var9 += var12; // L: 1671
+				var10 += var13; // L: 1672
+				var11 += var14; // L: 1673
+				var22 = var11 >> 14; // L: 1674
+				if (var22 != 0) { // L: 1675
+					var20 = var9 / var22; // L: 1676
+					var21 = var10 / var22; // L: 1677
+					if (var20 < 0) { // L: 1678
 						var20 = 0;
-					} else if (var20 > 16256) { // L: 1692
+					} else if (var20 > 16256) { // L: 1679
 						var20 = 16256;
 					}
 				} else {
-					var20 = 0; // L: 1695
-					var21 = 0; // L: 1696
+					var20 = 0; // L: 1682
+					var21 = 0; // L: 1683
 				}
 
-				var2 = (var18 << 18) + var19; // L: 1698
-				var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1699
-				var17 >>= 3; // L: 1700
-				var8 <<= 3; // L: 1701
-				var15 = var7 >> 8; // L: 1702
-				if (field2344) { // L: 1703
-					if (var17 > 0) { // L: 1704
+				var2 = (var18 << 18) + var19; // L: 1685
+				var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1686
+				var17 >>= 3; // L: 1687
+				var8 <<= 3; // L: 1688
+				var15 = var7 >> 8; // L: 1689
+				if (field2251) { // L: 1690
+					if (var17 > 0) { // L: 1691
 						do {
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1706
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1707
-							var2 += var16; // L: 1708
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1709
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1710
-							var2 += var16; // L: 1711
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1712
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1713
-							var2 += var16; // L: 1714
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1715
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1716
-							var2 += var16; // L: 1717
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1718
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1719
-							var2 += var16; // L: 1720
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1721
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1722
-							var2 += var16; // L: 1723
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1724
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1725
-							var2 += var16; // L: 1726
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1727
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1728
-							var10000 = var16 + var2; // L: 1729
-							var18 = var20; // L: 1730
-							var19 = var21; // L: 1731
-							var9 += var12; // L: 1732
-							var10 += var13; // L: 1733
-							var11 += var14; // L: 1734
-							var22 = var11 >> 14; // L: 1735
-							if (var22 != 0) { // L: 1736
-								var20 = var9 / var22; // L: 1737
-								var21 = var10 / var22; // L: 1738
-								if (var20 < 0) { // L: 1739
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1693
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1694
+							var2 += var16; // L: 1695
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1696
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1697
+							var2 += var16; // L: 1698
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1699
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1700
+							var2 += var16; // L: 1701
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1702
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1703
+							var2 += var16; // L: 1704
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1705
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1706
+							var2 += var16; // L: 1707
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1708
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1709
+							var2 += var16; // L: 1710
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1711
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1712
+							var2 += var16; // L: 1713
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1714
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1715
+							var10000 = var16 + var2; // L: 1716
+							var18 = var20; // L: 1717
+							var19 = var21; // L: 1718
+							var9 += var12; // L: 1719
+							var10 += var13; // L: 1720
+							var11 += var14; // L: 1721
+							var22 = var11 >> 14; // L: 1722
+							if (var22 != 0) { // L: 1723
+								var20 = var9 / var22; // L: 1724
+								var21 = var10 / var22; // L: 1725
+								if (var20 < 0) { // L: 1726
 									var20 = 0;
-								} else if (var20 > 16256) { // L: 1740
+								} else if (var20 > 16256) { // L: 1727
 									var20 = 16256;
 								}
 							} else {
-								var20 = 0; // L: 1743
-								var21 = 0; // L: 1744
+								var20 = 0; // L: 1730
+								var21 = 0; // L: 1731
 							}
 
-							var2 = (var18 << 18) + var19; // L: 1746
-							var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1747
-							var7 += var8; // L: 1748
-							var15 = var7 >> 8; // L: 1749
-							--var17; // L: 1750
+							var2 = (var18 << 18) + var19; // L: 1733
+							var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1734
+							var7 += var8; // L: 1735
+							var15 = var7 >> 8; // L: 1736
+							--var17; // L: 1737
 						} while(var17 > 0);
 					}
 
-					var17 = var6 - var5 & 7; // L: 1752
-					if (var17 > 0) { // L: 1753
+					var17 = var6 - var5 & 7; // L: 1739
+					if (var17 > 0) { // L: 1740
 						do {
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1755
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1756
-							var2 += var16; // L: 1757
-							--var17; // L: 1758
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1742
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1743
+							var2 += var16; // L: 1744
+							--var17; // L: 1745
 						} while(var17 > 0);
 					}
 				} else {
-					if (var17 > 0) { // L: 1762
+					if (var17 > 0) { // L: 1749
 						do {
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1764
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1765
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1751
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1752
 							}
 
-							++var4; // L: 1767
-							var2 += var16; // L: 1768
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1769
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1770
+							++var4; // L: 1754
+							var2 += var16; // L: 1755
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1756
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1757
 							}
 
-							++var4; // L: 1772
-							var2 += var16; // L: 1773
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1774
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1775
+							++var4; // L: 1759
+							var2 += var16; // L: 1760
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1761
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1762
 							}
 
-							++var4; // L: 1777
-							var2 += var16; // L: 1778
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1779
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1780
+							++var4; // L: 1764
+							var2 += var16; // L: 1765
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1766
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1767
 							}
 
-							++var4; // L: 1782
-							var2 += var16; // L: 1783
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1784
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1785
+							++var4; // L: 1769
+							var2 += var16; // L: 1770
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1771
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1772
 							}
 
-							++var4; // L: 1787
-							var2 += var16; // L: 1788
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1789
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1790
+							++var4; // L: 1774
+							var2 += var16; // L: 1775
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1776
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1777
 							}
 
-							++var4; // L: 1792
-							var2 += var16; // L: 1793
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1794
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1795
+							++var4; // L: 1779
+							var2 += var16; // L: 1780
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1781
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1782
 							}
 
-							++var4; // L: 1797
-							var2 += var16; // L: 1798
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1799
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1800
+							++var4; // L: 1784
+							var2 += var16; // L: 1785
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1786
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1787
 							}
 
-							++var4; // L: 1802
-							var10000 = var16 + var2; // L: 1803
-							var18 = var20; // L: 1804
-							var19 = var21; // L: 1805
-							var9 += var12; // L: 1806
-							var10 += var13; // L: 1807
-							var11 += var14; // L: 1808
-							var22 = var11 >> 14; // L: 1809
-							if (var22 != 0) { // L: 1810
-								var20 = var9 / var22; // L: 1811
-								var21 = var10 / var22; // L: 1812
-								if (var20 < 0) { // L: 1813
+							++var4; // L: 1789
+							var10000 = var16 + var2; // L: 1790
+							var18 = var20; // L: 1791
+							var19 = var21; // L: 1792
+							var9 += var12; // L: 1793
+							var10 += var13; // L: 1794
+							var11 += var14; // L: 1795
+							var22 = var11 >> 14; // L: 1796
+							if (var22 != 0) { // L: 1797
+								var20 = var9 / var22; // L: 1798
+								var21 = var10 / var22; // L: 1799
+								if (var20 < 0) { // L: 1800
 									var20 = 0;
-								} else if (var20 > 16256) { // L: 1814
+								} else if (var20 > 16256) { // L: 1801
 									var20 = 16256;
 								}
 							} else {
-								var20 = 0; // L: 1817
-								var21 = 0; // L: 1818
+								var20 = 0; // L: 1804
+								var21 = 0; // L: 1805
 							}
 
-							var2 = (var18 << 18) + var19; // L: 1820
-							var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1821
-							var7 += var8; // L: 1822
-							var15 = var7 >> 8; // L: 1823
-							--var17; // L: 1824
+							var2 = (var18 << 18) + var19; // L: 1807
+							var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1808
+							var7 += var8; // L: 1809
+							var15 = var7 >> 8; // L: 1810
+							--var17; // L: 1811
 						} while(var17 > 0);
 					}
 
-					var17 = var6 - var5 & 7; // L: 1826
-					if (var17 > 0) { // L: 1827
+					var17 = var6 - var5 & 7; // L: 1813
+					if (var17 > 0) { // L: 1814
 						do {
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1829
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1830
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1816
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1817
 							}
 
-							++var4; // L: 1832
-							var2 += var16; // L: 1833
-							--var17; // L: 1834
+							++var4; // L: 1819
+							var2 += var16; // L: 1820
+							--var17; // L: 1821
 						} while(var17 > 0);
 					}
 				}
 			}
 
 		}
-	} // L: 1838
+	} // L: 1825
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("drawTexturedTile")
 	static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
-		int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1841
+		int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1828
 		int var20;
-		if (var19 == null) { // L: 1842
-			var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1843
-			method4211(var0, var1, var2, var3, var4, var5, method4246(var20, var6), method4246(var20, var7), method4246(var20, var8)); // L: 1844
+		if (var19 == null) { // L: 1829
+			var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1830
+			method3854(var0, var1, var2, var3, var4, var5, method3862(var20, var6), method3862(var20, var7), method3862(var20, var8)); // L: 1831
 		} else {
-			Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1847
-			field2344 = Rasterizer3D_textureLoader.vmethod4636(var18); // L: 1848
-			var20 = var4 - var3; // L: 1849
-			int var21 = var1 - var0; // L: 1850
-			int var22 = var5 - var3; // L: 1851
-			int var23 = var2 - var0; // L: 1852
-			int var24 = var7 - var6; // L: 1853
-			int var25 = var8 - var6; // L: 1854
-			int var26 = 0; // L: 1855
-			if (var0 != var1) { // L: 1856
+			Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1834
+			field2251 = Rasterizer3D_textureLoader.vmethod4324(var18); // L: 1835
+			var20 = var4 - var3; // L: 1836
+			int var21 = var1 - var0; // L: 1837
+			int var22 = var5 - var3; // L: 1838
+			int var23 = var2 - var0; // L: 1839
+			int var24 = var7 - var6; // L: 1840
+			int var25 = var8 - var6; // L: 1841
+			int var26 = 0; // L: 1842
+			if (var0 != var1) { // L: 1843
 				var26 = (var4 - var3 << 14) / (var1 - var0);
 			}
 
-			int var27 = 0; // L: 1857
-			if (var2 != var1) { // L: 1858
+			int var27 = 0; // L: 1844
+			if (var2 != var1) { // L: 1845
 				var27 = (var5 - var4 << 14) / (var2 - var1);
 			}
 
-			int var28 = 0; // L: 1859
-			if (var0 != var2) { // L: 1860
+			int var28 = 0; // L: 1846
+			if (var0 != var2) { // L: 1847
 				var28 = (var3 - var5 << 14) / (var0 - var2);
 			}
 
-			int var29 = var20 * var23 - var22 * var21; // L: 1861
-			if (var29 != 0) { // L: 1862
-				int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1863
-				int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1864
-				var10 = var9 - var10; // L: 1865
-				var13 = var12 - var13; // L: 1866
-				var16 = var15 - var16; // L: 1867
-				var11 -= var9; // L: 1868
-				var14 -= var12; // L: 1869
-				var17 -= var15; // L: 1870
-				int var32 = var11 * var12 - var9 * var14 << 14; // L: 1871
-				int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1872
-				int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1873
-				int var35 = var10 * var12 - var13 * var9 << 14; // L: 1874
-				int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1875
-				int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1876
-				int var38 = var13 * var11 - var10 * var14 << 14; // L: 1877
-				int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1878
-				int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1879
+			int var29 = var20 * var23 - var22 * var21; // L: 1848
+			if (var29 != 0) { // L: 1849
+				int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1850
+				int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1851
+				var10 = var9 - var10; // L: 1852
+				var13 = var12 - var13; // L: 1853
+				var16 = var15 - var16; // L: 1854
+				var11 -= var9; // L: 1855
+				var14 -= var12; // L: 1856
+				var17 -= var15; // L: 1857
+				int var32 = var11 * var12 - var9 * var14 << 14; // L: 1858
+				int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1859
+				int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1860
+				int var35 = var10 * var12 - var13 * var9 << 14; // L: 1861
+				int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1862
+				int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1863
+				int var38 = var13 * var11 - var10 * var14 << 14; // L: 1864
+				int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1865
+				int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1866
 				int var41;
-				if (var0 <= var1 && var0 <= var2) { // L: 1880
-					if (var0 < Rasterizer3D_clipHeight) { // L: 1881
-						if (var1 > Rasterizer3D_clipHeight) { // L: 1882
+				if (var0 <= var1 && var0 <= var2) { // L: 1867
+					if (var0 < Rasterizer3D_clipHeight) { // L: 1868
+						if (var1 > Rasterizer3D_clipHeight) { // L: 1869
 							var1 = Rasterizer3D_clipHeight;
 						}
 
-						if (var2 > Rasterizer3D_clipHeight) { // L: 1883
+						if (var2 > Rasterizer3D_clipHeight) { // L: 1870
 							var2 = Rasterizer3D_clipHeight;
 						}
 
-						var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1884
-						if (var1 < var2) { // L: 1885
-							var5 = var3 <<= 14; // L: 1886
-							if (var0 < 0) { // L: 1887
-								var5 -= var0 * var28; // L: 1888
-								var3 -= var0 * var26; // L: 1889
-								var6 -= var0 * var31; // L: 1890
-								var0 = 0; // L: 1891
+						var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1871
+						if (var1 < var2) { // L: 1872
+							var5 = var3 <<= 14; // L: 1873
+							if (var0 < 0) { // L: 1874
+								var5 -= var0 * var28; // L: 1875
+								var3 -= var0 * var26; // L: 1876
+								var6 -= var0 * var31; // L: 1877
+								var0 = 0; // L: 1878
 							}
 
-							var4 <<= 14; // L: 1893
-							if (var1 < 0) { // L: 1894
-								var4 -= var27 * var1; // L: 1895
-								var1 = 0; // L: 1896
+							var4 <<= 14; // L: 1880
+							if (var1 < 0) { // L: 1881
+								var4 -= var27 * var1; // L: 1882
+								var1 = 0; // L: 1883
 							}
 
-							var41 = var0 - Rasterizer3D_clipMidY; // L: 1898
-							var32 += var34 * var41; // L: 1899
-							var35 += var37 * var41; // L: 1900
-							var38 += var40 * var41; // L: 1901
-							if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1902
-								var2 -= var1; // L: 1903
-								var1 -= var0; // L: 1904
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1905
+							var41 = var0 - Rasterizer3D_clipMidY; // L: 1885
+							var32 += var34 * var41; // L: 1886
+							var35 += var37 * var41; // L: 1887
+							var38 += var40 * var41; // L: 1888
+							if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1889
+								var2 -= var1; // L: 1916
+								var1 -= var0; // L: 1917
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1918
 
 								while (true) {
-									--var1; // L: 1906
+									--var1; // L: 1919
 									if (var1 < 0) {
 										while (true) {
-											--var2; // L: 1916
+											--var2; // L: 1929
 											if (var2 < 0) {
-												return; // L: 1926
+												return; // L: 1939
 											}
 
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1917
-											var5 += var28; // L: 1918
-											var4 += var27; // L: 1919
-											var6 += var31; // L: 1920
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1921
-											var32 += var34; // L: 1922
-											var35 += var37; // L: 1923
-											var38 += var40; // L: 1924
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1930
+											var5 += var28; // L: 1931
+											var4 += var27; // L: 1932
+											var6 += var31; // L: 1933
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1934
+											var32 += var34; // L: 1935
+											var35 += var37; // L: 1936
+											var38 += var40; // L: 1937
 										}
 									}
 
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1907
-									var5 += var28; // L: 1908
-									var3 += var26; // L: 1909
-									var6 += var31; // L: 1910
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1911
-									var32 += var34; // L: 1912
-									var35 += var37; // L: 1913
-									var38 += var40; // L: 1914
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1920
+									var5 += var28; // L: 1921
+									var3 += var26; // L: 1922
+									var6 += var31; // L: 1923
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1924
+									var32 += var34; // L: 1925
+									var35 += var37; // L: 1926
+									var38 += var40; // L: 1927
 								}
 							} else {
-								var2 -= var1; // L: 1929
-								var1 -= var0; // L: 1930
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1931
+								var2 -= var1; // L: 1890
+								var1 -= var0; // L: 1891
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1892
 
 								while (true) {
-									--var1; // L: 1932
+									--var1; // L: 1893
 									if (var1 < 0) {
 										while (true) {
-											--var2; // L: 1942
+											--var2; // L: 1903
 											if (var2 < 0) {
-												return; // L: 1952
+												return; // L: 1913
 											}
 
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1943
-											var5 += var28; // L: 1944
-											var4 += var27; // L: 1945
-											var6 += var31; // L: 1946
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1947
-											var32 += var34; // L: 1948
-											var35 += var37; // L: 1949
-											var38 += var40; // L: 1950
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1904
+											var5 += var28; // L: 1905
+											var4 += var27; // L: 1906
+											var6 += var31; // L: 1907
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1908
+											var32 += var34; // L: 1909
+											var35 += var37; // L: 1910
+											var38 += var40; // L: 1911
 										}
 									}
 
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1933
-									var5 += var28; // L: 1934
-									var3 += var26; // L: 1935
-									var6 += var31; // L: 1936
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1937
-									var32 += var34; // L: 1938
-									var35 += var37; // L: 1939
-									var38 += var40; // L: 1940
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1894
+									var5 += var28; // L: 1895
+									var3 += var26; // L: 1896
+									var6 += var31; // L: 1897
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1898
+									var32 += var34; // L: 1899
+									var35 += var37; // L: 1900
+									var38 += var40; // L: 1901
 								}
 							}
 						} else {
-							var4 = var3 <<= 14; // L: 1956
-							if (var0 < 0) { // L: 1957
-								var4 -= var0 * var28; // L: 1958
-								var3 -= var0 * var26; // L: 1959
-								var6 -= var0 * var31; // L: 1960
-								var0 = 0; // L: 1961
+							var4 = var3 <<= 14; // L: 1943
+							if (var0 < 0) { // L: 1944
+								var4 -= var0 * var28; // L: 1945
+								var3 -= var0 * var26; // L: 1946
+								var6 -= var0 * var31; // L: 1947
+								var0 = 0; // L: 1948
 							}
 
-							var5 <<= 14; // L: 1963
-							if (var2 < 0) { // L: 1964
-								var5 -= var27 * var2; // L: 1965
-								var2 = 0; // L: 1966
+							var5 <<= 14; // L: 1950
+							if (var2 < 0) { // L: 1951
+								var5 -= var27 * var2; // L: 1952
+								var2 = 0; // L: 1953
 							}
 
-							var41 = var0 - Rasterizer3D_clipMidY; // L: 1968
-							var32 += var34 * var41; // L: 1969
-							var35 += var37 * var41; // L: 1970
-							var38 += var40 * var41; // L: 1971
-							if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1972
-								var1 -= var2; // L: 1973
-								var2 -= var0; // L: 1974
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1975
+							var41 = var0 - Rasterizer3D_clipMidY; // L: 1955
+							var32 += var34 * var41; // L: 1956
+							var35 += var37 * var41; // L: 1957
+							var38 += var40 * var41; // L: 1958
+							if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1959
+								var1 -= var2; // L: 1986
+								var2 -= var0; // L: 1987
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1988
 
 								while (true) {
-									--var2; // L: 1976
+									--var2; // L: 1989
 									if (var2 < 0) {
 										while (true) {
-											--var1; // L: 1986
+											--var1; // L: 1999
 											if (var1 < 0) {
-												return; // L: 1996
+												return; // L: 2009
 											}
 
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1987
-											var5 += var27; // L: 1988
-											var3 += var26; // L: 1989
-											var6 += var31; // L: 1990
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1991
-											var32 += var34; // L: 1992
-											var35 += var37; // L: 1993
-											var38 += var40; // L: 1994
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2000
+											var5 += var27; // L: 2001
+											var3 += var26; // L: 2002
+											var6 += var31; // L: 2003
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 2004
+											var32 += var34; // L: 2005
+											var35 += var37; // L: 2006
+											var38 += var40; // L: 2007
 										}
 									}
 
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1977
-									var4 += var28; // L: 1978
-									var3 += var26; // L: 1979
-									var6 += var31; // L: 1980
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1981
-									var32 += var34; // L: 1982
-									var35 += var37; // L: 1983
-									var38 += var40; // L: 1984
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1990
+									var4 += var28; // L: 1991
+									var3 += var26; // L: 1992
+									var6 += var31; // L: 1993
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1994
+									var32 += var34; // L: 1995
+									var35 += var37; // L: 1996
+									var38 += var40; // L: 1997
 								}
 							} else {
-								var1 -= var2; // L: 1999
-								var2 -= var0; // L: 2000
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 2001
+								var1 -= var2; // L: 1960
+								var2 -= var0; // L: 1961
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1962
 
 								while (true) {
-									--var2; // L: 2002
+									--var2; // L: 1963
 									if (var2 < 0) {
 										while (true) {
-											--var1; // L: 2012
+											--var1; // L: 1973
 											if (var1 < 0) {
-												return; // L: 2022
+												return; // L: 1983
 											}
 
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2013
-											var5 += var27; // L: 2014
-											var3 += var26; // L: 2015
-											var6 += var31; // L: 2016
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 2017
-											var32 += var34; // L: 2018
-											var35 += var37; // L: 2019
-											var38 += var40; // L: 2020
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1974
+											var5 += var27; // L: 1975
+											var3 += var26; // L: 1976
+											var6 += var31; // L: 1977
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1978
+											var32 += var34; // L: 1979
+											var35 += var37; // L: 1980
+											var38 += var40; // L: 1981
 										}
 									}
 
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2003
-									var4 += var28; // L: 2004
-									var3 += var26; // L: 2005
-									var6 += var31; // L: 2006
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 2007
-									var32 += var34; // L: 2008
-									var35 += var37; // L: 2009
-									var38 += var40; // L: 2010
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1964
+									var4 += var28; // L: 1965
+									var3 += var26; // L: 1966
+									var6 += var31; // L: 1967
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1968
+									var32 += var34; // L: 1969
+									var35 += var37; // L: 1970
+									var38 += var40; // L: 1971
 								}
 							}
 						}
 					}
-				} else if (var1 <= var2) { // L: 2026
-					if (var1 < Rasterizer3D_clipHeight) { // L: 2027
-						if (var2 > Rasterizer3D_clipHeight) { // L: 2028
+				} else if (var1 <= var2) { // L: 2013
+					if (var1 < Rasterizer3D_clipHeight) { // L: 2014
+						if (var2 > Rasterizer3D_clipHeight) { // L: 2015
 							var2 = Rasterizer3D_clipHeight;
 						}
 
-						if (var0 > Rasterizer3D_clipHeight) { // L: 2029
+						if (var0 > Rasterizer3D_clipHeight) { // L: 2016
 							var0 = Rasterizer3D_clipHeight;
 						}
 
-						var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2030
-						if (var2 < var0) { // L: 2031
-							var3 = var4 <<= 14; // L: 2032
-							if (var1 < 0) { // L: 2033
-								var3 -= var26 * var1; // L: 2034
-								var4 -= var27 * var1; // L: 2035
-								var7 -= var31 * var1; // L: 2036
-								var1 = 0; // L: 2037
+						var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2017
+						if (var2 < var0) { // L: 2018
+							var3 = var4 <<= 14; // L: 2019
+							if (var1 < 0) { // L: 2020
+								var3 -= var26 * var1; // L: 2021
+								var4 -= var27 * var1; // L: 2022
+								var7 -= var31 * var1; // L: 2023
+								var1 = 0; // L: 2024
 							}
 
-							var5 <<= 14; // L: 2039
-							if (var2 < 0) { // L: 2040
-								var5 -= var28 * var2; // L: 2041
-								var2 = 0; // L: 2042
+							var5 <<= 14; // L: 2026
+							if (var2 < 0) { // L: 2027
+								var5 -= var28 * var2; // L: 2028
+								var2 = 0; // L: 2029
 							}
 
-							var41 = var1 - Rasterizer3D_clipMidY; // L: 2044
-							var32 += var34 * var41; // L: 2045
-							var35 += var37 * var41; // L: 2046
-							var38 += var40 * var41; // L: 2047
-							if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2048
-								var0 -= var2; // L: 2075
-								var2 -= var1; // L: 2076
-								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2077
+							var41 = var1 - Rasterizer3D_clipMidY; // L: 2031
+							var32 += var34 * var41; // L: 2032
+							var35 += var37 * var41; // L: 2033
+							var38 += var40 * var41; // L: 2034
+							if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 2035
+								var0 -= var2; // L: 2036
+								var2 -= var1; // L: 2037
+								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2038
 
 								while (true) {
-									--var2; // L: 2078
+									--var2; // L: 2039
 									if (var2 < 0) {
 										while (true) {
-											--var0; // L: 2088
+											--var0; // L: 2049
 											if (var0 < 0) {
-												return; // L: 2098
+												return; // L: 2059
 											}
 
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2089
-											var3 += var26; // L: 2090
-											var5 += var28; // L: 2091
-											var7 += var31; // L: 2092
-											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2093
-											var32 += var34; // L: 2094
-											var35 += var37; // L: 2095
-											var38 += var40; // L: 2096
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2050
+											var3 += var26; // L: 2051
+											var5 += var28; // L: 2052
+											var7 += var31; // L: 2053
+											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2054
+											var32 += var34; // L: 2055
+											var35 += var37; // L: 2056
+											var38 += var40; // L: 2057
 										}
 									}
 
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2079
-									var3 += var26; // L: 2080
-									var4 += var27; // L: 2081
-									var7 += var31; // L: 2082
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2083
-									var32 += var34; // L: 2084
-									var35 += var37; // L: 2085
-									var38 += var40; // L: 2086
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2040
+									var3 += var26; // L: 2041
+									var4 += var27; // L: 2042
+									var7 += var31; // L: 2043
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2044
+									var32 += var34; // L: 2045
+									var35 += var37; // L: 2046
+									var38 += var40; // L: 2047
 								}
 							} else {
-								var0 -= var2; // L: 2049
-								var2 -= var1; // L: 2050
-								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2051
+								var0 -= var2; // L: 2062
+								var2 -= var1; // L: 2063
+								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2064
 
 								while (true) {
-									--var2; // L: 2052
+									--var2; // L: 2065
 									if (var2 < 0) {
 										while (true) {
-											--var0; // L: 2062
+											--var0; // L: 2075
 											if (var0 < 0) {
-												return; // L: 2072
+												return; // L: 2085
 											}
 
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2063
-											var3 += var26; // L: 2064
-											var5 += var28; // L: 2065
-											var7 += var31; // L: 2066
-											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2067
-											var32 += var34; // L: 2068
-											var35 += var37; // L: 2069
-											var38 += var40; // L: 2070
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2076
+											var3 += var26; // L: 2077
+											var5 += var28; // L: 2078
+											var7 += var31; // L: 2079
+											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2080
+											var32 += var34; // L: 2081
+											var35 += var37; // L: 2082
+											var38 += var40; // L: 2083
 										}
 									}
 
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2053
-									var3 += var26; // L: 2054
-									var4 += var27; // L: 2055
-									var7 += var31; // L: 2056
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2057
-									var32 += var34; // L: 2058
-									var35 += var37; // L: 2059
-									var38 += var40; // L: 2060
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2066
+									var3 += var26; // L: 2067
+									var4 += var27; // L: 2068
+									var7 += var31; // L: 2069
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2070
+									var32 += var34; // L: 2071
+									var35 += var37; // L: 2072
+									var38 += var40; // L: 2073
 								}
 							}
 						} else {
-							var5 = var4 <<= 14; // L: 2102
-							if (var1 < 0) { // L: 2103
-								var5 -= var26 * var1; // L: 2104
-								var4 -= var27 * var1; // L: 2105
-								var7 -= var31 * var1; // L: 2106
-								var1 = 0; // L: 2107
+							var5 = var4 <<= 14; // L: 2089
+							if (var1 < 0) { // L: 2090
+								var5 -= var26 * var1; // L: 2091
+								var4 -= var27 * var1; // L: 2092
+								var7 -= var31 * var1; // L: 2093
+								var1 = 0; // L: 2094
 							}
 
-							var3 <<= 14; // L: 2109
-							if (var0 < 0) { // L: 2110
-								var3 -= var0 * var28; // L: 2111
-								var0 = 0; // L: 2112
+							var3 <<= 14; // L: 2096
+							if (var0 < 0) { // L: 2097
+								var3 -= var0 * var28; // L: 2098
+								var0 = 0; // L: 2099
 							}
 
-							var41 = var1 - Rasterizer3D_clipMidY; // L: 2114
-							var32 += var34 * var41; // L: 2115
-							var35 += var37 * var41; // L: 2116
-							var38 += var40 * var41; // L: 2117
-							if (var26 < var27) { // L: 2118
-								var2 -= var0; // L: 2119
-								var0 -= var1; // L: 2120
-								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2121
+							var41 = var1 - Rasterizer3D_clipMidY; // L: 2101
+							var32 += var34 * var41; // L: 2102
+							var35 += var37 * var41; // L: 2103
+							var38 += var40 * var41; // L: 2104
+							if (var26 < var27) { // L: 2105
+								var2 -= var0; // L: 2106
+								var0 -= var1; // L: 2107
+								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2108
 
 								while (true) {
-									--var0; // L: 2122
+									--var0; // L: 2109
 									if (var0 < 0) {
 										while (true) {
-											--var2; // L: 2132
+											--var2; // L: 2119
 											if (var2 < 0) {
-												return; // L: 2142
+												return; // L: 2129
 											}
 
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2133
-											var3 += var28; // L: 2134
-											var4 += var27; // L: 2135
-											var7 += var31; // L: 2136
-											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2137
-											var32 += var34; // L: 2138
-											var35 += var37; // L: 2139
-											var38 += var40; // L: 2140
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2120
+											var3 += var28; // L: 2121
+											var4 += var27; // L: 2122
+											var7 += var31; // L: 2123
+											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2124
+											var32 += var34; // L: 2125
+											var35 += var37; // L: 2126
+											var38 += var40; // L: 2127
 										}
 									}
 
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2123
-									var5 += var26; // L: 2124
-									var4 += var27; // L: 2125
-									var7 += var31; // L: 2126
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2127
-									var32 += var34; // L: 2128
-									var35 += var37; // L: 2129
-									var38 += var40; // L: 2130
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2110
+									var5 += var26; // L: 2111
+									var4 += var27; // L: 2112
+									var7 += var31; // L: 2113
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2114
+									var32 += var34; // L: 2115
+									var35 += var37; // L: 2116
+									var38 += var40; // L: 2117
 								}
 							} else {
-								var2 -= var0; // L: 2145
-								var0 -= var1; // L: 2146
-								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2147
+								var2 -= var0; // L: 2132
+								var0 -= var1; // L: 2133
+								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2134
 
 								while (true) {
-									--var0; // L: 2148
+									--var0; // L: 2135
 									if (var0 < 0) {
 										while (true) {
-											--var2; // L: 2158
+											--var2; // L: 2145
 											if (var2 < 0) {
-												return; // L: 2168
+												return; // L: 2155
 											}
 
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2159
-											var3 += var28; // L: 2160
-											var4 += var27; // L: 2161
-											var7 += var31; // L: 2162
-											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2163
-											var32 += var34; // L: 2164
-											var35 += var37; // L: 2165
-											var38 += var40; // L: 2166
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2146
+											var3 += var28; // L: 2147
+											var4 += var27; // L: 2148
+											var7 += var31; // L: 2149
+											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2150
+											var32 += var34; // L: 2151
+											var35 += var37; // L: 2152
+											var38 += var40; // L: 2153
 										}
 									}
 
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2149
-									var5 += var26; // L: 2150
-									var4 += var27; // L: 2151
-									var7 += var31; // L: 2152
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2153
-									var32 += var34; // L: 2154
-									var35 += var37; // L: 2155
-									var38 += var40; // L: 2156
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2136
+									var5 += var26; // L: 2137
+									var4 += var27; // L: 2138
+									var7 += var31; // L: 2139
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2140
+									var32 += var34; // L: 2141
+									var35 += var37; // L: 2142
+									var38 += var40; // L: 2143
 								}
 							}
 						}
 					}
-				} else if (var2 < Rasterizer3D_clipHeight) { // L: 2173
-					if (var0 > Rasterizer3D_clipHeight) { // L: 2174
+				} else if (var2 < Rasterizer3D_clipHeight) { // L: 2160
+					if (var0 > Rasterizer3D_clipHeight) { // L: 2161
 						var0 = Rasterizer3D_clipHeight;
 					}
 
-					if (var1 > Rasterizer3D_clipHeight) { // L: 2175
+					if (var1 > Rasterizer3D_clipHeight) { // L: 2162
 						var1 = Rasterizer3D_clipHeight;
 					}
 
-					var8 = (var8 << 9) - var5 * var30 + var30; // L: 2176
-					if (var0 < var1) { // L: 2177
-						var4 = var5 <<= 14; // L: 2178
-						if (var2 < 0) { // L: 2179
-							var4 -= var27 * var2; // L: 2180
-							var5 -= var28 * var2; // L: 2181
-							var8 -= var31 * var2; // L: 2182
-							var2 = 0; // L: 2183
+					var8 = (var8 << 9) - var5 * var30 + var30; // L: 2163
+					if (var0 < var1) { // L: 2164
+						var4 = var5 <<= 14; // L: 2165
+						if (var2 < 0) { // L: 2166
+							var4 -= var27 * var2; // L: 2167
+							var5 -= var28 * var2; // L: 2168
+							var8 -= var31 * var2; // L: 2169
+							var2 = 0; // L: 2170
 						}
 
-						var3 <<= 14; // L: 2185
-						if (var0 < 0) { // L: 2186
-							var3 -= var0 * var26; // L: 2187
-							var0 = 0; // L: 2188
+						var3 <<= 14; // L: 2172
+						if (var0 < 0) { // L: 2173
+							var3 -= var0 * var26; // L: 2174
+							var0 = 0; // L: 2175
 						}
 
-						var41 = var2 - Rasterizer3D_clipMidY; // L: 2190
-						var32 += var34 * var41; // L: 2191
-						var35 += var37 * var41; // L: 2192
-						var38 += var40 * var41; // L: 2193
-						if (var27 < var28) { // L: 2194
-							var1 -= var0; // L: 2195
-							var0 -= var2; // L: 2196
-							var2 = Rasterizer3D_rowOffsets[var2]; // L: 2197
+						var41 = var2 - Rasterizer3D_clipMidY; // L: 2177
+						var32 += var34 * var41; // L: 2178
+						var35 += var37 * var41; // L: 2179
+						var38 += var40 * var41; // L: 2180
+						if (var27 < var28) { // L: 2181
+							var1 -= var0; // L: 2182
+							var0 -= var2; // L: 2183
+							var2 = Rasterizer3D_rowOffsets[var2]; // L: 2184
 
 							while (true) {
-								--var0; // L: 2198
+								--var0; // L: 2185
 								if (var0 < 0) {
 									while (true) {
-										--var1; // L: 2208
+										--var1; // L: 2195
 										if (var1 < 0) {
-											return; // L: 2218
+											return; // L: 2205
 										}
 
-										Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2209
-										var4 += var27; // L: 2210
-										var3 += var26; // L: 2211
-										var8 += var31; // L: 2212
-										var2 += Rasterizer2D.Rasterizer2D_width; // L: 2213
-										var32 += var34; // L: 2214
-										var35 += var37; // L: 2215
-										var38 += var40; // L: 2216
+										Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2196
+										var4 += var27; // L: 2197
+										var3 += var26; // L: 2198
+										var8 += var31; // L: 2199
+										var2 += Rasterizer2D.Rasterizer2D_width; // L: 2200
+										var32 += var34; // L: 2201
+										var35 += var37; // L: 2202
+										var38 += var40; // L: 2203
 									}
 								}
 
-								Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2199
-								var4 += var27; // L: 2200
-								var5 += var28; // L: 2201
-								var8 += var31; // L: 2202
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 2203
-								var32 += var34; // L: 2204
-								var35 += var37; // L: 2205
-								var38 += var40; // L: 2206
+								Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2186
+								var4 += var27; // L: 2187
+								var5 += var28; // L: 2188
+								var8 += var31; // L: 2189
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 2190
+								var32 += var34; // L: 2191
+								var35 += var37; // L: 2192
+								var38 += var40; // L: 2193
 							}
 						} else {
-							var1 -= var0; // L: 2221
-							var0 -= var2; // L: 2222
-							var2 = Rasterizer3D_rowOffsets[var2]; // L: 2223
+							var1 -= var0; // L: 2208
+							var0 -= var2; // L: 2209
+							var2 = Rasterizer3D_rowOffsets[var2]; // L: 2210
 
 							while (true) {
-								--var0; // L: 2224
+								--var0; // L: 2211
 								if (var0 < 0) {
 									while (true) {
-										--var1; // L: 2234
+										--var1; // L: 2221
 										if (var1 < 0) {
-											return; // L: 2244
+											return; // L: 2231
 										}
 
-										Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2235
-										var4 += var27; // L: 2236
-										var3 += var26; // L: 2237
-										var8 += var31; // L: 2238
-										var2 += Rasterizer2D.Rasterizer2D_width; // L: 2239
-										var32 += var34; // L: 2240
-										var35 += var37; // L: 2241
-										var38 += var40; // L: 2242
+										Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2222
+										var4 += var27; // L: 2223
+										var3 += var26; // L: 2224
+										var8 += var31; // L: 2225
+										var2 += Rasterizer2D.Rasterizer2D_width; // L: 2226
+										var32 += var34; // L: 2227
+										var35 += var37; // L: 2228
+										var38 += var40; // L: 2229
 									}
 								}
 
-								Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2225
-								var4 += var27; // L: 2226
-								var5 += var28; // L: 2227
-								var8 += var31; // L: 2228
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 2229
-								var32 += var34; // L: 2230
-								var35 += var37; // L: 2231
-								var38 += var40; // L: 2232
+								Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2212
+								var4 += var27; // L: 2213
+								var5 += var28; // L: 2214
+								var8 += var31; // L: 2215
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 2216
+								var32 += var34; // L: 2217
+								var35 += var37; // L: 2218
+								var38 += var40; // L: 2219
 							}
 						}
 					} else {
-						var3 = var5 <<= 14; // L: 2248
-						if (var2 < 0) { // L: 2249
-							var3 -= var27 * var2; // L: 2250
-							var5 -= var28 * var2; // L: 2251
-							var8 -= var31 * var2; // L: 2252
-							var2 = 0; // L: 2253
+						var3 = var5 <<= 14; // L: 2235
+						if (var2 < 0) { // L: 2236
+							var3 -= var27 * var2; // L: 2237
+							var5 -= var28 * var2; // L: 2238
+							var8 -= var31 * var2; // L: 2239
+							var2 = 0; // L: 2240
 						}
 
-						var4 <<= 14; // L: 2255
-						if (var1 < 0) { // L: 2256
-							var4 -= var26 * var1; // L: 2257
-							var1 = 0; // L: 2258
+						var4 <<= 14; // L: 2242
+						if (var1 < 0) { // L: 2243
+							var4 -= var26 * var1; // L: 2244
+							var1 = 0; // L: 2245
 						}
 
-						var41 = var2 - Rasterizer3D_clipMidY; // L: 2260
-						var32 += var34 * var41; // L: 2261
-						var35 += var37 * var41; // L: 2262
-						var38 += var40 * var41; // L: 2263
-						if (var27 < var28) { // L: 2264
-							var0 -= var1; // L: 2265
-							var1 -= var2; // L: 2266
-							var2 = Rasterizer3D_rowOffsets[var2]; // L: 2267
+						var41 = var2 - Rasterizer3D_clipMidY; // L: 2247
+						var32 += var34 * var41; // L: 2248
+						var35 += var37 * var41; // L: 2249
+						var38 += var40 * var41; // L: 2250
+						if (var27 < var28) { // L: 2251
+							var0 -= var1; // L: 2252
+							var1 -= var2; // L: 2253
+							var2 = Rasterizer3D_rowOffsets[var2]; // L: 2254
 
 							while (true) {
-								--var1; // L: 2268
+								--var1; // L: 2255
 								if (var1 < 0) {
 									while (true) {
-										--var0; // L: 2278
+										--var0; // L: 2265
 										if (var0 < 0) {
-											return; // L: 2288
+											return; // L: 2275
 										}
 
-										Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2279
-										var4 += var26; // L: 2280
-										var5 += var28; // L: 2281
-										var8 += var31; // L: 2282
-										var2 += Rasterizer2D.Rasterizer2D_width; // L: 2283
-										var32 += var34; // L: 2284
-										var35 += var37; // L: 2285
-										var38 += var40; // L: 2286
+										Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2266
+										var4 += var26; // L: 2267
+										var5 += var28; // L: 2268
+										var8 += var31; // L: 2269
+										var2 += Rasterizer2D.Rasterizer2D_width; // L: 2270
+										var32 += var34; // L: 2271
+										var35 += var37; // L: 2272
+										var38 += var40; // L: 2273
 									}
 								}
 
-								Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2269
-								var3 += var27; // L: 2270
-								var5 += var28; // L: 2271
-								var8 += var31; // L: 2272
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 2273
-								var32 += var34; // L: 2274
-								var35 += var37; // L: 2275
-								var38 += var40; // L: 2276
+								Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2256
+								var3 += var27; // L: 2257
+								var5 += var28; // L: 2258
+								var8 += var31; // L: 2259
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 2260
+								var32 += var34; // L: 2261
+								var35 += var37; // L: 2262
+								var38 += var40; // L: 2263
 							}
 						} else {
-							var0 -= var1; // L: 2291
-							var1 -= var2; // L: 2292
-							var2 = Rasterizer3D_rowOffsets[var2]; // L: 2293
+							var0 -= var1; // L: 2278
+							var1 -= var2; // L: 2279
+							var2 = Rasterizer3D_rowOffsets[var2]; // L: 2280
 
 							while (true) {
-								--var1; // L: 2294
+								--var1; // L: 2281
 								if (var1 < 0) {
 									while (true) {
-										--var0; // L: 2304
+										--var0; // L: 2291
 										if (var0 < 0) {
-											return; // L: 2314
+											return; // L: 2301
 										}
 
-										Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2305
-										var4 += var26; // L: 2306
-										var5 += var28; // L: 2307
-										var8 += var31; // L: 2308
-										var2 += Rasterizer2D.Rasterizer2D_width; // L: 2309
-										var32 += var34; // L: 2310
-										var35 += var37; // L: 2311
-										var38 += var40; // L: 2312
+										Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2292
+										var4 += var26; // L: 2293
+										var5 += var28; // L: 2294
+										var8 += var31; // L: 2295
+										var2 += Rasterizer2D.Rasterizer2D_width; // L: 2296
+										var32 += var34; // L: 2297
+										var35 += var37; // L: 2298
+										var38 += var40; // L: 2299
 									}
 								}
 
-								Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2295
-								var3 += var27; // L: 2296
-								var5 += var28; // L: 2297
-								var8 += var31; // L: 2298
-								var2 += Rasterizer2D.Rasterizer2D_width; // L: 2299
-								var32 += var34; // L: 2300
-								var35 += var37; // L: 2301
-								var38 += var40; // L: 2302
+								Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2282
+								var3 += var27; // L: 2283
+								var5 += var28; // L: 2284
+								var8 += var31; // L: 2285
+								var2 += Rasterizer2D.Rasterizer2D_width; // L: 2286
+								var32 += var34; // L: 2287
+								var35 += var37; // L: 2288
+								var38 += var40; // L: 2289
 							}
 						}
 					}
 				}
 			}
 		}
-	} // L: 1845
+	} // L: 1832
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("Rasterizer3D_textureAlpha")
 	static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) {
-		if (field2365) { // L: 2323
-			if (var6 > Rasterizer3D_clipWidth) { // L: 2324
+		if (field2253) { // L: 2310
+			if (var6 > Rasterizer3D_clipWidth) { // L: 2311
 				var6 = Rasterizer3D_clipWidth;
 			}
 
-			if (var5 < 0) { // L: 2325
+			if (var5 < 0) { // L: 2312
 				var5 = 0;
 			}
 		}
 
-		if (var5 < var6) { // L: 2327
-			var4 += var5; // L: 2328
-			var7 += var5 * var8; // L: 2329
-			int var17 = var6 - var5; // L: 2330
+		if (var5 < var6) { // L: 2314
+			var4 += var5; // L: 2315
+			var7 += var5 * var8; // L: 2316
+			int var17 = var6 - var5; // L: 2317
 			int var15;
 			int var16;
 			int var18;
@@ -3127,336 +3117,336 @@ static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, in
 			int var21;
 			int var22;
 			int var23;
-			if (Rasterizer3D_isLowDetailTexture) { // L: 2331
-				var23 = var5 - Rasterizer3D_clipMidX; // L: 2338
-				var9 += var23 * var12; // L: 2339
-				var10 += var13 * var23; // L: 2340
-				var11 += var23 * var14; // L: 2341
-				var22 = var11 >> 12; // L: 2342
-				if (var22 != 0) { // L: 2343
-					var18 = var9 / var22; // L: 2344
-					var19 = var10 / var22; // L: 2345
+			if (Rasterizer3D_isLowDetailTexture) { // L: 2318
+				var23 = var5 - Rasterizer3D_clipMidX; // L: 2325
+				var9 += var23 * var12; // L: 2326
+				var10 += var13 * var23; // L: 2327
+				var11 += var23 * var14; // L: 2328
+				var22 = var11 >> 12; // L: 2329
+				if (var22 != 0) { // L: 2330
+					var18 = var9 / var22; // L: 2331
+					var19 = var10 / var22; // L: 2332
 				} else {
-					var18 = 0; // L: 2348
-					var19 = 0; // L: 2349
+					var18 = 0; // L: 2335
+					var19 = 0; // L: 2336
 				}
 
-				var9 += var17 * var12; // L: 2351
-				var10 += var13 * var17; // L: 2352
-				var11 += var17 * var14; // L: 2353
-				var22 = var11 >> 12; // L: 2354
-				if (var22 != 0) { // L: 2355
-					var20 = var9 / var22; // L: 2356
-					var21 = var10 / var22; // L: 2357
+				var9 += var17 * var12; // L: 2338
+				var10 += var13 * var17; // L: 2339
+				var11 += var17 * var14; // L: 2340
+				var22 = var11 >> 12; // L: 2341
+				if (var22 != 0) { // L: 2342
+					var20 = var9 / var22; // L: 2343
+					var21 = var10 / var22; // L: 2344
 				} else {
-					var20 = 0; // L: 2360
-					var21 = 0; // L: 2361
+					var20 = 0; // L: 2347
+					var21 = 0; // L: 2348
 				}
 
-				var2 = (var18 << 20) + var19; // L: 2363
-				var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2364
-				var17 >>= 3; // L: 2365
-				var8 <<= 3; // L: 2366
-				var15 = var7 >> 8; // L: 2367
-				if (field2344) { // L: 2369
-					if (var17 > 0) { // L: 2370
+				var2 = (var18 << 20) + var19; // L: 2350
+				var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2351
+				var17 >>= 3; // L: 2352
+				var8 <<= 3; // L: 2353
+				var15 = var7 >> 8; // L: 2354
+				if (field2251) { // L: 2356
+					if (var17 > 0) { // L: 2357
 						do {
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2372
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2373
-							var2 += var16; // L: 2374
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2375
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2376
-							var2 += var16; // L: 2377
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2378
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2379
-							var2 += var16; // L: 2380
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2381
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2382
-							var2 += var16; // L: 2383
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2384
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2385
-							var2 += var16; // L: 2386
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2387
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2388
-							var2 += var16; // L: 2389
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2390
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2391
-							var2 += var16; // L: 2392
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2393
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2394
-							var2 += var16; // L: 2395
-							var7 += var8; // L: 2396
-							var15 = var7 >> 8; // L: 2397
-							--var17; // L: 2398
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2359
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2360
+							var2 += var16; // L: 2361
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2362
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2363
+							var2 += var16; // L: 2364
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2365
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2366
+							var2 += var16; // L: 2367
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2368
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2369
+							var2 += var16; // L: 2370
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2371
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2372
+							var2 += var16; // L: 2373
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2374
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2375
+							var2 += var16; // L: 2376
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2377
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2378
+							var2 += var16; // L: 2379
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2380
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2381
+							var2 += var16; // L: 2382
+							var7 += var8; // L: 2383
+							var15 = var7 >> 8; // L: 2384
+							--var17; // L: 2385
 						} while(var17 > 0);
 					}
 
-					var17 = var6 - var5 & 7; // L: 2400
-					if (var17 > 0) { // L: 2401
+					var17 = var6 - var5 & 7; // L: 2387
+					if (var17 > 0) { // L: 2388
 						do {
-							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2403
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2404
-							var2 += var16; // L: 2405
-							--var17; // L: 2406
+							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2390
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2391
+							var2 += var16; // L: 2392
+							--var17; // L: 2393
 						} while(var17 > 0);
 					}
 				} else {
-					if (var17 > 0) { // L: 2410
+					if (var17 > 0) { // L: 2397
 						do {
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2412
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2413
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2399
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2400
 							}
 
-							++var4; // L: 2415
-							var2 += var16; // L: 2416
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2417
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2418
+							++var4; // L: 2402
+							var2 += var16; // L: 2403
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2404
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2405
 							}
 
-							++var4; // L: 2420
-							var2 += var16; // L: 2421
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2422
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2423
+							++var4; // L: 2407
+							var2 += var16; // L: 2408
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2409
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2410
 							}
 
-							++var4; // L: 2425
-							var2 += var16; // L: 2426
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2427
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2428
+							++var4; // L: 2412
+							var2 += var16; // L: 2413
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2414
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2415
 							}
 
-							++var4; // L: 2430
-							var2 += var16; // L: 2431
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2432
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2433
+							++var4; // L: 2417
+							var2 += var16; // L: 2418
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2419
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2420
 							}
 
-							++var4; // L: 2435
-							var2 += var16; // L: 2436
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2437
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2438
+							++var4; // L: 2422
+							var2 += var16; // L: 2423
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2424
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2425
 							}
 
-							++var4; // L: 2440
-							var2 += var16; // L: 2441
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2442
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2443
+							++var4; // L: 2427
+							var2 += var16; // L: 2428
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2429
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2430
 							}
 
-							++var4; // L: 2445
-							var2 += var16; // L: 2446
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2447
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2448
+							++var4; // L: 2432
+							var2 += var16; // L: 2433
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2434
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2435
 							}
 
-							++var4; // L: 2450
-							var2 += var16; // L: 2451
-							var7 += var8; // L: 2452
-							var15 = var7 >> 8; // L: 2453
-							--var17; // L: 2454
+							++var4; // L: 2437
+							var2 += var16; // L: 2438
+							var7 += var8; // L: 2439
+							var15 = var7 >> 8; // L: 2440
+							--var17; // L: 2441
 						} while(var17 > 0);
 					}
 
-					var17 = var6 - var5 & 7; // L: 2456
-					if (var17 > 0) { // L: 2457
+					var17 = var6 - var5 & 7; // L: 2443
+					if (var17 > 0) { // L: 2444
 						do {
-							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2459
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2460
+							if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2446
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2447
 							}
 
-							++var4; // L: 2462
-							var2 += var16; // L: 2463
-							--var17; // L: 2464
+							++var4; // L: 2449
+							var2 += var16; // L: 2450
+							--var17; // L: 2451
 						} while(var17 > 0);
 					}
 				}
 			} else {
-				var23 = var5 - Rasterizer3D_clipMidX; // L: 2475
-				var9 += var23 * var12; // L: 2476
-				var10 += var13 * var23; // L: 2477
-				var11 += var23 * var14; // L: 2478
-				var22 = var11 >> 14; // L: 2479
-				if (var22 != 0) { // L: 2480
-					var18 = var9 / var22; // L: 2481
-					var19 = var10 / var22; // L: 2482
+				var23 = var5 - Rasterizer3D_clipMidX; // L: 2462
+				var9 += var23 * var12; // L: 2463
+				var10 += var13 * var23; // L: 2464
+				var11 += var23 * var14; // L: 2465
+				var22 = var11 >> 14; // L: 2466
+				if (var22 != 0) { // L: 2467
+					var18 = var9 / var22; // L: 2468
+					var19 = var10 / var22; // L: 2469
 				} else {
-					var18 = 0; // L: 2485
-					var19 = 0; // L: 2486
+					var18 = 0; // L: 2472
+					var19 = 0; // L: 2473
 				}
 
-				var9 += var17 * var12; // L: 2488
-				var10 += var13 * var17; // L: 2489
-				var11 += var17 * var14; // L: 2490
-				var22 = var11 >> 14; // L: 2491
-				if (var22 != 0) { // L: 2492
-					var20 = var9 / var22; // L: 2493
-					var21 = var10 / var22; // L: 2494
+				var9 += var17 * var12; // L: 2475
+				var10 += var13 * var17; // L: 2476
+				var11 += var17 * var14; // L: 2477
+				var22 = var11 >> 14; // L: 2478
+				if (var22 != 0) { // L: 2479
+					var20 = var9 / var22; // L: 2480
+					var21 = var10 / var22; // L: 2481
 				} else {
-					var20 = 0; // L: 2497
-					var21 = 0; // L: 2498
+					var20 = 0; // L: 2484
+					var21 = 0; // L: 2485
 				}
 
-				var2 = (var18 << 18) + var19; // L: 2500
-				var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2501
-				var17 >>= 3; // L: 2502
-				var8 <<= 3; // L: 2503
-				var15 = var7 >> 8; // L: 2504
-				if (field2344) { // L: 2506
-					if (var17 > 0) { // L: 2507
+				var2 = (var18 << 18) + var19; // L: 2487
+				var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2488
+				var17 >>= 3; // L: 2489
+				var8 <<= 3; // L: 2490
+				var15 = var7 >> 8; // L: 2491
+				if (field2251) { // L: 2493
+					if (var17 > 0) { // L: 2494
 						do {
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2509
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2510
-							var2 += var16; // L: 2511
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2512
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2513
-							var2 += var16; // L: 2514
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2515
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2516
-							var2 += var16; // L: 2517
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2518
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2519
-							var2 += var16; // L: 2520
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2521
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2522
-							var2 += var16; // L: 2523
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2524
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2525
-							var2 += var16; // L: 2526
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2527
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2528
-							var2 += var16; // L: 2529
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2530
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2531
-							var2 += var16; // L: 2532
-							var7 += var8; // L: 2533
-							var15 = var7 >> 8; // L: 2534
-							--var17; // L: 2535
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2496
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2497
+							var2 += var16; // L: 2498
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2499
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2500
+							var2 += var16; // L: 2501
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2502
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2503
+							var2 += var16; // L: 2504
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2505
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2506
+							var2 += var16; // L: 2507
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2508
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2509
+							var2 += var16; // L: 2510
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2511
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2512
+							var2 += var16; // L: 2513
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2514
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2515
+							var2 += var16; // L: 2516
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2517
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2518
+							var2 += var16; // L: 2519
+							var7 += var8; // L: 2520
+							var15 = var7 >> 8; // L: 2521
+							--var17; // L: 2522
 						} while(var17 > 0);
 					}
 
-					var17 = var6 - var5 & 7; // L: 2537
-					if (var17 > 0) { // L: 2538
+					var17 = var6 - var5 & 7; // L: 2524
+					if (var17 > 0) { // L: 2525
 						do {
-							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2540
-							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2541
-							var2 += var16; // L: 2542
-							--var17; // L: 2543
+							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2527
+							var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2528
+							var2 += var16; // L: 2529
+							--var17; // L: 2530
 						} while(var17 > 0);
 					}
 				} else {
-					if (var17 > 0) { // L: 2547
+					if (var17 > 0) { // L: 2534
 						do {
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2549
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2550
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2536
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2537
 							}
 
-							++var4; // L: 2552
-							var2 += var16; // L: 2553
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2554
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2555
+							++var4; // L: 2539
+							var2 += var16; // L: 2540
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2541
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2542
 							}
 
-							++var4; // L: 2557
-							var2 += var16; // L: 2558
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2559
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2560
+							++var4; // L: 2544
+							var2 += var16; // L: 2545
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2546
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2547
 							}
 
-							++var4; // L: 2562
-							var2 += var16; // L: 2563
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2564
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2565
+							++var4; // L: 2549
+							var2 += var16; // L: 2550
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2551
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2552
 							}
 
-							++var4; // L: 2567
-							var2 += var16; // L: 2568
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2569
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2570
+							++var4; // L: 2554
+							var2 += var16; // L: 2555
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2556
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2557
 							}
 
-							++var4; // L: 2572
-							var2 += var16; // L: 2573
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2574
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2575
+							++var4; // L: 2559
+							var2 += var16; // L: 2560
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2561
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2562
 							}
 
-							++var4; // L: 2577
-							var2 += var16; // L: 2578
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2579
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2580
+							++var4; // L: 2564
+							var2 += var16; // L: 2565
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2566
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2567
 							}
 
-							++var4; // L: 2582
-							var2 += var16; // L: 2583
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2584
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2585
+							++var4; // L: 2569
+							var2 += var16; // L: 2570
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2571
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2572
 							}
 
-							++var4; // L: 2587
-							var2 += var16; // L: 2588
-							var7 += var8; // L: 2589
-							var15 = var7 >> 8; // L: 2590
-							--var17; // L: 2591
+							++var4; // L: 2574
+							var2 += var16; // L: 2575
+							var7 += var8; // L: 2576
+							var15 = var7 >> 8; // L: 2577
+							--var17; // L: 2578
 						} while(var17 > 0);
 					}
 
-					var17 = var6 - var5 & 7; // L: 2593
-					if (var17 > 0) { // L: 2594
+					var17 = var6 - var5 & 7; // L: 2580
+					if (var17 > 0) { // L: 2581
 						do {
-							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2596
-								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2597
+							if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2583
+								var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2584
 							}
 
-							++var4; // L: 2599
-							var2 += var16; // L: 2600
-							--var17; // L: 2601
+							++var4; // L: 2586
+							var2 += var16; // L: 2587
+							--var17; // L: 2588
 						} while(var17 > 0);
 					}
 				}
 			}
 
 		}
-	} // L: 2605
+	} // L: 2592
 
-	@ObfuscatedName("z")
-	static final int method4246(int var0, int var1) {
-		var1 = (var0 & 127) * var1 >> 7; // L: 2608
-		if (var1 < 2) { // L: 2609
+	@ObfuscatedName("u")
+	static final int method3862(int var0, int var1) {
+		var1 = (var0 & 127) * var1 >> 7; // L: 2595
+		if (var1 < 2) { // L: 2596
 			var1 = 2;
-		} else if (var1 > 126) { // L: 2610
+		} else if (var1 > 126) { // L: 2597
 			var1 = 126;
 		}
 
-		return (var0 & 65408) + var1; // L: 2611
+		return (var0 & 65408) + var1; // L: 2598
 	}
 
-	@ObfuscatedName("q")
-	static final int method4220(int var0, int var1, int var2, int var3) {
-		return var0 * var2 + var3 * var1 >> 16; // L: 2615
+	@ObfuscatedName("k")
+	static final int method3847(int var0, int var1, int var2, int var3) {
+		return var0 * var2 + var3 * var1 >> 16; // L: 2602
 	}
 
-	@ObfuscatedName("d")
-	static final int method4243(int var0, int var1, int var2, int var3) {
-		return var2 * var1 - var3 * var0 >> 16; // L: 2619
+	@ObfuscatedName("f")
+	static final int method3864(int var0, int var1, int var2, int var3) {
+		return var2 * var1 - var3 * var0 >> 16; // L: 2606
 	}
 
-	@ObfuscatedName("r")
-	static final int method4222(int var0, int var1, int var2, int var3) {
-		return var0 * var2 - var3 * var1 >> 16; // L: 2623
+	@ObfuscatedName("l")
+	static final int method3859(int var0, int var1, int var2, int var3) {
+		return var0 * var2 - var3 * var1 >> 16; // L: 2610
 	}
 
-	@ObfuscatedName("m")
-	static final int method4223(int var0, int var1, int var2, int var3) {
-		return var3 * var0 + var2 * var1 >> 16; // L: 2627
+	@ObfuscatedName("q")
+	static final int method3866(int var0, int var1, int var2, int var3) {
+		return var3 * var0 + var2 * var1 >> 16; // L: 2614
 	}
 
-	@ObfuscatedName("c")
-	static final int method4224(int var0, int var1, int var2, int var3) {
-		return var0 * var2 + var3 * var1 >> 16; // L: 2631
+	@ObfuscatedName("x")
+	static final int method3917(int var0, int var1, int var2, int var3) {
+		return var0 * var2 + var3 * var1 >> 16; // L: 2618
 	}
 
-	@ObfuscatedName("f")
-	static final int method4225(int var0, int var1, int var2, int var3) {
-		return var2 * var1 - var3 * var0 >> 16; // L: 2635
+	@ObfuscatedName("z")
+	static final int method3868(int var0, int var1, int var2, int var3) {
+		return var2 * var1 - var3 * var0 >> 16; // L: 2622
 	}
 }
diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java
index 05059c7bce..b89f7e0b86 100644
--- a/runescape-client/src/main/java/RawPcmStream.java
+++ b/runescape-client/src/main/java/RawPcmStream.java
@@ -3,107 +3,107 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ax")
+@ObfuscatedName("at")
 @Implements("RawPcmStream")
 public class RawPcmStream extends PcmStream {
-	@ObfuscatedName("i")
-	int field318;
-	@ObfuscatedName("s")
-	int field309;
-	@ObfuscatedName("a")
-	int field307;
-	@ObfuscatedName("o")
-	int field308;
-	@ObfuscatedName("g")
-	int field311;
-	@ObfuscatedName("e")
-	int field310;
+	@ObfuscatedName("c")
+	int field335;
+	@ObfuscatedName("b")
+	int field334;
 	@ObfuscatedName("p")
-	int field305;
+	int field331;
+	@ObfuscatedName("m")
+	int field332;
+	@ObfuscatedName("t")
+	int field333;
+	@ObfuscatedName("s")
+	int field340;
 	@ObfuscatedName("j")
+	int field336;
+	@ObfuscatedName("n")
 	@Export("numLoops")
 	int numLoops;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("start")
 	int start;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("end")
 	int end;
-	@ObfuscatedName("y")
-	boolean field315;
-	@ObfuscatedName("k")
-	int field316;
-	@ObfuscatedName("t")
-	int field317;
-	@ObfuscatedName("l")
-	int field306;
-	@ObfuscatedName("u")
-	int field319;
+	@ObfuscatedName("v")
+	boolean field339;
+	@ObfuscatedName("d")
+	int field329;
+	@ObfuscatedName("h")
+	int field341;
+	@ObfuscatedName("g")
+	int field342;
+	@ObfuscatedName("e")
+	int field343;
 
 	@ObfuscatedSignature(
-		descriptor = "(Laz;III)V"
+		descriptor = "(Laj;III)V"
 	)
 	RawPcmStream(RawSound var1, int var2, int var3, int var4) {
 		super.sound = var1; // L: 51
 		this.start = var1.start; // L: 52
 		this.end = var1.end; // L: 53
-		this.field315 = var1.field238; // L: 54
-		this.field309 = var2; // L: 55
-		this.field307 = var3; // L: 56
-		this.field308 = var4; // L: 57
-		this.field318 = 0; // L: 58
-		this.method818(); // L: 59
+		this.field339 = var1.field265; // L: 54
+		this.field334 = var2; // L: 55
+		this.field331 = var3; // L: 56
+		this.field332 = var4; // L: 57
+		this.field335 = 0; // L: 58
+		this.method841(); // L: 59
 	} // L: 60
 
 	@ObfuscatedSignature(
-		descriptor = "(Laz;II)V"
+		descriptor = "(Laj;II)V"
 	)
 	RawPcmStream(RawSound var1, int var2, int var3) {
 		super.sound = var1; // L: 39
 		this.start = var1.start; // L: 40
 		this.end = var1.end; // L: 41
-		this.field315 = var1.field238; // L: 42
-		this.field309 = var2; // L: 43
-		this.field307 = var3; // L: 44
-		this.field308 = 8192; // L: 45
-		this.field318 = 0; // L: 46
-		this.method818(); // L: 47
+		this.field339 = var1.field265; // L: 42
+		this.field334 = var2; // L: 43
+		this.field331 = var3; // L: 44
+		this.field332 = 8192; // L: 45
+		this.field335 = 0; // L: 46
+		this.method841(); // L: 47
 	} // L: 48
 
-	@ObfuscatedName("o")
-	void method818() {
-		this.field311 = this.field307; // L: 73
-		this.field310 = method826(this.field307, this.field308); // L: 74
-		this.field305 = method968(this.field307, this.field308); // L: 75
+	@ObfuscatedName("t")
+	void method841() {
+		this.field333 = this.field331; // L: 73
+		this.field340 = method967(this.field331, this.field332); // L: 74
+		this.field336 = method836(this.field331, this.field332); // L: 75
 	} // L: 76
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("firstSubStream")
 	protected PcmStream firstSubStream() {
 		return null; // L: 200
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lav;"
+		descriptor = "()Lai;"
 	)
 	@Export("nextSubStream")
 	protected PcmStream nextSubStream() {
 		return null; // L: 204
 	}
 
-	@ObfuscatedName("p")
-	protected int vmethod4958() {
-		return this.field307 == 0 && this.field316 == 0 ? 0 : 1; // L: 208 209
+	@ObfuscatedName("w")
+	protected int vmethod5260() {
+		return this.field331 == 0 && this.field329 == 0 ? 0 : 1; // L: 208 209
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("fill")
 	public synchronized void fill(int[] var1, int var2, int var3) {
-		if (this.field307 == 0 && this.field316 == 0) { // L: 213
+		if (this.field331 == 0 && this.field329 == 0) { // L: 213
 			this.skip(var3); // L: 214
 		} else {
 			RawSound var4 = (RawSound)super.sound; // L: 217
@@ -117,163 +117,163 @@ public synchronized void fill(int[] var1, int var2, int var3) {
 
 			int var9 = var2; // L: 223
 			var3 += var2; // L: 224
-			if (this.field318 < 0) { // L: 225
-				if (this.field309 <= 0) { // L: 226
-					this.method915(); // L: 228
+			if (this.field335 < 0) { // L: 225
+				if (this.field334 <= 0) { // L: 226
+					this.method850(); // L: 228
 					this.remove(); // L: 229
 					return; // L: 230
 				}
 
-				this.field318 = 0;
+				this.field335 = 0;
 			}
 
-			if (this.field318 >= var7) { // L: 233
-				if (this.field309 >= 0) { // L: 234
-					this.method915(); // L: 236
+			if (this.field335 >= var7) { // L: 233
+				if (this.field334 >= 0) { // L: 234
+					this.method850(); // L: 236
 					this.remove(); // L: 237
 					return; // L: 238
 				}
 
-				this.field318 = var7 - 1;
+				this.field335 = var7 - 1;
 			}
 
 			if (this.numLoops < 0) { // L: 241
-				if (this.field315) { // L: 242
-					if (this.field309 < 0) { // L: 243
-						var9 = this.method841(var1, var2, var5, var3, var4.samples[this.start]); // L: 244
-						if (this.field318 >= var5) { // L: 245
+				if (this.field339) { // L: 242
+					if (this.field334 < 0) { // L: 243
+						var9 = this.method864(var1, var2, var5, var3, var4.samples[this.start]); // L: 244
+						if (this.field335 >= var5) { // L: 245
 							return;
 						}
 
-						this.field318 = var5 + var5 - 1 - this.field318; // L: 246
-						this.field309 = -this.field309; // L: 247
+						this.field335 = var5 + var5 - 1 - this.field335; // L: 246
+						this.field334 = -this.field334; // L: 247
 					}
 
 					while (true) {
-						var9 = this.method827(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250
-						if (this.field318 < var6) { // L: 251
+						var9 = this.method889(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250
+						if (this.field335 < var6) { // L: 251
 							return;
 						}
 
-						this.field318 = var6 + var6 - 1 - this.field318; // L: 252
-						this.field309 = -this.field309; // L: 253
-						var9 = this.method841(var1, var9, var5, var3, var4.samples[this.start]); // L: 254
-						if (this.field318 >= var5) { // L: 255
+						this.field335 = var6 + var6 - 1 - this.field335; // L: 252
+						this.field334 = -this.field334; // L: 253
+						var9 = this.method864(var1, var9, var5, var3, var4.samples[this.start]); // L: 254
+						if (this.field335 >= var5) { // L: 255
 							return;
 						}
 
-						this.field318 = var5 + var5 - 1 - this.field318; // L: 256
-						this.field309 = -this.field309; // L: 257
+						this.field335 = var5 + var5 - 1 - this.field335; // L: 256
+						this.field334 = -this.field334; // L: 257
 					}
-				} else if (this.field309 < 0) { // L: 260
+				} else if (this.field334 < 0) { // L: 260
 					while (true) {
-						var9 = this.method841(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262
-						if (this.field318 >= var5) { // L: 263
+						var9 = this.method864(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262
+						if (this.field335 >= var5) { // L: 263
 							return;
 						}
 
-						this.field318 = var6 - 1 - (var6 - 1 - this.field318) % var8; // L: 264
+						this.field335 = var6 - 1 - (var6 - 1 - this.field335) % var8; // L: 264
 					}
 				} else {
 					while (true) {
-						var9 = this.method827(var1, var9, var6, var3, var4.samples[this.start]); // L: 269
-						if (this.field318 < var6) { // L: 270
+						var9 = this.method889(var1, var9, var6, var3, var4.samples[this.start]); // L: 269
+						if (this.field335 < var6) { // L: 270
 							return;
 						}
 
-						this.field318 = var5 + (this.field318 - var5) % var8; // L: 271
+						this.field335 = var5 + (this.field335 - var5) % var8; // L: 271
 					}
 				}
 			} else {
 				if (this.numLoops > 0) { // L: 275
-					if (this.field315) { // L: 276
+					if (this.field339) { // L: 276
 						label127: {
-							if (this.field309 < 0) { // L: 277
-								var9 = this.method841(var1, var2, var5, var3, var4.samples[this.start]); // L: 278
-								if (this.field318 >= var5) { // L: 279
+							if (this.field334 < 0) { // L: 277
+								var9 = this.method864(var1, var2, var5, var3, var4.samples[this.start]); // L: 278
+								if (this.field335 >= var5) { // L: 279
 									return;
 								}
 
-								this.field318 = var5 + var5 - 1 - this.field318; // L: 280
-								this.field309 = -this.field309; // L: 281
+								this.field335 = var5 + var5 - 1 - this.field335; // L: 280
+								this.field334 = -this.field334; // L: 281
 								if (--this.numLoops == 0) { // L: 282
 									break label127;
 								}
 							}
 
 							do {
-								var9 = this.method827(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285
-								if (this.field318 < var6) { // L: 286
+								var9 = this.method889(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285
+								if (this.field335 < var6) { // L: 286
 									return;
 								}
 
-								this.field318 = var6 + var6 - 1 - this.field318; // L: 287
-								this.field309 = -this.field309; // L: 288
+								this.field335 = var6 + var6 - 1 - this.field335; // L: 287
+								this.field334 = -this.field334; // L: 288
 								if (--this.numLoops == 0) { // L: 289
 									break;
 								}
 
-								var9 = this.method841(var1, var9, var5, var3, var4.samples[this.start]); // L: 290
-								if (this.field318 >= var5) { // L: 291
+								var9 = this.method864(var1, var9, var5, var3, var4.samples[this.start]); // L: 290
+								if (this.field335 >= var5) { // L: 291
 									return;
 								}
 
-								this.field318 = var5 + var5 - 1 - this.field318; // L: 292
-								this.field309 = -this.field309; // L: 293
+								this.field335 = var5 + var5 - 1 - this.field335; // L: 292
+								this.field334 = -this.field334; // L: 293
 							} while(--this.numLoops != 0); // L: 294
 						}
 					} else {
 						int var10;
-						if (this.field309 < 0) { // L: 297
+						if (this.field334 < 0) { // L: 297
 							while (true) {
-								var9 = this.method841(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299
-								if (this.field318 >= var5) { // L: 300
+								var9 = this.method864(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299
+								if (this.field335 >= var5) { // L: 300
 									return;
 								}
 
-								var10 = (var6 - 1 - this.field318) / var8; // L: 301
+								var10 = (var6 - 1 - this.field335) / var8; // L: 301
 								if (var10 >= this.numLoops) { // L: 302
-									this.field318 += var8 * this.numLoops; // L: 303
+									this.field335 += var8 * this.numLoops; // L: 303
 									this.numLoops = 0; // L: 304
 									break; // L: 305
 								}
 
-								this.field318 += var8 * var10; // L: 307
+								this.field335 += var8 * var10; // L: 307
 								this.numLoops -= var10; // L: 308
 							}
 						} else {
 							while (true) {
-								var9 = this.method827(var1, var9, var6, var3, var4.samples[this.start]); // L: 313
-								if (this.field318 < var6) { // L: 314
+								var9 = this.method889(var1, var9, var6, var3, var4.samples[this.start]); // L: 313
+								if (this.field335 < var6) { // L: 314
 									return;
 								}
 
-								var10 = (this.field318 - var5) / var8; // L: 315
+								var10 = (this.field335 - var5) / var8; // L: 315
 								if (var10 >= this.numLoops) { // L: 316
-									this.field318 -= var8 * this.numLoops; // L: 317
+									this.field335 -= var8 * this.numLoops; // L: 317
 									this.numLoops = 0; // L: 318
 									break; // L: 319
 								}
 
-								this.field318 -= var8 * var10; // L: 321
+								this.field335 -= var8 * var10; // L: 321
 								this.numLoops -= var10; // L: 322
 							}
 						}
 					}
 				}
 
-				if (this.field309 < 0) { // L: 326
-					this.method841(var1, var9, 0, var3, 0); // L: 327
-					if (this.field318 < 0) { // L: 328
-						this.field318 = -1; // L: 329
-						this.method915(); // L: 330
+				if (this.field334 < 0) { // L: 326
+					this.method864(var1, var9, 0, var3, 0); // L: 327
+					if (this.field335 < 0) { // L: 328
+						this.field335 = -1; // L: 329
+						this.method850(); // L: 330
 						this.remove(); // L: 331
 					}
 				} else {
-					this.method827(var1, var9, var7, var3, 0); // L: 335
-					if (this.field318 >= var7) { // L: 336
-						this.field318 = var7; // L: 337
-						this.method915(); // L: 338
+					this.method889(var1, var9, var7, var3, 0); // L: 335
+					if (this.field335 >= var7) { // L: 336
+						this.field335 = var7; // L: 337
+						this.method850(); // L: 338
 						this.remove(); // L: 339
 					}
 				}
@@ -282,33 +282,33 @@ public synchronized void fill(int[] var1, int var2, int var3) {
 		}
 	} // L: 215 342
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("setNumLoops")
 	public synchronized void setNumLoops(int var1) {
 		this.numLoops = var1; // L: 79
 	} // L: 80
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("skip")
 	public synchronized void skip(int var1) {
-		if (this.field316 > 0) { // L: 345
-			if (var1 >= this.field316) { // L: 346
-				if (this.field307 == Integer.MIN_VALUE) { // L: 347
-					this.field307 = 0; // L: 348
-					this.field305 = 0; // L: 349
-					this.field310 = 0; // L: 350
-					this.field311 = 0; // L: 351
+		if (this.field329 > 0) { // L: 345
+			if (var1 >= this.field329) { // L: 346
+				if (this.field331 == Integer.MIN_VALUE) { // L: 347
+					this.field331 = 0; // L: 348
+					this.field336 = 0; // L: 349
+					this.field340 = 0; // L: 350
+					this.field333 = 0; // L: 351
 					this.remove(); // L: 352
-					var1 = this.field316; // L: 353
+					var1 = this.field329; // L: 353
 				}
 
-				this.field316 = 0; // L: 355
-				this.method818(); // L: 356
+				this.field329 = 0; // L: 355
+				this.method841(); // L: 356
 			} else {
-				this.field311 += this.field317 * var1; // L: 359
-				this.field310 += this.field306 * var1; // L: 360
-				this.field305 += this.field319 * var1; // L: 361
-				this.field316 -= var1; // L: 362
+				this.field333 += this.field341 * var1; // L: 359
+				this.field340 += this.field342 * var1; // L: 360
+				this.field336 += this.field343 * var1; // L: 361
+				this.field329 -= var1; // L: 362
 			}
 		}
 
@@ -321,130 +321,130 @@ public synchronized void skip(int var1) {
 			this.numLoops = 0;
 		}
 
-		if (this.field318 < 0) { // L: 371
-			if (this.field309 <= 0) { // L: 372
-				this.method915(); // L: 374
+		if (this.field335 < 0) { // L: 371
+			if (this.field334 <= 0) { // L: 372
+				this.method850(); // L: 374
 				this.remove(); // L: 375
 				return; // L: 376
 			}
 
-			this.field318 = 0;
+			this.field335 = 0;
 		}
 
-		if (this.field318 >= var5) { // L: 379
-			if (this.field309 >= 0) { // L: 380
-				this.method915(); // L: 382
+		if (this.field335 >= var5) { // L: 379
+			if (this.field334 >= 0) { // L: 380
+				this.method850(); // L: 382
 				this.remove(); // L: 383
 				return; // L: 384
 			}
 
-			this.field318 = var5 - 1;
+			this.field335 = var5 - 1;
 		}
 
-		this.field318 += this.field309 * var1; // L: 387
+		this.field335 += this.field334 * var1; // L: 387
 		if (this.numLoops < 0) { // L: 388
-			if (!this.field315) { // L: 389
-				if (this.field309 < 0) { // L: 404
-					if (this.field318 >= var3) { // L: 405
+			if (!this.field339) { // L: 389
+				if (this.field334 < 0) { // L: 404
+					if (this.field335 >= var3) { // L: 405
 						return;
 					}
 
-					this.field318 = var4 - 1 - (var4 - 1 - this.field318) % var6; // L: 406
+					this.field335 = var4 - 1 - (var4 - 1 - this.field335) % var6; // L: 406
 				} else {
-					if (this.field318 < var4) { // L: 409
+					if (this.field335 < var4) { // L: 409
 						return;
 					}
 
-					this.field318 = var3 + (this.field318 - var3) % var6; // L: 410
+					this.field335 = var3 + (this.field335 - var3) % var6; // L: 410
 				}
 
 			} else {
-				if (this.field309 < 0) { // L: 390
-					if (this.field318 >= var3) { // L: 391
+				if (this.field334 < 0) { // L: 390
+					if (this.field335 >= var3) { // L: 391
 						return;
 					}
 
-					this.field318 = var3 + var3 - 1 - this.field318; // L: 392
-					this.field309 = -this.field309; // L: 393
+					this.field335 = var3 + var3 - 1 - this.field335; // L: 392
+					this.field334 = -this.field334; // L: 393
 				}
 
-				while (this.field318 >= var4) { // L: 396
-					this.field318 = var4 + var4 - 1 - this.field318; // L: 397
-					this.field309 = -this.field309; // L: 398
-					if (this.field318 >= var3) { // L: 399
+				while (this.field335 >= var4) { // L: 396
+					this.field335 = var4 + var4 - 1 - this.field335; // L: 397
+					this.field334 = -this.field334; // L: 398
+					if (this.field335 >= var3) { // L: 399
 						return;
 					}
 
-					this.field318 = var3 + var3 - 1 - this.field318; // L: 400
-					this.field309 = -this.field309; // L: 401
+					this.field335 = var3 + var3 - 1 - this.field335; // L: 400
+					this.field334 = -this.field334; // L: 401
 				}
 
 			}
 		} else {
 			if (this.numLoops > 0) { // L: 414
-				if (this.field315) { // L: 415
+				if (this.field339) { // L: 415
 					label129: {
-						if (this.field309 < 0) { // L: 416
-							if (this.field318 >= var3) { // L: 417
+						if (this.field334 < 0) { // L: 416
+							if (this.field335 >= var3) { // L: 417
 								return;
 							}
 
-							this.field318 = var3 + var3 - 1 - this.field318; // L: 418
-							this.field309 = -this.field309; // L: 419
+							this.field335 = var3 + var3 - 1 - this.field335; // L: 418
+							this.field334 = -this.field334; // L: 419
 							if (--this.numLoops == 0) { // L: 420
 								break label129;
 							}
 						}
 
 						do {
-							if (this.field318 < var4) { // L: 423
+							if (this.field335 < var4) { // L: 423
 								return;
 							}
 
-							this.field318 = var4 + var4 - 1 - this.field318; // L: 424
-							this.field309 = -this.field309; // L: 425
+							this.field335 = var4 + var4 - 1 - this.field335; // L: 424
+							this.field334 = -this.field334; // L: 425
 							if (--this.numLoops == 0) { // L: 426
 								break;
 							}
 
-							if (this.field318 >= var3) { // L: 427
+							if (this.field335 >= var3) { // L: 427
 								return;
 							}
 
-							this.field318 = var3 + var3 - 1 - this.field318; // L: 428
-							this.field309 = -this.field309; // L: 429
+							this.field335 = var3 + var3 - 1 - this.field335; // L: 428
+							this.field334 = -this.field334; // L: 429
 						} while(--this.numLoops != 0); // L: 430
 					}
 				} else {
 					label161: {
 						int var7;
-						if (this.field309 < 0) { // L: 433
-							if (this.field318 >= var3) { // L: 434
+						if (this.field334 < 0) { // L: 433
+							if (this.field335 >= var3) { // L: 434
 								return;
 							}
 
-							var7 = (var4 - 1 - this.field318) / var6; // L: 435
+							var7 = (var4 - 1 - this.field335) / var6; // L: 435
 							if (var7 >= this.numLoops) { // L: 436
-								this.field318 += var6 * this.numLoops; // L: 437
+								this.field335 += var6 * this.numLoops; // L: 437
 								this.numLoops = 0; // L: 438
 								break label161; // L: 439
 							}
 
-							this.field318 += var6 * var7; // L: 441
+							this.field335 += var6 * var7; // L: 441
 							this.numLoops -= var7; // L: 442
 						} else {
-							if (this.field318 < var4) { // L: 445
+							if (this.field335 < var4) { // L: 445
 								return;
 							}
 
-							var7 = (this.field318 - var3) / var6; // L: 446
+							var7 = (this.field335 - var3) / var6; // L: 446
 							if (var7 >= this.numLoops) { // L: 447
-								this.field318 -= var6 * this.numLoops; // L: 448
+								this.field335 -= var6 * this.numLoops; // L: 448
 								this.numLoops = 0; // L: 449
 								break label161; // L: 450
 							}
 
-							this.field318 -= var6 * var7; // L: 452
+							this.field335 -= var6 * var7; // L: 452
 							this.numLoops -= var7; // L: 453
 						}
 
@@ -453,51 +453,51 @@ public synchronized void skip(int var1) {
 				}
 			}
 
-			if (this.field309 < 0) { // L: 457
-				if (this.field318 < 0) { // L: 458
-					this.field318 = -1; // L: 459
-					this.method915(); // L: 460
+			if (this.field334 < 0) { // L: 457
+				if (this.field335 < 0) { // L: 458
+					this.field335 = -1; // L: 459
+					this.method850(); // L: 460
 					this.remove(); // L: 461
 				}
-			} else if (this.field318 >= var5) { // L: 465
-				this.field318 = var5; // L: 466
-				this.method915(); // L: 467
+			} else if (this.field335 >= var5) { // L: 465
+				this.field335 = var5; // L: 466
+				this.method850(); // L: 467
 				this.remove(); // L: 468
 			}
 
 		}
 	} // L: 412 471
 
-	@ObfuscatedName("y")
-	public synchronized void method821(int var1) {
-		this.method822(var1 << 6, this.method824()); // L: 83
+	@ObfuscatedName("v")
+	public synchronized void method843(int var1) {
+		this.method899(var1 << 6, this.method847()); // L: 83
 	} // L: 84
 
-	@ObfuscatedName("k")
-	synchronized void method927(int var1) {
-		this.method822(var1, this.method824()); // L: 87
+	@ObfuscatedName("d")
+	synchronized void method837(int var1) {
+		this.method899(var1, this.method847()); // L: 87
 	} // L: 88
 
-	@ObfuscatedName("t")
-	synchronized void method822(int var1, int var2) {
-		this.field307 = var1; // L: 91
-		this.field308 = var2; // L: 92
-		this.field316 = 0; // L: 93
-		this.method818(); // L: 94
+	@ObfuscatedName("h")
+	synchronized void method899(int var1, int var2) {
+		this.field331 = var1; // L: 91
+		this.field332 = var2; // L: 92
+		this.field329 = 0; // L: 93
+		this.method841(); // L: 94
 	} // L: 95
 
-	@ObfuscatedName("l")
-	public synchronized int method936() {
-		return this.field307 == Integer.MIN_VALUE ? 0 : this.field307; // L: 98
+	@ObfuscatedName("g")
+	public synchronized int method862() {
+		return this.field331 == Integer.MIN_VALUE ? 0 : this.field331; // L: 98
 	}
 
-	@ObfuscatedName("u")
-	public synchronized int method824() {
-		return this.field308 < 0 ? -1 : this.field308; // L: 102
+	@ObfuscatedName("e")
+	public synchronized int method847() {
+		return this.field332 < 0 ? -1 : this.field332; // L: 102
 	}
 
-	@ObfuscatedName("n")
-	public synchronized void method825(int var1) {
+	@ObfuscatedName("a")
+	public synchronized void method848(int var1) {
 		int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106
 		if (var1 < -1) { // L: 107
 			var1 = -1;
@@ -507,254 +507,267 @@ public synchronized void method825(int var1) {
 			var1 = var2;
 		}
 
-		this.field318 = var1; // L: 109
+		this.field335 = var1; // L: 109
 	} // L: 110
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		descriptor = "(Z)V",
 		garbageValue = "1"
 	)
-	public synchronized void method922() {
-		this.field309 = (this.field309 ^ this.field309 >> 31) + (this.field309 >>> 31); // L: 113
-		this.field309 = -this.field309; // L: 114
+	public synchronized void method925() {
+		this.field334 = (this.field334 ^ this.field334 >> 31) + (this.field334 >>> 31); // L: 113
+		this.field334 = -this.field334; // L: 114
 	} // L: 115
 
-	@ObfuscatedName("q")
-	void method915() {
-		if (this.field316 != 0) { // L: 118
-			if (this.field307 == Integer.MIN_VALUE) {
-				this.field307 = 0; // L: 119
+	@ObfuscatedName("k")
+	void method850() {
+		if (this.field329 != 0) { // L: 118
+			if (this.field331 == Integer.MIN_VALUE) {
+				this.field331 = 0; // L: 119
 			}
 
-			this.field316 = 0; // L: 120
-			this.method818(); // L: 121
+			this.field329 = 0; // L: 120
+			this.method841(); // L: 121
 		}
 
 	} // L: 123
 
-	@ObfuscatedName("d")
-	public synchronized void method941(int var1, int var2) {
-		this.method829(var1, var2, this.method824()); // L: 126
+	@ObfuscatedName("f")
+	public synchronized void method851(int var1, int var2) {
+		this.method932(var1, var2, this.method847()); // L: 126
 	} // L: 127
 
-	@ObfuscatedName("r")
-	public synchronized void method829(int var1, int var2, int var3) {
+	@ObfuscatedName("l")
+	public synchronized void method932(int var1, int var2, int var3) {
 		if (var1 == 0) { // L: 130
-			this.method822(var2, var3); // L: 131
+			this.method899(var2, var3); // L: 131
 		} else {
-			int var4 = method826(var2, var3); // L: 134
-			int var5 = method968(var2, var3); // L: 135
-			if (var4 == this.field310 && var5 == this.field305) { // L: 136
-				this.field316 = 0; // L: 137
+			int var4 = method967(var2, var3); // L: 134
+			int var5 = method836(var2, var3); // L: 135
+			if (var4 == this.field340 && var5 == this.field336) { // L: 136
+				this.field329 = 0; // L: 137
 			} else {
-				int var6 = var2 - this.field311; // L: 140
-				if (this.field311 - var2 > var6) { // L: 141
-					var6 = this.field311 - var2;
+				int var6 = var2 - this.field333; // L: 140
+				if (this.field333 - var2 > var6) { // L: 141
+					var6 = this.field333 - var2;
 				}
 
-				if (var4 - this.field310 > var6) { // L: 142
-					var6 = var4 - this.field310;
+				if (var4 - this.field340 > var6) { // L: 142
+					var6 = var4 - this.field340;
 				}
 
-				if (this.field310 - var4 > var6) { // L: 143
-					var6 = this.field310 - var4;
+				if (this.field340 - var4 > var6) { // L: 143
+					var6 = this.field340 - var4;
 				}
 
-				if (var5 - this.field305 > var6) {
-					var6 = var5 - this.field305; // L: 144
+				if (var5 - this.field336 > var6) {
+					var6 = var5 - this.field336; // L: 144
 				}
 
-				if (this.field305 - var5 > var6) { // L: 145
-					var6 = this.field305 - var5;
+				if (this.field336 - var5 > var6) { // L: 145
+					var6 = this.field336 - var5;
 				}
 
 				if (var1 > var6) { // L: 146
 					var1 = var6;
 				}
 
-				this.field316 = var1; // L: 147
-				this.field307 = var2; // L: 148
-				this.field308 = var3; // L: 149
-				this.field317 = (var2 - this.field311) / var1; // L: 150
-				this.field306 = (var4 - this.field310) / var1; // L: 151
-				this.field319 = (var5 - this.field305) / var1; // L: 152
+				this.field329 = var1; // L: 147
+				this.field331 = var2; // L: 148
+				this.field332 = var3; // L: 149
+				this.field341 = (var2 - this.field333) / var1; // L: 150
+				this.field342 = (var4 - this.field340) / var1; // L: 151
+				this.field343 = (var5 - this.field336) / var1; // L: 152
 			}
 		}
 	} // L: 132 138 153
 
-	@ObfuscatedName("m")
-	public synchronized void method830(int var1) {
+	@ObfuscatedName("q")
+	public synchronized void method954(int var1) {
 		if (var1 == 0) { // L: 156
-			this.method927(0); // L: 157
+			this.method837(0); // L: 157
 			this.remove(); // L: 158
-		} else if (this.field310 == 0 && this.field305 == 0) { // L: 161
-			this.field316 = 0; // L: 162
-			this.field307 = 0; // L: 163
-			this.field311 = 0; // L: 164
+		} else if (this.field340 == 0 && this.field336 == 0) { // L: 161
+			this.field329 = 0; // L: 162
+			this.field331 = 0; // L: 163
+			this.field333 = 0; // L: 164
 			this.remove(); // L: 165
 		} else {
-			int var2 = -this.field311; // L: 168
-			if (this.field311 > var2) { // L: 169
-				var2 = this.field311;
+			int var2 = -this.field333; // L: 168
+			if (this.field333 > var2) { // L: 169
+				var2 = this.field333;
 			}
 
-			if (-this.field310 > var2) { // L: 170
-				var2 = -this.field310;
+			if (-this.field340 > var2) { // L: 170
+				var2 = -this.field340;
 			}
 
-			if (this.field310 > var2) { // L: 171
-				var2 = this.field310;
+			if (this.field340 > var2) { // L: 171
+				var2 = this.field340;
 			}
 
-			if (-this.field305 > var2) { // L: 172
-				var2 = -this.field305;
+			if (-this.field336 > var2) { // L: 172
+				var2 = -this.field336;
 			}
 
-			if (this.field305 > var2) { // L: 173
-				var2 = this.field305;
+			if (this.field336 > var2) { // L: 173
+				var2 = this.field336;
 			}
 
 			if (var1 > var2) { // L: 174
 				var1 = var2;
 			}
 
-			this.field316 = var1; // L: 175
-			this.field307 = Integer.MIN_VALUE; // L: 176
-			this.field317 = -this.field311 / var1; // L: 177
-			this.field306 = -this.field310 / var1; // L: 178
-			this.field319 = -this.field305 / var1; // L: 179
+			this.field329 = var1; // L: 175
+			this.field331 = Integer.MIN_VALUE; // L: 176
+			this.field341 = -this.field333 / var1; // L: 177
+			this.field342 = -this.field340 / var1; // L: 178
+			this.field343 = -this.field336 / var1; // L: 179
 		}
 	} // L: 159 166 180
 
-	@ObfuscatedName("c")
-	public synchronized void method912(int var1) {
-		if (this.field309 < 0) { // L: 183
-			this.field309 = -var1;
+	@ObfuscatedName("x")
+	public synchronized void method963(int var1) {
+		if (this.field334 < 0) { // L: 183
+			this.field334 = -var1;
 		} else {
-			this.field309 = var1; // L: 184
+			this.field334 = var1; // L: 184
 		}
 
 	} // L: 185
 
-	@ObfuscatedName("f")
-	public synchronized int method832() {
-		return this.field309 < 0 ? -this.field309 : this.field309; // L: 188
+	@ObfuscatedName("ax")
+	public synchronized int method855() {
+		return this.field334 < 0 ? -this.field334 : this.field334; // L: 188
 	}
 
-	@ObfuscatedName("h")
-	public boolean method833() {
-		return this.field318 < 0 || this.field318 >= ((RawSound)super.sound).samples.length << 8; // L: 192
+	@ObfuscatedName("am")
+	public boolean method854() {
+		return this.field335 < 0 || this.field335 >= ((RawSound)super.sound).samples.length << 8; // L: 192
 	}
 
-	@ObfuscatedName("v")
-	public boolean method834() {
-		return this.field316 != 0; // L: 196
+	@ObfuscatedName("au")
+	public boolean method857() {
+		return this.field329 != 0; // L: 196
 	}
 
-	@ObfuscatedName("ab")
-	int method827(int[] var1, int var2, int var3, int var4, int var5) {
+	@ObfuscatedName("ac")
+	int vmethod991() {
+		int var1 = this.field333 * 3 >> 6; // L: 31
+		var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32
+		if (this.numLoops == 0) { // L: 33
+			var1 -= var1 * this.field335 / (((RawSound)super.sound).samples.length << 8);
+		} else if (this.numLoops >= 0) {
+			var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34
+		}
+
+		return var1 > 255 ? 255 : var1; // L: 35
+	}
+
+	@ObfuscatedName("aj")
+	int method889(int[] var1, int var2, int var3, int var4, int var5) {
 		while (true) {
-			if (this.field316 > 0) { // L: 474
-				int var6 = var2 + this.field316; // L: 475
+			if (this.field329 > 0) { // L: 474
+				int var6 = var2 + this.field329; // L: 475
 				if (var6 > var4) { // L: 476
 					var6 = var4;
 				}
 
-				this.field316 += var2; // L: 477
-				if (this.field309 == 256 && (this.field318 & 255) == 0) { // L: 478
-					if (PcmPlayer.PcmPlayer_stereo) { // L: 479
-						var2 = method852(0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, this.field306, this.field319, 0, var6, var3, this);
+				this.field329 += var2; // L: 477
+				if (this.field334 == 256 && (this.field335 & 255) == 0) { // L: 478
+					if (SpriteMask.PcmPlayer_stereo) { // L: 479
+						var2 = method875(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this);
 					} else {
-						var2 = method960(((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, this.field317, 0, var6, var3, this); // L: 480
+						var2 = method874(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this); // L: 480
 					}
-				} else if (PcmPlayer.PcmPlayer_stereo) { // L: 483
-					var2 = method856(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, this.field306, this.field319, 0, var6, var3, this, this.field309, var5);
+				} else if (SpriteMask.PcmPlayer_stereo) { // L: 483
+					var2 = method879(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this, this.field334, var5);
 				} else {
-					var2 = method855(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, this.field317, 0, var6, var3, this, this.field309, var5); // L: 484
+					var2 = method878(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this, this.field334, var5); // L: 484
 				}
 
-				this.field316 -= var2; // L: 486
-				if (this.field316 != 0) { // L: 487
+				this.field329 -= var2; // L: 486
+				if (this.field329 != 0) { // L: 487
 					return var2;
 				}
 
-				if (!this.method954()) { // L: 488
+				if (!this.method865()) { // L: 488
 					continue;
 				}
 
 				return var4;
 			}
 
-			if (this.field309 == 256 && (this.field318 & 255) == 0) { // L: 490
-				if (PcmPlayer.PcmPlayer_stereo) { // L: 491
-					return method962(0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, 0, var4, var3, this);
+			if (this.field334 == 256 && (this.field335 & 255) == 0) { // L: 490
+				if (SpriteMask.PcmPlayer_stereo) { // L: 491
+					return method867(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this);
 				}
 
-				return method843(((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, 0, var4, var3, this); // L: 492
+				return method866(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this); // L: 492
 			}
 
-			if (PcmPlayer.PcmPlayer_stereo) { // L: 495
-				return method848(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, 0, var4, var3, this, this.field309, var5);
+			if (SpriteMask.PcmPlayer_stereo) { // L: 495
+				return method871(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this, this.field334, var5);
 			}
 
-			return method847(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, 0, var4, var3, this, this.field309, var5); // L: 496
+			return method870(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this, this.field334, var5); // L: 496
 		}
 	}
 
-	@ObfuscatedName("ar")
-	int method841(int[] var1, int var2, int var3, int var4, int var5) {
+	@ObfuscatedName("af")
+	int method864(int[] var1, int var2, int var3, int var4, int var5) {
 		while (true) {
-			if (this.field316 > 0) { // L: 501
-				int var6 = var2 + this.field316; // L: 502
+			if (this.field329 > 0) { // L: 501
+				int var6 = var2 + this.field329; // L: 502
 				if (var6 > var4) { // L: 503
 					var6 = var4;
 				}
 
-				this.field316 += var2; // L: 504
-				if (this.field309 == -256 && (this.field318 & 255) == 0) { // L: 505
-					if (PcmPlayer.PcmPlayer_stereo) { // L: 506
-						var2 = method854(0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, this.field306, this.field319, 0, var6, var3, this);
+				this.field329 += var2; // L: 504
+				if (this.field334 == -256 && (this.field335 & 255) == 0) { // L: 505
+					if (SpriteMask.PcmPlayer_stereo) { // L: 506
+						var2 = method877(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this);
 					} else {
-						var2 = method831(((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, this.field317, 0, var6, var3, this); // L: 507
+						var2 = method876(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this); // L: 507
 					}
-				} else if (PcmPlayer.PcmPlayer_stereo) { // L: 510
-					var2 = method858(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, this.field306, this.field319, 0, var6, var3, this, this.field309, var5);
+				} else if (SpriteMask.PcmPlayer_stereo) { // L: 510
+					var2 = method881(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, this.field342, this.field343, 0, var6, var3, this, this.field334, var5);
 				} else {
-					var2 = method899(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, this.field317, 0, var6, var3, this, this.field309, var5); // L: 511
+					var2 = method880(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, this.field341, 0, var6, var3, this, this.field334, var5); // L: 511
 				}
 
-				this.field316 -= var2; // L: 513
-				if (this.field316 != 0) { // L: 514
+				this.field329 -= var2; // L: 513
+				if (this.field329 != 0) { // L: 514
 					return var2;
 				}
 
-				if (!this.method954()) { // L: 515
+				if (!this.method865()) { // L: 515
 					continue;
 				}
 
 				return var4;
 			}
 
-			if (this.field309 == -256 && (this.field318 & 255) == 0) { // L: 517
-				if (PcmPlayer.PcmPlayer_stereo) { // L: 518
-					return method846(0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, 0, var4, var3, this);
+			if (this.field334 == -256 && (this.field335 & 255) == 0) { // L: 517
+				if (SpriteMask.PcmPlayer_stereo) { // L: 518
+					return method869(0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this);
 				}
 
-				return method845(((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, 0, var4, var3, this); // L: 519
+				return method844(((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this); // L: 519
 			}
 
-			if (PcmPlayer.PcmPlayer_stereo) { // L: 522
-				return method850(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field310, this.field305, 0, var4, var3, this, this.field309, var5);
+			if (SpriteMask.PcmPlayer_stereo) { // L: 522
+				return method885(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field340, this.field336, 0, var4, var3, this, this.field334, var5);
 			}
 
-			return method849(0, 0, ((RawSound)super.sound).samples, var1, this.field318, var2, this.field311, 0, var4, var3, this, this.field309, var5); // L: 523
+			return method872(0, 0, ((RawSound)super.sound).samples, var1, this.field335, var2, this.field333, 0, var4, var3, this, this.field334, var5); // L: 523
 		}
 	}
 
-	@ObfuscatedName("ad")
-	boolean method954() {
-		int var1 = this.field307; // L: 528
+	@ObfuscatedName("ar")
+	boolean method865() {
+		int var1 = this.field331; // L: 528
 		int var2;
 		int var3;
 		if (var1 == Integer.MIN_VALUE) { // L: 531
@@ -762,110 +775,97 @@ boolean method954() {
 			var2 = 0; // L: 533
 			var1 = 0; // L: 534
 		} else {
-			var2 = method826(var1, this.field308); // L: 537
-			var3 = method968(var1, this.field308); // L: 538
+			var2 = method967(var1, this.field332); // L: 537
+			var3 = method836(var1, this.field332); // L: 538
 		}
 
-		if (var1 == this.field311 && var2 == this.field310 && var3 == this.field305) { // L: 540
-			if (this.field307 == Integer.MIN_VALUE) { // L: 570
-				this.field307 = 0; // L: 571
-				this.field305 = 0; // L: 572
-				this.field310 = 0; // L: 573
-				this.field311 = 0; // L: 574
+		if (var1 == this.field333 && var2 == this.field340 && var3 == this.field336) { // L: 540
+			if (this.field331 == Integer.MIN_VALUE) { // L: 570
+				this.field331 = 0; // L: 571
+				this.field336 = 0; // L: 572
+				this.field340 = 0; // L: 573
+				this.field333 = 0; // L: 574
 				this.remove(); // L: 575
 				return true; // L: 576
 			} else {
-				this.method818(); // L: 578
+				this.method841(); // L: 578
 				return false; // L: 579
 			}
 		} else {
-			if (this.field311 < var1) { // L: 541
-				this.field317 = 1; // L: 542
-				this.field316 = var1 - this.field311; // L: 543
-			} else if (this.field311 > var1) { // L: 545
-				this.field317 = -1; // L: 546
-				this.field316 = this.field311 - var1; // L: 547
+			if (this.field333 < var1) { // L: 541
+				this.field341 = 1; // L: 542
+				this.field329 = var1 - this.field333; // L: 543
+			} else if (this.field333 > var1) { // L: 545
+				this.field341 = -1; // L: 546
+				this.field329 = this.field333 - var1; // L: 547
 			} else {
-				this.field317 = 0; // L: 549
+				this.field341 = 0; // L: 549
 			}
 
-			if (this.field310 < var2) { // L: 550
-				this.field306 = 1; // L: 551
-				if (this.field316 == 0 || this.field316 > var2 - this.field310) { // L: 552
-					this.field316 = var2 - this.field310;
+			if (this.field340 < var2) { // L: 550
+				this.field342 = 1; // L: 551
+				if (this.field329 == 0 || this.field329 > var2 - this.field340) { // L: 552
+					this.field329 = var2 - this.field340;
 				}
-			} else if (this.field310 > var2) { // L: 554
-				this.field306 = -1; // L: 555
-				if (this.field316 == 0 || this.field316 > this.field310 - var2) { // L: 556
-					this.field316 = this.field310 - var2;
+			} else if (this.field340 > var2) { // L: 554
+				this.field342 = -1; // L: 555
+				if (this.field329 == 0 || this.field329 > this.field340 - var2) { // L: 556
+					this.field329 = this.field340 - var2;
 				}
 			} else {
-				this.field306 = 0; // L: 558
+				this.field342 = 0; // L: 558
 			}
 
-			if (this.field305 < var3) { // L: 559
-				this.field319 = 1; // L: 560
-				if (this.field316 == 0 || this.field316 > var3 - this.field305) { // L: 561
-					this.field316 = var3 - this.field305;
+			if (this.field336 < var3) { // L: 559
+				this.field343 = 1; // L: 560
+				if (this.field329 == 0 || this.field329 > var3 - this.field336) { // L: 561
+					this.field329 = var3 - this.field336;
 				}
-			} else if (this.field305 > var3) { // L: 563
-				this.field319 = -1; // L: 564
-				if (this.field316 == 0 || this.field316 > this.field305 - var3) { // L: 565
-					this.field316 = this.field305 - var3;
+			} else if (this.field336 > var3) { // L: 563
+				this.field343 = -1; // L: 564
+				if (this.field329 == 0 || this.field329 > this.field336 - var3) { // L: 565
+					this.field329 = this.field336 - var3;
 				}
 			} else {
-				this.field319 = 0; // L: 567
+				this.field343 = 0; // L: 567
 			}
 
 			return false; // L: 568
 		}
 	}
 
-	@ObfuscatedName("au")
-	int vmethod974() {
-		int var1 = this.field311 * 3 >> 6; // L: 31
-		var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32
-		if (this.numLoops == 0) { // L: 33
-			var1 -= var1 * this.field318 / (((RawSound)super.sound).samples.length << 8);
-		} else if (this.numLoops >= 0) {
-			var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34
-		}
-
-		return var1 > 255 ? 255 : var1; // L: 35
-	}
-
-	@ObfuscatedName("i")
-	static int method826(int var0, int var1) {
+	@ObfuscatedName("c")
+	static int method967(int var0, int var1) {
 		return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23
 	}
 
-	@ObfuscatedName("w")
-	static int method968(int var0, int var1) {
+	@ObfuscatedName("b")
+	static int method836(int var0, int var1) {
 		return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Laz;II)Lax;"
+		descriptor = "(Laj;II)Lat;"
 	)
 	@Export("createRawPcmStream")
 	public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) {
-		return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(UserComparator2.field4359 * 100)), var2 << 6) : null; // L: 63 64
+		return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class339.field4058 * 100)), var2 << 6) : null; // L: 63 64
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Laz;III)Lax;"
+		descriptor = "(Laj;III)Lat;"
 	)
-	public static RawPcmStream method817(RawSound var0, int var1, int var2, int var3) {
+	public static RawPcmStream method943(RawSound var0, int var1, int var2, int var3) {
 		return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; // L: 68 69
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "([B[IIIIIIILax;)I"
+		descriptor = "([B[IIIIIIILat;)I"
 	)
-	static int method843(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
+	static int method866(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
 		var2 >>= 8; // L: 583
 		var7 >>= 8; // L: 584
 		var4 <<= 2; // L: 585
@@ -888,15 +888,15 @@ static int method843(byte[] var0, int[] var1, int var2, int var3, int var4, int
 			var10001 = var3++; // L: 596
 		}
 
-		var8.field318 = var2 << 8; // L: 598
+		var8.field335 = var2 << 8; // L: 598
 		return var3; // L: 599
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "(I[B[IIIIIIIILax;)I"
+		descriptor = "(I[B[IIIIIIIILat;)I"
 	)
-	static int method962(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
+	static int method867(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
 		var3 >>= 8; // L: 603
 		var9 >>= 8; // L: 604
 		var5 <<= 2; // L: 605
@@ -939,15 +939,15 @@ static int method962(int var0, byte[] var1, int[] var2, int var3, int var4, int
 			var10001 = var4++;
 		}
 
-		var10.field318 = var3 << 8; // L: 631
+		var10.field335 = var3 << 8; // L: 631
 		return var4 >> 1; // L: 632
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "([B[IIIIIIILax;)I"
+		descriptor = "([B[IIIIIIILat;)I"
 	)
-	static int method845(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
+	static int method844(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
 		var2 >>= 8; // L: 636
 		var7 >>= 8; // L: 637
 		var4 <<= 2; // L: 638
@@ -970,15 +970,15 @@ static int method845(byte[] var0, int[] var1, int var2, int var3, int var4, int
 			var10001 = var3++; // L: 649
 		}
 
-		var8.field318 = var2 << 8; // L: 651
+		var8.field335 = var2 << 8; // L: 651
 		return var3; // L: 652
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "(I[B[IIIIIIIILax;)I"
+		descriptor = "(I[B[IIIIIIIILat;)I"
 	)
-	static int method846(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
+	static int method869(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
 		var3 >>= 8; // L: 656
 		var9 >>= 8; // L: 657
 		var5 <<= 2; // L: 658
@@ -1021,15 +1021,15 @@ static int method846(int var0, byte[] var1, int[] var2, int var3, int var4, int
 			var10001 = var4++;
 		}
 
-		var10.field318 = var3 << 8; // L: 684
+		var10.field335 = var3 << 8; // L: 684
 		return var4 >> 1; // L: 685
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		descriptor = "(II[B[IIIIIIILax;II)I"
+		descriptor = "(II[B[IIIIIIILat;II)I"
 	)
-	static int method847(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
+	static int method870(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
 		if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689
 			var7 = var8;
 		}
@@ -1054,15 +1054,15 @@ static int method847(int var0, int var1, byte[] var2, int[] var3, int var4, int
 			var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700
 		}
 
-		var10.field318 = var4; // L: 703
+		var10.field335 = var4; // L: 703
 		return var5; // L: 704
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "(II[B[IIIIIIIILax;II)I"
+		descriptor = "(II[B[IIIIIIIILat;II)I"
 	)
-	static int method848(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+	static int method871(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
 		if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708
 			var8 = var9;
 		}
@@ -1096,15 +1096,15 @@ static int method848(int var0, int var1, byte[] var2, int[] var3, int var4, int
 			var3[var10001] += var0 * var7 >> 6;
 		}
 
-		var11.field318 = var4; // L: 729
+		var11.field335 = var4; // L: 729
 		return var5 >> 1; // L: 730
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "(II[B[IIIIIIILax;II)I"
+		descriptor = "(II[B[IIIIIIILat;II)I"
 	)
-	static int method849(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
+	static int method872(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
 		if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { // L: 734
 			var7 = var8;
 		}
@@ -1129,15 +1129,15 @@ static int method849(int var0, int var1, byte[] var2, int[] var3, int var4, int
 			var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745
 		}
 
-		var10.field318 = var4; // L: 748
+		var10.field335 = var4; // L: 748
 		return var5; // L: 749
 	}
 
-	@ObfuscatedName("bg")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(II[B[IIIIIIIILax;II)I"
+		descriptor = "(II[B[IIIIIIIILat;II)I"
 	)
-	static int method850(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+	static int method885(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
 		if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753
 			var8 = var9;
 		}
@@ -1169,15 +1169,15 @@ static int method850(int var0, int var1, byte[] var2, int[] var3, int var4, int
 			var3[var10001] += var0 * var7 >> 6;
 		}
 
-		var11.field318 = var4; // L: 773
+		var11.field335 = var4; // L: 773
 		return var5 >> 1; // L: 774
 	}
 
-	@ObfuscatedName("bl")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "([B[IIIIIIIILax;)I"
+		descriptor = "([B[IIIIIIIILat;)I"
 	)
-	static int method960(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
+	static int method874(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
 		var2 >>= 8; // L: 778
 		var8 >>= 8; // L: 779
 		var4 <<= 2; // L: 780
@@ -1186,8 +1186,8 @@ static int method960(byte[] var0, int[] var1, int var2, int var3, int var4, int
 			var6 = var7;
 		}
 
-		var9.field310 += var9.field306 * (var6 - var3); // L: 783
-		var9.field305 += var9.field319 * (var6 - var3); // L: 784
+		var9.field340 += var9.field342 * (var6 - var3); // L: 783
+		var9.field336 += var9.field343 * (var6 - var3); // L: 784
 
 		int var10001;
 		for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794
@@ -1209,16 +1209,16 @@ static int method960(byte[] var0, int[] var1, int var2, int var3, int var4, int
 			var1[var10001] += var0[var2++] * var4;
 		}
 
-		var9.field311 = var4 >> 2; // L: 801
-		var9.field318 = var2 << 8; // L: 802
+		var9.field333 = var4 >> 2; // L: 801
+		var9.field335 = var2 << 8; // L: 802
 		return var3; // L: 803
 	}
 
-	@ObfuscatedName("bx")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		descriptor = "(I[B[IIIIIIIIIILax;)I"
+		descriptor = "(I[B[IIIIIIIIIILat;)I"
 	)
-	static int method852(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
+	static int method875(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
 		var3 >>= 8; // L: 807
 		var11 >>= 8; // L: 808
 		var5 <<= 2; // L: 809
@@ -1229,7 +1229,7 @@ static int method852(int var0, byte[] var1, int[] var2, int var3, int var4, int
 			var9 = var10;
 		}
 
-		var12.field311 += var12.field317 * (var9 - var4); // L: 814
+		var12.field333 += var12.field341 * (var9 - var4); // L: 814
 		var4 <<= 1; // L: 815
 		var9 <<= 1; // L: 816
 
@@ -1274,17 +1274,17 @@ static int method852(int var0, byte[] var1, int[] var2, int var3, int var4, int
 			var2[var10001] += var13 * var6;
 		}
 
-		var12.field310 = var5 >> 2; // L: 848
-		var12.field305 = var6 >> 2; // L: 849
-		var12.field318 = var3 << 8; // L: 850
+		var12.field340 = var5 >> 2; // L: 848
+		var12.field336 = var6 >> 2; // L: 849
+		var12.field335 = var3 << 8; // L: 850
 		return var4 >> 1; // L: 851
 	}
 
-	@ObfuscatedName("bd")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "([B[IIIIIIIILax;)I"
+		descriptor = "([B[IIIIIIIILat;)I"
 	)
-	static int method831(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
+	static int method876(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
 		var2 >>= 8; // L: 855
 		var8 >>= 8; // L: 856
 		var4 <<= 2; // L: 857
@@ -1293,8 +1293,8 @@ static int method831(byte[] var0, int[] var1, int var2, int var3, int var4, int
 			var6 = var7;
 		}
 
-		var9.field310 += var9.field306 * (var6 - var3); // L: 860
-		var9.field305 += var9.field319 * (var6 - var3); // L: 861
+		var9.field340 += var9.field342 * (var6 - var3); // L: 860
+		var9.field336 += var9.field343 * (var6 - var3); // L: 861
 
 		int var10001;
 		for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871
@@ -1316,16 +1316,16 @@ static int method831(byte[] var0, int[] var1, int var2, int var3, int var4, int
 			var1[var10001] += var0[var2--] * var4;
 		}
 
-		var9.field311 = var4 >> 2; // L: 878
-		var9.field318 = var2 << 8; // L: 879
+		var9.field333 = var4 >> 2; // L: 878
+		var9.field335 = var2 << 8; // L: 879
 		return var3; // L: 880
 	}
 
-	@ObfuscatedName("bt")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		descriptor = "(I[B[IIIIIIIIIILax;)I"
+		descriptor = "(I[B[IIIIIIIIIILat;)I"
 	)
-	static int method854(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
+	static int method877(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
 		var3 >>= 8; // L: 884
 		var11 >>= 8; // L: 885
 		var5 <<= 2; // L: 886
@@ -1336,7 +1336,7 @@ static int method854(int var0, byte[] var1, int[] var2, int var3, int var4, int
 			var9 = var10;
 		}
 
-		var12.field311 += var12.field317 * (var9 - var4); // L: 891
+		var12.field333 += var12.field341 * (var9 - var4); // L: 891
 		var4 <<= 1; // L: 892
 		var9 <<= 1; // L: 893
 
@@ -1381,19 +1381,19 @@ static int method854(int var0, byte[] var1, int[] var2, int var3, int var4, int
 			var2[var10001] += var13 * var6;
 		}
 
-		var12.field310 = var5 >> 2; // L: 925
-		var12.field305 = var6 >> 2; // L: 926
-		var12.field318 = var3 << 8; // L: 927
+		var12.field340 = var5 >> 2; // L: 925
+		var12.field336 = var6 >> 2; // L: 926
+		var12.field335 = var3 << 8; // L: 927
 		return var4 >> 1; // L: 928
 	}
 
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bp")
 	@ObfuscatedSignature(
-		descriptor = "(II[B[IIIIIIIILax;II)I"
+		descriptor = "(II[B[IIIIIIIILat;II)I"
 	)
-	static int method855(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
-		var11.field310 -= var11.field306 * var5; // L: 932
-		var11.field305 -= var11.field319 * var5; // L: 933
+	static int method878(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+		var11.field340 -= var11.field342 * var5; // L: 932
+		var11.field336 -= var11.field343 * var5; // L: 933
 		if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934
 			var8 = var9;
 		}
@@ -1420,19 +1420,19 @@ static int method855(int var0, int var1, byte[] var2, int[] var3, int var4, int
 			var6 += var7; // L: 947
 		}
 
-		var11.field310 += var11.field306 * var5; // L: 950
-		var11.field305 += var11.field319 * var5; // L: 951
-		var11.field311 = var6; // L: 952
-		var11.field318 = var4; // L: 953
+		var11.field340 += var11.field342 * var5; // L: 950
+		var11.field336 += var11.field343 * var5; // L: 951
+		var11.field333 = var6; // L: 952
+		var11.field335 = var4; // L: 953
 		return var5; // L: 954
 	}
 
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bd")
 	@ObfuscatedSignature(
-		descriptor = "(II[B[IIIIIIIIIILax;II)I"
+		descriptor = "(II[B[IIIIIIIIIILat;II)I"
 	)
-	static int method856(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
-		var13.field311 -= var5 * var13.field317; // L: 958
+	static int method879(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
+		var13.field333 -= var5 * var13.field341; // L: 958
 		if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959
 			var10 = var11;
 		}
@@ -1471,20 +1471,20 @@ static int method856(int var0, int var1, byte[] var2, int[] var3, int var4, int
 		}
 
 		var5 >>= 1; // L: 984
-		var13.field311 += var13.field317 * var5; // L: 985
-		var13.field310 = var6; // L: 986
-		var13.field305 = var7; // L: 987
-		var13.field318 = var4; // L: 988
+		var13.field333 += var13.field341 * var5; // L: 985
+		var13.field340 = var6; // L: 986
+		var13.field336 = var7; // L: 987
+		var13.field335 = var4; // L: 988
 		return var5; // L: 989
 	}
 
-	@ObfuscatedName("bm")
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		descriptor = "(II[B[IIIIIIIILax;II)I"
+		descriptor = "(II[B[IIIIIIIILat;II)I"
 	)
-	static int method899(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
-		var11.field310 -= var11.field306 * var5; // L: 993
-		var11.field305 -= var11.field319 * var5; // L: 994
+	static int method880(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+		var11.field340 -= var11.field342 * var5; // L: 993
+		var11.field336 -= var11.field343 * var5; // L: 994
 		if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995
 			var8 = var9;
 		}
@@ -1511,19 +1511,19 @@ static int method899(int var0, int var1, byte[] var2, int[] var3, int var4, int
 			var6 += var7; // L: 1008
 		}
 
-		var11.field310 += var11.field306 * var5; // L: 1011
-		var11.field305 += var11.field319 * var5; // L: 1012
-		var11.field311 = var6; // L: 1013
-		var11.field318 = var4; // L: 1014
+		var11.field340 += var11.field342 * var5; // L: 1011
+		var11.field336 += var11.field343 * var5; // L: 1012
+		var11.field333 = var6; // L: 1013
+		var11.field335 = var4; // L: 1014
 		return var5; // L: 1015
 	}
 
-	@ObfuscatedName("br")
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
-		descriptor = "(II[B[IIIIIIIIIILax;II)I"
+		descriptor = "(II[B[IIIIIIIIIILat;II)I"
 	)
-	static int method858(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
-		var13.field311 -= var5 * var13.field317; // L: 1019
+	static int method881(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
+		var13.field333 -= var5 * var13.field341; // L: 1019
 		if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020
 			var10 = var11;
 		}
@@ -1560,10 +1560,10 @@ static int method858(int var0, int var1, byte[] var2, int[] var3, int var4, int
 		}
 
 		var5 >>= 1; // L: 1044
-		var13.field311 += var13.field317 * var5; // L: 1045
-		var13.field310 = var6; // L: 1046
-		var13.field305 = var7; // L: 1047
-		var13.field318 = var4; // L: 1048
+		var13.field333 += var13.field341 * var5; // L: 1045
+		var13.field340 = var6; // L: 1046
+		var13.field336 = var7; // L: 1047
+		var13.field335 = var4; // L: 1048
 		return var5; // L: 1049
 	}
 }
diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java
index e79aed368f..4826dd4363 100644
--- a/runescape-client/src/main/java/RawSound.java
+++ b/runescape-client/src/main/java/RawSound.java
@@ -3,23 +3,23 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("az")
+@ObfuscatedName("aj")
 @Implements("RawSound")
 public class RawSound extends AbstractSound {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("sampleRate")
 	public int sampleRate;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("samples")
 	public byte[] samples;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("start")
 	public int start;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("end")
 	int end;
-	@ObfuscatedName("o")
-	public boolean field238;
+	@ObfuscatedName("t")
+	public boolean field265;
 
 	RawSound(int var1, byte[] var2, int var3, int var4) {
 		this.sampleRate = var1; // L: 13
@@ -33,12 +33,12 @@ public class RawSound extends AbstractSound {
 		this.samples = var2; // L: 21
 		this.start = var3; // L: 22
 		this.end = var4; // L: 23
-		this.field238 = var5; // L: 24
+		this.field265 = var5; // L: 24
 	} // L: 25
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Laa;)Laz;"
+		descriptor = "(Lbp;)Laj;"
 	)
 	@Export("resample")
 	public RawSound resample(Decimator var1) {
diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java
index 047fb9b3b7..a7756c3669 100644
--- a/runescape-client/src/main/java/ReflectionCheck.java
+++ b/runescape-client/src/main/java/ReflectionCheck.java
@@ -5,93 +5,210 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bd")
+@ObfuscatedName("av")
 @Implements("ReflectionCheck")
 public class ReflectionCheck extends Node {
-	@ObfuscatedName("bo")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -740973297
-	)
-	static int field429;
-	@ObfuscatedName("nt")
-	@ObfuscatedGetter(
-		intValue = 999048453
-	)
-	@Export("selectedItemSlot")
-	static int selectedItemSlot;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -467081415
+		intValue = 928910033
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 143972529
+		intValue = -2055812563
 	)
 	@Export("size")
 	int size;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("operations")
 	int[] operations;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
+	@Export("arguments")
+	byte[][][] arguments;
+	@ObfuscatedName("t")
 	@Export("creationErrors")
 	int[] creationErrors;
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
 	@Export("fields")
 	Field[] fields;
-	@ObfuscatedName("g")
+	@ObfuscatedName("j")
 	@Export("intReplaceValues")
 	int[] intReplaceValues;
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@Export("methods")
 	Method[] methods;
-	@ObfuscatedName("p")
-	@Export("arguments")
-	byte[][][] arguments;
 
 	ReflectionCheck() {
 	} // L: 17
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Les;",
-		garbageValue = "16"
+		descriptor = "(III)I",
+		garbageValue = "12877661"
 	)
-	@Export("KitDefinition_get")
-	public static KitDefinition KitDefinition_get(int var0) {
-		KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27
-		if (var1 != null) { // L: 28
-			return var1;
+	@Export("ItemContainer_getCount")
+	static int ItemContainer_getCount(int var0, int var1) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21
+		if (var2 == null) { // L: 22
+			return 0;
 		} else {
-			byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 29
-			var1 = new KitDefinition(); // L: 30
-			if (var2 != null) { // L: 31
-				var1.decode(new Buffer(var2));
+			return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24
+		}
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1748869629"
+	)
+	static void method662(int var0) {
+		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72
+		if (var1 != null) {
+			var1.remove(); // L: 74
+		}
+	} // L: 73 75
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(Lbw;Lbw;IZB)I",
+		garbageValue = "-31"
+	)
+	@Export("compareWorlds")
+	static int compareWorlds(World var0, World var1, int var2, boolean var3) {
+		if (var2 == 1) { // L: 211
+			int var4 = var0.population; // L: 212
+			int var5 = var1.population; // L: 213
+			if (!var3) { // L: 214
+				if (var4 == -1) { // L: 215
+					var4 = 2001;
+				}
+
+				if (var5 == -1) { // L: 216
+					var5 = 2001;
+				}
 			}
 
-			KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 32
-			return var1; // L: 33
+			return var4 - var5; // L: 218
+		} else if (var2 == 2) { // L: 220
+			return var0.location - var1.location;
+		} else if (var2 == 3) { // L: 221
+			if (var0.activity.equals("-")) { // L: 222
+				if (var1.activity.equals("-")) { // L: 223
+					return 0;
+				} else {
+					return var3 ? -1 : 1; // L: 224
+				}
+			} else if (var1.activity.equals("-")) { // L: 226
+				return var3 ? 1 : -1;
+			} else {
+				return var0.activity.compareTo(var1.activity); // L: 227
+			}
+		} else if (var2 == 4) { // L: 229
+			return var0.method1676() ? (var1.method1676() ? 0 : 1) : (var1.method1676() ? -1 : 0);
+		} else if (var2 == 5) { // L: 230
+			return var0.method1696() ? (var1.method1696() ? 0 : 1) : (var1.method1696() ? -1 : 0);
+		} else if (var2 == 6) { // L: 231
+			return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
+		} else if (var2 == 7) { // L: 232
+			return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
+		} else {
+			return var0.id - var1.id; // L: 233
 		}
 	}
 
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "611566572"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "23177696"
 	)
-	static int method1115() {
-		return Login.field871.length + Login.field885.length; // L: 143
+	static int method663(int var0, Script var1, boolean var2) {
+		int var3;
+		int var6;
+		int var9;
+		if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2059
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 2060
+			var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2061
+			var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2062
+			EnumComposition var10 = class119.getEnum(var3); // L: 2063
+			if (var10.outputType != 's') { // L: 2064
+			}
+
+			for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2065
+				if (var9 == var10.keys[var6]) { // L: 2066
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2067
+					var10 = null; // L: 2068
+					break;
+				}
+			}
+
+			if (var10 != null) { // L: 2072
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10.defaultStr;
+			}
+
+			return 1; // L: 2073
+		} else if (var0 != ScriptOpcodes.ENUM) { // L: 2075
+			if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2101
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2102
+				EnumComposition var4 = class119.getEnum(var3); // L: 2103
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.size(); // L: 2104
+				return 1; // L: 2105
+			} else {
+				return 2; // L: 2107
+			}
+		} else {
+			IsaacCipher.Interpreter_intStackSize -= 4; // L: 2076
+			var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2077
+			var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2078
+			int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2079
+			var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 2080
+			EnumComposition var7 = class119.getEnum(var5); // L: 2081
+			if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2082
+				for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2087
+					if (var6 == var7.keys[var8]) { // L: 2088
+						if (var9 == 115) { // L: 2089
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.strVals[var8];
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2090
+						}
+
+						var7 = null; // L: 2091
+						break;
+					}
+				}
+
+				if (var7 != null) { // L: 2095
+					if (var9 == 115) {
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var7.defaultStr; // L: 2096
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2097
+					}
+				}
+
+				return 1; // L: 2099
+			} else {
+				if (var9 == 115) { // L: 2083
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = "null";
+				} else {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2084
+				}
+
+				return 1; // L: 2085
+			}
+		}
 	}
 
-	@ObfuscatedName("kz")
+	@ObfuscatedName("go")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "2023329615"
+		garbageValue = "682246596"
 	)
-	static final void method1114() {
-		Client.field666 = Client.cycleCntr; // L: 11794
-		class6.ClanChat_inClanChat = true; // L: 11795
-	} // L: 11796
+	static void method664() {
+		if (class340.localPlayer.x >> 7 == Client.destinationX && class340.localPlayer.y >> 7 == Client.destinationY) { // L: 5435
+			Client.destinationX = 0; // L: 5436
+		}
+
+	} // L: 5438
 }
diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java
index b3d0c3f48e..bcce93ead2 100644
--- a/runescape-client/src/main/java/Renderable.java
+++ b/runescape-client/src/main/java/Renderable.java
@@ -4,17 +4,17 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hj")
+@ObfuscatedName("gt")
 @Implements("Renderable")
 public abstract class Renderable extends DualNode {
-	@ObfuscatedName("sd")
+	@ObfuscatedName("sy")
 	@ObfuscatedGetter(
-		intValue = 1632556935
+		intValue = -1303192777
 	)
-	static int field2442;
-	@ObfuscatedName("cu")
+	static int field2358;
+	@ObfuscatedName("cf")
 	@ObfuscatedGetter(
-		intValue = 1520356877
+		intValue = -1198254481
 	)
 	@Export("height")
 	public int height;
@@ -23,17 +23,17 @@ protected Renderable() {
 		this.height = 1000; // L: 6
 	} // L: 8
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lhl;",
-		garbageValue = "461766541"
+		descriptor = "(I)Lgo;",
+		garbageValue = "202861607"
 	)
 	@Export("getModel")
 	protected Model getModel() {
 		return null; // L: 19
 	}
 
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cq")
 	@Export("draw")
 	void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
 		Model var11 = this.getModel(); // L: 11
@@ -43,4 +43,92 @@ void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7,
 		}
 
 	} // L: 16
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(CLlf;B)C",
+		garbageValue = "106"
+	)
+	@Export("standardizeChar")
+	static char standardizeChar(char var0, Language var1) {
+		if (var0 >= 192 && var0 <= 255) { // L: 117
+			if (var0 >= 192 && var0 <= 198) { // L: 118
+				return 'A';
+			}
+
+			if (var0 == 199) { // L: 119
+				return 'C';
+			}
+
+			if (var0 >= 200 && var0 <= 203) { // L: 120
+				return 'E';
+			}
+
+			if (var0 >= 204 && var0 <= 207) { // L: 121
+				return 'I';
+			}
+
+			if (var0 == 209 && var1 != Language.Language_ES) { // L: 122
+				return 'N';
+			}
+
+			if (var0 >= 210 && var0 <= 214) { // L: 123
+				return 'O';
+			}
+
+			if (var0 >= 217 && var0 <= 220) { // L: 124
+				return 'U';
+			}
+
+			if (var0 == 221) { // L: 125
+				return 'Y';
+			}
+
+			if (var0 == 223) { // L: 126
+				return 's';
+			}
+
+			if (var0 >= 224 && var0 <= 230) { // L: 127
+				return 'a';
+			}
+
+			if (var0 == 231) { // L: 128
+				return 'c';
+			}
+
+			if (var0 >= 232 && var0 <= 235) { // L: 129
+				return 'e';
+			}
+
+			if (var0 >= 236 && var0 <= 239) { // L: 130
+				return 'i';
+			}
+
+			if (var0 == 241 && var1 != Language.Language_ES) { // L: 131
+				return 'n';
+			}
+
+			if (var0 >= 242 && var0 <= 246) { // L: 132
+				return 'o';
+			}
+
+			if (var0 >= 249 && var0 <= 252) { // L: 133
+				return 'u';
+			}
+
+			if (var0 == 253 || var0 == 255) { // L: 134
+				return 'y';
+			}
+		}
+
+		if (var0 == 338) { // L: 136
+			return 'O';
+		} else if (var0 == 339) { // L: 137
+			return 'o';
+		} else if (var0 == 376) { // L: 138
+			return 'Y';
+		} else {
+			return var0; // L: 139
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java
index 87a3a08967..cfd961d163 100644
--- a/runescape-client/src/main/java/RouteStrategy.java
+++ b/runescape-client/src/main/java/RouteStrategy.java
@@ -4,58 +4,104 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fc")
+@ObfuscatedName("gv")
 @Implements("RouteStrategy")
 public abstract class RouteStrategy {
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
+	@Export("SpriteBuffer_yOffsets")
+	public static int[] SpriteBuffer_yOffsets;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 12457579
-	)
-	public static int field1979;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Low;"
-	)
-	@Export("leftTitleSprite")
-	static SpritePixels leftTitleSprite;
-	@ObfuscatedName("bt")
-	@ObfuscatedSignature(
-		descriptor = "Ljd;"
-	)
-	static StudioGame field1986;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -116469837
+		intValue = -1093494781
 	)
 	@Export("approxDestinationX")
 	public int approxDestinationX;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1807509661
+		intValue = 601492967
 	)
 	@Export("approxDestinationY")
 	public int approxDestinationY;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -655785289
+		intValue = 1459181163
 	)
-	@Export("approxDestinationSizeX")
-	public int approxDestinationSizeX;
-	@ObfuscatedName("a")
+	public int field2117;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1106041025
+		intValue = 1902503467
 	)
-	@Export("approxDestinationSizeY")
-	public int approxDestinationSizeY;
+	public int field2114;
 
 	protected RouteStrategy() {
 	} // L: 9
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIILfq;I)Z",
-		garbageValue = "-526381699"
+		descriptor = "(IIILgf;I)Z",
+		garbageValue = "-563456214"
 	)
 	@Export("hasArrived")
 	public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4);
+
+	@ObfuscatedName("gj")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-1664950073"
+	)
+	@Export("doCheat")
+	static final void doCheat(String var0) {
+		if (var0.equalsIgnoreCase("toggleroof")) { // L: 4503
+			SecureRandomFuture.clientPreferences.roofsHidden = !SecureRandomFuture.clientPreferences.roofsHidden; // L: 4504
+			class127.savePreferences(); // L: 4505
+			if (SecureRandomFuture.clientPreferences.roofsHidden) { // L: 4506
+				class194.addGameMessage(99, "", "Roofs are now all hidden");
+			} else {
+				class194.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 4507
+			}
+		}
+
+		if (var0.equalsIgnoreCase("displayfps")) { // L: 4509
+			Client.displayFps = !Client.displayFps;
+		}
+
+		if (var0.equalsIgnoreCase("renderself")) { // L: 4510
+			Client.renderSelf = !Client.renderSelf;
+		}
+
+		if (var0.equalsIgnoreCase("mouseovertext")) {
+			Client.showMouseOverText = !Client.showMouseOverText; // L: 4511
+		}
+
+		if (Client.staffModLevel >= 2) { // L: 4512
+			if (var0.equalsIgnoreCase("errortest")) { // L: 4513
+				throw new RuntimeException();
+			}
+
+			if (var0.equalsIgnoreCase("showcoord")) { // L: 4514
+				Varcs.worldMap.showCoord = !Varcs.worldMap.showCoord;
+			}
+
+			if (var0.equalsIgnoreCase("fpson")) { // L: 4515
+				Client.displayFps = true;
+			}
+
+			if (var0.equalsIgnoreCase("fpsoff")) { // L: 4516
+				Client.displayFps = false;
+			}
+
+			if (var0.equalsIgnoreCase("gc")) { // L: 4517
+				System.gc();
+			}
+
+			if (var0.equalsIgnoreCase("clientdrop")) { // L: 4518
+				Varcs.method2411();
+			}
+		}
+
+		PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2846, Client.packetWriter.isaacCipher); // L: 4521
+		var1.packetBuffer.writeByte(var0.length() + 1); // L: 4522
+		var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 4523
+		Client.packetWriter.addNode(var1); // L: 4524
+	} // L: 4525
 }
diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java
index e5571f6729..f30bf8a52d 100644
--- a/runescape-client/src/main/java/RunException.java
+++ b/runescape-client/src/main/java/RunException.java
@@ -4,31 +4,25 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("pg")
+@ObfuscatedName("qg")
 @Implements("RunException")
 public class RunException extends RuntimeException {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("RunException_applet")
 	public static Applet RunException_applet;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("localPlayerName")
 	public static String localPlayerName;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1816654499
+		intValue = 70250403
 	)
 	@Export("RunException_revision")
 	public static int RunException_revision;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = -312845881
-	)
-	@Export("clientType")
-	public static int clientType;
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
 	@Export("message")
 	String message;
-	@ObfuscatedName("g")
+	@ObfuscatedName("j")
 	@Export("throwable")
 	Throwable throwable;
 
diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java
index 788afafa1c..34da6cf84e 100644
--- a/runescape-client/src/main/java/Scene.java
+++ b/runescape-client/src/main/java/Scene.java
@@ -3,188 +3,188 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hf")
+@ObfuscatedName("gy")
 @Implements("Scene")
 public class Scene {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("Scene_isLowDetail")
 	public static boolean Scene_isLowDetail;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("tileUpdateCount")
 	static int tileUpdateCount;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("Scene_plane")
 	static int Scene_plane;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("Scene_drawnCount")
 	static int Scene_drawnCount;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("Scene_cameraXTileMin")
 	static int Scene_cameraXTileMin;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("Scene_cameraXTileMax")
 	static int Scene_cameraXTileMax;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("Scene_cameraYTileMin")
 	static int Scene_cameraYTileMin;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("Scene_cameraYTileMax")
 	static int Scene_cameraYTileMax;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("Scene_cameraXTile")
 	static int Scene_cameraXTile;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("Scene_cameraYTile")
 	static int Scene_cameraYTile;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@Export("Scene_cameraX")
 	static int Scene_cameraX;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@Export("Scene_cameraY")
 	static int Scene_cameraY;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@Export("Scene_cameraZ")
 	static int Scene_cameraZ;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@Export("Scene_cameraPitchSine")
 	static int Scene_cameraPitchSine;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@Export("Scene_cameraPitchCosine")
 	static int Scene_cameraPitchCosine;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@Export("Scene_cameraYawSine")
 	static int Scene_cameraYawSine;
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@Export("Scene_cameraYawCosine")
 	static int Scene_cameraYawCosine;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "[Lhv;"
+		descriptor = "[Lhl;"
 	)
 	@Export("gameObjects")
 	static GameObject[] gameObjects;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@Export("checkClick")
 	static boolean checkClick;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@Export("Scene_selectedPlane")
 	static int Scene_selectedPlane;
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@Export("Scene_selectedScreenX")
 	static int Scene_selectedScreenX;
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@Export("Scene_selectedScreenY")
 	static int Scene_selectedScreenY;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@Export("Scene_selectedX")
 	public static int Scene_selectedX;
 	@ObfuscatedName("ac")
 	@Export("Scene_selectedY")
 	public static int Scene_selectedY;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@Export("viewportWalking")
 	static boolean viewportWalking;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ag")
 	@Export("Scene_planesCount")
 	static int Scene_planesCount;
-	@ObfuscatedName("an")
+	@ObfuscatedName("al")
 	@Export("Scene_planeOccluderCounts")
 	static int[] Scene_planeOccluderCounts;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "[[Lhw;"
+		descriptor = "[[Lgl;"
 	)
 	@Export("Scene_planeOccluders")
 	static Occluder[][] Scene_planeOccluders;
-	@ObfuscatedName("av")
+	@ObfuscatedName("as")
 	@Export("Scene_currentOccludersCount")
 	static int Scene_currentOccludersCount;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		descriptor = "[Lhw;"
+		descriptor = "[Lgl;"
 	)
 	@Export("Scene_currentOccluders")
 	static Occluder[] Scene_currentOccluders;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("Scene_tilesDeque")
 	static NodeDeque Scene_tilesDeque;
-	@ObfuscatedName("aj")
-	static final int[] field2421;
-	@ObfuscatedName("af")
-	static final int[] field2422;
+	@ObfuscatedName("aq")
+	static final int[] field2306;
 	@ObfuscatedName("aw")
-	static final int[] field2423;
-	@ObfuscatedName("ao")
-	static final int[] field2424;
-	@ObfuscatedName("aa")
-	static final int[] field2425;
+	static final int[] field2338;
 	@ObfuscatedName("ay")
-	static final int[] field2378;
-	@ObfuscatedName("bg")
-	static final int[] field2376;
-	@ObfuscatedName("bh")
+	static final int[] field2339;
+	@ObfuscatedName("ae")
+	static final int[] field2323;
+	@ObfuscatedName("ak")
+	static final int[] field2357;
+	@ObfuscatedName("ad")
+	static final int[] field2342;
+	@ObfuscatedName("bp")
+	static final int[] field2343;
+	@ObfuscatedName("bm")
 	@Export("visibilityMap")
 	static boolean[][][][] visibilityMap;
 	@ObfuscatedName("bw")
 	@Export("visibleTiles")
 	static boolean[][] visibleTiles;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bl")
 	@Export("Scene_viewportXCenter")
 	static int Scene_viewportXCenter;
-	@ObfuscatedName("br")
+	@ObfuscatedName("bz")
 	@Export("Scene_viewportYCenter")
 	static int Scene_viewportYCenter;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bu")
 	@Export("Scene_viewportXMin")
 	static int Scene_viewportXMin;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bs")
 	@Export("Scene_viewportYMin")
 	static int Scene_viewportYMin;
 	@ObfuscatedName("bv")
 	@Export("Scene_viewportXMax")
 	static int Scene_viewportXMax;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bb")
 	@Export("Scene_viewportYMax")
 	static int Scene_viewportYMax;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("xSize")
 	int xSize;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("tileHeights")
 	int[][][] tileHeights;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "[[[Lhm;"
+		descriptor = "[[[Lgb;"
 	)
 	@Export("tiles")
 	Tile[][][] tiles;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("tempGameObjectsCount")
 	int tempGameObjectsCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "[Lhv;"
+		descriptor = "[Lhl;"
 	)
 	@Export("tempGameObjects")
 	GameObject[] tempGameObjects;
-	@ObfuscatedName("b")
-	int[][][] field2409;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("r")
+	int[][][] field2300;
+	@ObfuscatedName("br")
 	@Export("tileShape2D")
 	int[][] tileShape2D;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bi")
 	@Export("tileRotation2D")
 	int[][] tileRotation2D;
 
@@ -206,13 +206,13 @@ public class Scene {
 		Scene_currentOccludersCount = 0; // L: 51
 		Scene_currentOccluders = new Occluder[500]; // L: 52
 		Scene_tilesDeque = new NodeDeque(); // L: 53
-		field2421 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54
-		field2422 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55
-		field2423 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56
-		field2424 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57
-		field2425 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58
-		field2378 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59
-		field2376 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60
+		field2306 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54
+		field2338 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55
+		field2339 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56
+		field2323 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57
+		field2357 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58
+		field2342 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59
+		field2343 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60
 		visibilityMap = new boolean[8][32][51][51]; // L: 86
 	}
 
@@ -226,12 +226,12 @@ public Scene(int var1, int var2, int var3, int[][][] var4) {
 		this.xSize = var2; // L: 97
 		this.ySize = var3; // L: 98
 		this.tiles = new Tile[var1][var2][var3]; // L: 99
-		this.field2409 = new int[var1][var2 + 1][var3 + 1]; // L: 100
+		this.field2300 = new int[var1][var2 + 1][var3 + 1]; // L: 100
 		this.tileHeights = var4; // L: 101
 		this.clear(); // L: 102
 	} // L: 103
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("clear")
 	public void clear() {
 		int var1;
@@ -264,7 +264,7 @@ public void clear() {
 
 	} // L: 120
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("init")
 	public void init(int var1) {
 		this.minPlane = var1; // L: 123
@@ -279,7 +279,7 @@ public void init(int var1) {
 
 	} // L: 129
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("setLinkBelow")
 	public void setLinkBelow(int var1, int var2) {
 		Tile var3 = this.tiles[0][var1][var2]; // L: 132
@@ -291,681 +291,669 @@ public void setLinkBelow(int var1, int var2) {
 
 				for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137
 					GameObject var7 = var5.gameObjects[var6]; // L: 138
-					long var9 = var7.tag; // L: 140
-					int var11 = (int)(var9 >>> 14 & 3L); // L: 144
-					boolean var8 = var11 == 2; // L: 146
-					if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 148
+					if (ArchiveLoader.method2123(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139
 						--var7.plane;
 					}
 				}
 			}
 		}
 
-		if (this.tiles[0][var1][var2] == null) { // L: 152
+		if (this.tiles[0][var1][var2] == null) { // L: 143
 			this.tiles[0][var1][var2] = new Tile(0, var1, var2);
 		}
 
-		this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 153
-		this.tiles[3][var1][var2] = null; // L: 154
-	} // L: 155
+		this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 144
+		this.tiles[3][var1][var2] = null; // L: 145
+	} // L: 146
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("setTileMinPlane")
 	public void setTileMinPlane(int var1, int var2, int var3, int var4) {
-		Tile var5 = this.tiles[var1][var2][var3]; // L: 174
-		if (var5 != null) { // L: 175
-			this.tiles[var1][var2][var3].minPlane = var4; // L: 176
+		Tile var5 = this.tiles[var1][var2][var3]; // L: 165
+		if (var5 != null) { // L: 166
+			this.tiles[var1][var2][var3].minPlane = var4; // L: 167
 		}
-	} // L: 177
+	} // L: 168
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("addTile")
 	public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) {
 		SceneTilePaint var21;
 		int var22;
-		if (var4 == 0) { // L: 180
-			var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 181
+		if (var4 == 0) { // L: 171
+			var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172
 
-			for (var22 = var1; var22 >= 0; --var22) { // L: 182
+			for (var22 = var1; var22 >= 0; --var22) { // L: 173
 				if (this.tiles[var22][var2][var3] == null) {
 					this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
 				}
 			}
 
-			this.tiles[var1][var2][var3].paint = var21; // L: 183
-		} else if (var4 != 1) { // L: 186
-			SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 192
+			this.tiles[var1][var2][var3].paint = var21; // L: 174
+		} else if (var4 != 1) { // L: 177
+			SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183
 
-			for (var22 = var1; var22 >= 0; --var22) { // L: 193
+			for (var22 = var1; var22 >= 0; --var22) { // L: 184
 				if (this.tiles[var22][var2][var3] == null) {
 					this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
 				}
 			}
 
-			this.tiles[var1][var2][var3].model = var23; // L: 194
+			this.tiles[var1][var2][var3].model = var23; // L: 185
 		} else {
-			var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 187
+			var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178
 
-			for (var22 = var1; var22 >= 0; --var22) { // L: 188
+			for (var22 = var1; var22 >= 0; --var22) { // L: 179
 				if (this.tiles[var22][var2][var3] == null) {
 					this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
 				}
 			}
 
-			this.tiles[var1][var2][var3].paint = var21; // L: 189
+			this.tiles[var1][var2][var3].paint = var21; // L: 180
 		}
-	} // L: 184 190 195
+	} // L: 175 181 186
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILhj;JI)V"
+		descriptor = "(IIIILgt;JI)V"
 	)
 	@Export("newFloorDecoration")
 	public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) {
-		if (var5 != null) { // L: 198
-			FloorDecoration var9 = new FloorDecoration(); // L: 199
-			var9.renderable = var5; // L: 200
-			var9.x = var2 * 128 + 64; // L: 201
-			var9.y = var3 * 128 + 64; // L: 202
-			var9.tileHeight = var4; // L: 203
-			var9.tag = var6; // L: 204
-			var9.flags = var8; // L: 205
-			if (this.tiles[var1][var2][var3] == null) { // L: 206
+		if (var5 != null) { // L: 189
+			FloorDecoration var9 = new FloorDecoration(); // L: 190
+			var9.renderable = var5; // L: 191
+			var9.x = var2 * 128 + 64; // L: 192
+			var9.y = var3 * 128 + 64; // L: 193
+			var9.tileHeight = var4; // L: 194
+			var9.tag = var6; // L: 195
+			var9.flags = var8; // L: 196
+			if (this.tiles[var1][var2][var3] == null) { // L: 197
 				this.tiles[var1][var2][var3] = new Tile(var1, var2, var3);
 			}
 
-			this.tiles[var1][var2][var3].floorDecoration = var9; // L: 207
+			this.tiles[var1][var2][var3].floorDecoration = var9; // L: 198
 		}
-	} // L: 208
+	} // L: 199
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILhj;JLhj;Lhj;)V"
+		descriptor = "(IIIILgt;JLgt;Lgt;)V"
 	)
 	@Export("newGroundItemPile")
 	public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) {
-		ItemLayer var10 = new ItemLayer(); // L: 211
-		var10.first = var5; // L: 212
-		var10.x = var2 * 128 + 64; // L: 213
-		var10.y = var3 * 128 + 64; // L: 214
-		var10.tileHeight = var4; // L: 215
-		var10.tag = var6; // L: 216
-		var10.second = var8; // L: 217
-		var10.third = var9; // L: 218
-		int var11 = 0; // L: 219
-		Tile var12 = this.tiles[var1][var2][var3]; // L: 220
-		if (var12 != null) { // L: 221
-			for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 222
-				if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 223
-					Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 224
-					var14.calculateBoundsCylinder(); // L: 225
-					if (var14.height > var11) { // L: 226
+		ItemLayer var10 = new ItemLayer(); // L: 202
+		var10.first = var5; // L: 203
+		var10.x = var2 * 128 + 64; // L: 204
+		var10.y = var3 * 128 + 64; // L: 205
+		var10.tileHeight = var4; // L: 206
+		var10.tag = var6; // L: 207
+		var10.second = var8; // L: 208
+		var10.third = var9; // L: 209
+		int var11 = 0; // L: 210
+		Tile var12 = this.tiles[var1][var2][var3]; // L: 211
+		if (var12 != null) { // L: 212
+			for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 213
+				if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 214
+					Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 215
+					var14.calculateBoundsCylinder(); // L: 216
+					if (var14.height > var11) { // L: 217
 						var11 = var14.height;
 					}
 				}
 			}
 		}
 
-		var10.height = var11; // L: 230
+		var10.height = var11; // L: 221
 		if (this.tiles[var1][var2][var3] == null) {
-			this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 231
+			this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222
 		}
 
-		this.tiles[var1][var2][var3].itemLayer = var10; // L: 232
-	} // L: 233
+		this.tiles[var1][var2][var3].itemLayer = var10; // L: 223
+	} // L: 224
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILhj;Lhj;IIJI)V"
+		descriptor = "(IIIILgt;Lgt;IIJI)V"
 	)
 	@Export("newBoundaryObject")
 	public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) {
-		if (var5 != null || var6 != null) { // L: 236
-			BoundaryObject var12 = new BoundaryObject(); // L: 237
-			var12.tag = var9; // L: 238
-			var12.flags = var11; // L: 239
-			var12.x = var2 * 128 + 64; // L: 240
-			var12.y = var3 * 128 + 64; // L: 241
-			var12.tileHeight = var4; // L: 242
-			var12.renderable1 = var5; // L: 243
-			var12.renderable2 = var6; // L: 244
-			var12.orientationA = var7; // L: 245
-			var12.orientationB = var8; // L: 246
+		if (var5 != null || var6 != null) { // L: 227
+			BoundaryObject var12 = new BoundaryObject(); // L: 228
+			var12.tag = var9; // L: 229
+			var12.flags = var11; // L: 230
+			var12.x = var2 * 128 + 64; // L: 231
+			var12.y = var3 * 128 + 64; // L: 232
+			var12.tileHeight = var4; // L: 233
+			var12.renderable1 = var5; // L: 234
+			var12.renderable2 = var6; // L: 235
+			var12.orientationA = var7; // L: 236
+			var12.orientationB = var8; // L: 237
 
 			for (int var13 = var1; var13 >= 0; --var13) {
 				if (this.tiles[var13][var2][var3] == null) {
-					this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 247
+					this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 238
 				}
 			}
 
-			this.tiles[var1][var2][var3].boundaryObject = var12; // L: 248
+			this.tiles[var1][var2][var3].boundaryObject = var12; // L: 239
 		}
-	} // L: 249
+	} // L: 240
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILhj;Lhj;IIIIJI)V"
+		descriptor = "(IIIILgt;Lgt;IIIIJI)V"
 	)
 	@Export("newWallDecoration")
 	public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) {
-		if (var5 != null) { // L: 252
-			WallDecoration var14 = new WallDecoration(); // L: 253
-			var14.tag = var11; // L: 254
-			var14.flags = var13; // L: 255
-			var14.x = var2 * 128 + 64; // L: 256
-			var14.y = var3 * 128 + 64; // L: 257
-			var14.tileHeight = var4; // L: 258
-			var14.renderable1 = var5; // L: 259
-			var14.renderable2 = var6; // L: 260
-			var14.orientation = var7; // L: 261
-			var14.orientation2 = var8; // L: 262
-			var14.xOffset = var9; // L: 263
-			var14.yOffset = var10; // L: 264
+		if (var5 != null) { // L: 243
+			WallDecoration var14 = new WallDecoration(); // L: 244
+			var14.tag = var11; // L: 245
+			var14.flags = var13; // L: 246
+			var14.x = var2 * 128 + 64; // L: 247
+			var14.y = var3 * 128 + 64; // L: 248
+			var14.tileHeight = var4; // L: 249
+			var14.renderable1 = var5; // L: 250
+			var14.renderable2 = var6; // L: 251
+			var14.orientation = var7; // L: 252
+			var14.orientation2 = var8; // L: 253
+			var14.xOffset = var9; // L: 254
+			var14.yOffset = var10; // L: 255
 
 			for (int var15 = var1; var15 >= 0; --var15) {
 				if (this.tiles[var15][var2][var3] == null) {
-					this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 265
+					this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 256
 				}
 			}
 
-			this.tiles[var1][var2][var3].wallDecoration = var14; // L: 266
+			this.tiles[var1][var2][var3].wallDecoration = var14; // L: 257
 		}
-	} // L: 267
+	} // L: 258
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIILhj;IJI)Z"
+		descriptor = "(IIIIIILgt;IJI)Z"
 	)
-	public boolean method4289(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) {
-		if (var7 == null) { // L: 270
+	public boolean method3960(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) {
+		if (var7 == null) { // L: 261
 			return true;
 		} else {
-			int var12 = var5 * 64 + var2 * 128; // L: 271
-			int var13 = var6 * 64 + var3 * 128; // L: 272
-			return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 273
+			int var12 = var5 * 64 + var2 * 128; // L: 262
+			int var13 = var6 * 64 + var3 * 128; // L: 263
+			return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 264
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIILhj;IJZ)Z"
+		descriptor = "(IIIIILgt;IJZ)Z"
 	)
 	@Export("drawEntity")
 	public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) {
-		if (var6 == null) { // L: 277
+		if (var6 == null) { // L: 268
 			return true;
 		} else {
-			int var11 = var2 - var5; // L: 278
-			int var12 = var3 - var5; // L: 279
-			int var13 = var5 + var2; // L: 280
-			int var14 = var3 + var5; // L: 281
-			if (var10) { // L: 282
-				if (var7 > 640 && var7 < 1408) { // L: 283
+			int var11 = var2 - var5; // L: 269
+			int var12 = var3 - var5; // L: 270
+			int var13 = var5 + var2; // L: 271
+			int var14 = var3 + var5; // L: 272
+			if (var10) { // L: 273
+				if (var7 > 640 && var7 < 1408) { // L: 274
 					var14 += 128;
 				}
 
-				if (var7 > 1152 && var7 < 1920) { // L: 284
+				if (var7 > 1152 && var7 < 1920) { // L: 275
 					var13 += 128;
 				}
 
-				if (var7 > 1664 || var7 < 384) { // L: 285
+				if (var7 > 1664 || var7 < 384) { // L: 276
 					var12 -= 128;
 				}
 
-				if (var7 > 128 && var7 < 896) { // L: 286
+				if (var7 > 128 && var7 < 896) { // L: 277
 					var11 -= 128;
 				}
 			}
 
-			var11 /= 128; // L: 288
-			var12 /= 128; // L: 289
-			var13 /= 128; // L: 290
-			var14 /= 128; // L: 291
-			return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 292
+			var11 /= 128; // L: 279
+			var12 /= 128; // L: 280
+			var13 /= 128; // L: 281
+			var14 /= 128; // L: 282
+			return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 283
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIILhj;IJIIII)Z"
+		descriptor = "(IIIIILgt;IJIIII)Z"
 	)
 	@Export("addNullableObject")
 	public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) {
-		return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 296 297
+		return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 287 288
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIILhj;IZJI)Z"
+		descriptor = "(IIIIIIIILgt;IZJI)Z"
 	)
 	@Export("newGameObject")
 	boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) {
 		int var16;
-		for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 301
-			for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 302
-				if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 303
+		for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 292
+			for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 293
+				if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 294
 					return false;
 				}
 
-				Tile var23 = this.tiles[var1][var15][var16]; // L: 304
-				if (var23 != null && var23.gameObjectsCount >= 5) { // L: 305
+				Tile var23 = this.tiles[var1][var15][var16]; // L: 295
+				if (var23 != null && var23.gameObjectsCount >= 5) { // L: 296
 					return false;
 				}
 			}
 		}
 
-		GameObject var21 = new GameObject(); // L: 308
-		var21.tag = var12; // L: 309
-		var21.flags = var14; // L: 310
-		var21.plane = var1; // L: 311
-		var21.centerX = var6; // L: 312
-		var21.centerY = var7; // L: 313
-		var21.height = var8; // L: 314
-		var21.renderable = var9; // L: 315
-		var21.orientation = var10; // L: 316
-		var21.startX = var2; // L: 317
-		var21.startY = var3; // L: 318
-		var21.endX = var2 + var4 - 1; // L: 319
-		var21.endY = var3 + var5 - 1; // L: 320
-
-		for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 321
-			for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 322
-				int var18 = 0; // L: 323
-				if (var16 > var2) { // L: 324
+		GameObject var21 = new GameObject(); // L: 299
+		var21.tag = var12; // L: 300
+		var21.flags = var14; // L: 301
+		var21.plane = var1; // L: 302
+		var21.centerX = var6; // L: 303
+		var21.centerY = var7; // L: 304
+		var21.height = var8; // L: 305
+		var21.renderable = var9; // L: 306
+		var21.orientation = var10; // L: 307
+		var21.startX = var2; // L: 308
+		var21.startY = var3; // L: 309
+		var21.endX = var2 + var4 - 1; // L: 310
+		var21.endY = var3 + var5 - 1; // L: 311
+
+		for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 312
+			for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 313
+				int var18 = 0; // L: 314
+				if (var16 > var2) { // L: 315
 					++var18;
 				}
 
-				if (var16 < var2 + var4 - 1) { // L: 325
+				if (var16 < var2 + var4 - 1) { // L: 316
 					var18 += 4;
 				}
 
-				if (var17 > var3) { // L: 326
+				if (var17 > var3) { // L: 317
 					var18 += 8;
 				}
 
-				if (var17 < var3 + var5 - 1) { // L: 327
+				if (var17 < var3 + var5 - 1) { // L: 318
 					var18 += 2;
 				}
 
 				for (int var19 = var1; var19 >= 0; --var19) {
 					if (this.tiles[var19][var16][var17] == null) {
-						this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 328
+						this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 319
 					}
 				}
 
-				Tile var22 = this.tiles[var1][var16][var17]; // L: 329
-				var22.gameObjects[var22.gameObjectsCount] = var21; // L: 330
-				var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 331
-				var22.gameObjectsEdgeMask |= var18; // L: 333
-				++var22.gameObjectsCount; // L: 334
+				Tile var22 = this.tiles[var1][var16][var17]; // L: 320
+				var22.gameObjects[var22.gameObjectsCount] = var21; // L: 321
+				var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 322
+				var22.gameObjectsEdgeMask |= var18; // L: 324
+				++var22.gameObjectsCount; // L: 325
 			}
 		}
 
-		if (var11) { // L: 337
+		if (var11) { // L: 328
 			this.tempGameObjects[this.tempGameObjectsCount++] = var21;
 		}
 
-		return true; // L: 338
+		return true; // L: 329
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("clearTempGameObjects")
 	public void clearTempGameObjects() {
-		for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 342
-			GameObject var2 = this.tempGameObjects[var1]; // L: 343
-			this.removeGameObject(var2); // L: 344
-			this.tempGameObjects[var1] = null; // L: 345
+		for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333
+			GameObject var2 = this.tempGameObjects[var1]; // L: 334
+			this.removeGameObject(var2); // L: 335
+			this.tempGameObjects[var1] = null; // L: 336
 		}
 
-		this.tempGameObjectsCount = 0; // L: 347
-	} // L: 348
+		this.tempGameObjectsCount = 0; // L: 338
+	} // L: 339
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lhv;)V"
+		descriptor = "(Lhl;)V"
 	)
 	@Export("removeGameObject")
 	void removeGameObject(GameObject var1) {
-		for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 351
-			for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 352
-				Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 353
-				if (var4 != null) { // L: 354
+		for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 342
+			for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 343
+				Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 344
+				if (var4 != null) { // L: 345
 					int var5;
-					for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 355
-						if (var4.gameObjects[var5] == var1) { // L: 356
-							--var4.gameObjectsCount; // L: 357
+					for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 346
+						if (var4.gameObjects[var5] == var1) { // L: 347
+							--var4.gameObjectsCount; // L: 348
 
-							for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 358
-								var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 359
-								var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 360
+							for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 349
+								var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 350
+								var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 351
 							}
 
-							var4.gameObjects[var4.gameObjectsCount] = null; // L: 362
+							var4.gameObjects[var4.gameObjectsCount] = null; // L: 353
 							break;
 						}
 					}
 
-					var4.gameObjectsEdgeMask = 0; // L: 366
+					var4.gameObjectsEdgeMask = 0; // L: 357
 
-					for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 367
-						var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 369
+					for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 358
+						var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 360
 					}
 				}
 			}
 		}
 
-	} // L: 374
+	} // L: 365
 
-	@ObfuscatedName("n")
-	public void method4387(int var1, int var2, int var3, int var4) {
-		Tile var5 = this.tiles[var1][var2][var3]; // L: 377
-		if (var5 != null) { // L: 378
-			WallDecoration var6 = var5.wallDecoration; // L: 379
-			if (var6 != null) { // L: 380
-				var6.xOffset = var4 * var6.xOffset / 16; // L: 381
-				var6.yOffset = var4 * var6.yOffset / 16; // L: 382
+	@ObfuscatedName("a")
+	public void method3966(int var1, int var2, int var3, int var4) {
+		Tile var5 = this.tiles[var1][var2][var3]; // L: 368
+		if (var5 != null) { // L: 369
+			WallDecoration var6 = var5.wallDecoration; // L: 370
+			if (var6 != null) { // L: 371
+				var6.xOffset = var4 * var6.xOffset / 16; // L: 372
+				var6.yOffset = var4 * var6.yOffset / 16; // L: 373
 			}
 		}
-	} // L: 383
+	} // L: 374
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("removeBoundaryObject")
 	public void removeBoundaryObject(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 386
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 377
 		if (var4 != null) {
-			var4.boundaryObject = null; // L: 388
+			var4.boundaryObject = null; // L: 379
 		}
-	} // L: 387 389
+	} // L: 378 380
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("removeWallDecoration")
 	public void removeWallDecoration(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 392
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 383
 		if (var4 != null) {
-			var4.wallDecoration = null; // L: 394
+			var4.wallDecoration = null; // L: 385
 		}
-	} // L: 393 395
+	} // L: 384 386
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("removeGameObject")
 	public void removeGameObject(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 398
-		if (var4 != null) { // L: 399
-			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 400
-				GameObject var6 = var4.gameObjects[var5]; // L: 401
-				long var8 = var6.tag; // L: 403
-				int var10 = (int)(var8 >>> 14 & 3L); // L: 407
-				boolean var7 = var10 == 2; // L: 409
-				if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 411
-					this.removeGameObject(var6); // L: 412
-					return; // L: 413
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 389
+		if (var4 != null) { // L: 390
+			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 391
+				GameObject var6 = var4.gameObjects[var5]; // L: 392
+				if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393
+					this.removeGameObject(var6); // L: 394
+					return; // L: 395
 				}
 			}
 
 		}
-	} // L: 416
+	} // L: 398
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("removeFloorDecoration")
 	public void removeFloorDecoration(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 419
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 401
 		if (var4 != null) {
-			var4.floorDecoration = null; // L: 421
+			var4.floorDecoration = null; // L: 403
 		}
-	} // L: 420 422
+	} // L: 402 404
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("removeGroundItemPile")
 	public void removeGroundItemPile(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 425
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 407
 		if (var4 != null) {
-			var4.itemLayer = null; // L: 427
+			var4.itemLayer = null; // L: 409
 		}
-	} // L: 426 428
+	} // L: 408 410
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lhb;"
+		descriptor = "(III)Lhg;"
 	)
-	public BoundaryObject method4301(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 431
-		return var4 == null ? null : var4.boundaryObject; // L: 432 433
+	public BoundaryObject method4105(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 413
+		return var4 == null ? null : var4.boundaryObject; // L: 414 415
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lhn;"
+		descriptor = "(III)Lhp;"
 	)
-	public WallDecoration method4410(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 437
-		return var4 == null ? null : var4.wallDecoration; // L: 438 439
+	public WallDecoration method3973(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 419
+		return var4 == null ? null : var4.wallDecoration; // L: 420 421
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lhv;"
+		descriptor = "(III)Lhl;"
 	)
 	@Export("getGameObject")
 	public GameObject getGameObject(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 443
-		if (var4 == null) { // L: 444
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 425
+		if (var4 == null) { // L: 426
 			return null;
 		} else {
-			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 445
-				GameObject var6 = var4.gameObjects[var5]; // L: 446
-				long var8 = var6.tag; // L: 448
-				int var10 = (int)(var8 >>> 14 & 3L); // L: 452
-				boolean var7 = var10 == 2; // L: 454
-				if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 456
+			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427
+				GameObject var6 = var4.gameObjects[var5]; // L: 428
+				if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429
 					return var6;
 				}
 			}
 
-			return null; // L: 458
+			return null; // L: 431
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lgq;"
+		descriptor = "(III)Lgx;"
 	)
 	@Export("getFloorDecoration")
 	public FloorDecoration getFloorDecoration(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 462
-		return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 463 464
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 435
+		return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@Export("getBoundaryObjectTag")
 	public long getBoundaryObjectTag(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 468
-		return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 469 470
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 441
+		return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@Export("getWallDecorationTag")
 	public long getWallDecorationTag(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 474
-		return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 475 476
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 447
+		return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@Export("getGameObjectTag")
 	public long getGameObjectTag(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 480
-		if (var4 == null) { // L: 481
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 453
+		if (var4 == null) { // L: 454
 			return 0L;
 		} else {
-			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 482
-				GameObject var6 = var4.gameObjects[var5]; // L: 483
-				long var8 = var6.tag; // L: 485
-				int var10 = (int)(var8 >>> 14 & 3L); // L: 489
-				boolean var7 = var10 == 2; // L: 491
-				if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 493
+			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455
+				GameObject var6 = var4.gameObjects[var5]; // L: 456
+				if (ArchiveLoader.method2123(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457
 					return var6.tag;
 				}
 			}
 
-			return 0L; // L: 495
+			return 0L; // L: 459
 		}
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@Export("getFloorDecorationTag")
 	public long getFloorDecorationTag(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 499
-		return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 500 501
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 463
+		return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@Export("getObjectFlags")
 	public int getObjectFlags(int var1, int var2, int var3, long var4) {
-		Tile var6 = this.tiles[var1][var2][var3]; // L: 505
-		if (var6 == null) { // L: 506
+		Tile var6 = this.tiles[var1][var2][var3]; // L: 469
+		if (var6 == null) { // L: 470
 			return -1;
-		} else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 507
+		} else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 471
 			return var6.boundaryObject.flags & 255;
-		} else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 508
+		} else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 472
 			return var6.wallDecoration.flags & 255;
-		} else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 509
+		} else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 473
 			return var6.floorDecoration.flags & 255;
 		} else {
-			for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 510
-				if (var6.gameObjects[var7].tag == var4) { // L: 511
+			for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 474
+				if (var6.gameObjects[var7].tag == var4) { // L: 475
 					return var6.gameObjects[var7].flags & 255;
 				}
 			}
 
-			return -1; // L: 513
+			return -1; // L: 477
 		}
 	}
 
-	@ObfuscatedName("ai")
-	public void method4310(int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < this.planes; ++var4) { // L: 517
-			for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 518
-				for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 519
-					Tile var7 = this.tiles[var4][var5][var6]; // L: 520
-					if (var7 != null) { // L: 521
-						BoundaryObject var8 = var7.boundaryObject; // L: 522
+	@ObfuscatedName("am")
+	public void method3981(int var1, int var2, int var3) {
+		for (int var4 = 0; var4 < this.planes; ++var4) { // L: 481
+			for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 482
+				for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 483
+					Tile var7 = this.tiles[var4][var5][var6]; // L: 484
+					if (var7 != null) { // L: 485
+						BoundaryObject var8 = var7.boundaryObject; // L: 486
 						ModelData var10;
-						if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 523
-							ModelData var9 = (ModelData)var8.renderable1; // L: 524
-							this.method4325(var9, var4, var5, var6, 1, 1); // L: 525
-							if (var8.renderable2 instanceof ModelData) { // L: 526
-								var10 = (ModelData)var8.renderable2; // L: 527
-								this.method4325(var10, var4, var5, var6, 1, 1); // L: 528
-								ModelData.method4130(var9, var10, 0, 0, 0, false); // L: 529
-								var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 530
+						if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487
+							ModelData var9 = (ModelData)var8.renderable1; // L: 488
+							this.method3976(var9, var4, var5, var6, 1, 1); // L: 489
+							if (var8.renderable2 instanceof ModelData) { // L: 490
+								var10 = (ModelData)var8.renderable2; // L: 491
+								this.method3976(var10, var4, var5, var6, 1, 1); // L: 492
+								ModelData.method3812(var9, var10, 0, 0, 0, false); // L: 493
+								var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494
 							}
 
-							var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 532
+							var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496
 						}
 
-						for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 534
-							GameObject var14 = var7.gameObjects[var12]; // L: 535
-							if (var14 != null && var14.renderable instanceof ModelData) { // L: 536
-								ModelData var11 = (ModelData)var14.renderable; // L: 537
-								this.method4325(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 538
-								var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 539
+						for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 498
+							GameObject var14 = var7.gameObjects[var12]; // L: 499
+							if (var14 != null && var14.renderable instanceof ModelData) { // L: 500
+								ModelData var11 = (ModelData)var14.renderable; // L: 501
+								this.method3976(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502
+								var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503
 							}
 						}
 
-						FloorDecoration var13 = var7.floorDecoration; // L: 542
-						if (var13 != null && var13.renderable instanceof ModelData) { // L: 543
-							var10 = (ModelData)var13.renderable; // L: 544
-							this.method4311(var10, var4, var5, var6); // L: 545
-							var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 546
+						FloorDecoration var13 = var7.floorDecoration; // L: 506
+						if (var13 != null && var13.renderable instanceof ModelData) { // L: 507
+							var10 = (ModelData)var13.renderable; // L: 508
+							this.method3982(var10, var4, var5, var6); // L: 509
+							var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510
 						}
 					}
 				}
 			}
 		}
 
-	} // L: 552
+	} // L: 516
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(Lgk;III)V"
+		descriptor = "(Lge;III)V"
 	)
-	void method4311(ModelData var1, int var2, int var3, int var4) {
+	void method3982(ModelData var1, int var2, int var3, int var4) {
 		Tile var5;
 		ModelData var6;
-		if (var3 < this.xSize) { // L: 555
-			var5 = this.tiles[var2][var3 + 1][var4]; // L: 556
-			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 557
-				var6 = (ModelData)var5.floorDecoration.renderable; // L: 558
-				ModelData.method4130(var1, var6, 128, 0, 0, true); // L: 559
+		if (var3 < this.xSize) { // L: 519
+			var5 = this.tiles[var2][var3 + 1][var4]; // L: 520
+			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 521
+				var6 = (ModelData)var5.floorDecoration.renderable; // L: 522
+				ModelData.method3812(var1, var6, 128, 0, 0, true); // L: 523
 			}
 		}
 
-		if (var4 < this.xSize) { // L: 562
-			var5 = this.tiles[var2][var3][var4 + 1]; // L: 563
-			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 564
-				var6 = (ModelData)var5.floorDecoration.renderable; // L: 565
-				ModelData.method4130(var1, var6, 0, 0, 128, true); // L: 566
+		if (var4 < this.xSize) { // L: 526
+			var5 = this.tiles[var2][var3][var4 + 1]; // L: 527
+			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 528
+				var6 = (ModelData)var5.floorDecoration.renderable; // L: 529
+				ModelData.method3812(var1, var6, 0, 0, 128, true); // L: 530
 			}
 		}
 
-		if (var3 < this.xSize && var4 < this.ySize) { // L: 569
-			var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 570
-			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 571
-				var6 = (ModelData)var5.floorDecoration.renderable; // L: 572
-				ModelData.method4130(var1, var6, 128, 0, 128, true); // L: 573
+		if (var3 < this.xSize && var4 < this.ySize) { // L: 533
+			var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 534
+			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 535
+				var6 = (ModelData)var5.floorDecoration.renderable; // L: 536
+				ModelData.method3812(var1, var6, 128, 0, 128, true); // L: 537
 			}
 		}
 
-		if (var3 < this.xSize && var4 > 0) { // L: 576
-			var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 577
-			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 578
-				var6 = (ModelData)var5.floorDecoration.renderable; // L: 579
-				ModelData.method4130(var1, var6, 128, 0, -128, true); // L: 580
+		if (var3 < this.xSize && var4 > 0) { // L: 540
+			var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 541
+			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 542
+				var6 = (ModelData)var5.floorDecoration.renderable; // L: 543
+				ModelData.method3812(var1, var6, 128, 0, -128, true); // L: 544
 			}
 		}
 
-	} // L: 583
+	} // L: 547
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "(Lgk;IIIII)V"
+		descriptor = "(Lge;IIIII)V"
 	)
-	void method4325(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
-		boolean var7 = true; // L: 586
-		int var8 = var3; // L: 587
-		int var9 = var3 + var5; // L: 588
-		int var10 = var4 - 1; // L: 589
-		int var11 = var4 + var6; // L: 590
-
-		for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 591
-			if (var12 != this.planes) { // L: 592
-				for (int var13 = var8; var13 <= var9; ++var13) { // L: 593
-					if (var13 >= 0 && var13 < this.xSize) { // L: 594
-						for (int var14 = var10; var14 <= var11; ++var14) { // L: 595
-							if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 596 597
-								Tile var15 = this.tiles[var12][var13][var14]; // L: 598
-								if (var15 != null) { // L: 599
-									int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 600
-									BoundaryObject var17 = var15.boundaryObject; // L: 601
-									if (var17 != null) { // L: 602
+	void method3976(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
+		boolean var7 = true; // L: 550
+		int var8 = var3; // L: 551
+		int var9 = var3 + var5; // L: 552
+		int var10 = var4 - 1; // L: 553
+		int var11 = var4 + var6; // L: 554
+
+		for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 555
+			if (var12 != this.planes) { // L: 556
+				for (int var13 = var8; var13 <= var9; ++var13) { // L: 557
+					if (var13 >= 0 && var13 < this.xSize) { // L: 558
+						for (int var14 = var10; var14 <= var11; ++var14) { // L: 559
+							if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 560 561
+								Tile var15 = this.tiles[var12][var13][var14]; // L: 562
+								if (var15 != null) { // L: 563
+									int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 564
+									BoundaryObject var17 = var15.boundaryObject; // L: 565
+									if (var17 != null) { // L: 566
 										ModelData var18;
-										if (var17.renderable1 instanceof ModelData) { // L: 603
-											var18 = (ModelData)var17.renderable1; // L: 604
-											ModelData.method4130(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 605
+										if (var17.renderable1 instanceof ModelData) { // L: 567
+											var18 = (ModelData)var17.renderable1; // L: 568
+											ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569
 										}
 
-										if (var17.renderable2 instanceof ModelData) { // L: 607
-											var18 = (ModelData)var17.renderable2; // L: 608
-											ModelData.method4130(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 609
+										if (var17.renderable2 instanceof ModelData) { // L: 571
+											var18 = (ModelData)var17.renderable2; // L: 572
+											ModelData.method3812(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573
 										}
 									}
 
-									for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 612
-										GameObject var19 = var15.gameObjects[var23]; // L: 613
-										if (var19 != null && var19.renderable instanceof ModelData) { // L: 614
-											ModelData var20 = (ModelData)var19.renderable; // L: 615
-											int var21 = var19.endX - var19.startX + 1; // L: 616
-											int var22 = var19.endY - var19.startY + 1; // L: 617
-											ModelData.method4130(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 618
+									for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 576
+										GameObject var19 = var15.gameObjects[var23]; // L: 577
+										if (var19 != null && var19.renderable instanceof ModelData) { // L: 578
+											ModelData var20 = (ModelData)var19.renderable; // L: 579
+											int var21 = var19.endX - var19.startX + 1; // L: 580
+											int var22 = var19.endY - var19.startY + 1; // L: 581
+											ModelData.method3812(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582
 										}
 									}
 								}
@@ -974,179 +962,179 @@ void method4325(ModelData var1, int var2, int var3, int var4, int var5, int var6
 					}
 				}
 
-				--var8; // L: 623
-				var7 = false; // L: 624
+				--var8; // L: 587
+				var7 = false; // L: 588
 			}
 		}
 
-	} // L: 626
+	} // L: 590
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@Export("drawTileMinimap")
 	public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) {
-		Tile var7 = this.tiles[var4][var5][var6]; // L: 629
-		if (var7 != null) { // L: 630
-			SceneTilePaint var8 = var7.paint; // L: 631
+		Tile var7 = this.tiles[var4][var5][var6]; // L: 593
+		if (var7 != null) { // L: 594
+			SceneTilePaint var8 = var7.paint; // L: 595
 			int var10;
-			if (var8 != null) { // L: 632
-				int var18 = var8.rgb; // L: 633
-				if (var18 != 0) { // L: 634
-					for (var10 = 0; var10 < 4; ++var10) { // L: 635
-						var1[var2] = var18; // L: 636
-						var1[var2 + 1] = var18; // L: 637
-						var1[var2 + 2] = var18; // L: 638
-						var1[var2 + 3] = var18; // L: 639
-						var2 += var3; // L: 640
+			if (var8 != null) { // L: 596
+				int var18 = var8.rgb; // L: 597
+				if (var18 != 0) { // L: 598
+					for (var10 = 0; var10 < 4; ++var10) { // L: 599
+						var1[var2] = var18; // L: 600
+						var1[var2 + 1] = var18; // L: 601
+						var1[var2 + 2] = var18; // L: 602
+						var1[var2 + 3] = var18; // L: 603
+						var2 += var3; // L: 604
 					}
 
 				}
 			} else {
-				SceneTileModel var9 = var7.model; // L: 644
-				if (var9 != null) { // L: 645
-					var10 = var9.shape; // L: 646
-					int var11 = var9.rotation; // L: 647
-					int var12 = var9.underlayRgb; // L: 648
-					int var13 = var9.overlayRgb; // L: 649
-					int[] var14 = this.tileShape2D[var10]; // L: 650
-					int[] var15 = this.tileRotation2D[var11]; // L: 651
-					int var16 = 0; // L: 652
+				SceneTileModel var9 = var7.model; // L: 608
+				if (var9 != null) { // L: 609
+					var10 = var9.shape; // L: 610
+					int var11 = var9.rotation; // L: 611
+					int var12 = var9.underlayRgb; // L: 612
+					int var13 = var9.overlayRgb; // L: 613
+					int[] var14 = this.tileShape2D[var10]; // L: 614
+					int[] var15 = this.tileRotation2D[var11]; // L: 615
+					int var16 = 0; // L: 616
 					int var17;
-					if (var12 != 0) { // L: 653
-						for (var17 = 0; var17 < 4; ++var17) { // L: 654
-							var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 655
-							var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 656
-							var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 657
-							var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 658
-							var2 += var3; // L: 659
+					if (var12 != 0) { // L: 617
+						for (var17 = 0; var17 < 4; ++var17) { // L: 618
+							var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 619
+							var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 620
+							var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 621
+							var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 622
+							var2 += var3; // L: 623
 						}
 					} else {
-						for (var17 = 0; var17 < 4; ++var17) { // L: 663
-							if (var14[var15[var16++]] != 0) { // L: 664
+						for (var17 = 0; var17 < 4; ++var17) { // L: 627
+							if (var14[var15[var16++]] != 0) { // L: 628
 								var1[var2] = var13;
 							}
 
-							if (var14[var15[var16++]] != 0) { // L: 665
+							if (var14[var15[var16++]] != 0) { // L: 629
 								var1[var2 + 1] = var13;
 							}
 
-							if (var14[var15[var16++]] != 0) { // L: 666
+							if (var14[var15[var16++]] != 0) { // L: 630
 								var1[var2 + 2] = var13;
 							}
 
-							if (var14[var15[var16++]] != 0) { // L: 667
+							if (var14[var15[var16++]] != 0) { // L: 631
 								var1[var2 + 3] = var13;
 							}
 
-							var2 += var3; // L: 668
+							var2 += var3; // L: 632
 						}
 					}
 
 				}
 			}
 		}
-	} // L: 642 671
+	} // L: 606 635
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@Export("menuOpen")
 	public void menuOpen(int var1, int var2, int var3, boolean var4) {
-		if (!shouldSendWalk() || var4) { // L: 750
-			checkClick = true; // L: 751
-			viewportWalking = var4; // L: 752
-			Scene_selectedPlane = var1; // L: 753
-			Scene_selectedScreenX = var2; // L: 754
-			Scene_selectedScreenY = var3; // L: 755
-			Scene_selectedX = -1; // L: 756
-			Scene_selectedY = -1; // L: 757
+		if (!shouldSendWalk() || var4) { // L: 714
+			checkClick = true; // L: 715
+			viewportWalking = var4; // L: 716
+			Scene_selectedPlane = var1; // L: 717
+			Scene_selectedScreenX = var2; // L: 718
+			Scene_selectedScreenY = var3; // L: 719
+			Scene_selectedX = -1; // L: 720
+			Scene_selectedY = -1; // L: 721
 		}
-	} // L: 758
+	} // L: 722
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("af")
 	@Export("setViewportWalking")
 	public void setViewportWalking() {
-		viewportWalking = true; // L: 761
-	} // L: 762
+		viewportWalking = true; // L: 725
+	} // L: 726
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("al")
 	@Export("draw")
 	public void draw(int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (var1 < 0) { // L: 774
+		if (var1 < 0) { // L: 738
 			var1 = 0;
-		} else if (var1 >= this.xSize * 128) { // L: 775
+		} else if (var1 >= this.xSize * 128) { // L: 739
 			var1 = this.xSize * 128 - 1;
 		}
 
-		if (var3 < 0) { // L: 776
+		if (var3 < 0) { // L: 740
 			var3 = 0;
-		} else if (var3 >= this.ySize * 128) { // L: 777
+		} else if (var3 >= this.ySize * 128) { // L: 741
 			var3 = this.ySize * 128 - 1;
 		}
 
-		if (var4 < 128) { // L: 778
+		if (var4 < 128) { // L: 742
 			var4 = 128;
-		} else if (var4 > 383) { // L: 779
+		} else if (var4 > 383) { // L: 743
 			var4 = 383;
 		}
 
-		++Scene_drawnCount; // L: 780
-		Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 781
-		Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 782
-		Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 783
-		Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 784
-		visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 785
-		Scene_cameraX = var1; // L: 786
-		Scene_cameraY = var2; // L: 787
-		Scene_cameraZ = var3; // L: 788
-		Scene_cameraXTile = var1 / 128; // L: 789
-		Scene_cameraYTile = var3 / 128; // L: 790
-		Scene_plane = var6; // L: 791
-		Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 792
-		if (Scene_cameraXTileMin < 0) { // L: 793
+		++Scene_drawnCount; // L: 744
+		Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 745
+		Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 746
+		Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 747
+		Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 748
+		visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 749
+		Scene_cameraX = var1; // L: 750
+		Scene_cameraY = var2; // L: 751
+		Scene_cameraZ = var3; // L: 752
+		Scene_cameraXTile = var1 / 128; // L: 753
+		Scene_cameraYTile = var3 / 128; // L: 754
+		Scene_plane = var6; // L: 755
+		Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 756
+		if (Scene_cameraXTileMin < 0) { // L: 757
 			Scene_cameraXTileMin = 0;
 		}
 
-		Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 794
-		if (Scene_cameraYTileMin < 0) { // L: 795
+		Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 758
+		if (Scene_cameraYTileMin < 0) { // L: 759
 			Scene_cameraYTileMin = 0;
 		}
 
-		Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 796
-		if (Scene_cameraXTileMax > this.xSize) { // L: 797
+		Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 760
+		if (Scene_cameraXTileMax > this.xSize) { // L: 761
 			Scene_cameraXTileMax = this.xSize;
 		}
 
-		Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 798
-		if (Scene_cameraYTileMax > this.ySize) { // L: 799
+		Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 762
+		if (Scene_cameraYTileMax > this.ySize) { // L: 763
 			Scene_cameraYTileMax = this.ySize;
 		}
 
-		this.occlude(); // L: 800
-		tileUpdateCount = 0; // L: 801
+		this.occlude(); // L: 764
+		tileUpdateCount = 0; // L: 765
 
 		int var7;
 		Tile[][] var8;
 		int var9;
 		int var10;
-		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 802
-			var8 = this.tiles[var7]; // L: 803
-
-			for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 804
-				for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 805
-					Tile var16 = var8[var9][var10]; // L: 806
-					if (var16 != null) { // L: 807
-						if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 808
-							var16.drawPrimary = true; // L: 814
-							var16.drawSecondary = true; // L: 815
-							if (var16.gameObjectsCount > 0) { // L: 816
+		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 766
+			var8 = this.tiles[var7]; // L: 767
+
+			for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 768
+				for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 769
+					Tile var16 = var8[var9][var10]; // L: 770
+					if (var16 != null) { // L: 771
+						if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 772
+							var16.drawPrimary = true; // L: 778
+							var16.drawSecondary = true; // L: 779
+							if (var16.gameObjectsCount > 0) { // L: 780
 								var16.drawGameObjects = true;
 							} else {
-								var16.drawGameObjects = false; // L: 817
+								var16.drawGameObjects = false; // L: 781
 							}
 
-							++tileUpdateCount; // L: 818
+							++tileUpdateCount; // L: 782
 						} else {
-							var16.drawPrimary = false; // L: 809
-							var16.drawSecondary = false; // L: 810
-							var16.drawGameObjectEdges = 0; // L: 811
+							var16.drawPrimary = false; // L: 773
+							var16.drawSecondary = false; // L: 774
+							var16.drawGameObjectEdges = 0; // L: 775
 						}
 					}
 				}
@@ -1158,118 +1146,118 @@ public void draw(int var1, int var2, int var3, int var4, int var5, int var6) {
 		int var13;
 		int var14;
 		Tile var15;
-		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 824
-			var8 = this.tiles[var7]; // L: 825
-
-			for (var9 = -25; var9 <= 0; ++var9) { // L: 826
-				var10 = var9 + Scene_cameraXTile; // L: 827
-				var11 = Scene_cameraXTile - var9; // L: 828
-				if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 829
-					for (var12 = -25; var12 <= 0; ++var12) { // L: 830
-						var13 = var12 + Scene_cameraYTile; // L: 831
-						var14 = Scene_cameraYTile - var12; // L: 832
-						if (var10 >= Scene_cameraXTileMin) { // L: 833
-							if (var13 >= Scene_cameraYTileMin) { // L: 834
-								var15 = var8[var10][var13]; // L: 835
-								if (var15 != null && var15.drawPrimary) { // L: 836
+		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 788
+			var8 = this.tiles[var7]; // L: 789
+
+			for (var9 = -25; var9 <= 0; ++var9) { // L: 790
+				var10 = var9 + Scene_cameraXTile; // L: 791
+				var11 = Scene_cameraXTile - var9; // L: 792
+				if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 793
+					for (var12 = -25; var12 <= 0; ++var12) { // L: 794
+						var13 = var12 + Scene_cameraYTile; // L: 795
+						var14 = Scene_cameraYTile - var12; // L: 796
+						if (var10 >= Scene_cameraXTileMin) { // L: 797
+							if (var13 >= Scene_cameraYTileMin) { // L: 798
+								var15 = var8[var10][var13]; // L: 799
+								if (var15 != null && var15.drawPrimary) { // L: 800
 									this.drawTile(var15, true);
 								}
 							}
 
-							if (var14 < Scene_cameraYTileMax) { // L: 838
-								var15 = var8[var10][var14]; // L: 839
-								if (var15 != null && var15.drawPrimary) { // L: 840
+							if (var14 < Scene_cameraYTileMax) { // L: 802
+								var15 = var8[var10][var14]; // L: 803
+								if (var15 != null && var15.drawPrimary) { // L: 804
 									this.drawTile(var15, true);
 								}
 							}
 						}
 
-						if (var11 < Scene_cameraXTileMax) { // L: 843
-							if (var13 >= Scene_cameraYTileMin) { // L: 844
-								var15 = var8[var11][var13]; // L: 845
-								if (var15 != null && var15.drawPrimary) { // L: 846
+						if (var11 < Scene_cameraXTileMax) { // L: 807
+							if (var13 >= Scene_cameraYTileMin) { // L: 808
+								var15 = var8[var11][var13]; // L: 809
+								if (var15 != null && var15.drawPrimary) { // L: 810
 									this.drawTile(var15, true);
 								}
 							}
 
-							if (var14 < Scene_cameraYTileMax) { // L: 848
-								var15 = var8[var11][var14]; // L: 849
-								if (var15 != null && var15.drawPrimary) { // L: 850
+							if (var14 < Scene_cameraYTileMax) { // L: 812
+								var15 = var8[var11][var14]; // L: 813
+								if (var15 != null && var15.drawPrimary) { // L: 814
 									this.drawTile(var15, true);
 								}
 							}
 						}
 
-						if (tileUpdateCount == 0) { // L: 853
-							checkClick = false; // L: 854
-							return; // L: 855
+						if (tileUpdateCount == 0) { // L: 817
+							checkClick = false; // L: 818
+							return; // L: 819
 						}
 					}
 				}
 			}
 		}
 
-		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 861
-			var8 = this.tiles[var7]; // L: 862
-
-			for (var9 = -25; var9 <= 0; ++var9) { // L: 863
-				var10 = var9 + Scene_cameraXTile; // L: 864
-				var11 = Scene_cameraXTile - var9; // L: 865
-				if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 866
-					for (var12 = -25; var12 <= 0; ++var12) { // L: 867
-						var13 = var12 + Scene_cameraYTile; // L: 868
-						var14 = Scene_cameraYTile - var12; // L: 869
-						if (var10 >= Scene_cameraXTileMin) { // L: 870
-							if (var13 >= Scene_cameraYTileMin) { // L: 871
-								var15 = var8[var10][var13]; // L: 872
-								if (var15 != null && var15.drawPrimary) { // L: 873
+		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 825
+			var8 = this.tiles[var7]; // L: 826
+
+			for (var9 = -25; var9 <= 0; ++var9) { // L: 827
+				var10 = var9 + Scene_cameraXTile; // L: 828
+				var11 = Scene_cameraXTile - var9; // L: 829
+				if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 830
+					for (var12 = -25; var12 <= 0; ++var12) { // L: 831
+						var13 = var12 + Scene_cameraYTile; // L: 832
+						var14 = Scene_cameraYTile - var12; // L: 833
+						if (var10 >= Scene_cameraXTileMin) { // L: 834
+							if (var13 >= Scene_cameraYTileMin) { // L: 835
+								var15 = var8[var10][var13]; // L: 836
+								if (var15 != null && var15.drawPrimary) { // L: 837
 									this.drawTile(var15, false);
 								}
 							}
 
-							if (var14 < Scene_cameraYTileMax) { // L: 875
-								var15 = var8[var10][var14]; // L: 876
-								if (var15 != null && var15.drawPrimary) { // L: 877
-									this.drawTile(var15, false);
+							if (var14 < Scene_cameraYTileMax) { // L: 839
+								var15 = var8[var10][var14]; // L: 840
+								if (var15 != null && var15.drawPrimary) {
+									this.drawTile(var15, false); // L: 841
 								}
 							}
 						}
 
-						if (var11 < Scene_cameraXTileMax) { // L: 880
-							if (var13 >= Scene_cameraYTileMin) { // L: 881
-								var15 = var8[var11][var13]; // L: 882
-								if (var15 != null && var15.drawPrimary) { // L: 883
+						if (var11 < Scene_cameraXTileMax) { // L: 844
+							if (var13 >= Scene_cameraYTileMin) { // L: 845
+								var15 = var8[var11][var13]; // L: 846
+								if (var15 != null && var15.drawPrimary) { // L: 847
 									this.drawTile(var15, false);
 								}
 							}
 
-							if (var14 < Scene_cameraYTileMax) { // L: 885
-								var15 = var8[var11][var14]; // L: 886
-								if (var15 != null && var15.drawPrimary) { // L: 887
+							if (var14 < Scene_cameraYTileMax) { // L: 849
+								var15 = var8[var11][var14]; // L: 850
+								if (var15 != null && var15.drawPrimary) { // L: 851
 									this.drawTile(var15, false);
 								}
 							}
 						}
 
-						if (tileUpdateCount == 0) { // L: 890
-							checkClick = false; // L: 891
-							return; // L: 892
+						if (tileUpdateCount == 0) { // L: 854
+							checkClick = false; // L: 855
+							return; // L: 856
 						}
 					}
 				}
 			}
 		}
 
-		checkClick = false; // L: 898
-	} // L: 899
+		checkClick = false; // L: 862
+	} // L: 863
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "(Lhm;Z)V"
+		descriptor = "(Lgb;Z)V"
 	)
 	@Export("drawTile")
 	void drawTile(Tile var1, boolean var2) {
-		Scene_tilesDeque.addFirst(var1); // L: 902
+		Scene_tilesDeque.addFirst(var1); // L: 866
 
 		while (true) {
 			Tile var3;
@@ -1301,227 +1289,227 @@ void drawTile(Tile var1, boolean var2) {
 										Tile var36;
 										while (true) {
 											do {
-												var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 904
-												if (var3 == null) { // L: 905
+												var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 868
+												if (var3 == null) { // L: 869
 													return;
 												}
-											} while(!var3.drawSecondary); // L: 906
-
-											var4 = var3.x; // L: 907
-											var5 = var3.y; // L: 908
-											var6 = var3.plane; // L: 909
-											var7 = var3.originalPlane; // L: 910
-											var8 = this.tiles[var6]; // L: 911
-											if (!var3.drawPrimary) { // L: 912
+											} while(!var3.drawSecondary); // L: 870
+
+											var4 = var3.x; // L: 871
+											var5 = var3.y; // L: 872
+											var6 = var3.plane; // L: 873
+											var7 = var3.originalPlane; // L: 874
+											var8 = this.tiles[var6]; // L: 875
+											if (!var3.drawPrimary) { // L: 876
 												break;
 											}
 
-											if (var2) { // L: 913
-												if (var6 > 0) { // L: 914
-													var9 = this.tiles[var6 - 1][var4][var5]; // L: 915
-													if (var9 != null && var9.drawSecondary) { // L: 916
+											if (var2) { // L: 877
+												if (var6 > 0) { // L: 878
+													var9 = this.tiles[var6 - 1][var4][var5]; // L: 879
+													if (var9 != null && var9.drawSecondary) { // L: 880
 														continue;
 													}
 												}
 
-												if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 918
-													var9 = var8[var4 - 1][var5]; // L: 919
-													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 920
+												if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 882
+													var9 = var8[var4 - 1][var5]; // L: 883
+													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 884
 														continue;
 													}
 												}
 
-												if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 922
-													var9 = var8[var4 + 1][var5]; // L: 923
-													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 924
+												if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 886
+													var9 = var8[var4 + 1][var5]; // L: 887
+													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 888
 														continue;
 													}
 												}
 
-												if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 926
-													var9 = var8[var4][var5 - 1]; // L: 927
-													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 928
+												if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 890
+													var9 = var8[var4][var5 - 1]; // L: 891
+													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 892
 														continue;
 													}
 												}
 
-												if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 930
-													var9 = var8[var4][var5 + 1]; // L: 931
-													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 932
+												if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 894
+													var9 = var8[var4][var5 + 1]; // L: 895
+													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 896
 														continue;
 													}
 												}
 											} else {
-												var2 = true; // L: 935
+												var2 = true; // L: 899
 											}
 
-											var3.drawPrimary = false; // L: 936
-											if (var3.linkedBelowTile != null) { // L: 937
-												var9 = var3.linkedBelowTile; // L: 938
-												if (var9.paint != null) { // L: 939
-													if (!this.method4369(0, var4, var5)) { // L: 940
+											var3.drawPrimary = false; // L: 900
+											if (var3.linkedBelowTile != null) { // L: 901
+												var9 = var3.linkedBelowTile; // L: 902
+												if (var9.paint != null) { // L: 903
+													if (!this.method3998(0, var4, var5)) { // L: 904
 														this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
 													}
-												} else if (var9.model != null && !this.method4369(0, var4, var5)) { // L: 942 943
+												} else if (var9.model != null && !this.method3998(0, var4, var5)) { // L: 906 907
 													this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
 												}
 
-												var10 = var9.boundaryObject; // L: 945
-												if (var10 != null) { // L: 946
+												var10 = var9.boundaryObject; // L: 909
+												if (var10 != null) { // L: 910
 													var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
 												}
 
-												for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 947
-													var12 = var9.gameObjects[var11]; // L: 948
-													if (var12 != null) { // L: 949
+												for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911
+													var12 = var9.gameObjects[var11]; // L: 912
+													if (var12 != null) { // L: 913
 														var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag);
 													}
 												}
 											}
 
-											var20 = false; // L: 952
-											if (var3.paint != null) { // L: 953
-												if (!this.method4369(var7, var4, var5)) { // L: 954
-													var20 = true; // L: 955
-													if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 956
+											var20 = false; // L: 916
+											if (var3.paint != null) { // L: 917
+												if (!this.method3998(var7, var4, var5)) { // L: 918
+													var20 = true; // L: 919
+													if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920
 														this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
 													}
 												}
-											} else if (var3.model != null && !this.method4369(var7, var4, var5)) { // L: 959 960
-												var20 = true; // L: 961
-												this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 962
+											} else if (var3.model != null && !this.method3998(var7, var4, var5)) { // L: 923 924
+												var20 = true; // L: 925
+												this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 926
 											}
 
-											var21 = 0; // L: 965
-											var11 = 0; // L: 966
-											BoundaryObject var31 = var3.boundaryObject; // L: 967
-											WallDecoration var13 = var3.wallDecoration; // L: 968
-											if (var31 != null || var13 != null) { // L: 969
-												if (var4 == Scene_cameraXTile) { // L: 970
+											var21 = 0; // L: 929
+											var11 = 0; // L: 930
+											BoundaryObject var31 = var3.boundaryObject; // L: 931
+											WallDecoration var13 = var3.wallDecoration; // L: 932
+											if (var31 != null || var13 != null) { // L: 933
+												if (var4 == Scene_cameraXTile) { // L: 934
 													++var21;
-												} else if (Scene_cameraXTile < var4) { // L: 971
+												} else if (Scene_cameraXTile < var4) { // L: 935
 													var21 += 2;
 												}
 
-												if (var5 == Scene_cameraYTile) { // L: 972
+												if (var5 == Scene_cameraYTile) { // L: 936
 													var21 += 3;
-												} else if (Scene_cameraYTile > var5) { // L: 973
+												} else if (Scene_cameraYTile > var5) { // L: 937
 													var21 += 6;
 												}
 
-												var11 = field2421[var21]; // L: 974
-												var3.field2334 = field2423[var21]; // L: 975
+												var11 = field2306[var21]; // L: 938
+												var3.field2236 = field2339[var21]; // L: 939
 											}
 
-											if (var31 != null) { // L: 977
-												if ((var31.orientationA & field2422[var21]) != 0) { // L: 978
-													if (var31.orientationA == 16) { // L: 979
-														var3.drawGameObjectEdges = 3; // L: 980
-														var3.field2328 = field2424[var21]; // L: 981
-														var3.field2340 = 3 - var3.field2328; // L: 982
-													} else if (var31.orientationA == 32) { // L: 984
-														var3.drawGameObjectEdges = 6; // L: 985
-														var3.field2328 = field2425[var21]; // L: 986
-														var3.field2340 = 6 - var3.field2328; // L: 987
-													} else if (var31.orientationA == 64) { // L: 989
-														var3.drawGameObjectEdges = 12; // L: 990
-														var3.field2328 = field2378[var21]; // L: 991
-														var3.field2340 = 12 - var3.field2328; // L: 992
+											if (var31 != null) { // L: 941
+												if ((var31.orientationA & field2338[var21]) != 0) { // L: 942
+													if (var31.orientationA == 16) { // L: 943
+														var3.drawGameObjectEdges = 3; // L: 944
+														var3.field2246 = field2323[var21]; // L: 945
+														var3.field2247 = 3 - var3.field2246; // L: 946
+													} else if (var31.orientationA == 32) { // L: 948
+														var3.drawGameObjectEdges = 6; // L: 949
+														var3.field2246 = field2357[var21]; // L: 950
+														var3.field2247 = 6 - var3.field2246; // L: 951
+													} else if (var31.orientationA == 64) { // L: 953
+														var3.drawGameObjectEdges = 12; // L: 954
+														var3.field2246 = field2342[var21]; // L: 955
+														var3.field2247 = 12 - var3.field2246; // L: 956
 													} else {
-														var3.drawGameObjectEdges = 9; // L: 995
-														var3.field2328 = field2376[var21]; // L: 996
-														var3.field2340 = 9 - var3.field2328; // L: 997
+														var3.drawGameObjectEdges = 9; // L: 959
+														var3.field2246 = field2343[var21]; // L: 960
+														var3.field2247 = 9 - var3.field2246; // L: 961
 													}
 												} else {
-													var3.drawGameObjectEdges = 0; // L: 1000
+													var3.drawGameObjectEdges = 0; // L: 964
 												}
 
-												if ((var31.orientationA & var11) != 0 && !this.method4328(var7, var4, var5, var31.orientationA)) { // L: 1001
+												if ((var31.orientationA & var11) != 0 && !this.method3958(var7, var4, var5, var31.orientationA)) { // L: 965
 													var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
 												}
 
-												if ((var31.orientationB & var11) != 0 && !this.method4328(var7, var4, var5, var31.orientationB)) { // L: 1002
+												if ((var31.orientationB & var11) != 0 && !this.method3958(var7, var4, var5, var31.orientationB)) { // L: 966
 													var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
 												}
 											}
 
-											if (var13 != null && !this.method4341(var7, var4, var5, var13.renderable1.height)) { // L: 1004
-												if ((var13.orientation & var11) != 0) { // L: 1005
-													var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 1006
-												} else if (var13.orientation == 256) { // L: 1008
-													var14 = var13.x - Scene_cameraX; // L: 1009
-													var15 = var13.tileHeight - Scene_cameraY; // L: 1010
-													var16 = var13.y - Scene_cameraZ; // L: 1011
-													var17 = var13.orientation2; // L: 1012
-													if (var17 != 1 && var17 != 2) { // L: 1014
-														var18 = var14; // L: 1015
+											if (var13 != null && !this.method4000(var7, var4, var5, var13.renderable1.height)) { // L: 968
+												if ((var13.orientation & var11) != 0) { // L: 969
+													var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970
+												} else if (var13.orientation == 256) { // L: 972
+													var14 = var13.x - Scene_cameraX; // L: 973
+													var15 = var13.tileHeight - Scene_cameraY; // L: 974
+													var16 = var13.y - Scene_cameraZ; // L: 975
+													var17 = var13.orientation2; // L: 976
+													if (var17 != 1 && var17 != 2) { // L: 978
+														var18 = var14; // L: 979
 													} else {
 														var18 = -var14;
 													}
 
 													int var19;
-													if (var17 != 2 && var17 != 3) { // L: 1017
-														var19 = var16; // L: 1018
+													if (var17 != 2 && var17 != 3) { // L: 981
+														var19 = var16; // L: 982
 													} else {
 														var19 = -var16;
 													}
 
-													if (var19 < var18) { // L: 1019
-														var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1020
-													} else if (var13.renderable2 != null) { // L: 1022
-														var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1023
+													if (var19 < var18) { // L: 983
+														var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984
+													} else if (var13.renderable2 != null) { // L: 986
+														var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987
 													}
 												}
 											}
 
-											if (var20) { // L: 1027
-												FloorDecoration var22 = var3.floorDecoration; // L: 1028
-												if (var22 != null) { // L: 1029
+											if (var20) { // L: 991
+												FloorDecoration var22 = var3.floorDecoration; // L: 992
+												if (var22 != null) { // L: 993
 													var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag);
 												}
 
-												ItemLayer var23 = var3.itemLayer; // L: 1030
-												if (var23 != null && var23.height == 0) { // L: 1031
-													if (var23.second != null) { // L: 1032
+												ItemLayer var23 = var3.itemLayer; // L: 994
+												if (var23 != null && var23.height == 0) { // L: 995
+													if (var23.second != null) { // L: 996
 														var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
 													}
 
-													if (var23.third != null) { // L: 1033
+													if (var23.third != null) { // L: 997
 														var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
 													}
 
-													if (var23.first != null) { // L: 1034
+													if (var23.first != null) { // L: 998
 														var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
 													}
 												}
 											}
 
-											var14 = var3.gameObjectsEdgeMask; // L: 1037
-											if (var14 != 0) { // L: 1038
-												if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1039
-													var36 = var8[var4 + 1][var5]; // L: 1040
-													if (var36 != null && var36.drawSecondary) { // L: 1041
+											var14 = var3.gameObjectsEdgeMask; // L: 1001
+											if (var14 != 0) { // L: 1002
+												if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1003
+													var36 = var8[var4 + 1][var5]; // L: 1004
+													if (var36 != null && var36.drawSecondary) { // L: 1005
 														Scene_tilesDeque.addFirst(var36);
 													}
 												}
 
-												if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1043
-													var36 = var8[var4][var5 + 1]; // L: 1044
-													if (var36 != null && var36.drawSecondary) { // L: 1045
+												if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1007
+													var36 = var8[var4][var5 + 1]; // L: 1008
+													if (var36 != null && var36.drawSecondary) { // L: 1009
 														Scene_tilesDeque.addFirst(var36);
 													}
 												}
 
-												if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1047
-													var36 = var8[var4 - 1][var5]; // L: 1048
-													if (var36 != null && var36.drawSecondary) { // L: 1049
+												if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1011
+													var36 = var8[var4 - 1][var5]; // L: 1012
+													if (var36 != null && var36.drawSecondary) { // L: 1013
 														Scene_tilesDeque.addFirst(var36);
 													}
 												}
 
-												if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1051
-													var36 = var8[var4][var5 - 1]; // L: 1052
-													if (var36 != null && var36.drawSecondary) { // L: 1053
+												if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1015
+													var36 = var8[var4][var5 - 1]; // L: 1016
+													if (var36 != null && var36.drawSecondary) { // L: 1017
 														Scene_tilesDeque.addFirst(var36);
 													}
 												}
@@ -1529,372 +1517,372 @@ void drawTile(Tile var1, boolean var2) {
 											break;
 										}
 
-										if (var3.drawGameObjectEdges != 0) { // L: 1057
-											var20 = true; // L: 1058
+										if (var3.drawGameObjectEdges != 0) { // L: 1021
+											var20 = true; // L: 1022
 
-											for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1059
-												if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2328) { // L: 1060
-													var20 = false; // L: 1061
-													break; // L: 1062
+											for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023
+												if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2246) { // L: 1024
+													var20 = false; // L: 1025
+													break; // L: 1026
 												}
 											}
 
-											if (var20) { // L: 1065
-												var10 = var3.boundaryObject; // L: 1066
-												if (!this.method4328(var7, var4, var5, var10.orientationA)) { // L: 1067
+											if (var20) { // L: 1029
+												var10 = var3.boundaryObject; // L: 1030
+												if (!this.method3958(var7, var4, var5, var10.orientationA)) { // L: 1031
 													var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
 												}
 
-												var3.drawGameObjectEdges = 0; // L: 1068
+												var3.drawGameObjectEdges = 0; // L: 1032
 											}
 										}
 
-										if (!var3.drawGameObjects) { // L: 1071
+										if (!var3.drawGameObjects) { // L: 1035
 											break;
 										}
 
 										try {
-											int var34 = var3.gameObjectsCount; // L: 1073
-											var3.drawGameObjects = false; // L: 1074
-											var21 = 0; // L: 1075
+											int var34 = var3.gameObjectsCount; // L: 1037
+											var3.drawGameObjects = false; // L: 1038
+											var21 = 0; // L: 1039
 
 											label563:
-											for (var11 = 0; var11 < var34; ++var11) { // L: 1076
-												var12 = var3.gameObjects[var11]; // L: 1077
-												if (var12.lastDrawn != Scene_drawnCount) { // L: 1078
-													for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1079
-														for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1080
-															var36 = var8[var24][var14]; // L: 1081
-															if (var36.drawPrimary) { // L: 1082
-																var3.drawGameObjects = true; // L: 1083
-																continue label563; // L: 1084
+											for (var11 = 0; var11 < var34; ++var11) { // L: 1040
+												var12 = var3.gameObjects[var11]; // L: 1041
+												if (var12.lastDrawn != Scene_drawnCount) { // L: 1042
+													for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1043
+														for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1044
+															var36 = var8[var24][var14]; // L: 1045
+															if (var36.drawPrimary) { // L: 1046
+																var3.drawGameObjects = true; // L: 1047
+																continue label563; // L: 1048
 															}
 
-															if (var36.drawGameObjectEdges != 0) { // L: 1086
-																var16 = 0; // L: 1087
-																if (var24 > var12.startX) { // L: 1088
+															if (var36.drawGameObjectEdges != 0) { // L: 1050
+																var16 = 0; // L: 1051
+																if (var24 > var12.startX) { // L: 1052
 																	++var16;
 																}
 
-																if (var24 < var12.endX) { // L: 1089
+																if (var24 < var12.endX) { // L: 1053
 																	var16 += 4;
 																}
 
-																if (var14 > var12.startY) { // L: 1090
+																if (var14 > var12.startY) { // L: 1054
 																	var16 += 8;
 																}
 
-																if (var14 < var12.endY) { // L: 1091
+																if (var14 < var12.endY) { // L: 1055
 																	var16 += 2;
 																}
 
-																if ((var16 & var36.drawGameObjectEdges) == var3.field2340) { // L: 1092
-																	var3.drawGameObjects = true; // L: 1093
-																	continue label563; // L: 1094
+																if ((var16 & var36.drawGameObjectEdges) == var3.field2247) { // L: 1056
+																	var3.drawGameObjects = true; // L: 1057
+																	continue label563; // L: 1058
 																}
 															}
 														}
 													}
 
-													gameObjects[var21++] = var12; // L: 1099
-													var24 = Scene_cameraXTile - var12.startX; // L: 1100
-													var14 = var12.endX - Scene_cameraXTile; // L: 1101
-													if (var14 > var24) { // L: 1102
+													gameObjects[var21++] = var12; // L: 1063
+													var24 = Scene_cameraXTile - var12.startX; // L: 1064
+													var14 = var12.endX - Scene_cameraXTile; // L: 1065
+													if (var14 > var24) { // L: 1066
 														var24 = var14;
 													}
 
-													var15 = Scene_cameraYTile - var12.startY; // L: 1103
-													var16 = var12.endY - Scene_cameraYTile; // L: 1104
-													if (var16 > var15) { // L: 1105
-														var12.field2641 = var24 + var16;
+													var15 = Scene_cameraYTile - var12.startY; // L: 1067
+													var16 = var12.endY - Scene_cameraYTile; // L: 1068
+													if (var16 > var15) { // L: 1069
+														var12.field2548 = var24 + var16;
 													} else {
-														var12.field2641 = var24 + var15; // L: 1106
+														var12.field2548 = var24 + var15; // L: 1070
 													}
 												}
 											}
 
-											while (var21 > 0) { // L: 1109
-												var11 = -50; // L: 1110
-												var25 = -1; // L: 1111
-
-												for (var24 = 0; var24 < var21; ++var24) { // L: 1112
-													GameObject var35 = gameObjects[var24]; // L: 1113
-													if (var35.lastDrawn != Scene_drawnCount) { // L: 1114
-														if (var35.field2641 > var11) { // L: 1115
-															var11 = var35.field2641; // L: 1116
-															var25 = var24; // L: 1117
-														} else if (var11 == var35.field2641) { // L: 1119
-															var15 = var35.centerX - Scene_cameraX; // L: 1120
-															var16 = var35.centerY - Scene_cameraZ; // L: 1121
-															var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1122
-															var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1123
-															if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1124
+											while (var21 > 0) { // L: 1073
+												var11 = -50; // L: 1074
+												var25 = -1; // L: 1075
+
+												for (var24 = 0; var24 < var21; ++var24) { // L: 1076
+													GameObject var35 = gameObjects[var24]; // L: 1077
+													if (var35.lastDrawn != Scene_drawnCount) { // L: 1078
+														if (var35.field2548 > var11) { // L: 1079
+															var11 = var35.field2548; // L: 1080
+															var25 = var24; // L: 1081
+														} else if (var11 == var35.field2548) { // L: 1083
+															var15 = var35.centerX - Scene_cameraX; // L: 1084
+															var16 = var35.centerY - Scene_cameraZ; // L: 1085
+															var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086
+															var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1087
+															if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1088
 																var25 = var24;
 															}
 														}
 													}
 												}
 
-												if (var25 == -1) { // L: 1128
+												if (var25 == -1) { // L: 1092
 													break;
 												}
 
-												GameObject var33 = gameObjects[var25]; // L: 1129
-												var33.lastDrawn = Scene_drawnCount; // L: 1130
-												if (!this.method4330(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1131
-													var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1132
+												GameObject var33 = gameObjects[var25]; // L: 1093
+												var33.lastDrawn = Scene_drawnCount; // L: 1094
+												if (!this.method4001(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095
+													var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096
 												}
 
-												for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1134
-													for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1135
-														Tile var26 = var8[var14][var15]; // L: 1136
-														if (var26.drawGameObjectEdges != 0) { // L: 1137
+												for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1098
+													for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1099
+														Tile var26 = var8[var14][var15]; // L: 1100
+														if (var26.drawGameObjectEdges != 0) { // L: 1101
 															Scene_tilesDeque.addFirst(var26);
-														} else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1138
+														} else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1102
 															Scene_tilesDeque.addFirst(var26);
 														}
 													}
 												}
 											}
 
-											if (!var3.drawGameObjects) { // L: 1142
+											if (!var3.drawGameObjects) { // L: 1106
 												break;
 											}
-										} catch (Exception var28) { // L: 1144
-											var3.drawGameObjects = false; // L: 1145
+										} catch (Exception var28) { // L: 1108
+											var3.drawGameObjects = false; // L: 1109
 											break;
 										}
 									}
-								} while(!var3.drawSecondary); // L: 1148
-							} while(var3.drawGameObjectEdges != 0); // L: 1149
+								} while(!var3.drawSecondary); // L: 1112
+							} while(var3.drawGameObjectEdges != 0); // L: 1113
 
-							if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1150
+							if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1114
 								break;
 							}
 
-							var9 = var8[var4 - 1][var5]; // L: 1151
-						} while(var9 != null && var9.drawSecondary); // L: 1152
+							var9 = var8[var4 - 1][var5]; // L: 1115
+						} while(var9 != null && var9.drawSecondary); // L: 1116
 
-						if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1154
+						if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1118
 							break;
 						}
 
-						var9 = var8[var4 + 1][var5]; // L: 1155
-					} while(var9 != null && var9.drawSecondary); // L: 1156
+						var9 = var8[var4 + 1][var5]; // L: 1119
+					} while(var9 != null && var9.drawSecondary); // L: 1120
 
-					if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1158
+					if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1122
 						break;
 					}
 
-					var9 = var8[var4][var5 - 1]; // L: 1159
-				} while(var9 != null && var9.drawSecondary); // L: 1160
+					var9 = var8[var4][var5 - 1]; // L: 1123
+				} while(var9 != null && var9.drawSecondary); // L: 1124
 
-				if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1162
+				if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1126
 					break;
 				}
 
-				var9 = var8[var4][var5 + 1]; // L: 1163
-			} while(var9 != null && var9.drawSecondary); // L: 1164
+				var9 = var8[var4][var5 + 1]; // L: 1127
+			} while(var9 != null && var9.drawSecondary); // L: 1128
 
-			var3.drawSecondary = false; // L: 1166
-			--tileUpdateCount; // L: 1167
-			ItemLayer var32 = var3.itemLayer; // L: 1168
-			if (var32 != null && var32.height != 0) { // L: 1169
-				if (var32.second != null) { // L: 1170
+			var3.drawSecondary = false; // L: 1130
+			--tileUpdateCount; // L: 1131
+			ItemLayer var32 = var3.itemLayer; // L: 1132
+			if (var32 != null && var32.height != 0) { // L: 1133
+				if (var32.second != null) { // L: 1134
 					var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
 				}
 
-				if (var32.third != null) { // L: 1171
+				if (var32.third != null) { // L: 1135
 					var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
 				}
 
-				if (var32.first != null) { // L: 1172
+				if (var32.first != null) { // L: 1136
 					var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
 				}
 			}
 
-			if (var3.field2334 != 0) { // L: 1174
-				WallDecoration var29 = var3.wallDecoration; // L: 1175
-				if (var29 != null && !this.method4341(var7, var4, var5, var29.renderable1.height)) { // L: 1176
-					if ((var29.orientation & var3.field2334) != 0) { // L: 1177
-						var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1178
-					} else if (var29.orientation == 256) { // L: 1180
-						var11 = var29.x - Scene_cameraX; // L: 1181
-						var25 = var29.tileHeight - Scene_cameraY; // L: 1182
-						var24 = var29.y - Scene_cameraZ; // L: 1183
-						var14 = var29.orientation2; // L: 1184
-						if (var14 != 1 && var14 != 2) { // L: 1186
-							var15 = var11; // L: 1187
+			if (var3.field2236 != 0) { // L: 1138
+				WallDecoration var29 = var3.wallDecoration; // L: 1139
+				if (var29 != null && !this.method4000(var7, var4, var5, var29.renderable1.height)) { // L: 1140
+					if ((var29.orientation & var3.field2236) != 0) { // L: 1141
+						var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142
+					} else if (var29.orientation == 256) { // L: 1144
+						var11 = var29.x - Scene_cameraX; // L: 1145
+						var25 = var29.tileHeight - Scene_cameraY; // L: 1146
+						var24 = var29.y - Scene_cameraZ; // L: 1147
+						var14 = var29.orientation2; // L: 1148
+						if (var14 != 1 && var14 != 2) { // L: 1150
+							var15 = var11; // L: 1151
 						} else {
 							var15 = -var11;
 						}
 
-						if (var14 != 2 && var14 != 3) { // L: 1189
-							var16 = var24; // L: 1190
+						if (var14 != 2 && var14 != 3) { // L: 1153
+							var16 = var24; // L: 1154
 						} else {
 							var16 = -var24;
 						}
 
-						if (var16 >= var15) { // L: 1191
-							var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1192
-						} else if (var29.renderable2 != null) { // L: 1194
-							var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1195
+						if (var16 >= var15) { // L: 1155
+							var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156
+						} else if (var29.renderable2 != null) { // L: 1158
+							var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159
 						}
 					}
 				}
 
-				BoundaryObject var27 = var3.boundaryObject; // L: 1199
-				if (var27 != null) { // L: 1200
-					if ((var27.orientationB & var3.field2334) != 0 && !this.method4328(var7, var4, var5, var27.orientationB)) { // L: 1201
+				BoundaryObject var27 = var3.boundaryObject; // L: 1163
+				if (var27 != null) { // L: 1164
+					if ((var27.orientationB & var3.field2236) != 0 && !this.method3958(var7, var4, var5, var27.orientationB)) { // L: 1165
 						var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
 					}
 
-					if ((var27.orientationA & var3.field2334) != 0 && !this.method4328(var7, var4, var5, var27.orientationA)) { // L: 1202
+					if ((var27.orientationA & var3.field2236) != 0 && !this.method3958(var7, var4, var5, var27.orientationA)) { // L: 1166
 						var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
 					}
 				}
 			}
 
 			Tile var30;
-			if (var6 < this.planes - 1) { // L: 1205
-				var30 = this.tiles[var6 + 1][var4][var5]; // L: 1206
-				if (var30 != null && var30.drawSecondary) { // L: 1207
+			if (var6 < this.planes - 1) { // L: 1169
+				var30 = this.tiles[var6 + 1][var4][var5]; // L: 1170
+				if (var30 != null && var30.drawSecondary) { // L: 1171
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 
-			if (var4 < Scene_cameraXTile) { // L: 1209
-				var30 = var8[var4 + 1][var5]; // L: 1210
-				if (var30 != null && var30.drawSecondary) { // L: 1211
+			if (var4 < Scene_cameraXTile) { // L: 1173
+				var30 = var8[var4 + 1][var5]; // L: 1174
+				if (var30 != null && var30.drawSecondary) { // L: 1175
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 
-			if (var5 < Scene_cameraYTile) { // L: 1213
-				var30 = var8[var4][var5 + 1]; // L: 1214
-				if (var30 != null && var30.drawSecondary) { // L: 1215
+			if (var5 < Scene_cameraYTile) { // L: 1177
+				var30 = var8[var4][var5 + 1]; // L: 1178
+				if (var30 != null && var30.drawSecondary) { // L: 1179
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 
-			if (var4 > Scene_cameraXTile) { // L: 1217
-				var30 = var8[var4 - 1][var5]; // L: 1218
-				if (var30 != null && var30.drawSecondary) { // L: 1219
+			if (var4 > Scene_cameraXTile) { // L: 1181
+				var30 = var8[var4 - 1][var5]; // L: 1182
+				if (var30 != null && var30.drawSecondary) { // L: 1183
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 
-			if (var5 > Scene_cameraYTile) { // L: 1221
-				var30 = var8[var4][var5 - 1]; // L: 1222
-				if (var30 != null && var30.drawSecondary) { // L: 1223
+			if (var5 > Scene_cameraYTile) { // L: 1185
+				var30 = var8[var4][var5 - 1]; // L: 1186
+				if (var30 != null && var30.drawSecondary) { // L: 1187
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "(Lhg;IIIIIII)V"
+		descriptor = "(Lgk;IIIIIII)V"
 	)
 	@Export("drawTileUnderlay")
 	void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9;
-		int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1231
+		int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1195
 		int var11;
-		int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1233
+		int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1197
 		int var13;
-		int var14 = var13 = var10 + 128; // L: 1235
+		int var14 = var13 = var10 + 128; // L: 1199
 		int var15;
-		int var16 = var15 = var12 + 128; // L: 1237
-		int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1238
-		int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1239
-		int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1240
-		int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1241
-		int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1242
-		var12 = var12 * var6 - var5 * var10 >> 16; // L: 1243
-		var10 = var21; // L: 1244
-		var21 = var17 * var4 - var3 * var12 >> 16; // L: 1245
-		var12 = var3 * var17 + var12 * var4 >> 16; // L: 1246
-		var17 = var21; // L: 1247
-		if (var12 >= 50) { // L: 1248
-			var21 = var14 * var6 + var5 * var11 >> 16; // L: 1249
-			var11 = var11 * var6 - var5 * var14 >> 16; // L: 1250
-			var14 = var21; // L: 1251
-			var21 = var18 * var4 - var3 * var11 >> 16; // L: 1252
-			var11 = var3 * var18 + var11 * var4 >> 16; // L: 1253
-			var18 = var21; // L: 1254
-			if (var11 >= 50) { // L: 1255
-				var21 = var13 * var6 + var5 * var16 >> 16; // L: 1256
-				var16 = var16 * var6 - var5 * var13 >> 16; // L: 1257
-				var13 = var21; // L: 1258
-				var21 = var19 * var4 - var3 * var16 >> 16; // L: 1259
-				var16 = var3 * var19 + var16 * var4 >> 16; // L: 1260
-				var19 = var21; // L: 1261
-				if (var16 >= 50) { // L: 1262
-					var21 = var9 * var6 + var5 * var15 >> 16; // L: 1263
-					var15 = var15 * var6 - var5 * var9 >> 16; // L: 1264
-					var9 = var21; // L: 1265
-					var21 = var20 * var4 - var3 * var15 >> 16; // L: 1266
-					var15 = var3 * var20 + var15 * var4 >> 16; // L: 1267
-					if (var15 >= 50) { // L: 1269
-						int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1270
-						int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1271
-						int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1272
-						int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1273
-						int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1274
-						int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1275
-						int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1276
-						int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1277
-						Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1278
+		int var16 = var15 = var12 + 128; // L: 1201
+		int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1202
+		int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1203
+		int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1204
+		int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1205
+		int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1206
+		var12 = var12 * var6 - var5 * var10 >> 16; // L: 1207
+		var10 = var21; // L: 1208
+		var21 = var17 * var4 - var3 * var12 >> 16; // L: 1209
+		var12 = var3 * var17 + var12 * var4 >> 16; // L: 1210
+		var17 = var21; // L: 1211
+		if (var12 >= 50) { // L: 1212
+			var21 = var14 * var6 + var5 * var11 >> 16; // L: 1213
+			var11 = var11 * var6 - var5 * var14 >> 16; // L: 1214
+			var14 = var21; // L: 1215
+			var21 = var18 * var4 - var3 * var11 >> 16; // L: 1216
+			var11 = var3 * var18 + var11 * var4 >> 16; // L: 1217
+			var18 = var21; // L: 1218
+			if (var11 >= 50) { // L: 1219
+				var21 = var13 * var6 + var5 * var16 >> 16; // L: 1220
+				var16 = var16 * var6 - var5 * var13 >> 16; // L: 1221
+				var13 = var21; // L: 1222
+				var21 = var19 * var4 - var3 * var16 >> 16; // L: 1223
+				var16 = var3 * var19 + var16 * var4 >> 16; // L: 1224
+				var19 = var21; // L: 1225
+				if (var16 >= 50) { // L: 1226
+					var21 = var9 * var6 + var5 * var15 >> 16; // L: 1227
+					var15 = var15 * var6 - var5 * var9 >> 16; // L: 1228
+					var9 = var21; // L: 1229
+					var21 = var20 * var4 - var3 * var15 >> 16; // L: 1230
+					var15 = var3 * var20 + var15 * var4 >> 16; // L: 1231
+					if (var15 >= 50) { // L: 1233
+						int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1234
+						int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1235
+						int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1236
+						int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1237
+						int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1238
+						int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1239
+						int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1240
+						int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1241
+						Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242
 						int var30;
-						if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1279
-							Rasterizer3D.field2365 = false; // L: 1280
-							if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1281
-								Rasterizer3D.field2365 = true;
+						if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243
+							Rasterizer3D.field2253 = false; // L: 1244
+							if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1245
+								Rasterizer3D.field2253 = true;
 							}
 
-							if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1282
-								Scene_selectedX = var7; // L: 1283
-								Scene_selectedY = var8; // L: 1284
+							if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246
+								Scene_selectedX = var7; // L: 1247
+								Scene_selectedY = var8; // L: 1248
 							}
 
-							if (var1.texture == -1) { // L: 1286
-								if (var1.neColor != 12345678) { // L: 1287
-									Rasterizer3D.method4211(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
+							if (var1.texture == -1) { // L: 1250
+								if (var1.neColor != 12345678) { // L: 1251
+									Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
 								}
-							} else if (!Scene_isLowDetail) { // L: 1289
-								if (var1.isFlat) { // L: 1290
+							} else if (!Scene_isLowDetail) { // L: 1253
+								if (var1.isFlat) { // L: 1254
 									Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
 								} else {
-									Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1291
+									Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1255
 								}
 							} else {
-								var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1294
-								Rasterizer3D.method4211(var27, var29, var25, var26, var28, var24, method4324(var30, var1.neColor), method4324(var30, var1.nwColor), method4324(var30, var1.seColor)); // L: 1295
+								var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258
+								Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, method4073(var30, var1.neColor), method4073(var30, var1.nwColor), method4073(var30, var1.seColor)); // L: 1259
 							}
 						}
 
-						if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1298
-							Rasterizer3D.field2365 = false; // L: 1299
-							if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1300
-								Rasterizer3D.field2365 = true;
+						if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262
+							Rasterizer3D.field2253 = false; // L: 1263
+							if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1264
+								Rasterizer3D.field2253 = true;
 							}
 
-							if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1301
-								Scene_selectedX = var7; // L: 1302
-								Scene_selectedY = var8; // L: 1303
+							if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265
+								Scene_selectedX = var7; // L: 1266
+								Scene_selectedY = var8; // L: 1267
 							}
 
-							if (var1.texture == -1) { // L: 1305
-								if (var1.swColor != 12345678) { // L: 1306
-									Rasterizer3D.method4211(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
+							if (var1.texture == -1) { // L: 1269
+								if (var1.swColor != 12345678) { // L: 1270
+									Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
 								}
-							} else if (!Scene_isLowDetail) { // L: 1308
-								Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1309
+							} else if (!Scene_isLowDetail) { // L: 1272
+								Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1273
 							} else {
-								var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1312
-								Rasterizer3D.method4211(var23, var25, var29, var22, var24, var28, method4324(var30, var1.swColor), method4324(var30, var1.seColor), method4324(var30, var1.nwColor)); // L: 1313
+								var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276
+								Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, method4073(var30, var1.swColor), method4073(var30, var1.seColor), method4073(var30, var1.nwColor)); // L: 1277
 							}
 						}
 
@@ -1902,566 +1890,566 @@ void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var
 				}
 			}
 		}
-	} // L: 1316
+	} // L: 1280
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		descriptor = "(Lhs;IIIIII)V"
+		descriptor = "(Lgc;IIIIII)V"
 	)
 	@Export("drawTileOverlay")
 	void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		int var8 = var1.vertexX.length; // L: 1319
+		int var8 = var1.vertexX.length; // L: 1283
 
 		int var9;
 		int var10;
 		int var11;
 		int var12;
 		int var13;
-		for (var9 = 0; var9 < var8; ++var9) { // L: 1320
-			var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1321
-			var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1322
-			var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1323
-			var13 = var12 * var4 + var5 * var10 >> 16; // L: 1324
-			var12 = var5 * var12 - var10 * var4 >> 16; // L: 1325
-			var10 = var13; // L: 1326
-			var13 = var3 * var11 - var12 * var2 >> 16; // L: 1327
-			var12 = var11 * var2 + var3 * var12 >> 16; // L: 1328
-			if (var12 < 50) { // L: 1330
+		for (var9 = 0; var9 < var8; ++var9) { // L: 1284
+			var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1285
+			var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1286
+			var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1287
+			var13 = var12 * var4 + var5 * var10 >> 16; // L: 1288
+			var12 = var5 * var12 - var10 * var4 >> 16; // L: 1289
+			var10 = var13; // L: 1290
+			var13 = var3 * var11 - var12 * var2 >> 16; // L: 1291
+			var12 = var11 * var2 + var3 * var12 >> 16; // L: 1292
+			if (var12 < 50) { // L: 1294
 				return;
 			}
 
-			if (var1.triangleTextureId != null) { // L: 1331
-				SceneTileModel.field2503[var9] = var10; // L: 1332
-				SceneTileModel.field2504[var9] = var13; // L: 1333
-				SceneTileModel.field2502[var9] = var12; // L: 1334
+			if (var1.triangleTextureId != null) { // L: 1295
+				SceneTileModel.field2414[var9] = var10; // L: 1296
+				SceneTileModel.field2415[var9] = var13; // L: 1297
+				SceneTileModel.field2416[var9] = var12; // L: 1298
 			}
 
-			SceneTileModel.field2501[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1336
-			SceneTileModel.field2488[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1337
+			SceneTileModel.field2399[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300
+			SceneTileModel.field2413[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301
 		}
 
-		Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1339
-		var8 = var1.faceX.length; // L: 1340
-
-		for (var9 = 0; var9 < var8; ++var9) { // L: 1341
-			var10 = var1.faceX[var9]; // L: 1342
-			var11 = var1.faceY[var9]; // L: 1343
-			var12 = var1.faceZ[var9]; // L: 1344
-			var13 = SceneTileModel.field2501[var10]; // L: 1345
-			int var14 = SceneTileModel.field2501[var11]; // L: 1346
-			int var15 = SceneTileModel.field2501[var12]; // L: 1347
-			int var16 = SceneTileModel.field2488[var10]; // L: 1348
-			int var17 = SceneTileModel.field2488[var11]; // L: 1349
-			int var18 = SceneTileModel.field2488[var12]; // L: 1350
-			if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1351
-				Rasterizer3D.field2365 = false; // L: 1352
-				if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1353
-					Rasterizer3D.field2365 = true;
-				}
-
-				if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1354
-					Scene_selectedX = var6; // L: 1355
-					Scene_selectedY = var7; // L: 1356
-				}
-
-				if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1358
-					if (!Scene_isLowDetail) { // L: 1362
-						if (var1.isFlat) { // L: 1363
-							Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2503[0], SceneTileModel.field2503[1], SceneTileModel.field2503[3], SceneTileModel.field2504[0], SceneTileModel.field2504[1], SceneTileModel.field2504[3], SceneTileModel.field2502[0], SceneTileModel.field2502[1], SceneTileModel.field2502[3], var1.triangleTextureId[var9]);
+		Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303
+		var8 = var1.faceX.length; // L: 1304
+
+		for (var9 = 0; var9 < var8; ++var9) { // L: 1305
+			var10 = var1.faceX[var9]; // L: 1306
+			var11 = var1.faceY[var9]; // L: 1307
+			var12 = var1.faceZ[var9]; // L: 1308
+			var13 = SceneTileModel.field2399[var10]; // L: 1309
+			int var14 = SceneTileModel.field2399[var11]; // L: 1310
+			int var15 = SceneTileModel.field2399[var12]; // L: 1311
+			int var16 = SceneTileModel.field2413[var10]; // L: 1312
+			int var17 = SceneTileModel.field2413[var11]; // L: 1313
+			int var18 = SceneTileModel.field2413[var12]; // L: 1314
+			if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315
+				Rasterizer3D.field2253 = false; // L: 1316
+				if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317
+					Rasterizer3D.field2253 = true;
+				}
+
+				if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318
+					Scene_selectedX = var6; // L: 1319
+					Scene_selectedY = var7; // L: 1320
+				}
+
+				if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322
+					if (!Scene_isLowDetail) { // L: 1326
+						if (var1.isFlat) { // L: 1327
+							Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2414[0], SceneTileModel.field2414[1], SceneTileModel.field2414[3], SceneTileModel.field2415[0], SceneTileModel.field2415[1], SceneTileModel.field2415[3], SceneTileModel.field2416[0], SceneTileModel.field2416[1], SceneTileModel.field2416[3], var1.triangleTextureId[var9]);
 						} else {
-							Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2503[var10], SceneTileModel.field2503[var11], SceneTileModel.field2503[var12], SceneTileModel.field2504[var10], SceneTileModel.field2504[var11], SceneTileModel.field2504[var12], SceneTileModel.field2502[var10], SceneTileModel.field2502[var11], SceneTileModel.field2502[var12], var1.triangleTextureId[var9]); // L: 1364
+							Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2414[var10], SceneTileModel.field2414[var11], SceneTileModel.field2414[var12], SceneTileModel.field2415[var10], SceneTileModel.field2415[var11], SceneTileModel.field2415[var12], SceneTileModel.field2416[var10], SceneTileModel.field2416[var11], SceneTileModel.field2416[var12], var1.triangleTextureId[var9]); // L: 1328
 						}
 					} else {
-						int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1367
-						Rasterizer3D.method4211(var16, var17, var18, var13, var14, var15, method4324(var19, var1.triangleColorA[var9]), method4324(var19, var1.triangleColorB[var9]), method4324(var19, var1.triangleColorC[var9])); // L: 1368
+						int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331
+						Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, method4073(var19, var1.triangleColorA[var9]), method4073(var19, var1.triangleColorB[var9]), method4073(var19, var1.triangleColorC[var9])); // L: 1332
 					}
-				} else if (var1.triangleColorA[var9] != 12345678) { // L: 1359
-					Rasterizer3D.method4211(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
+				} else if (var1.triangleColorA[var9] != 12345678) { // L: 1323
+					Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
 				}
 			}
 		}
 
-	} // L: 1373
+	} // L: 1337
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("aw")
 	@Export("occlude")
 	void occlude() {
-		int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1400
-		Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1401
-		Scene_currentOccludersCount = 0; // L: 1402
+		int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364
+		Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365
+		Scene_currentOccludersCount = 0; // L: 1366
 
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 1403
-			Occluder var4 = var2[var3]; // L: 1404
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 1367
+			Occluder var4 = var2[var3]; // L: 1368
 			int var5;
 			int var6;
 			int var7;
 			int var9;
 			boolean var13;
-			if (var4.type == 1) { // L: 1405
-				var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1406
-				if (var5 >= 0 && var5 <= 50) { // L: 1407
-					var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1408
-					if (var6 < 0) { // L: 1409
+			if (var4.type == 1) { // L: 1369
+				var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1370
+				if (var5 >= 0 && var5 <= 50) { // L: 1371
+					var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1372
+					if (var6 < 0) { // L: 1373
 						var6 = 0;
 					}
 
-					var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1410
-					if (var7 > 50) { // L: 1411
+					var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1374
+					if (var7 > 50) { // L: 1375
 						var7 = 50;
 					}
 
-					var13 = false; // L: 1412
+					var13 = false; // L: 1376
 
-					while (var6 <= var7) { // L: 1413
-						if (visibleTiles[var5][var6++]) { // L: 1414
-							var13 = true; // L: 1415
+					while (var6 <= var7) { // L: 1377
+						if (visibleTiles[var5][var6++]) { // L: 1378
+							var13 = true; // L: 1379
 							break;
 						}
 					}
 
-					if (var13) { // L: 1419
-						var9 = Scene_cameraX - var4.minX; // L: 1420
-						if (var9 > 32) { // L: 1421
-							var4.field2464 = 1;
+					if (var13) { // L: 1383
+						var9 = Scene_cameraX - var4.minX; // L: 1384
+						if (var9 > 32) { // L: 1385
+							var4.field2378 = 1;
 						} else {
-							if (var9 >= -32) { // L: 1422
+							if (var9 >= -32) { // L: 1386
 								continue;
 							}
 
-							var4.field2464 = 2; // L: 1423
-							var9 = -var9; // L: 1424
+							var4.field2378 = 2; // L: 1387
+							var9 = -var9; // L: 1388
 						}
 
-						var4.field2471 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1427
-						var4.field2470 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1428
-						var4.field2473 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1429
-						var4.field2472 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1430
-						Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1431
+						var4.field2381 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391
+						var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392
+						var4.field2383 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393
+						var4.field2367 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394
+						Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395
 					}
 				}
-			} else if (var4.type == 2) { // L: 1434
-				var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1435
-				if (var5 >= 0 && var5 <= 50) { // L: 1436
-					var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1437
-					if (var6 < 0) { // L: 1438
+			} else if (var4.type == 2) { // L: 1398
+				var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399
+				if (var5 >= 0 && var5 <= 50) { // L: 1400
+					var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1401
+					if (var6 < 0) { // L: 1402
 						var6 = 0;
 					}
 
-					var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1439
-					if (var7 > 50) { // L: 1440
+					var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1403
+					if (var7 > 50) { // L: 1404
 						var7 = 50;
 					}
 
-					var13 = false; // L: 1441
+					var13 = false; // L: 1405
 
-					while (var6 <= var7) { // L: 1442
-						if (visibleTiles[var6++][var5]) { // L: 1443
-							var13 = true; // L: 1444
+					while (var6 <= var7) { // L: 1406
+						if (visibleTiles[var6++][var5]) { // L: 1407
+							var13 = true; // L: 1408
 							break;
 						}
 					}
 
-					if (var13) { // L: 1448
-						var9 = Scene_cameraZ - var4.minZ; // L: 1449
-						if (var9 > 32) { // L: 1450
-							var4.field2464 = 3;
+					if (var13) { // L: 1412
+						var9 = Scene_cameraZ - var4.minZ; // L: 1413
+						if (var9 > 32) { // L: 1414
+							var4.field2378 = 3;
 						} else {
-							if (var9 >= -32) { // L: 1451
+							if (var9 >= -32) { // L: 1415
 								continue;
 							}
 
-							var4.field2464 = 4; // L: 1452
-							var9 = -var9; // L: 1453
+							var4.field2378 = 4; // L: 1416
+							var9 = -var9; // L: 1417
 						}
 
-						var4.field2469 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1456
-						var4.field2463 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1457
-						var4.field2473 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1458
-						var4.field2472 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1459
-						Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1460
+						var4.field2369 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420
+						var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421
+						var4.field2383 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422
+						var4.field2367 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423
+						Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424
 					}
 				}
-			} else if (var4.type == 4) { // L: 1463
-				var5 = var4.minY - Scene_cameraY; // L: 1464
-				if (var5 > 128) { // L: 1465
-					var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1466
-					if (var6 < 0) { // L: 1467
+			} else if (var4.type == 4) { // L: 1427
+				var5 = var4.minY - Scene_cameraY; // L: 1428
+				if (var5 > 128) { // L: 1429
+					var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1430
+					if (var6 < 0) { // L: 1431
 						var6 = 0;
 					}
 
-					var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1468
-					if (var7 > 50) { // L: 1469
+					var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1432
+					if (var7 > 50) { // L: 1433
 						var7 = 50;
 					}
 
-					if (var6 <= var7) { // L: 1470
-						int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1471
-						if (var8 < 0) { // L: 1472
+					if (var6 <= var7) { // L: 1434
+						int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1435
+						if (var8 < 0) { // L: 1436
 							var8 = 0;
 						}
 
-						var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1473
-						if (var9 > 50) { // L: 1474
+						var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1437
+						if (var9 > 50) { // L: 1438
 							var9 = 50;
 						}
 
-						boolean var10 = false; // L: 1475
+						boolean var10 = false; // L: 1439
 
 						label150:
-						for (int var11 = var8; var11 <= var9; ++var11) { // L: 1476
-							for (int var12 = var6; var12 <= var7; ++var12) { // L: 1477
-								if (visibleTiles[var11][var12]) { // L: 1478
-									var10 = true; // L: 1479
+						for (int var11 = var8; var11 <= var9; ++var11) { // L: 1440
+							for (int var12 = var6; var12 <= var7; ++var12) { // L: 1441
+								if (visibleTiles[var11][var12]) { // L: 1442
+									var10 = true; // L: 1443
 									break label150;
 								}
 							}
 						}
 
-						if (var10) { // L: 1484
-							var4.field2464 = 5; // L: 1485
-							var4.field2469 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1486
-							var4.field2463 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1487
-							var4.field2471 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1488
-							var4.field2470 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1489
-							Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1490
+						if (var10) { // L: 1448
+							var4.field2378 = 5; // L: 1449
+							var4.field2369 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450
+							var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451
+							var4.field2381 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452
+							var4.field2368 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453
+							Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454
 						}
 					}
 				}
 			}
 		}
 
-	} // L: 1494
+	} // L: 1458
 
-	@ObfuscatedName("aw")
-	boolean method4369(int var1, int var2, int var3) {
-		int var4 = this.field2409[var1][var2][var3]; // L: 1497
-		if (var4 == -Scene_drawnCount) { // L: 1498
+	@ObfuscatedName("ay")
+	boolean method3998(int var1, int var2, int var3) {
+		int var4 = this.field2300[var1][var2][var3]; // L: 1461
+		if (var4 == -Scene_drawnCount) { // L: 1462
 			return false;
-		} else if (var4 == Scene_drawnCount) { // L: 1499
+		} else if (var4 == Scene_drawnCount) { // L: 1463
 			return true;
 		} else {
-			int var5 = var2 << 7; // L: 1500
-			int var6 = var3 << 7; // L: 1501
-			if (this.method4331(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4331(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1502
-				this.field2409[var1][var2][var3] = Scene_drawnCount; // L: 1503
-				return true; // L: 1504
+			int var5 = var2 << 7; // L: 1464
+			int var6 = var3 << 7; // L: 1465
+			if (this.method4086(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4086(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466
+				this.field2300[var1][var2][var3] = Scene_drawnCount; // L: 1467
+				return true; // L: 1468
 			} else {
-				this.field2409[var1][var2][var3] = -Scene_drawnCount; // L: 1507
-				return false; // L: 1508
+				this.field2300[var1][var2][var3] = -Scene_drawnCount; // L: 1471
+				return false; // L: 1472
 			}
 		}
 	}
 
-	@ObfuscatedName("ao")
-	boolean method4328(int var1, int var2, int var3, int var4) {
-		if (!this.method4369(var1, var2, var3)) { // L: 1513
+	@ObfuscatedName("ae")
+	boolean method3958(int var1, int var2, int var3, int var4) {
+		if (!this.method3998(var1, var2, var3)) { // L: 1477
 			return false;
 		} else {
-			int var5 = var2 << 7; // L: 1514
-			int var6 = var3 << 7; // L: 1515
-			int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1516
-			int var8 = var7 - 120; // L: 1517
-			int var9 = var7 - 230; // L: 1518
-			int var10 = var7 - 238; // L: 1519
-			if (var4 < 16) { // L: 1520
-				if (var4 == 1) { // L: 1521
-					if (var5 > Scene_cameraX) { // L: 1522
-						if (!this.method4331(var5, var7, var6)) { // L: 1523
+			int var5 = var2 << 7; // L: 1478
+			int var6 = var3 << 7; // L: 1479
+			int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1480
+			int var8 = var7 - 120; // L: 1481
+			int var9 = var7 - 230; // L: 1482
+			int var10 = var7 - 238; // L: 1483
+			if (var4 < 16) { // L: 1484
+				if (var4 == 1) { // L: 1485
+					if (var5 > Scene_cameraX) { // L: 1486
+						if (!this.method4086(var5, var7, var6)) { // L: 1487
 							return false;
 						}
 
-						if (!this.method4331(var5, var7, var6 + 128)) { // L: 1524
+						if (!this.method4086(var5, var7, var6 + 128)) { // L: 1488
 							return false;
 						}
 					}
 
-					if (var1 > 0) { // L: 1526
-						if (!this.method4331(var5, var8, var6)) { // L: 1527
+					if (var1 > 0) { // L: 1490
+						if (!this.method4086(var5, var8, var6)) { // L: 1491
 							return false;
 						}
 
-						if (!this.method4331(var5, var8, var6 + 128)) { // L: 1528
+						if (!this.method4086(var5, var8, var6 + 128)) { // L: 1492
 							return false;
 						}
 					}
 
-					if (!this.method4331(var5, var9, var6)) { // L: 1530
+					if (!this.method4086(var5, var9, var6)) { // L: 1494
 						return false;
 					}
 
-					if (!this.method4331(var5, var9, var6 + 128)) { // L: 1531
+					if (!this.method4086(var5, var9, var6 + 128)) { // L: 1495
 						return false;
 					}
 
-					return true; // L: 1532
+					return true; // L: 1496
 				}
 
-				if (var4 == 2) { // L: 1534
-					if (var6 < Scene_cameraZ) { // L: 1535
-						if (!this.method4331(var5, var7, var6 + 128)) { // L: 1536
+				if (var4 == 2) { // L: 1498
+					if (var6 < Scene_cameraZ) { // L: 1499
+						if (!this.method4086(var5, var7, var6 + 128)) { // L: 1500
 							return false;
 						}
 
-						if (!this.method4331(var5 + 128, var7, var6 + 128)) { // L: 1537
+						if (!this.method4086(var5 + 128, var7, var6 + 128)) { // L: 1501
 							return false;
 						}
 					}
 
-					if (var1 > 0) { // L: 1539
-						if (!this.method4331(var5, var8, var6 + 128)) { // L: 1540
+					if (var1 > 0) { // L: 1503
+						if (!this.method4086(var5, var8, var6 + 128)) { // L: 1504
 							return false;
 						}
 
-						if (!this.method4331(var5 + 128, var8, var6 + 128)) { // L: 1541
+						if (!this.method4086(var5 + 128, var8, var6 + 128)) { // L: 1505
 							return false;
 						}
 					}
 
-					if (!this.method4331(var5, var9, var6 + 128)) { // L: 1543
+					if (!this.method4086(var5, var9, var6 + 128)) { // L: 1507
 						return false;
 					}
 
-					if (!this.method4331(var5 + 128, var9, var6 + 128)) { // L: 1544
+					if (!this.method4086(var5 + 128, var9, var6 + 128)) { // L: 1508
 						return false;
 					}
 
-					return true; // L: 1545
+					return true; // L: 1509
 				}
 
-				if (var4 == 4) { // L: 1547
-					if (var5 < Scene_cameraX) { // L: 1548
-						if (!this.method4331(var5 + 128, var7, var6)) { // L: 1549
+				if (var4 == 4) { // L: 1511
+					if (var5 < Scene_cameraX) { // L: 1512
+						if (!this.method4086(var5 + 128, var7, var6)) { // L: 1513
 							return false;
 						}
 
-						if (!this.method4331(var5 + 128, var7, var6 + 128)) { // L: 1550
+						if (!this.method4086(var5 + 128, var7, var6 + 128)) { // L: 1514
 							return false;
 						}
 					}
 
-					if (var1 > 0) { // L: 1552
-						if (!this.method4331(var5 + 128, var8, var6)) { // L: 1553
+					if (var1 > 0) { // L: 1516
+						if (!this.method4086(var5 + 128, var8, var6)) { // L: 1517
 							return false;
 						}
 
-						if (!this.method4331(var5 + 128, var8, var6 + 128)) { // L: 1554
+						if (!this.method4086(var5 + 128, var8, var6 + 128)) { // L: 1518
 							return false;
 						}
 					}
 
-					if (!this.method4331(var5 + 128, var9, var6)) { // L: 1556
+					if (!this.method4086(var5 + 128, var9, var6)) { // L: 1520
 						return false;
 					}
 
-					if (!this.method4331(var5 + 128, var9, var6 + 128)) { // L: 1557
+					if (!this.method4086(var5 + 128, var9, var6 + 128)) { // L: 1521
 						return false;
 					}
 
-					return true; // L: 1558
+					return true; // L: 1522
 				}
 
-				if (var4 == 8) { // L: 1560
-					if (var6 > Scene_cameraZ) { // L: 1561
-						if (!this.method4331(var5, var7, var6)) { // L: 1562
+				if (var4 == 8) { // L: 1524
+					if (var6 > Scene_cameraZ) { // L: 1525
+						if (!this.method4086(var5, var7, var6)) { // L: 1526
 							return false;
 						}
 
-						if (!this.method4331(var5 + 128, var7, var6)) { // L: 1563
+						if (!this.method4086(var5 + 128, var7, var6)) { // L: 1527
 							return false;
 						}
 					}
 
-					if (var1 > 0) { // L: 1565
-						if (!this.method4331(var5, var8, var6)) { // L: 1566
+					if (var1 > 0) { // L: 1529
+						if (!this.method4086(var5, var8, var6)) { // L: 1530
 							return false;
 						}
 
-						if (!this.method4331(var5 + 128, var8, var6)) { // L: 1567
+						if (!this.method4086(var5 + 128, var8, var6)) { // L: 1531
 							return false;
 						}
 					}
 
-					if (!this.method4331(var5, var9, var6)) { // L: 1569
+					if (!this.method4086(var5, var9, var6)) { // L: 1533
 						return false;
 					}
 
-					if (!this.method4331(var5 + 128, var9, var6)) { // L: 1570
+					if (!this.method4086(var5 + 128, var9, var6)) { // L: 1534
 						return false;
 					}
 
-					return true; // L: 1571
+					return true; // L: 1535
 				}
 			}
 
-			if (!this.method4331(var5 + 64, var10, var6 + 64)) { // L: 1574
+			if (!this.method4086(var5 + 64, var10, var6 + 64)) { // L: 1538
 				return false;
-			} else if (var4 == 16) { // L: 1575
-				return this.method4331(var5, var9, var6 + 128); // L: 1576
-			} else if (var4 == 32) { // L: 1579
-				return this.method4331(var5 + 128, var9, var6 + 128); // L: 1580
-			} else if (var4 == 64) { // L: 1583
-				return this.method4331(var5 + 128, var9, var6); // L: 1584
-			} else if (var4 == 128) { // L: 1587
-				return this.method4331(var5, var9, var6); // L: 1588
+			} else if (var4 == 16) { // L: 1539
+				return this.method4086(var5, var9, var6 + 128); // L: 1540
+			} else if (var4 == 32) { // L: 1543
+				return this.method4086(var5 + 128, var9, var6 + 128); // L: 1544
+			} else if (var4 == 64) { // L: 1547
+				return this.method4086(var5 + 128, var9, var6); // L: 1548
+			} else if (var4 == 128) { // L: 1551
+				return this.method4086(var5, var9, var6); // L: 1552
 			} else {
-				return true; // L: 1591
+				return true; // L: 1555
 			}
 		}
 	}
 
-	@ObfuscatedName("aa")
-	boolean method4341(int var1, int var2, int var3, int var4) {
-		if (!this.method4369(var1, var2, var3)) { // L: 1595
+	@ObfuscatedName("ak")
+	boolean method4000(int var1, int var2, int var3, int var4) {
+		if (!this.method3998(var1, var2, var3)) { // L: 1559
 			return false;
 		} else {
-			int var5 = var2 << 7; // L: 1596
-			int var6 = var3 << 7; // L: 1597
-			return this.method4331(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4331(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4331(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1598
+			int var5 = var2 << 7; // L: 1560
+			int var6 = var3 << 7; // L: 1561
+			return this.method4086(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4086(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4086(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562
 		}
 	}
 
-	@ObfuscatedName("ay")
-	boolean method4330(int var1, int var2, int var3, int var4, int var5, int var6) {
+	@ObfuscatedName("ad")
+	boolean method4001(int var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7;
 		int var8;
-		if (var3 == var2 && var5 == var4) { // L: 1603
-			if (!this.method4369(var1, var2, var4)) { // L: 1604
+		if (var3 == var2 && var5 == var4) { // L: 1567
+			if (!this.method3998(var1, var2, var4)) { // L: 1568
 				return false;
 			} else {
-				var7 = var2 << 7; // L: 1605
-				var8 = var4 << 7; // L: 1606
-				return this.method4331(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4331(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4331(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4331(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1607
+				var7 = var2 << 7; // L: 1569
+				var8 = var4 << 7; // L: 1570
+				return this.method4086(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4086(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4086(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4086(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571
 			}
 		} else {
-			for (var7 = var2; var7 <= var3; ++var7) { // L: 1610
-				for (var8 = var4; var8 <= var5; ++var8) { // L: 1611
-					if (this.field2409[var1][var7][var8] == -Scene_drawnCount) { // L: 1612
+			for (var7 = var2; var7 <= var3; ++var7) { // L: 1574
+				for (var8 = var4; var8 <= var5; ++var8) { // L: 1575
+					if (this.field2300[var1][var7][var8] == -Scene_drawnCount) { // L: 1576
 						return false;
 					}
 				}
 			}
 
-			var7 = (var2 << 7) + 1; // L: 1615
-			var8 = (var4 << 7) + 2; // L: 1616
-			int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1617
-			if (!this.method4331(var7, var9, var8)) { // L: 1618
+			var7 = (var2 << 7) + 1; // L: 1579
+			var8 = (var4 << 7) + 2; // L: 1580
+			int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581
+			if (!this.method4086(var7, var9, var8)) { // L: 1582
 				return false;
 			} else {
-				int var10 = (var3 << 7) - 1; // L: 1619
-				if (!this.method4331(var10, var9, var8)) { // L: 1620
+				int var10 = (var3 << 7) - 1; // L: 1583
+				if (!this.method4086(var10, var9, var8)) { // L: 1584
 					return false;
 				} else {
-					int var11 = (var5 << 7) - 1; // L: 1621
-					if (!this.method4331(var7, var9, var11)) { // L: 1622
+					int var11 = (var5 << 7) - 1; // L: 1585
+					if (!this.method4086(var7, var9, var11)) { // L: 1586
 						return false;
-					} else if (!this.method4331(var10, var9, var11)) { // L: 1623
+					} else if (!this.method4086(var10, var9, var11)) { // L: 1587
 						return false;
 					} else {
-						return true; // L: 1624
+						return true; // L: 1588
 					}
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("bg")
-	boolean method4331(int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1628
-			Occluder var5 = Scene_currentOccluders[var4]; // L: 1629
+	@ObfuscatedName("bp")
+	boolean method4086(int var1, int var2, int var3) {
+		for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592
+			Occluder var5 = Scene_currentOccluders[var4]; // L: 1593
 			int var6;
 			int var7;
 			int var8;
 			int var9;
 			int var10;
-			if (var5.field2464 == 1) { // L: 1630
-				var6 = var5.minX - var1; // L: 1631
-				if (var6 > 0) { // L: 1632
-					var7 = (var6 * var5.field2471 >> 8) + var5.minZ; // L: 1633
-					var8 = (var6 * var5.field2470 >> 8) + var5.maxZ; // L: 1634
-					var9 = (var6 * var5.field2473 >> 8) + var5.minY; // L: 1635
-					var10 = (var6 * var5.field2472 >> 8) + var5.maxY; // L: 1636
-					if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1637
+			if (var5.field2378 == 1) { // L: 1594
+				var6 = var5.minX - var1; // L: 1595
+				if (var6 > 0) { // L: 1596
+					var7 = (var6 * var5.field2381 >> 8) + var5.minZ; // L: 1597
+					var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1598
+					var9 = (var6 * var5.field2383 >> 8) + var5.minY; // L: 1599
+					var10 = (var6 * var5.field2367 >> 8) + var5.maxY; // L: 1600
+					if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601
 						return true;
 					}
 				}
-			} else if (var5.field2464 == 2) { // L: 1641
-				var6 = var1 - var5.minX; // L: 1642
-				if (var6 > 0) { // L: 1643
-					var7 = (var6 * var5.field2471 >> 8) + var5.minZ; // L: 1644
-					var8 = (var6 * var5.field2470 >> 8) + var5.maxZ; // L: 1645
-					var9 = (var6 * var5.field2473 >> 8) + var5.minY; // L: 1646
-					var10 = (var6 * var5.field2472 >> 8) + var5.maxY; // L: 1647
-					if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1648
+			} else if (var5.field2378 == 2) { // L: 1605
+				var6 = var1 - var5.minX; // L: 1606
+				if (var6 > 0) { // L: 1607
+					var7 = (var6 * var5.field2381 >> 8) + var5.minZ; // L: 1608
+					var8 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1609
+					var9 = (var6 * var5.field2383 >> 8) + var5.minY; // L: 1610
+					var10 = (var6 * var5.field2367 >> 8) + var5.maxY; // L: 1611
+					if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612
 						return true;
 					}
 				}
-			} else if (var5.field2464 == 3) { // L: 1652
-				var6 = var5.minZ - var3; // L: 1653
-				if (var6 > 0) { // L: 1654
-					var7 = (var6 * var5.field2469 >> 8) + var5.minX; // L: 1655
-					var8 = (var6 * var5.field2463 >> 8) + var5.maxX; // L: 1656
-					var9 = (var6 * var5.field2473 >> 8) + var5.minY; // L: 1657
-					var10 = (var6 * var5.field2472 >> 8) + var5.maxY; // L: 1658
-					if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1659
+			} else if (var5.field2378 == 3) { // L: 1616
+				var6 = var5.minZ - var3; // L: 1617
+				if (var6 > 0) { // L: 1618
+					var7 = (var6 * var5.field2369 >> 8) + var5.minX; // L: 1619
+					var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1620
+					var9 = (var6 * var5.field2383 >> 8) + var5.minY; // L: 1621
+					var10 = (var6 * var5.field2367 >> 8) + var5.maxY; // L: 1622
+					if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623
 						return true;
 					}
 				}
-			} else if (var5.field2464 == 4) { // L: 1663
-				var6 = var3 - var5.minZ; // L: 1664
-				if (var6 > 0) { // L: 1665
-					var7 = (var6 * var5.field2469 >> 8) + var5.minX; // L: 1666
-					var8 = (var6 * var5.field2463 >> 8) + var5.maxX; // L: 1667
-					var9 = (var6 * var5.field2473 >> 8) + var5.minY; // L: 1668
-					var10 = (var6 * var5.field2472 >> 8) + var5.maxY; // L: 1669
-					if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1670
+			} else if (var5.field2378 == 4) { // L: 1627
+				var6 = var3 - var5.minZ; // L: 1628
+				if (var6 > 0) { // L: 1629
+					var7 = (var6 * var5.field2369 >> 8) + var5.minX; // L: 1630
+					var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1631
+					var9 = (var6 * var5.field2383 >> 8) + var5.minY; // L: 1632
+					var10 = (var6 * var5.field2367 >> 8) + var5.maxY; // L: 1633
+					if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634
 						return true;
 					}
 				}
-			} else if (var5.field2464 == 5) { // L: 1674
-				var6 = var2 - var5.minY; // L: 1675
-				if (var6 > 0) { // L: 1676
-					var7 = (var6 * var5.field2469 >> 8) + var5.minX; // L: 1677
-					var8 = (var6 * var5.field2463 >> 8) + var5.maxX; // L: 1678
-					var9 = (var6 * var5.field2471 >> 8) + var5.minZ; // L: 1679
-					var10 = (var6 * var5.field2470 >> 8) + var5.maxZ; // L: 1680
-					if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1681
+			} else if (var5.field2378 == 5) { // L: 1638
+				var6 = var2 - var5.minY; // L: 1639
+				if (var6 > 0) { // L: 1640
+					var7 = (var6 * var5.field2369 >> 8) + var5.minX; // L: 1641
+					var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1642
+					var9 = (var6 * var5.field2381 >> 8) + var5.minZ; // L: 1643
+					var10 = (var6 * var5.field2368 >> 8) + var5.maxZ; // L: 1644
+					if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645
 						return true;
 					}
 				}
 			}
 		}
 
-		return false; // L: 1686
+		return false; // L: 1650
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("Scene_addOccluder")
 	public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		Occluder var8 = new Occluder(); // L: 158
-		var8.minTileX = var2 / 128; // L: 159
-		var8.maxTileX = var3 / 128; // L: 160
-		var8.minTileY = var4 / 128; // L: 161
-		var8.maxTileY = var5 / 128; // L: 162
-		var8.type = var1; // L: 163
-		var8.minX = var2; // L: 164
-		var8.maxX = var3; // L: 165
-		var8.minZ = var4; // L: 166
-		var8.maxZ = var5; // L: 167
-		var8.minY = var6; // L: 168
-		var8.maxY = var7; // L: 169
-		Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 170
-	} // L: 171
+		Occluder var8 = new Occluder(); // L: 149
+		var8.minTileX = var2 / 128; // L: 150
+		var8.maxTileX = var3 / 128; // L: 151
+		var8.minTileY = var4 / 128; // L: 152
+		var8.maxTileY = var5 / 128; // L: 153
+		var8.type = var1; // L: 154
+		var8.minX = var2; // L: 155
+		var8.maxX = var3; // L: 156
+		var8.minZ = var4; // L: 157
+		var8.maxZ = var5; // L: 158
+		var8.minY = var6; // L: 159
+		var8.maxY = var7; // L: 160
+		Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161
+	} // L: 162
 
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@Export("Scene_buildVisiblityMap")
 	public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) {
-		Scene_viewportXMin = 0; // L: 674
-		Scene_viewportYMin = 0; // L: 675
-		Scene_viewportXMax = var3; // L: 676
-		Scene_viewportYMax = var4; // L: 677
-		Scene_viewportXCenter = var3 / 2; // L: 678
-		Scene_viewportYCenter = var4 / 2; // L: 679
-		boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 680
+		Scene_viewportXMin = 0; // L: 638
+		Scene_viewportYMin = 0; // L: 639
+		Scene_viewportXMax = var3; // L: 640
+		Scene_viewportYMax = var4; // L: 641
+		Scene_viewportXCenter = var3 / 2; // L: 642
+		Scene_viewportYCenter = var4 / 2; // L: 643
+		boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 644
 
 		int var6;
 		int var7;
@@ -2469,135 +2457,135 @@ public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int v
 		int var9;
 		int var11;
 		int var12;
-		for (var6 = 128; var6 <= 383; var6 += 32) { // L: 681
-			for (var7 = 0; var7 < 2048; var7 += 64) { // L: 682
-				Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 683
-				Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 684
-				Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 685
-				Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 686
-				var8 = (var6 - 128) / 32; // L: 687
-				var9 = var7 / 64; // L: 688
-
-				for (int var10 = -26; var10 < 26; ++var10) { // L: 689
-					for (var11 = -26; var11 < 26; ++var11) { // L: 690
-						var12 = var10 * 128; // L: 691
-						int var13 = var11 * 128; // L: 692
-						boolean var14 = false; // L: 693
-
-						for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 694
-							if (method4329(var12, var0[var8] + var15, var13)) { // L: 695
-								var14 = true; // L: 696
+		for (var6 = 128; var6 <= 383; var6 += 32) { // L: 645
+			for (var7 = 0; var7 < 2048; var7 += 64) { // L: 646
+				Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 647
+				Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 648
+				Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 649
+				Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 650
+				var8 = (var6 - 128) / 32; // L: 651
+				var9 = var7 / 64; // L: 652
+
+				for (int var10 = -26; var10 < 26; ++var10) { // L: 653
+					for (var11 = -26; var11 < 26; ++var11) { // L: 654
+						var12 = var10 * 128; // L: 655
+						int var13 = var11 * 128; // L: 656
+						boolean var14 = false; // L: 657
+
+						for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658
+							if (method3986(var12, var0[var8] + var15, var13)) { // L: 659
+								var14 = true; // L: 660
 								break;
 							}
 						}
 
-						var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 700
+						var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 664
 					}
 				}
 			}
 		}
 
-		for (var6 = 0; var6 < 8; ++var6) { // L: 705
-			for (var7 = 0; var7 < 32; ++var7) { // L: 706
-				for (var8 = -25; var8 < 25; ++var8) { // L: 707
-					for (var9 = -25; var9 < 25; ++var9) { // L: 708
-						boolean var16 = false; // L: 709
+		for (var6 = 0; var6 < 8; ++var6) { // L: 669
+			for (var7 = 0; var7 < 32; ++var7) { // L: 670
+				for (var8 = -25; var8 < 25; ++var8) { // L: 671
+					for (var9 = -25; var9 < 25; ++var9) { // L: 672
+						boolean var16 = false; // L: 673
 
 						label84:
-						for (var11 = -1; var11 <= 1; ++var11) { // L: 710
-							for (var12 = -1; var12 <= 1; ++var12) { // L: 711
-								if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 712
-									var16 = true; // L: 713
+						for (var11 = -1; var11 <= 1; ++var11) { // L: 674
+							for (var12 = -1; var12 <= 1; ++var12) { // L: 675
+								if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 676
+									var16 = true; // L: 677
 									break label84;
 								}
 
-								if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 716
-									var16 = true; // L: 717
-									break label84; // L: 718
+								if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 680
+									var16 = true; // L: 681
+									break label84; // L: 682
 								}
 
-								if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 720
-									var16 = true; // L: 721
-									break label84; // L: 722
+								if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 684
+									var16 = true; // L: 685
+									break label84; // L: 686
 								}
 
-								if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 724
-									var16 = true; // L: 725
-									break label84; // L: 726
+								if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 688
+									var16 = true; // L: 689
+									break label84; // L: 690
 								}
 							}
 						}
 
-						visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 730
+						visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 694
 					}
 				}
 			}
 		}
 
-	} // L: 735
+	} // L: 699
 
 	@ObfuscatedName("ac")
-	static boolean method4329(int var0, int var1, int var2) {
-		int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 738
-		int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 739
-		int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 740
-		int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 741
-		if (var5 >= 50 && var5 <= 3500) { // L: 742
-			int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 743
-			int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 744
-			return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 745
+	static boolean method3986(int var0, int var1, int var2) {
+		int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 702
+		int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 703
+		int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 704
+		int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 705
+		if (var5 >= 50 && var5 <= 3500) { // L: 706
+			int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 707
+			int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 708
+			return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 709
 		} else {
-			return false; // L: 746
+			return false; // L: 710
 		}
 	}
 
 	@ObfuscatedName("ar")
 	@Export("shouldSendWalk")
 	public static boolean shouldSendWalk() {
-		return viewportWalking && Scene_selectedX != -1; // L: 765
+		return viewportWalking && Scene_selectedX != -1; // L: 729
 	}
 
-	@ObfuscatedName("ad")
-	public static void method4451() {
-		Scene_selectedX = -1; // L: 769
-		viewportWalking = false; // L: 770
-	} // L: 771
+	@ObfuscatedName("ag")
+	public static void method3990() {
+		Scene_selectedX = -1; // L: 733
+		viewportWalking = false; // L: 734
+	} // L: 735
 
-	@ObfuscatedName("au")
-	static final int method4324(int var0, int var1) {
-		var1 = (var0 & 127) * var1 >> 7; // L: 1376
-		if (var1 < 2) { // L: 1377
+	@ObfuscatedName("ai")
+	static final int method4073(int var0, int var1) {
+		var1 = (var0 & 127) * var1 >> 7; // L: 1340
+		if (var1 < 2) { // L: 1341
 			var1 = 2;
-		} else if (var1 > 126) { // L: 1378
+		} else if (var1 > 126) { // L: 1342
 			var1 = 126;
 		}
 
-		return (var0 & 65408) + var1; // L: 1379
+		return (var0 & 65408) + var1; // L: 1343
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("aq")
 	@Export("containsBounds")
 	static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1383
+		if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1347
 			return false;
-		} else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1384
+		} else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1348
 			return false;
-		} else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1385
+		} else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1349
 			return false;
-		} else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1386
+		} else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1350
 			return false;
 		} else {
-			int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1387
-			int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1388
-			int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1389
-			if (var8 == 0) { // L: 1390
-				if (var9 != 0) { // L: 1393
-					return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1394
+			int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1351
+			int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1352
+			int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1353
+			if (var8 == 0) { // L: 1354
+				if (var9 != 0) { // L: 1357
+					return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1358
 				} else {
-					return true; // L: 1396
+					return true; // L: 1360
 				}
 			} else {
-				return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1391
+				return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1355
 			}
 		}
 	}
diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java
index ea0bd77913..24a876bee6 100644
--- a/runescape-client/src/main/java/SceneTileModel.java
+++ b/runescape-client/src/main/java/SceneTileModel.java
@@ -2,77 +2,77 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("hs")
+@ObfuscatedName("gc")
 @Implements("SceneTileModel")
 public final class SceneTileModel {
+	@ObfuscatedName("e")
+	static int[] field2399;
+	@ObfuscatedName("a")
+	static int[] field2413;
 	@ObfuscatedName("u")
-	static int[] field2501;
-	@ObfuscatedName("n")
-	static int[] field2488;
-	@ObfuscatedName("z")
-	static int[] field2503;
+	static int[] field2414;
+	@ObfuscatedName("k")
+	static int[] field2415;
+	@ObfuscatedName("f")
+	static int[] field2416;
+	@ObfuscatedName("l")
+	static final int[][] field2401;
 	@ObfuscatedName("q")
-	static int[] field2504;
-	@ObfuscatedName("d")
-	static int[] field2502;
-	@ObfuscatedName("r")
-	static final int[][] field2505;
-	@ObfuscatedName("m")
-	static final int[][] field2492;
-	@ObfuscatedName("i")
+	static final int[][] field2397;
+	@ObfuscatedName("c")
 	@Export("vertexX")
 	int[] vertexX;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("vertexY")
 	int[] vertexY;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("vertexZ")
 	int[] vertexZ;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("triangleColorA")
 	int[] triangleColorA;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("triangleColorB")
 	int[] triangleColorB;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("triangleColorC")
 	int[] triangleColorC;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("faceX")
 	int[] faceX;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("faceY")
 	int[] faceY;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("faceZ")
 	int[] faceZ;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("triangleTextureId")
 	int[] triangleTextureId;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("isFlat")
 	boolean isFlat;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("shape")
 	int shape;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("underlayRgb")
 	int underlayRgb;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("overlayRgb")
 	int overlayRgb;
 
 	static {
-		field2501 = new int[6]; // L: 21
-		field2488 = new int[6]; // L: 22
-		field2503 = new int[6]; // L: 23
-		field2504 = new int[6]; // L: 24
-		field2502 = new int[6]; // L: 25
-		field2505 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26
-		field2492 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41
+		field2399 = new int[6]; // L: 21
+		field2413 = new int[6]; // L: 22
+		field2414 = new int[6]; // L: 23
+		field2415 = new int[6]; // L: 24
+		field2416 = new int[6]; // L: 25
+		field2401 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26
+		field2397 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41
 	}
 
 	SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) {
@@ -89,7 +89,7 @@ public final class SceneTileModel {
 		int var21 = var20 / 2; // L: 64
 		int var22 = var20 / 4; // L: 65
 		int var23 = var20 * 3 / 4; // L: 66
-		int[] var24 = field2505[var1]; // L: 67
+		int[] var24 = field2401[var1]; // L: 67
 		int var25 = var24.length; // L: 68
 		this.vertexX = new int[var25]; // L: 69
 		this.vertexY = new int[var25]; // L: 70
@@ -224,7 +224,7 @@ public final class SceneTileModel {
 			var27[var30] = var36; // L: 202
 		}
 
-		int[] var38 = field2492[var1]; // L: 204
+		int[] var38 = field2397[var1]; // L: 204
 		var31 = var38.length / 4; // L: 205
 		this.faceX = new int[var31]; // L: 206
 		this.faceY = new int[var31]; // L: 207
diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java
index 93272bd057..6f07910eed 100644
--- a/runescape-client/src/main/java/SceneTilePaint.java
+++ b/runescape-client/src/main/java/SceneTilePaint.java
@@ -3,45 +3,45 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("hg")
+@ObfuscatedName("gk")
 @Implements("SceneTilePaint")
 public final class SceneTilePaint {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1142629297
+		intValue = -1849890093
 	)
 	@Export("swColor")
 	int swColor;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1241248513
+		intValue = 325904735
 	)
 	@Export("seColor")
 	int seColor;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -601544489
+		intValue = -79551477
 	)
 	@Export("neColor")
 	int neColor;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -714792091
+		intValue = -378888485
 	)
 	@Export("nwColor")
 	int nwColor;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1463497725
+		intValue = 1880581479
 	)
 	@Export("texture")
 	int texture;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("isFlat")
 	boolean isFlat;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 969353043
+		intValue = 1789996375
 	)
 	@Export("rgb")
 	int rgb;
diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java
index 75a0c524a6..7b6522effc 100644
--- a/runescape-client/src/main/java/Script.java
+++ b/runescape-client/src/main/java/Script.java
@@ -4,53 +4,53 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bp")
+@ObfuscatedName("bn")
 @Implements("Script")
 public class Script extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("Script_cached")
 	static EvictingDualNodeHashTable Script_cached;
-	@ObfuscatedName("w")
-	String field928;
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
+	String field937;
+	@ObfuscatedName("p")
 	@Export("opcodes")
 	int[] opcodes;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("intOperands")
 	int[] intOperands;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("stringOperands")
 	String[] stringOperands;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1670350009
+		intValue = 1986002175
 	)
 	@Export("localIntCount")
 	int localIntCount;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -239833439
+		intValue = 140084379
 	)
 	@Export("localStringCount")
 	int localStringCount;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1823289949
+		intValue = 773546685
 	)
 	@Export("intArgumentCount")
 	int intArgumentCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1448244841
+		intValue = -2027696431
 	)
 	@Export("stringArgumentCount")
 	int stringArgumentCount;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "[Lnf;"
+		descriptor = "[Loz;"
 	)
 	@Export("switches")
 	IterableNodeHashTable[] switches;
@@ -62,149 +62,30 @@ public class Script extends DualNode {
 	Script() {
 	} // L: 23
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[Lnf;",
-		garbageValue = "17"
+		descriptor = "(II)[Loz;",
+		garbageValue = "-1725303821"
 	)
 	@Export("newIterableNodeHashTable")
 	IterableNodeHashTable[] newIterableNodeHashTable(int var1) {
-		return new IterableNodeHashTable[var1]; // L: 170
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "1899123891"
-	)
-	static int method1988(int var0, int var1) {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14
-		if (var2 == null) { // L: 15
-			return -1;
-		} else {
-			return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17
-		}
+		return new IterableNodeHashTable[var1]; // L: 155
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "8"
+		descriptor = "(ILku;Ljava/lang/String;Ljava/lang/String;IZB)V",
+		garbageValue = "62"
 	)
-	public static void method1989() {
-		if (NetCache.NetCache_socket != null) { // L: 156
-			NetCache.NetCache_socket.close();
-		}
-
-	} // L: 157
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;Ljava/lang/String;Ljava/lang/String;I)Loe;",
-		garbageValue = "846421699"
-	)
-	@Export("SpriteBuffer_getIndexedSpriteByName")
-	public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
-		int var3 = var0.getGroupId(var1); // L: 64
-		int var4 = var0.getFileId(var3, var2); // L: 65
-		byte[] var7 = var0.takeFile(var3, var4); // L: 70
-		boolean var6;
-		if (var7 == null) { // L: 71
-			var6 = false; // L: 72
-		} else {
-			SpriteBuffer_decode(var7); // L: 75
-			var6 = true; // L: 76
-		}
-
-		IndexedSprite var5;
-		if (!var6) { // L: 78
-			var5 = null; // L: 79
-		} else {
-			IndexedSprite var8 = new IndexedSprite(); // L: 84
-			var8.width = class414.SpriteBuffer_spriteWidth; // L: 85
-			var8.height = class414.SpriteBuffer_spriteHeight; // L: 86
-			var8.xOffset = class414.SpriteBuffer_xOffsets[0]; // L: 87
-			var8.yOffset = class414.SpriteBuffer_yOffsets[0]; // L: 88
-			var8.subWidth = UrlRequester.SpriteBuffer_spriteWidths[0]; // L: 89
-			var8.subHeight = class414.SpriteBuffer_spriteHeights[0]; // L: 90
-			var8.palette = HitSplatDefinition.SpriteBuffer_spritePalette; // L: 91
-			var8.pixels = class295.SpriteBuffer_pixels[0]; // L: 92
-			PacketBuffer.method6913(); // L: 93
-			var5 = var8; // L: 96
-		}
-
-		return var5; // L: 98
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "([BI)V",
-		garbageValue = "1694864666"
-	)
-	@Export("SpriteBuffer_decode")
-	static void SpriteBuffer_decode(byte[] var0) {
-		Buffer var1 = new Buffer(var0); // L: 215
-		var1.offset = var0.length - 2; // L: 216
-		class414.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 217
-		class414.SpriteBuffer_xOffsets = new int[class414.SpriteBuffer_spriteCount]; // L: 218
-		class414.SpriteBuffer_yOffsets = new int[class414.SpriteBuffer_spriteCount]; // L: 219
-		UrlRequester.SpriteBuffer_spriteWidths = new int[class414.SpriteBuffer_spriteCount]; // L: 220
-		class414.SpriteBuffer_spriteHeights = new int[class414.SpriteBuffer_spriteCount]; // L: 221
-		class295.SpriteBuffer_pixels = new byte[class414.SpriteBuffer_spriteCount][]; // L: 222
-		var1.offset = var0.length - 7 - class414.SpriteBuffer_spriteCount * 8; // L: 223
-		class414.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 224
-		class414.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 225
-		int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 226
-
-		int var3;
-		for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 227
-			class414.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
-		}
-
-		for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 228
-			class414.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
-		}
-
-		for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 229
-			UrlRequester.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort();
-		}
-
-		for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 230
-			class414.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort();
-		}
-
-		var1.offset = var0.length - 7 - class414.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 231
-		HitSplatDefinition.SpriteBuffer_spritePalette = new int[var2]; // L: 232
-
-		for (var3 = 1; var3 < var2; ++var3) { // L: 233
-			HitSplatDefinition.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 234
-			if (HitSplatDefinition.SpriteBuffer_spritePalette[var3] == 0) { // L: 235
-				HitSplatDefinition.SpriteBuffer_spritePalette[var3] = 1;
-			}
-		}
-
-		var1.offset = 0; // L: 237
-
-		for (var3 = 0; var3 < class414.SpriteBuffer_spriteCount; ++var3) { // L: 238
-			int var4 = UrlRequester.SpriteBuffer_spriteWidths[var3]; // L: 239
-			int var5 = class414.SpriteBuffer_spriteHeights[var3]; // L: 240
-			int var6 = var4 * var5; // L: 241
-			byte[] var7 = new byte[var6]; // L: 242
-			class295.SpriteBuffer_pixels[var3] = var7; // L: 243
-			int var8 = var1.readUnsignedByte(); // L: 244
-			int var9;
-			if (var8 == 0) { // L: 245
-				for (var9 = 0; var9 < var6; ++var9) { // L: 246
-					var7[var9] = var1.readByte();
-				}
-			} else if (var8 == 1) { // L: 248
-				for (var9 = 0; var9 < var4; ++var9) { // L: 249
-					for (int var10 = 0; var10 < var5; ++var10) { // L: 250
-						var7[var9 + var10 * var4] = var1.readByte(); // L: 251
-					}
-				}
-			}
-		}
-
-	} // L: 256
+	public static void method2040(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) {
+		int var6 = var1.getGroupId(var2); // L: 48
+		int var7 = var1.getFileId(var6, var3); // L: 49
+		class260.musicPlayerStatus = 1; // L: 51
+		class124.musicTrackArchive = var1; // L: 52
+		VarcInt.musicTrackGroupId = var6; // L: 53
+		class260.musicTrackFileId = var7; // L: 54
+		ChatChannel.musicTrackVolume = var4; // L: 55
+		DynamicObject.musicTrackBoolean = var5; // L: 56
+		class260.pcmSampleLength = var0; // L: 57
+	} // L: 59
 }
diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java
index 7366635c48..5aa682e8ae 100644
--- a/runescape-client/src/main/java/ScriptEvent.java
+++ b/runescape-client/src/main/java/ScriptEvent.java
@@ -4,80 +4,74 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ck")
+@ObfuscatedName("cp")
 @Implements("ScriptEvent")
 public class ScriptEvent extends Node {
-	@ObfuscatedName("rq")
+	@ObfuscatedName("dl")
 	@ObfuscatedSignature(
-		descriptor = "Lak;"
+		descriptor = "Lfk;"
 	)
-	@Export("pcmPlayer1")
-	static PcmPlayer pcmPlayer1;
-	@ObfuscatedName("fw")
-	@ObfuscatedGetter(
-		intValue = -1958240273
-	)
-	@Export("currentPort")
-	static int currentPort;
-	@ObfuscatedName("i")
+	@Export("js5SocketTask")
+	static Task js5SocketTask;
+	@ObfuscatedName("c")
 	@Export("args")
 	Object[] args;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("isMouseInputEvent")
 	boolean isMouseInputEvent;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+		descriptor = "Ljm;"
 	)
 	@Export("widget")
 	Widget widget;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1998799811
+		intValue = -1316811587
 	)
 	@Export("mouseX")
 	int mouseX;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1979729253
+		intValue = 429308499
 	)
 	@Export("mouseY")
 	int mouseY;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -932845739
+		intValue = 2143189111
 	)
 	@Export("opIndex")
 	int opIndex;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+		descriptor = "Ljm;"
 	)
 	@Export("dragTarget")
 	Widget dragTarget;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1702725871
+		intValue = 1992981497
 	)
 	@Export("keyTyped")
 	int keyTyped;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1708889307
+		intValue = 1481039273
 	)
 	@Export("keyPressed")
 	int keyPressed;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("targetName")
 	String targetName;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 989440955
+		intValue = 2063557447
 	)
-	int field1024;
-	@ObfuscatedName("y")
+	int field1018;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1164936437
+		intValue = -170521561
 	)
 	@Export("type")
 	int type;
@@ -86,23 +80,93 @@ public ScriptEvent() {
 		this.type = 76; // L: 19
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/Object;I)V",
-		garbageValue = "-1142629297"
+		descriptor = "([Ljava/lang/Object;B)V",
+		garbageValue = "1"
 	)
 	@Export("setArgs")
 	public void setArgs(Object[] var1) {
 		this.args = var1; // L: 22
 	} // L: 23
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "2078540065"
+		garbageValue = "-1783513885"
 	)
 	@Export("setType")
 	public void setType(int var1) {
 		this.type = var1; // L: 26
 	} // L: 27
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(II)Ldh;",
+		garbageValue = "665811152"
+	)
+	static class114 method2154(int var0) {
+		class114 var1 = (class114)class130.findEnumerated(LoginScreenAnimation.method2251(), var0); // L: 138
+		if (var1 == null) {
+			var1 = class114.field1390; // L: 139
+		}
+
+		return var1; // L: 140
+	}
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-37"
+	)
+	static final void method2152() {
+		Object var10000 = null; // L: 108
+		String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members";
+		class194.addGameMessage(30, "", var0); // L: 110
+	} // L: 112
+
+	@ObfuscatedName("jt")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIB)V",
+		garbageValue = "95"
+	)
+	static final void method2147(int var0, int var1, int var2, int var3, int var4, int var5) {
+		int var6 = var2 - var0; // L: 10850
+		int var7 = var3 - var1; // L: 10851
+		int var8 = var6 >= 0 ? var6 : -var6; // L: 10852
+		int var9 = var7 >= 0 ? var7 : -var7; // L: 10853
+		int var10 = var8; // L: 10854
+		if (var8 < var9) { // L: 10855
+			var10 = var9;
+		}
+
+		if (var10 != 0) { // L: 10856
+			int var11 = (var6 << 16) / var10; // L: 10857
+			int var12 = (var7 << 16) / var10; // L: 10858
+			if (var12 <= var11) { // L: 10859
+				var11 = -var11;
+			} else {
+				var12 = -var12; // L: 10860
+			}
+
+			int var13 = var5 * var12 >> 17; // L: 10861
+			int var14 = var5 * var12 + 1 >> 17; // L: 10862
+			int var15 = var5 * var11 >> 17; // L: 10863
+			int var16 = var5 * var11 + 1 >> 17; // L: 10864
+			var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10865
+			var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10866
+			int var17 = var0 + var13; // L: 10867
+			int var18 = var0 - var14; // L: 10868
+			int var19 = var0 + var6 - var14; // L: 10869
+			int var20 = var0 + var6 + var13; // L: 10870
+			int var21 = var15 + var1; // L: 10871
+			int var22 = var1 - var16; // L: 10872
+			int var23 = var7 + var1 - var16; // L: 10873
+			int var24 = var7 + var15 + var1; // L: 10874
+			Rasterizer3D.method3853(var17, var18, var19); // L: 10875
+			Rasterizer3D.method3856(var21, var22, var23, var17, var18, var19, var4); // L: 10876
+			Rasterizer3D.method3853(var17, var19, var20); // L: 10877
+			Rasterizer3D.method3856(var21, var23, var24, var17, var19, var20, var4); // L: 10878
+		}
+	} // L: 10879
 }
diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java
index b6a4910b04..4958584002 100644
--- a/runescape-client/src/main/java/ScriptFrame.java
+++ b/runescape-client/src/main/java/ScriptFrame.java
@@ -5,25 +5,41 @@
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bt")
+@ObfuscatedName("bg")
 @Implements("ScriptFrame")
 public class ScriptFrame {
-	@ObfuscatedName("i")
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -238445721
+	)
+	static int field446;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = -2036578637
+	)
+	static int field448;
+	@ObfuscatedName("bw")
+	@ObfuscatedSignature(
+		descriptor = "Llf;"
+	)
+	@Export("clientLanguage")
+	static Language clientLanguage;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lbp;"
+		descriptor = "Lbn;"
 	)
 	@Export("script")
 	Script script;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -17818799
+		intValue = 1958186209
 	)
 	@Export("pc")
 	int pc;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("intLocals")
 	int[] intLocals;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("stringLocals")
 	String[] stringLocals;
 
@@ -31,426 +47,493 @@ public class ScriptFrame {
 		this.pc = -1; // L: 5
 	} // L: 9
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lfw;",
-		garbageValue = "-39610559"
+		descriptor = "(Lcp;IIB)V",
+		garbageValue = "61"
 	)
-	@Export("getNpcDefinition")
-	public static NPCComposition getNpcDefinition(int var0) {
-		NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 57
-		if (var1 != null) { // L: 58
-			return var1;
+	@Export("runScript")
+	static void runScript(ScriptEvent var0, int var1, int var2) {
+		Object[] var3 = var0.args; // L: 114
+		Script var4;
+		int var20;
+		if (ClanMate.isWorldMapEvent(var0.type)) { // L: 116
+			FileSystem.worldMapEvent = (WorldMapEvent)var3[0]; // L: 117
+			WorldMapElement var5 = class78.WorldMapElement_get(FileSystem.worldMapEvent.mapElement); // L: 118
+			var4 = Skeleton.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 119
 		} else {
-			byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 59
-			var1 = new NPCComposition(); // L: 60
-			var1.id = var0; // L: 61
-			if (var2 != null) { // L: 62
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode(); // L: 63
-			NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 64
-			return var1; // L: 65
+			var20 = (Integer)var3[0]; // L: 122
+			var4 = class410.getScript(var20); // L: 123
 		}
-	}
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "77"
-	)
-	@Export("ItemContainer_getCount")
-	static int ItemContainer_getCount(int var0, int var1) {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21
-		if (var2 == null) { // L: 22
-			return 0;
-		} else {
-			return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24
-		}
-	}
+		if (var4 != null) { // L: 125
+			IsaacCipher.Interpreter_intStackSize = 0; // L: 128
+			class13.Interpreter_stringStackSize = 0;
+			var20 = -1;
+			int[] var6 = var4.opcodes;
+			int[] var7 = var4.intOperands;
+			byte var8 = -1; // L: 133
+			Interpreter.Interpreter_frameDepth = 0; // L: 134
+			Interpreter.field818 = false;
+			boolean var9 = false;
+			int var10 = 0;
+			boolean var30 = false;
 
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1571821946"
-	)
-	public static void method1117() {
-		SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 117
-		SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 118
-	} // L: 119
+			label955: {
+				label956: {
+					try {
+						int var13;
+						try {
+							var30 = true;
+							SoundCache.Interpreter_intLocals = new int[var4.localIntCount];
+							int var11 = 0;
+							AbstractUserComparator.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 142
+							int var12 = 0;
 
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "1762076085"
-	)
-	static int method1118(int var0, Script var1, boolean var2) {
-		String var7;
-		if (var0 == ScriptOpcodes.MES) { // L: 1412
-			var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1413
-			class397.addGameMessage(0, "", var7); // L: 1414
-			return 1; // L: 1415
-		} else if (var0 == ScriptOpcodes.ANIM) {
-			class14.Interpreter_intStackSize -= 2; // L: 1418
-			FaceNormal.performPlayerAnimation(HealthBarDefinition.localPlayer, Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 1419
-			return 1; // L: 1420
-		} else if (var0 == ScriptOpcodes.IF_CLOSE) {
-			if (!Interpreter.field791) { // L: 1423
-				Interpreter.field795 = true; // L: 1424
-			}
+							int var14;
+							String var21;
+							for (var13 = 1; var13 < var3.length; ++var13) { // L: 143
+								if (var3[var13] instanceof Integer) {
+									var14 = (Integer)var3[var13]; // L: 145
+									if (var14 == -2147483647) {
+										var14 = var0.mouseX;
+									}
 
-			return 1; // L: 1426
-		} else {
-			int var16;
-			if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
-				var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1429
-				var16 = 0; // L: 1430
-				if (class129.isNumber(var7)) { // L: 1431
-					var16 = TaskHandler.method2881(var7);
-				}
+									if (var14 == -2147483646) { // L: 147
+										var14 = var0.mouseY;
+									}
 
-				PacketBufferNode var14 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2754, Client.packetWriter.isaacCipher); // L: 1433
-				var14.packetBuffer.writeInt(var16); // L: 1434
-				Client.packetWriter.addNode(var14); // L: 1435
-				return 1; // L: 1436
-			} else {
-				PacketBufferNode var12;
-				if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
-					var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1439
-					var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2764, Client.packetWriter.isaacCipher); // L: 1441
-					var12.packetBuffer.writeByte(var7.length() + 1); // L: 1442
-					var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1443
-					Client.packetWriter.addNode(var12); // L: 1444
-					return 1; // L: 1445
-				} else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
-					var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1448
-					var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2707, Client.packetWriter.isaacCipher); // L: 1450
-					var12.packetBuffer.writeByte(var7.length() + 1); // L: 1451
-					var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1452
-					Client.packetWriter.addNode(var12); // L: 1453
-					return 1; // L: 1454
-				} else {
-					String var4;
-					int var10;
-					if (var0 == ScriptOpcodes.OPPLAYER) {
-						var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1457
-						var4 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1458
-						AbstractByteArrayCopier.method5169(var10, var4); // L: 1459
-						return 1; // L: 1460
-					} else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
-						class14.Interpreter_intStackSize -= 3; // L: 1463
-						var10 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1464
-						var16 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1465
-						int var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 1466
-						Widget var15 = UserComparator9.getWidget(var9); // L: 1467
-						UserComparator6.clickWidget(var15, var10, var16); // L: 1468
-						return 1; // L: 1469
-					} else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
-						class14.Interpreter_intStackSize -= 2; // L: 1472
-						var10 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1473
-						var16 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1474
-						Widget var13 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1475
-						UserComparator6.clickWidget(var13, var10, var16); // L: 1476
-						return 1; // L: 1477
-					} else if (var0 == ScriptOpcodes.MOUSECAM) {
-						ApproximateRouteStrategy.mouseCam = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1480
-						return 1; // L: 1481
-					} else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class408.clientPreferences.roofsHidden ? 1 : 0; // L: 1484
-						return 1; // L: 1485
-					} else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
-						class408.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1488
-						Login.savePreferences(); // L: 1489
-						return 1; // L: 1490
-					} else if (var0 == ScriptOpcodes.OPENURL) {
-						var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 1493
-						boolean var8 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1494
-						class91.openURL(var7, var8, false); // L: 1495
-						return 1; // L: 1496
-					} else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
-						var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1499
-						var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2685, Client.packetWriter.isaacCipher); // L: 1501
-						var12.packetBuffer.writeShort(var10); // L: 1502
-						Client.packetWriter.addNode(var12); // L: 1503
-						return 1; // L: 1504
-					} else if (var0 == ScriptOpcodes.BUG_REPORT) {
-						var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1507
-						class295.Interpreter_stringStackSize -= 2; // L: 1508
-						var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 1509
-						String var5 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 1510
-						if (var4.length() > 500) { // L: 1511
-							return 1;
-						} else if (var5.length() > 500) { // L: 1512
-							return 1;
-						} else {
-							PacketBufferNode var6 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2724, Client.packetWriter.isaacCipher); // L: 1513
-							var6.packetBuffer.writeShort(1 + Client.stringCp1252NullTerminatedByteSize(var4) + Client.stringCp1252NullTerminatedByteSize(var5)); // L: 1514
-							var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1515
-							var6.packetBuffer.writeByte(var10); // L: 1516
-							var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1517
-							Client.packetWriter.addNode(var6); // L: 1518
-							return 1; // L: 1519
-						}
-					} else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
-						Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1522
-						return 1; // L: 1523
-					} else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
-						Client.showMouseOverText = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1526
-						return 1; // L: 1527
-					} else if (var0 == ScriptOpcodes.RENDERSELF) {
-						Client.renderSelf = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1530
-						return 1; // L: 1531
-					} else if (var0 == 3120) {
-						if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 1534
-							Client.drawPlayerNames |= 1;
-						} else {
-							Client.drawPlayerNames &= -2; // L: 1535
-						}
+									if (var14 == -2147483645) { // L: 148
+										var14 = var0.widget != null ? var0.widget.id * 1695982371 * 2075239563 : -1;
+									}
 
-						return 1; // L: 1536
-					} else if (var0 == 3121) {
-						if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 1539
-							Client.drawPlayerNames |= 2;
-						} else {
-							Client.drawPlayerNames &= -3; // L: 1540
-						}
+									if (var14 == -2147483644) {
+										var14 = var0.opIndex;
+									}
 
-						return 1; // L: 1541
-					} else if (var0 == 3122) {
-						if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 1544
-							Client.drawPlayerNames |= 4;
-						} else {
-							Client.drawPlayerNames &= -5; // L: 1545
-						}
+									if (var14 == -2147483643) {
+										var14 = var0.widget != null ? var0.widget.childIndex * -1765912961 * -1567657601 : -1;
+									}
+
+									if (var14 == -2147483642) {
+										var14 = var0.dragTarget != null ? var0.dragTarget.id * 1695982371 * 2075239563 : -1;
+									}
+
+									if (var14 == -2147483641) {
+										var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1765912961 * -1567657601 : -1;
+									}
+
+									if (var14 == -2147483640) {
+										var14 = var0.keyTyped;
+									}
+
+									if (var14 == -2147483639) { // L: 154
+										var14 = var0.keyPressed;
+									}
+
+									SoundCache.Interpreter_intLocals[var11++] = var14; // L: 155
+								} else if (var3[var13] instanceof String) {
+									var21 = (String)var3[var13];
+									if (var21.equals("event_opbase")) {
+										var21 = var0.targetName;
+									}
+
+									AbstractUserComparator.Interpreter_stringLocals[var12++] = var21; // L: 160
+								}
+							}
+
+							Interpreter.field815 = var0.field1018; // L: 164
+
+							while (true) {
+								++var10;
+								if (var10 > var1) { // L: 167
+									throw new RuntimeException();
+								}
+
+								++var20; // L: 168
+								int var33 = var6[var20];
+								if (var33 >= 100) { // L: 169
+									boolean var35;
+									if (var4.intOperands[var20] == 1) { // L: 387
+										var35 = true;
+									} else {
+										var35 = false; // L: 388
+									}
+
+									var14 = class112.method2560(var33, var4, var35); // L: 389
+									switch(var14) { // L: 390
+									case 0:
+										var30 = false;
+										break label955;
+									case 1:
+									default:
+										break;
+									case 2:
+										throw new IllegalStateException(); // L: 393
+									}
+								} else if (var33 == ScriptOpcodes.ICONST) { // L: 170
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7[var20];
+								} else if (var33 == ScriptOpcodes.GET_VARP) {
+									var13 = var7[var20]; // L: 175
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 176
+								} else if (var33 == ScriptOpcodes.SET_VARP) { // L: 179
+									var13 = var7[var20];
+									Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 181
+									class281.changeGameOptions(var13); // L: 182
+								} else if (var33 == ScriptOpcodes.SCONST) { // L: 185
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 186
+								} else if (var33 == ScriptOpcodes.JUMP) { // L: 189
+									var20 += var7[var20]; // L: 190
+								} else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 193
+									IsaacCipher.Interpreter_intStackSize -= 2; // L: 194
+									if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 195
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 198
+									IsaacCipher.Interpreter_intStackSize -= 2; // L: 199
+									if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 200
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 203
+									IsaacCipher.Interpreter_intStackSize -= 2; // L: 204
+									if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 205
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 208
+									IsaacCipher.Interpreter_intStackSize -= 2; // L: 209
+									if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 210
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.RETURN) { // L: 213
+									if (Interpreter.Interpreter_frameDepth == 0) {
+										var30 = false;
+										break;
+									}
+
+									ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 215
+									var4 = var40.script; // L: 216
+									var6 = var4.opcodes; // L: 217
+									var7 = var4.intOperands; // L: 218
+									var20 = var40.pc; // L: 219
+									SoundCache.Interpreter_intLocals = var40.intLocals; // L: 220
+									AbstractUserComparator.Interpreter_stringLocals = var40.stringLocals; // L: 221
+								} else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 224
+									var13 = var7[var20]; // L: 225
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class273.getVarbit(var13); // L: 226
+								} else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 229
+									var13 = var7[var20]; // L: 230
+									Tile.method3843(var13, Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 231
+								} else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 234
+									IsaacCipher.Interpreter_intStackSize -= 2; // L: 235
+									if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 236
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 239
+									IsaacCipher.Interpreter_intStackSize -= 2; // L: 240
+									if (Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]) { // L: 241
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.ILOAD) { // L: 244
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SoundCache.Interpreter_intLocals[var7[var20]]; // L: 245
+								} else if (var33 == ScriptOpcodes.ISTORE) { // L: 248
+									SoundCache.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 249
+								} else if (var33 == ScriptOpcodes.SLOAD) { // L: 252
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractUserComparator.Interpreter_stringLocals[var7[var20]]; // L: 253
+								} else if (var33 == ScriptOpcodes.SSTORE) { // L: 256
+									AbstractUserComparator.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 257
+								} else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 260
+									var13 = var7[var20]; // L: 261
+									class13.Interpreter_stringStackSize -= var13; // L: 262
+									var21 = class112.method2565(Interpreter.Interpreter_stringStack, class13.Interpreter_stringStackSize, var13); // L: 263
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var21; // L: 264
+								} else if (var33 == ScriptOpcodes.POP_INT) { // L: 267
+									--IsaacCipher.Interpreter_intStackSize; // L: 268
+								} else if (var33 == ScriptOpcodes.POP_STRING) { // L: 271
+									--class13.Interpreter_stringStackSize; // L: 272
+								} else {
+									int var17;
+									if (var33 != ScriptOpcodes.INVOKE) { // L: 275
+										if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 298
+											Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class339.varcs.getInt(var7[var20]); // L: 299
+										} else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 302
+											class339.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 303
+										} else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 306
+											var13 = var7[var20] >> 16; // L: 307
+											var14 = var7[var20] & 65535; // L: 308
+											int var24 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 309
+											if (var24 < 0 || var24 > 5000) { // L: 310
+												throw new RuntimeException(); // L: 311
+											}
 
-						return 1; // L: 1546
-					} else if (var0 == 3123) {
-						if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 1549
-							Client.drawPlayerNames |= 8;
-						} else {
-							Client.drawPlayerNames &= -9; // L: 1550
+											Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 313
+											byte var25 = -1; // L: 314
+											if (var14 == 105) { // L: 315
+												var25 = 0;
+											}
+
+											for (var17 = 0; var17 < var24; ++var17) { // L: 316
+												Interpreter.Interpreter_arrays[var13][var17] = var25;
+											}
+										} else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 319
+											var13 = var7[var20]; // L: 320
+											var14 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 321
+											if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 322
+												throw new RuntimeException(); // L: 323
+											}
+
+											Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 325
+										} else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 328
+											var13 = var7[var20]; // L: 329
+											IsaacCipher.Interpreter_intStackSize -= 2; // L: 330
+											var14 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 331
+											if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 332
+												throw new RuntimeException(); // L: 333
+											}
+
+											Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 335
+										} else {
+											String var22;
+											if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 338
+												var22 = class339.varcs.getStringOld(var7[var20]); // L: 339
+												if (var22 == null) { // L: 340
+													var22 = "null";
+												}
+
+												Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var22; // L: 341
+											} else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 344
+												class339.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 345
+											} else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 348
+												var22 = class339.varcs.getString(var7[var20]); // L: 349
+												Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var22; // L: 350
+											} else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 353
+												class339.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 354
+											} else if (var33 == ScriptOpcodes.SWITCH) { // L: 357
+												IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 358
+												IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 359
+												if (var37 != null) { // L: 360
+													var20 += var37.integer;
+												}
+											} else {
+												Integer var39;
+												if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 363
+													var39 = Friend.field4084.getTitleGroupValue(var7[var20]); // L: 364
+													if (var39 == null) { // L: 365
+														Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 366
+													} else {
+														Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var39; // L: 369
+													}
+												} else {
+													if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 373
+														throw new IllegalStateException(); // L: 383
+													}
+
+													var39 = BuddyRankComparator.field1342.method6757(var7[var20]); // L: 374
+													if (var39 == null) { // L: 375
+														Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 376
+													} else {
+														Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var39; // L: 379
+													}
+												}
+											}
+										}
+									} else {
+										var13 = var7[var20]; // L: 276
+										Script var36 = class410.getScript(var13); // L: 277
+										int[] var15 = new int[var36.localIntCount]; // L: 278
+										String[] var16 = new String[var36.localStringCount]; // L: 279
+
+										for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 280
+											var15[var17] = Interpreter.Interpreter_intStack[var17 + (IsaacCipher.Interpreter_intStackSize - var36.intArgumentCount)];
+										}
+
+										for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 281
+											var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class13.Interpreter_stringStackSize - var36.stringArgumentCount)];
+										}
+
+										IsaacCipher.Interpreter_intStackSize -= var36.intArgumentCount; // L: 282
+										class13.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 283
+										ScriptFrame var23 = new ScriptFrame(); // L: 284
+										var23.script = var4; // L: 285
+										var23.pc = var20; // L: 286
+										var23.intLocals = SoundCache.Interpreter_intLocals; // L: 287
+										var23.stringLocals = AbstractUserComparator.Interpreter_stringLocals; // L: 288
+										Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 289
+										var4 = var36; // L: 290
+										var6 = var36.opcodes; // L: 291
+										var7 = var36.intOperands; // L: 292
+										var20 = -1; // L: 293
+										SoundCache.Interpreter_intLocals = var15; // L: 294
+										AbstractUserComparator.Interpreter_stringLocals = var16; // L: 295
+									}
+								}
+							}
+						} catch (Exception var31) { // L: 403
+							var9 = true; // L: 404
+							StringBuilder var27 = new StringBuilder(30); // L: 406
+							var27.append("").append(var4.key).append(" "); // L: 407
+
+							for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 408
+								var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" ");
+							}
+
+							var27.append("").append(var8); // L: 409
+							AccessFile.RunException_sendStackTrace(var27.toString(), var31); // L: 410
+							var30 = false;
+							break label956;
 						}
+					} finally {
+						if (var30) {
+							while (Interpreter.field817.size() > 0) {
+								class92 var19 = (class92)Interpreter.field817.remove(0); // L: 415
+								SoundCache.widgetDefaultMenuAction(var19.method2340(), var19.method2339(), var19.method2341(), var19.method2348(), "");
+							}
 
-						return 1; // L: 1551
-					} else if (var0 == 3124) {
-						Client.drawPlayerNames = 0; // L: 1554
-						return 1; // L: 1555
-					} else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
-						Client.showMouseCross = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1558
-						return 1; // L: 1559
-					} else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
-						Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1562
-						return 1; // L: 1563
-					} else if (var0 == ScriptOpcodes.SETTAPTODROP) {
-						Messages.setTapToDrop(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1); // L: 1566
-						return 1; // L: 1567
-					} else if (var0 == ScriptOpcodes.GETTAPTODROP) {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Decimator.getTapToDrop() ? 1 : 0; // L: 1570
-						return 1; // L: 1571
-					} else if (var0 == 3129) {
-						class14.Interpreter_intStackSize -= 2; // L: 1574
-						Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1575
-						Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1576
-						return 1; // L: 1577
-					} else if (var0 == 3130) {
-						class14.Interpreter_intStackSize -= 2; // L: 1580
-						return 1; // L: 1581
-					} else if (var0 == 3131) {
-						--class14.Interpreter_intStackSize; // L: 1584
-						return 1; // L: 1585
-					} else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = GameEngine.canvasWidth; // L: 1588
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = KeyHandler.canvasHeight; // L: 1589
-						return 1; // L: 1590
-					} else if (var0 == ScriptOpcodes.MOBILE_SETFPS) {
-						--class14.Interpreter_intStackSize; // L: 1593
-						return 1; // L: 1594
-					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) {
-						return 1; // L: 1597
-					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) {
-						class14.Interpreter_intStackSize -= 2; // L: 1600
-						return 1; // L: 1601
-					} else if (var0 == 3136) {
-						Client.field479 = 3; // L: 1604
-						Client.field633 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1605
-						return 1; // L: 1606
-					} else if (var0 == 3137) {
-						Client.field479 = 2; // L: 1609
-						Client.field633 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1610
-						return 1; // L: 1611
-					} else if (var0 == 3138) {
-						Client.field479 = 0; // L: 1614
-						return 1; // L: 1615
-					} else if (var0 == 3139) {
-						Client.field479 = 1; // L: 1618
-						return 1; // L: 1619
-					} else if (var0 == 3140) {
-						Client.field479 = 3; // L: 1622
-						Client.field633 = var2 ? class120.scriptDotWidget.id * 851670683 * -830177389 : Frames.scriptActiveWidget.id * 851670683 * -830177389; // L: 1623
-						return 1; // L: 1624
-					} else {
-						boolean var11;
-						if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
-							var11 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1627
-							class408.clientPreferences.hideUsername = var11; // L: 1628
-							Login.savePreferences(); // L: 1629
-							return 1; // L: 1630
-						} else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class408.clientPreferences.hideUsername ? 1 : 0; // L: 1633
-							return 1; // L: 1634
-						} else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
-							var11 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1637
-							Client.Login_isUsernameRemembered = var11; // L: 1638
-							if (!var11) { // L: 1639
-								class408.clientPreferences.rememberedUsername = ""; // L: 1640
-								Login.savePreferences(); // L: 1641
+							if (Interpreter.field818) { // L: 418
+								Interpreter.field818 = false; // L: 419
+								class4.method28(); // L: 420
 							}
 
-							return 1; // L: 1643
-						} else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1646
-							return 1; // L: 1647
-						} else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) {
-							return 1; // L: 1650
-						} else if (var0 == 3146) {
-							var11 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 1653
-							if (var11 == class408.clientPreferences.titleMusicDisabled) { // L: 1654
-								class408.clientPreferences.titleMusicDisabled = !var11; // L: 1655
-								Login.savePreferences(); // L: 1656
+							if (!var9 && var2 > 0 && var10 >= var2) {
+								AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
 							}
 
-							return 1; // L: 1658
-						} else if (var0 == 3147) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class408.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1661
-							return 1; // L: 1662
-						} else if (var0 == 3148) {
-							return 1; // L: 1665
-						} else if (var0 == 3149) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1668
-							return 1; // L: 1669
-						} else if (var0 == 3150) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1672
-							return 1; // L: 1673
-						} else if (var0 == 3151) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1676
-							return 1; // L: 1677
-						} else if (var0 == 3152) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1680
-							return 1; // L: 1681
-						} else if (var0 == 3153) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1684
-							return 1; // L: 1685
-						} else if (var0 == 3154) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class87.method2224(); // L: 1688
-							return 1; // L: 1689
-						} else if (var0 == 3155) {
-							--class295.Interpreter_stringStackSize; // L: 1692
-							return 1; // L: 1693
-						} else if (var0 == 3156) {
-							return 1; // L: 1696
-						} else if (var0 == 3157) {
-							class14.Interpreter_intStackSize -= 2; // L: 1699
-							return 1; // L: 1700
-						} else if (var0 == 3158) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1703
-							return 1; // L: 1704
-						} else if (var0 == 3159) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1707
-							return 1; // L: 1708
-						} else if (var0 == 3160) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1711
-							return 1; // L: 1712
-						} else if (var0 == 3161) {
-							--class14.Interpreter_intStackSize; // L: 1715
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1716
-							return 1; // L: 1717
-						} else if (var0 == 3162) {
-							--class14.Interpreter_intStackSize; // L: 1720
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1721
-							return 1; // L: 1722
-						} else if (var0 == 3163) {
-							--class295.Interpreter_stringStackSize; // L: 1725
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1726
-							return 1; // L: 1727
-						} else if (var0 == 3164) {
-							--class14.Interpreter_intStackSize; // L: 1730
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1731
-							return 1; // L: 1732
-						} else if (var0 == 3165) {
-							--class14.Interpreter_intStackSize; // L: 1735
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1736
-							return 1; // L: 1737
-						} else if (var0 == 3166) {
-							class14.Interpreter_intStackSize -= 2; // L: 1740
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1741
-							return 1; // L: 1742
-						} else if (var0 == 3167) {
-							class14.Interpreter_intStackSize -= 2; // L: 1745
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1746
-							return 1; // L: 1747
-						} else if (var0 == 3168) {
-							class14.Interpreter_intStackSize -= 2; // L: 1750
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1751
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1752
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1753
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1754
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1755
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1756
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1757
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1758
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 1759
-							return 1; // L: 1760
-						} else if (var0 == 3169) {
-							return 1; // L: 1763
-						} else if (var0 == 3170) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1766
-							return 1; // L: 1767
-						} else if (var0 == 3171) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1770
-							return 1; // L: 1771
-						} else if (var0 == 3172) {
-							--class14.Interpreter_intStackSize; // L: 1774
-							return 1; // L: 1775
-						} else if (var0 == 3173) {
-							--class14.Interpreter_intStackSize; // L: 1778
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1779
-							return 1; // L: 1780
-						} else if (var0 == 3174) {
-							--class14.Interpreter_intStackSize; // L: 1783
-							return 1; // L: 1784
-						} else if (var0 == 3175) {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1787
-							return 1; // L: 1788
-						} else if (var0 == 3176) {
-							return 1; // L: 1791
-						} else if (var0 == 3177) {
-							return 1; // L: 1794
-						} else if (var0 == 3178) {
-							--class295.Interpreter_stringStackSize; // L: 1797
-							return 1; // L: 1798
-						} else if (var0 == 3179) {
-							return 1; // L: 1801
-						} else if (var0 == 3180) {
-							--class295.Interpreter_stringStackSize; // L: 1804
-							return 1; // L: 1805
-						} else if (var0 == 3181) {
-							var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize], 0), 100); // L: 1808
-							class354.method6396((double)((float)var10 / 200.0F + 0.5F)); // L: 1809
-							return 1; // L: 1810
-						} else if (var0 == 3182) {
-							float var3 = ((float)class408.clientPreferences.brightness - 0.5F) * 200.0F; // L: 1813
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1814
-							return 1; // L: 1815
-						} else if (var0 != 3183 && var0 != 3184) {
-							return 2; // L: 1821
-						} else {
-							--class14.Interpreter_intStackSize; // L: 1818
-							return 1; // L: 1819
 						}
 					}
+
+					while (Interpreter.field817.size() > 0) {
+						class92 var41 = (class92)Interpreter.field817.remove(0);
+						SoundCache.widgetDefaultMenuAction(var41.method2340(), var41.method2339(), var41.method2341(), var41.method2348(), "");
+					}
+
+					if (Interpreter.field818) {
+						Interpreter.field818 = false;
+						class4.method28();
+					}
+
+					if (!var9 && var2 > 0 && var10 >= var2) {
+						AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
+					}
+
+					return; // L: 214
+				}
+
+				while (Interpreter.field817.size() > 0) { // L: 414
+					class92 var26 = (class92)Interpreter.field817.remove(0);
+					SoundCache.widgetDefaultMenuAction(var26.method2340(), var26.method2339(), var26.method2341(), var26.method2348(), "");
+				}
+
+				if (Interpreter.field818) {
+					Interpreter.field818 = false;
+					class4.method28();
+				}
+
+				if (!var9 && var2 > 0 && var10 >= var2) {
+					AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
 				}
+
+				return; // L: 426
+			}
+
+			while (Interpreter.field817.size() > 0) {
+				class92 var34 = (class92)Interpreter.field817.remove(0);
+				SoundCache.widgetDefaultMenuAction(var34.method2340(), var34.method2339(), var34.method2341(), var34.method2348(), ""); // L: 416
+			}
+
+			if (Interpreter.field818) {
+				Interpreter.field818 = false;
+				class4.method28();
+			}
+
+			if (!var9 && var2 > 0 && var10 >= var2) { // L: 422
+				AccessFile.RunException_sendStackTrace("Warning: Script " + var4.field937 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 423
 			}
+
 		}
-	}
+	} // L: 396
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;IIIIIII)V",
+		garbageValue = "280009494"
+	)
+	@Export("loadTerrain")
+	static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		int var7;
+		if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 126
+			Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 127
+
+			while (true) {
+				var7 = var0.readUnsignedByte(); // L: 129
+				if (var7 == 0) { // L: 130
+					if (var1 == 0) { // L: 131
+						int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 132
+						int var11 = var2 + var4 + 932731; // L: 135
+						int var12 = var3 + var5 + 556238;
+						int var13 = class260.method5069(var11 + 45365, var12 + 91923, 4) - 128 + (class260.method5069(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (class260.method5069(var11, var12, 1) - 128 >> 2); // L: 138
+						var13 = (int)((double)var13 * 0.3D) + 35; // L: 139
+						if (var13 < 10) { // L: 140
+							var13 = 10;
+						} else if (var13 > 60) { // L: 141
+							var13 = 60;
+						}
+
+						var14[var3] = -var13 * 8; // L: 144
+					} else {
+						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 146
+					}
+					break;
+				}
+
+				if (var7 == 1) { // L: 149
+					int var8 = var0.readUnsignedByte(); // L: 150
+					if (var8 == 1) { // L: 151
+						var8 = 0;
+					}
+
+					if (var1 == 0) { // L: 152
+						Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
+					} else {
+						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 153
+					}
+					break;
+				}
+
+				if (var7 <= 49) { // L: 156
+					Tiles.Tiles_overlays[var1][var2][var3] = var0.readByte(); // L: 157
+					Tiles.Tiles_shapes[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 158
+					WorldMapLabelSize.field2580[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 159
+				} else if (var7 <= 81) { // L: 162
+					Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 163
+				} else {
+					Tiles.Tiles_underlays[var1][var2][var3] = (byte)(var7 - 81); // L: 166
+				}
+			}
+		} else {
+			while (true) {
+				var7 = var0.readUnsignedByte(); // L: 171
+				if (var7 == 0) { // L: 172
+					break;
+				}
+
+				if (var7 == 1) { // L: 173
+					var0.readUnsignedByte(); // L: 174
+					break;
+				}
+
+				if (var7 <= 49) { // L: 177
+					var0.readUnsignedByte();
+				}
+			}
+		}
+
+	} // L: 180
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1370934798"
+	)
+	public static void method1110() {
+		KitDefinition.KitDefinition_cached.clear(); // L: 136
+	} // L: 137
 }
diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java
index d491270e5f..e4ce8460c1 100644
--- a/runescape-client/src/main/java/SecureRandomCallable.java
+++ b/runescape-client/src/main/java/SecureRandomCallable.java
@@ -1,88 +1,51 @@
-import java.security.SecureRandom;
 import java.util.concurrent.Callable;
 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("by")
+@ObfuscatedName("bo")
 @Implements("SecureRandomCallable")
 public class SecureRandomCallable implements Callable {
-	@ObfuscatedName("x")
-	@Export("musicTrackBoolean")
-	public static boolean musicTrackBoolean;
-	@ObfuscatedName("er")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive14")
-	static Archive archive14;
-	@ObfuscatedName("ma")
-	@ObfuscatedGetter(
-		intValue = -276676703
-	)
-	@Export("menuX")
-	static int menuX;
-
 	SecureRandomCallable() {
-	} // L: 42
+	} // L: 36
 
 	public Object call() {
-		SecureRandom var2 = new SecureRandom(); // L: 47
-		var2.nextInt(); // L: 48
-		return var2; // L: 51
+		return WallDecoration.method4340(); // L: 46
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lni;B)I",
-		garbageValue = "1"
+		descriptor = "(IB)Lfb;",
+		garbageValue = "0"
 	)
-	static final int method2052(LoginType var0) {
-		if (var0 == null) { // L: 16
-			return 12; // L: 17
+	@Export("VarpDefinition_get")
+	public static VarpDefinition VarpDefinition_get(int var0) {
+		VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18
+		if (var1 != null) { // L: 19
+			return var1;
 		} else {
-			switch(var0.field4229) { // L: 19
-			case 2:
-				return 20; // L: 21
-			default:
-				return 12; // L: 23
+			byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20
+			var1 = new VarpDefinition(); // L: 21
+			if (var2 != null) { // L: 22
+				var1.decode(new Buffer(var2));
 			}
-		}
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "924721389"
-	)
-	@Export("Widget_unpackTargetMask")
-	public static int Widget_unpackTargetMask(int var0) {
-		return var0 >> 11 & 63; // L: 13
-	}
 
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "76"
-	)
-	public static int method2047(int var0) {
-		if (var0 > 0) { // L: 212
-			return 1;
-		} else {
-			return var0 < 0 ? -1 : 0; // L: 213 214
+			VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23
+			return var1; // L: 24
 		}
 	}
 
-	@ObfuscatedName("is")
+	@ObfuscatedName("ky")
 	@ObfuscatedSignature(
-		descriptor = "(IIIZI)V",
-		garbageValue = "-1971468049"
+		descriptor = "(Ljm;I)V",
+		garbageValue = "-1394977452"
 	)
-	static final void method2051(int var0, int var1, int var2, boolean var3) {
-		if (class174.loadInterface(var0)) { // L: 10239
-			WorldMapLabelSize.resizeInterface(WorldMapSection1.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 10240
+	@Export("invalidateWidget")
+	static void invalidateWidget(Widget var0) {
+		if (var0.cycle == Client.field684) { // L: 12032
+			Client.field504[var0.rootIndex] = true; // L: 12033
 		}
-	} // L: 10241
+
+	} // L: 12035
 }
diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java
index d9fb480a8e..84a4848e49 100644
--- a/runescape-client/src/main/java/SecureRandomFuture.java
+++ b/runescape-client/src/main/java/SecureRandomFuture.java
@@ -7,19 +7,19 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bk")
+@ObfuscatedName("bh")
 @Implements("SecureRandomFuture")
 public class SecureRandomFuture {
-	@ObfuscatedName("ep")
+	@ObfuscatedName("ta")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Lcc;"
 	)
-	@Export("archive9")
-	static Archive archive9;
-	@ObfuscatedName("i")
+	@Export("clientPreferences")
+	static ClientPreferences clientPreferences;
+	@ObfuscatedName("c")
 	@Export("executor")
 	ExecutorService executor;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("future")
 	Future future;
 
@@ -28,10 +28,10 @@ public class SecureRandomFuture {
 		this.future = this.executor.submit(new SecureRandomCallable()); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "14"
+		descriptor = "(I)V",
+		garbageValue = "392598921"
 	)
 	@Export("shutdown")
 	void shutdown() {
@@ -39,179 +39,138 @@ void shutdown() {
 		this.executor = null; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1642436388"
+		garbageValue = "-786037347"
 	)
 	@Export("isDone")
 	boolean isDone() {
 		return this.future.isDone(); // L: 23
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/security/SecureRandom;",
-		garbageValue = "-11"
+		descriptor = "(I)Ljava/security/SecureRandom;",
+		garbageValue = "-1927504024"
 	)
 	@Export("get")
 	SecureRandom get() {
 		try {
 			return (SecureRandom)this.future.get(); // L: 28
-		} catch (Exception var4) { // L: 30
-			SecureRandom var3 = new SecureRandom(); // L: 33
-			var3.nextInt(); // L: 34
-			return var3; // L: 37
+		} catch (Exception var2) { // L: 30
+			return WallDecoration.method4340(); // L: 31
 		}
 	}
 
-	@ObfuscatedName("fl")
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(IIIZII)J",
+		garbageValue = "205087229"
+	)
+	@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: 89
+		if (var3) { // L: 90
+			var5 |= 65536L;
+		}
+
+		return var5; // L: 91
+	}
+
+	@ObfuscatedName("fz")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1350647812"
+		garbageValue = "-1413371821"
 	)
-	@Export("getLoginError")
-	static void getLoginError(int var0) {
-		if (var0 == -3) { // L: 3071
-			class1.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
-		} else if (var0 == -2) { // L: 3072
-			class1.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
-		} else if (var0 == -1) { // L: 3073
-			class1.setLoginResponseString("No response from server.", "Please try using a different world.", "");
-		} else if (var0 == 3) { // L: 3074
-			class275.method5201(3); // L: 3075
-			Login.field865 = 1; // L: 3076
-		} else if (var0 == 4) { // L: 3078
-			class275.method5201(14); // L: 3080
-			Login.field866 = 0; // L: 3081
-		} else if (var0 == 5) { // L: 3084
-			Login.field865 = 2; // L: 3085
-			class1.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 3086
-		} else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 3088
-			if (var0 == 7) { // L: 3091
-				class1.setLoginResponseString("This world is full.", "Please use a different world.", "");
-			} else if (var0 == 8) { // L: 3092
-				class1.setLoginResponseString("Unable to connect.", "Login server offline.", "");
-			} else if (var0 == 9) { // L: 3093
-				class1.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
-			} else if (var0 == 10) { // L: 3094
-				class1.setLoginResponseString("Unable to connect.", "Bad session id.", "");
-			} else if (var0 == 11) { // L: 3095
-				class1.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
-			} else if (var0 == 12) { // L: 3096
-				class1.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
-			} else if (var0 == 13) { // L: 3097
-				class1.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
-			} else if (var0 == 14) { // L: 3098
-				class1.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
-			} else if (var0 == 16) { // L: 3099
-				class1.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
-			} else if (var0 == 17) { // L: 3100
-				class1.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
-			} else if (var0 == 18) { // L: 3101
-				class275.method5201(14); // L: 3103
-				Login.field866 = 1; // L: 3104
-			} else if (var0 == 19) { // L: 3107
-				class1.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
-			} else if (var0 == 20) { // L: 3108
-				class1.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
-			} else if (var0 == 22) { // L: 3109
-				class1.setLoginResponseString("Malformed login packet.", "Please try again.", "");
-			} else if (var0 == 23) { // L: 3110
-				class1.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
-			} else if (var0 == 24) { // L: 3111
-				class1.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
-			} else if (var0 == 25) { // L: 3112
-				class1.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
-			} else if (var0 == 26) { // L: 3113
-				class1.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
-			} else if (var0 == 27) { // L: 3114
-				class1.setLoginResponseString("", "Service unavailable.", "");
-			} else if (var0 == 31) {
-				class1.setLoginResponseString("Your account must have a displayname set", "in order to play the game.  Please set it", "via the website, or the main game."); // L: 3115
-			} else if (var0 == 32) { // L: 3116
-				class1.setLoginResponseString("Your attempt to log into your account was", "unsuccessful.  Don't worry, you can sort", "this out by visiting the billing system.");
-			} else if (var0 == 37) { // L: 3117
-				class1.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
-			} else if (var0 == 38) { // L: 3118
-				class1.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
-			} else if (var0 == 55) { // L: 3119
-				class275.method5201(8); // L: 3120
-			} else {
-				if (var0 == 56) { // L: 3122
-					class1.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 3123
-					WorldMapData_1.updateGameState(11); // L: 3124
-					return; // L: 3125
-				}
-
-				if (var0 == 57) { // L: 3127
-					class1.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 3128
-					WorldMapData_1.updateGameState(11); // L: 3129
-					return; // L: 3130
-				}
-
-				if (var0 == 61) { // L: 3132
-					class275.method5201(7); // L: 3133
-				} else {
-					if (var0 == 62) { // L: 3135
-						WorldMapData_1.updateGameState(10); // L: 3136
-						class275.method5201(9); // L: 3137
-						class1.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 3138
-						return; // L: 3139
-					}
-
-					if (var0 == 63) { // L: 3141
-						WorldMapData_1.updateGameState(10); // L: 3142
-						class275.method5201(9); // L: 3143
-						class1.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 3144
-						return; // L: 3145
-					}
-
-					if (var0 == 65 || var0 == 67) { // L: 3147
-						WorldMapData_1.updateGameState(10); // L: 3148
-						class275.method5201(9); // L: 3149
-						class1.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 3150
-						return; // L: 3151
-					}
-
-					class1.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 3153
-				}
+	@Export("forceDisconnect")
+	static final void forceDisconnect(int var0) {
+		LoginScreenAnimation.logOut(); // L: 3565
+		switch(var0) { // L: 3566
+		case 1:
+			PlayerType.method5521(24); // L: 3578
+			class19.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 3579
+			break;
+		case 2:
+			PlayerType.method5521(24); // L: 3570
+			class19.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 3571
+		}
+
+	} // L: 3584
+
+	@ObfuscatedName("ge")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-1736689537"
+	)
+	static final void method2025(int var0, int var1) {
+		if (var0 < 128) { // L: 4575
+			var0 = 128;
+		}
+
+		if (var0 > 383) { // L: 4576
+			var0 = 383;
+		}
+
+		if (UserComparator7.cameraPitch < var0) { // L: 4577
+			UserComparator7.cameraPitch = (var0 - UserComparator7.cameraPitch) * ChatChannel.field956 / 1000 + UserComparator7.cameraPitch + WorldMapSection1.field2755; // L: 4578
+			if (UserComparator7.cameraPitch > var0) { // L: 4579
+				UserComparator7.cameraPitch = var0;
+			}
+		}
+
+		if (UserComparator7.cameraPitch > var0) { // L: 4581
+			UserComparator7.cameraPitch -= (UserComparator7.cameraPitch - var0) * ChatChannel.field956 / 1000 + WorldMapSection1.field2755; // L: 4582
+			if (UserComparator7.cameraPitch < var0) { // L: 4583
+				UserComparator7.cameraPitch = var0;
 			}
-		} else {
-			class1.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 3089
 		}
 
-		WorldMapData_1.updateGameState(10); // L: 3154
-		if (Client.field500.method7220()) { // L: 3155
-			class275.method5201(9); // L: 3156
+		int var2 = var1 - class379.cameraYaw; // L: 4585
+		if (var2 > 1024) { // L: 4586
+			var2 -= 2048;
 		}
 
-	} // L: 3158
+		if (var2 < -1024) { // L: 4587
+			var2 += 2048;
+		}
+
+		if (var2 > 0) { // L: 4588
+			class379.cameraYaw = class379.cameraYaw + WorldMapSection1.field2755 + var2 * ChatChannel.field956 / 1000; // L: 4589
+			class379.cameraYaw &= 2047; // L: 4590
+		}
+
+		if (var2 < 0) { // L: 4592
+			class379.cameraYaw -= -var2 * ChatChannel.field956 / 1000 + WorldMapSection1.field2755; // L: 4593
+			class379.cameraYaw &= 2047; // L: 4594
+		}
+
+		int var3 = var1 - class379.cameraYaw; // L: 4596
+		if (var3 > 1024) { // L: 4597
+			var3 -= 2048;
+		}
 
-	@ObfuscatedName("ht")
+		if (var3 < -1024) { // L: 4598
+			var3 += 2048;
+		}
+
+		if (var3 < 0 && var2 > 0 || var3 > 0 && var2 < 0) { // L: 4599
+			class379.cameraYaw = var1;
+		}
+
+	} // L: 4600
+
+	@ObfuscatedName("ls")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "75"
+		descriptor = "(Ljm;S)Ljava/lang/String;",
+		garbageValue = "13301"
 	)
-	static final void method1979(int var0, int var1) {
-		if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 8068
-			if (Client.showMouseOverText) { // L: 8069
-				int var2 = Client.menuOptionsCount - 1; // L: 8072
-				String var4;
-				if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 8076
-					var4 = "Use" + " " + Client.selectedItemName + " " + "->";
-				} else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 8077
-					var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
-				} else {
-					var4 = class392.method6873(var2); // L: 8078
-				}
-
-				if (Client.menuOptionsCount > 2) { // L: 8079
-					var4 = var4 + MouseHandler.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
-				}
-
-				Login.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 8080
-			}
+	@Export("Widget_getSpellActionName")
+	static String Widget_getSpellActionName(Widget var0) {
+		if (class404.Widget_unpackTargetMask(class363.getWidgetFlags(var0)) == 0) { // L: 12581
+			return null;
+		} else {
+			return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 12582 12583 12585
 		}
-	} // L: 8081
+	}
 }
diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java
index fef6c763a4..e49bbbc066 100644
--- a/runescape-client/src/main/java/SequenceDefinition.java
+++ b/runescape-client/src/main/java/SequenceDefinition.java
@@ -1,475 +1,956 @@
+import java.util.HashMap;
+import java.util.Map;
 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("fm")
+@ObfuscatedName("gn")
 @Implements("SequenceDefinition")
 public class SequenceDefinition extends DualNode {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("SequenceDefinition_archive")
-	public static AbstractArchive SequenceDefinition_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
+	static boolean field2084;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("SequenceDefinition_animationsArchive")
 	public static AbstractArchive SequenceDefinition_animationsArchive;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Liq;"
+	)
+	@Export("SequenceDefinition_cached")
+	public static EvictingDualNodeHashTable SequenceDefinition_cached;
 	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Liq;"
 	)
-	@Export("SequenceDefinition_skeletonsArchive")
-	public static AbstractArchive SequenceDefinition_skeletonsArchive;
-	@ObfuscatedName("a")
+	@Export("SequenceDefinition_cachedFrames")
+	public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
-	@Export("SequenceDefinition_cached")
-	static EvictingDualNodeHashTable SequenceDefinition_cached;
+	public static EvictingDualNodeHashTable field2086;
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		intValue = -2061102361
+	)
+	int field2079;
+	@ObfuscatedName("n")
+	public Map field2075;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -1465456923
+	)
+	int field2082;
 	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lig;"
+	@ObfuscatedGetter(
+		intValue = 1046662309
 	)
-	@Export("SequenceDefinition_cachedFrames")
-	static EvictingDualNodeHashTable SequenceDefinition_cachedFrames;
-	@ObfuscatedName("g")
+	int field2083;
+	@ObfuscatedName("v")
 	@Export("frameIds")
 	public int[] frameIds;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@Export("chatFrameIds")
 	int[] chatFrameIds;
-	@ObfuscatedName("p")
+	@ObfuscatedName("h")
 	@Export("frameLengths")
 	public int[] frameLengths;
-	@ObfuscatedName("j")
+	@ObfuscatedName("g")
 	@Export("soundEffects")
 	public int[] soundEffects;
-	@ObfuscatedName("b")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -724339659
+		intValue = -1755183367
 	)
 	@Export("frameCount")
 	public int frameCount;
-	@ObfuscatedName("x")
-	int[] field1957;
-	@ObfuscatedName("y")
-	public boolean field1958;
+	@ObfuscatedName("a")
+	int[] field2089;
+	@ObfuscatedName("u")
+	boolean[] field2081;
 	@ObfuscatedName("k")
+	public boolean field2091;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1109851961
+		intValue = -68245833
 	)
-	public int field1959;
-	@ObfuscatedName("t")
+	public int field2092;
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -2080361701
+		intValue = -1710656193
 	)
 	@Export("shield")
 	public int shield;
-	@ObfuscatedName("l")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 911643557
+		intValue = 1298879717
 	)
 	@Export("weapon")
 	public int weapon;
-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1755314831
+		intValue = -1981709083
 	)
-	public int field1962;
-	@ObfuscatedName("n")
+	public int field2095;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1777344097
+		intValue = -2129353131
 	)
-	public int field1963;
-	@ObfuscatedName("z")
+	public int field2096;
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 532178661
+		intValue = 2113674843
 	)
-	public int field1956;
-	@ObfuscatedName("q")
+	public int field2097;
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1664617853
+		intValue = 1259669941
 	)
-	public int field1965;
+	public int field2078;
 
 	static {
-		SequenceDefinition_cached = new EvictingDualNodeHashTable(64);
-		SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100);
+		field2084 = false; // L: 16
+		SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 20
+		SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); // L: 21
+		field2086 = new EvictingDualNodeHashTable(100); // L: 22
 	}
 
 	SequenceDefinition() {
-		this.frameCount = -1;
-		this.field1958 = false;
-		this.field1959 = 5;
+		this.field2079 = -1; // L: 23
+		this.field2082 = 0;
+		this.field2083 = 0;
+		this.frameCount = -1; // L: 31
+		this.field2091 = false; // L: 34
+		this.field2092 = 5; // L: 35
 		this.shield = -1;
-		this.weapon = -1;
-		this.field1962 = 99;
-		this.field1963 = -1;
-		this.field1956 = -1;
-		this.field1965 = 2;
-	}
+		this.weapon = -1; // L: 37
+		this.field2095 = 99; // L: 38
+		this.field2096 = -1; // L: 39
+		this.field2097 = -1; // L: 40
+		this.field2078 = 2; // L: 41
+	} // L: 43
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;S)V",
-		garbageValue = "-19285"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "-31"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 47
-			if (var2 == 0) { // L: 48
-				return; // L: 51
+			int var2 = var1.readUnsignedByte(); // L: 58
+			if (var2 == 0) { // L: 59
+				return; // L: 62
 			}
 
-			this.decodeNext(var1, var2); // L: 49
+			this.decodeNext(var1, var2); // L: 60
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "1217260020"
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "122"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		int var3;
 		int var4;
-		if (var2 == 1) { // L: 54
-			var3 = var1.readUnsignedShort(); // L: 55
-			this.frameLengths = new int[var3]; // L: 56
+		if (var2 == 1) { // L: 65
+			var3 = var1.readUnsignedShort(); // L: 66
+			this.frameLengths = new int[var3]; // L: 67
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 57
+			for (var4 = 0; var4 < var3; ++var4) { // L: 68
 				this.frameLengths[var4] = var1.readUnsignedShort();
 			}
 
-			this.frameIds = new int[var3]; // L: 58
+			this.frameIds = new int[var3]; // L: 69
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 59
+			for (var4 = 0; var4 < var3; ++var4) { // L: 70
 				this.frameIds[var4] = var1.readUnsignedShort();
 			}
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 60
+			for (var4 = 0; var4 < var3; ++var4) { // L: 71
 				this.frameIds[var4] += var1.readUnsignedShort() << 16;
 			}
-		} else if (var2 == 2) { // L: 62
+		} else if (var2 == 2) { // L: 73
 			this.frameCount = var1.readUnsignedShort();
-		} else if (var2 == 3) { // L: 63
-			var3 = var1.readUnsignedByte(); // L: 64
-			this.field1957 = new int[var3 + 1]; // L: 65
+		} else if (var2 == 3) { // L: 74
+			var3 = var1.readUnsignedByte(); // L: 75
+			this.field2089 = new int[var3 + 1]; // L: 76
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 66
-				this.field1957[var4] = var1.readUnsignedByte();
+			for (var4 = 0; var4 < var3; ++var4) { // L: 77
+				this.field2089[var4] = var1.readUnsignedByte();
 			}
 
-			this.field1957[var3] = 9999999; // L: 67
-		} else if (var2 == 4) { // L: 69
-			this.field1958 = true;
-		} else if (var2 == 5) { // L: 70
-			this.field1959 = var1.readUnsignedByte();
-		} else if (var2 == 6) { // L: 71
+			this.field2089[var3] = 9999999; // L: 78
+		} else if (var2 == 4) { // L: 80
+			this.field2091 = true;
+		} else if (var2 == 5) { // L: 81
+			this.field2092 = var1.readUnsignedByte();
+		} else if (var2 == 6) { // L: 82
 			this.shield = var1.readUnsignedShort();
-		} else if (var2 == 7) { // L: 72
+		} else if (var2 == 7) { // L: 83
 			this.weapon = var1.readUnsignedShort();
-		} else if (var2 == 8) { // L: 73
-			this.field1962 = var1.readUnsignedByte();
-		} else if (var2 == 9) { // L: 74
-			this.field1963 = var1.readUnsignedByte();
-		} else if (var2 == 10) { // L: 75
-			this.field1956 = var1.readUnsignedByte();
-		} else if (var2 == 11) { // L: 76
-			this.field1965 = var1.readUnsignedByte();
-		} else if (var2 == 12) { // L: 77
-			var3 = var1.readUnsignedByte(); // L: 78
-			this.chatFrameIds = new int[var3]; // L: 79
-
-			for (var4 = 0; var4 < var3; ++var4) { // L: 80
+		} else if (var2 == 8) { // L: 84
+			this.field2095 = var1.readUnsignedByte();
+		} else if (var2 == 9) { // L: 85
+			this.field2096 = var1.readUnsignedByte();
+		} else if (var2 == 10) { // L: 86
+			this.field2097 = var1.readUnsignedByte();
+		} else if (var2 == 11) { // L: 87
+			this.field2078 = var1.readUnsignedByte();
+		} else if (var2 == 12) { // L: 88
+			var3 = var1.readUnsignedByte(); // L: 89
+			this.chatFrameIds = new int[var3]; // L: 90
+
+			for (var4 = 0; var4 < var3; ++var4) { // L: 91
 				this.chatFrameIds[var4] = var1.readUnsignedShort();
 			}
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 81
+			for (var4 = 0; var4 < var3; ++var4) { // L: 92
 				this.chatFrameIds[var4] += var1.readUnsignedShort() << 16;
 			}
-		} else if (var2 == 13) { // L: 83
-			var3 = var1.readUnsignedByte(); // L: 84
-			this.soundEffects = new int[var3]; // L: 85
+		} else if (var2 == 13) { // L: 94
+			var3 = var1.readUnsignedByte(); // L: 95
+			this.soundEffects = new int[var3]; // L: 96
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 86
+			for (var4 = 0; var4 < var3; ++var4) { // L: 97
 				this.soundEffects[var4] = var1.readMedium();
 			}
+		} else if (var2 == 14) { // L: 99
+			this.field2079 = var1.readInt(); // L: 100
+		} else if (var2 == 15) { // L: 102
+			var3 = var1.readUnsignedShort(); // L: 103
+			this.field2075 = new HashMap(); // L: 104
+
+			for (var4 = 0; var4 < var3; ++var4) { // L: 105
+				int var5 = var1.readUnsignedShort(); // L: 106
+				int var6 = var1.readMedium(); // L: 107
+				this.field2075.put(var5, var6); // L: 108
+			}
+		} else if (var2 == 16) { // L: 111
+			this.field2082 = var1.readUnsignedShort(); // L: 112
+			this.field2083 = var1.readUnsignedShort(); // L: 113
+		} else if (var2 == 17) { // L: 115
+			this.field2081 = new boolean[256]; // L: 116
+
+			for (var3 = 0; var3 < this.field2081.length; ++var3) { // L: 117
+				this.field2081[var3] = false; // L: 118
+			}
+
+			var3 = var1.readUnsignedByte(); // L: 120
+
+			for (var4 = 0; var4 < var3; ++var4) { // L: 121
+				this.field2081[var1.readUnsignedByte()] = true; // L: 122
+			}
 		}
 
-	} // L: 89
+	} // L: 126
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "2018272752"
+		descriptor = "(B)V",
+		garbageValue = "-68"
 	)
 	@Export("postDecode")
 	void postDecode() {
-		if (this.field1963 == -1) { // L: 92
-			if (this.field1957 != null) { // L: 93
-				this.field1963 = 2;
+		if (this.field2096 == -1) { // L: 129
+			if (this.field2089 == null && this.field2081 == null) { // L: 130
+				this.field2096 = 0; // L: 131
 			} else {
-				this.field1963 = 0; // L: 94
+				this.field2096 = 2;
 			}
 		}
 
-		if (this.field1956 == -1) { // L: 96
-			if (this.field1957 != null) { // L: 97
-				this.field1956 = 2;
+		if (this.field2097 == -1) { // L: 133
+			if (this.field2089 == null && this.field2081 == null) { // L: 134
+				this.field2097 = 0; // L: 135
 			} else {
-				this.field1956 = 0; // L: 98
+				this.field2097 = 2;
 			}
 		}
 
-	} // L: 100
+	} // L: 137
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lhl;IS)Lhl;",
-		garbageValue = "11483"
+		descriptor = "(Lgo;IB)Lgo;",
+		garbageValue = "-89"
 	)
 	@Export("transformActorModel")
 	public Model transformActorModel(Model var1, int var2) {
-		var2 = this.frameIds[var2]; // L: 103
-		Frames var3 = DynamicObject.getFrames(var2 >> 16); // L: 104
-		var2 &= 65535; // L: 105
-		if (var3 == null) {
-			return var1.toSharedSequenceModel(true); // L: 106
+		Model var4;
+		if (!this.method3690()) { // L: 140
+			var2 = this.frameIds[var2]; // L: 141
+			Frames var5 = ItemComposition.getFrames(var2 >> 16); // L: 142
+			var2 &= 65535; // L: 143
+			if (var5 == null) { // L: 144
+				return var1.toSharedSequenceModel(true);
+			} else {
+				var4 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 145
+				var4.animate(var5, var2); // L: 146
+				return var4; // L: 147
+			}
 		} else {
-			Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); // L: 107
-			var4.animate(var3, var2); // L: 108
-			return var4; // L: 109
+			class120 var3 = JagexCache.method3064(this.field2079); // L: 150
+			if (var3 == null) { // L: 151
+				return var1.toSharedSequenceModel(true);
+			} else {
+				var4 = var1.toSharedSequenceModel(!var3.method2695()); // L: 152
+				var4.method4271(var3, var2); // L: 153
+				return var4; // L: 154
+			}
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lhl;IIB)Lhl;",
-		garbageValue = "0"
+		descriptor = "(Lgo;IIB)Lgo;",
+		garbageValue = "-127"
 	)
 	@Export("transformObjectModel")
 	Model transformObjectModel(Model var1, int var2, int var3) {
-		var2 = this.frameIds[var2]; // L: 113
-		Frames var4 = DynamicObject.getFrames(var2 >> 16); // L: 114
-		var2 &= 65535; // L: 115
-		if (var4 == null) { // L: 116
-			return var1.toSharedSequenceModel(true);
-		} else {
-			Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); // L: 117
-			var3 &= 3; // L: 118
-			if (var3 == 1) { // L: 119
-				var5.rotateY270Ccw();
-			} else if (var3 == 2) { // L: 120
-				var5.rotateY180();
-			} else if (var3 == 3) { // L: 121
-				var5.rotateY90Ccw();
+		Model var5;
+		if (!this.method3690()) { // L: 159
+			var2 = this.frameIds[var2]; // L: 160
+			Frames var6 = ItemComposition.getFrames(var2 >> 16); // L: 161
+			var2 &= 65535; // L: 162
+			if (var6 == null) { // L: 163
+				return var1.toSharedSequenceModel(true);
+			} else {
+				var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2)); // L: 164
+				var3 &= 3; // L: 165
+				if (var3 == 1) { // L: 166
+					var5.rotateY270Ccw();
+				} else if (var3 == 2) { // L: 167
+					var5.rotateY180();
+				} else if (var3 == 3) { // L: 168
+					var5.rotateY90Ccw();
+				}
+
+				var5.animate(var6, var2); // L: 169
+				if (var3 == 1) { // L: 170
+					var5.rotateY90Ccw();
+				} else if (var3 == 2) { // L: 171
+					var5.rotateY180();
+				} else if (var3 == 3) { // L: 172
+					var5.rotateY270Ccw();
+				}
+
+				return var5; // L: 173
 			}
-
-			var5.animate(var4, var2); // L: 122
-			if (var3 == 1) { // L: 123
-				var5.rotateY90Ccw();
-			} else if (var3 == 2) { // L: 124
-				var5.rotateY180();
-			} else if (var3 == 3) { // L: 125
-				var5.rotateY270Ccw();
+		} else {
+			class120 var4 = JagexCache.method3064(this.field2079); // L: 176
+			if (var4 == null) { // L: 177
+				return var1.toSharedSequenceModel(true);
+			} else {
+				var5 = var1.toSharedSequenceModel(!var4.method2695()); // L: 178
+				var3 &= 3; // L: 179
+				if (var3 == 1) { // L: 180
+					var5.rotateY270Ccw();
+				} else if (var3 == 2) { // L: 181
+					var5.rotateY180();
+				} else if (var3 == 3) { // L: 182
+					var5.rotateY90Ccw();
+				}
+
+				var5.method4271(var4, var2); // L: 183
+				if (var3 == 1) { // L: 184
+					var5.rotateY90Ccw();
+				} else if (var3 == 2) {
+					var5.rotateY180(); // L: 185
+				} else if (var3 == 3) { // L: 186
+					var5.rotateY270Ccw();
+				}
+
+				return var5; // L: 187
 			}
-
-			return var5; // L: 126
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lhl;IB)Lhl;",
-		garbageValue = "55"
+		descriptor = "(Lgo;II)Lgo;",
+		garbageValue = "2108768382"
 	)
 	@Export("transformSpotAnimationModel")
 	Model transformSpotAnimationModel(Model var1, int var2) {
-		var2 = this.frameIds[var2]; // L: 130
-		Frames var3 = DynamicObject.getFrames(var2 >> 16); // L: 131
-		var2 &= 65535; // L: 132
-		if (var3 == null) {
-			return var1.toSharedSpotAnimationModel(true); // L: 133
+		Model var4;
+		if (!this.method3690()) { // L: 192
+			var2 = this.frameIds[var2]; // L: 193
+			Frames var5 = ItemComposition.getFrames(var2 >> 16); // L: 194
+			var2 &= 65535; // L: 195
+			if (var5 == null) { // L: 196
+				return var1.toSharedSpotAnimationModel(true);
+			} else {
+				var4 = var1.toSharedSpotAnimationModel(!var5.hasAlphaTransform(var2)); // L: 197
+				var4.animate(var5, var2); // L: 198
+				return var4; // L: 199
+			}
 		} else {
-			Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); // L: 134
-			var4.animate(var3, var2); // L: 135
-			return var4; // L: 136
+			class120 var3 = JagexCache.method3064(this.field2079); // L: 202
+			if (var3 == null) { // L: 203
+				return var1.toSharedSpotAnimationModel(true);
+			} else {
+				var4 = var1.toSharedSpotAnimationModel(!var3.method2695()); // L: 204
+				var4.method4271(var3, var2); // L: 205
+				return var4; // L: 206
+			}
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Lhl;ILfm;II)Lhl;",
-		garbageValue = "1824353368"
+		descriptor = "(Lgo;ILgn;IB)Lgo;",
+		garbageValue = "8"
 	)
 	@Export("applyTransformations")
 	public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) {
-		var2 = this.frameIds[var2]; // L: 140
-		Frames var5 = DynamicObject.getFrames(var2 >> 16); // L: 141
-		var2 &= 65535; // L: 142
-		if (var5 == null) { // L: 143
-			return var3.transformActorModel(var1, var4);
+		if (field2084 && !this.method3690() && !var3.method3690()) { // L: 211
+			return this.method3674(var1, var2, var3, var4); // L: 212
 		} else {
-			var4 = var3.frameIds[var4]; // L: 144
-			Frames var6 = DynamicObject.getFrames(var4 >> 16); // L: 145
-			var4 &= 65535; // L: 146
-			Model var7;
-			if (var6 == null) { // L: 147
-				var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 148
-				var7.animate(var5, var2); // L: 149
-				return var7; // L: 150
+			Model var5 = var1.toSharedSequenceModel(false); // L: 214
+			boolean var6 = false; // L: 215
+			Frames var7 = null; // L: 216
+			class120 var8;
+			if (this.method3690()) { // L: 217
+				var8 = this.method3648(); // L: 218
+				if (var3.method3690() && this.field2081 == null) { // L: 219
+					var5.method4271(var8, var2); // L: 220
+					return var5; // L: 221
+				}
+
+				var5.method4202(var8, var2, this.field2081, false); // L: 223
 			} else {
-				var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 152
-				var7.animate2(var5, var2, var6, var4, this.field1957); // L: 153
-				return var7; // L: 154
+				var2 = this.frameIds[var2]; // L: 226
+				var7 = ItemComposition.getFrames(var2 >> 16); // L: 227
+				var2 &= 65535; // L: 228
+				if (var7 == null) { // L: 229
+					return var3.transformActorModel(var1, var4);
+				}
+
+				if (!var3.method3690() && (this.field2089 == null || var4 == -1)) { // L: 230
+					var5.animate(var7, var2); // L: 231
+					return var5; // L: 232
+				}
+
+				if (this.field2089 == null || var4 == -1) { // L: 234
+					var5.animate(var7, var2); // L: 235
+					return var5; // L: 236
+				}
+
+				var6 = var3.method3690(); // L: 238
+				if (!var6) { // L: 239
+					var5.method4203(var7, var2, this.field2089, false); // L: 240
+				}
 			}
+
+			if (var3.method3690()) { // L: 243
+				var8 = var3.method3648(); // L: 244
+				var5.method4202(var8, var4, this.field2081, true); // L: 245
+			} else {
+				var4 = var3.frameIds[var4]; // L: 248
+				Frames var9 = ItemComposition.getFrames(var4 >> 16); // L: 249
+				var4 &= 65535; // L: 250
+				if (var9 == null) { // L: 251
+					return this.transformActorModel(var1, var2);
+				}
+
+				var5.method4203(var9, var4, this.field2089, true); // L: 252
+			}
+
+			if (var6 && var7 != null) { // L: 254
+				var5.method4203(var7, var2, this.field2089, false); // L: 255
+			}
+
+			var5.resetBounds(); // L: 257
+			return var5; // L: 258
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Lhl;II)Lhl;",
-		garbageValue = "530277296"
+		descriptor = "(Lgo;ILgn;II)Lgo;",
+		garbageValue = "-2136022860"
 	)
-	@Export("transformWidgetModel")
-	public Model transformWidgetModel(Model var1, int var2) {
-		int var3 = this.frameIds[var2]; // L: 158
-		Frames var4 = DynamicObject.getFrames(var3 >> 16); // L: 159
-		var3 &= 65535; // L: 160
-		if (var4 == null) { // L: 161
-			return var1.toSharedSequenceModel(true);
+	Model method3674(Model var1, int var2, SequenceDefinition var3, int var4) {
+		var2 = this.frameIds[var2]; // L: 262
+		Frames var5 = ItemComposition.getFrames(var2 >> 16); // L: 263
+		var2 &= 65535; // L: 264
+		if (var5 == null) { // L: 265
+			return var3.transformActorModel(var1, var4);
 		} else {
-			Frames var5 = null; // L: 162
-			int var6 = 0; // L: 163
-			if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 164
-				var6 = this.chatFrameIds[var2]; // L: 165
-				var5 = DynamicObject.getFrames(var6 >> 16); // L: 166
-				var6 &= 65535; // L: 167
-			}
-
+			var4 = var3.frameIds[var4]; // L: 266
+			Frames var6 = ItemComposition.getFrames(var4 >> 16); // L: 267
+			var4 &= 65535; // L: 268
 			Model var7;
-			if (var5 != null && var6 != 65535) { // L: 169
-				var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 174
-				var7.animate(var4, var3); // L: 175
-				var7.animate(var5, var6); // L: 176
-				return var7; // L: 177
+			if (var6 == null) { // L: 269
+				var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 270
+				var7.animate(var5, var2); // L: 271
+				return var7; // L: 272
 			} else {
-				var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 170
-				var7.animate(var4, var3); // L: 171
-				return var7; // L: 172
+				var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 274
+				var7.animate2(var5, var2, var6, var4, this.field2089); // L: 275
+				return var7; // L: 276
 			}
 		}
 	}
 
-	@ObfuscatedName("i")
-	public static final int method3461(double var0, double var2, double var4) {
-		double var6 = var4; // L: 9
-		double var8 = var4; // L: 10
-		double var10 = var4; // L: 11
-		if (0.0D != var2) { // L: 12
-			double var12;
-			if (var4 < 0.5D) { // L: 14
-				var12 = var4 * (var2 + 1.0D);
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(Lgo;II)Lgo;",
+		garbageValue = "1131668881"
+	)
+	@Export("transformWidgetModel")
+	public Model transformWidgetModel(Model var1, int var2) {
+		if (!this.method3690()) { // L: 280
+			int var3 = this.frameIds[var2]; // L: 281
+			Frames var4 = ItemComposition.getFrames(var3 >> 16); // L: 282
+			var3 &= 65535; // L: 283
+			if (var4 == null) { // L: 284
+				return var1.toSharedSequenceModel(true);
 			} else {
-				var12 = var4 + var2 - var2 * var4; // L: 15
+				Frames var5 = null; // L: 285
+				int var6 = 0; // L: 286
+				if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 287
+					var6 = this.chatFrameIds[var2]; // L: 288
+					var5 = ItemComposition.getFrames(var6 >> 16); // L: 289
+					var6 &= 65535; // L: 290
+				}
+
+				Model var7;
+				if (var5 != null && var6 != 65535) { // L: 292
+					var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 297
+					var7.animate(var4, var3); // L: 298
+					var7.animate(var5, var6); // L: 299
+					return var7; // L: 300
+				} else {
+					var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 293
+					var7.animate(var4, var3); // L: 294
+					return var7; // L: 295
+				}
 			}
+		} else {
+			return this.transformActorModel(var1, var2); // L: 303
+		}
+	}
 
-			double var14 = 2.0D * var4 - var12; // L: 16
-			double var16 = 0.3333333333333333D + var0; // L: 17
-			if (var16 > 1.0D) { // L: 18
-				--var16;
-			}
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "-1401537933"
+	)
+	public boolean method3690() {
+		return this.field2079 >= 0; // L: 308
+	}
 
-			double var20 = var0 - 0.3333333333333333D; // L: 20
-			if (var20 < 0.0D) { // L: 21
-				++var20;
-			}
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "2132950979"
+	)
+	public int method3647() {
+		return this.field2083 - this.field2082; // L: 312
+	}
 
-			if (6.0D * var16 < 1.0D) { // L: 22
-				var6 = var14 + 6.0D * (var12 - var14) * var16;
-			} else if (2.0D * var16 < 1.0D) { // L: 23
-				var6 = var12;
-			} else if (3.0D * var16 < 2.0D) { // L: 24
-				var6 = (0.6666666666666666D - var16) * (var12 - var14) * 6.0D + var14;
-			} else {
-				var6 = var14; // L: 25
-			}
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(B)Ldb;",
+		garbageValue = "0"
+	)
+	public class120 method3648() {
+		return this.method3690() ? JagexCache.method3064(this.field2079) : null; // L: 353 354 357
+	}
 
-			if (var0 * 6.0D < 1.0D) { // L: 26
-				var8 = var14 + 6.0D * (var12 - var14) * var0;
-			} else if (2.0D * var0 < 1.0D) { // L: 27
-				var8 = var12;
-			} else if (var0 * 3.0D < 2.0D) {
-				var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; // L: 28
-			} else {
-				var8 = var14; // L: 29
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;S)Ljava/lang/String;",
+		garbageValue = "-18009"
+	)
+	public static String method3689(Buffer var0) {
+		String var1;
+		try {
+			int var2 = var0.readUShortSmart(); // L: 25
+			if (var2 > 32767) { // L: 26
+				var2 = 32767;
 			}
 
-			if (var20 * 6.0D < 1.0D) { // L: 30
-				var10 = var20 * (var12 - var14) * 6.0D + var14;
-			} else if (var20 * 2.0D < 1.0D) { // L: 31
-				var10 = var12;
-			} else if (3.0D * var20 < 2.0D) { // L: 32
-				var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14);
-			} else {
-				var10 = var14; // L: 33
-			}
+			byte[] var3 = new byte[var2]; // L: 27
+			var0.offset += class410.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 28
+			String var4 = PendingSpawn.decodeStringCp1252(var3, 0, var2); // L: 29
+			var1 = var4; // L: 30
+		} catch (Exception var6) { // L: 32
+			var1 = "Cabbage"; // L: 33
 		}
 
-		int var22 = (int)(256.0D * var6); // L: 35
-		int var13 = (int)(256.0D * var8); // L: 36
-		int var23 = (int)(var10 * 256.0D); // L: 37
-		int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38
-		return var15; // L: 39
+		return var1; // L: 36
 	}
 
-	@ObfuscatedName("fe")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1706767111"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-942937629"
 	)
-	@Export("logOut")
-	static final void logOut() {
-		Client.packetWriter.close(); // L: 3161
-		class19.method289(); // L: 3162
-		GameBuild.scene.clear(); // L: 3163
-
-		for (int var0 = 0; var0 < 4; ++var0) { // L: 3164
-			Client.collisionMaps[var0].clear();
-		}
-
-		System.gc(); // L: 3165
-		class247.musicPlayerStatus = 1; // L: 3167
-		class128.musicTrackArchive = null; // L: 3168
-		FillMode.musicTrackGroupId = -1; // L: 3169
-		ArchiveDiskActionHandler.musicTrackFileId = -1; // L: 3170
-		class247.musicTrackVolume = 0; // L: 3171
-		SecureRandomCallable.musicTrackBoolean = false; // L: 3172
-		class247.pcmSampleLength = 2; // L: 3173
-		Client.currentTrackGroupId = -1; // L: 3175
-		Client.field710 = false; // L: 3176
-
-		for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 3178
-			if (var1.stream1 != null) { // L: 3179
-				BuddyRankComparator.pcmStreamMixer.removeSubStream(var1.stream1); // L: 3180
-				var1.stream1 = null; // L: 3181
+	static int method3640(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2130
+			if (GameEngine.friendSystem.field778 == 0) { // L: 2131
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -2;
+			} else if (GameEngine.friendSystem.field778 == 1) { // L: 2132
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1;
+			} else {
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.friendsList.getSize(); // L: 2133
 			}
 
-			if (var1.stream2 != null) { // L: 3183
-				BuddyRankComparator.pcmStreamMixer.removeSubStream(var1.stream2); // L: 3184
-				var1.stream2 = null; // L: 3185
+			return 1; // L: 2134
+		} else {
+			int var3;
+			if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2137
+				if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { // L: 2138
+					Friend var8 = (Friend)GameEngine.friendSystem.friendsList.get(var3); // L: 2139
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2140
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2141
+				} else {
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2144
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2145
+				}
+
+				return 1; // L: 2147
+			} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2150
+				if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { // L: 2151
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)GameEngine.friendSystem.friendsList.get(var3)).world; // L: 2152
+				} else {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2154
+				}
+
+				return 1; // L: 2155
+			} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2158
+				if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.friendsList.getSize()) { // L: 2159
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)GameEngine.friendSystem.friendsList.get(var3)).rank; // L: 2160
+				} else {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2162
+				}
+
+				return 1; // L: 2163
+			} else {
+				String var5;
+				if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
+					var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2166
+					int var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2167
+					class113.method2618(var5, var6); // L: 2168
+					return 1; // L: 2169
+				} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
+					var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2172
+					GameEngine.friendSystem.addFriend(var5); // L: 2173
+					return 1; // L: 2174
+				} else if (var0 == ScriptOpcodes.FRIEND_DEL) {
+					var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2177
+					GameEngine.friendSystem.removeFriend(var5); // L: 2178
+					return 1; // L: 2179
+				} else if (var0 == ScriptOpcodes.IGNORE_ADD) {
+					var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2182
+					GameEngine.friendSystem.addIgnore(var5); // L: 2183
+					return 1; // L: 2184
+				} else if (var0 == ScriptOpcodes.IGNORE_DEL) {
+					var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2187
+					GameEngine.friendSystem.removeIgnore(var5); // L: 2188
+					return 1; // L: 2189
+				} else if (var0 == ScriptOpcodes.FRIEND_TEST) {
+					var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2192
+					var5 = AbstractWorldMapData.method4791(var5); // L: 2193
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.isFriended(new Username(var5, class194.loginType), false) ? 1 : 0; // L: 2194
+					return 1; // L: 2195
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
+					if (Players.friendsChat != null) { // L: 2198
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.name; // L: 2199
+					} else {
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2201
+					}
+
+					return 1; // L: 2202
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
+					if (Players.friendsChat != null) { // L: 2205
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat.getSize(); // L: 2206
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2208
+					}
+
+					return 1; // L: 2209
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2212
+					if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { // L: 2213
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.get(var3).getUsername().getName(); // L: 2214
+					} else {
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2216
+					}
+
+					return 1; // L: 2217
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2220
+					if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { // L: 2221
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)Players.friendsChat.get(var3)).getWorld(); // L: 2222
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2224
+					}
+
+					return 1; // L: 2225
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2228
+					if (Players.friendsChat != null && var3 < Players.friendsChat.getSize()) { // L: 2229
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((Buddy)Players.friendsChat.get(var3)).rank; // L: 2230
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2232
+					}
+
+					return 1; // L: 2233
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat != null ? Players.friendsChat.minKick : 0; // L: 2236
+					return 1; // L: 2237
+				} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
+					var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2240
+					class409.clanKickUser(var5); // L: 2241
+					return 1; // L: 2242
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Players.friendsChat != null ? Players.friendsChat.rank * -577246511 * -541938127 : 0; // L: 2245
+					return 1; // L: 2246
+				} else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
+					var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2249
+					class141.Clan_joinChat(var5); // L: 2250
+					return 1; // L: 2251
+				} else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
+					WorldMapIcon_1.Clan_leaveChat(); // L: 2254
+					return 1; // L: 2255
+				} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
+					if (!GameEngine.friendSystem.method1728()) { // L: 2258
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1;
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.ignoreList.getSize(); // L: 2259
+					}
+
+					return 1; // L: 2260
+				} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2263
+					if (GameEngine.friendSystem.method1728() && var3 >= 0 && var3 < GameEngine.friendSystem.ignoreList.getSize()) { // L: 2264
+						Ignored var4 = (Ignored)GameEngine.friendSystem.ignoreList.get(var3); // L: 2265
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2266
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2267
+					} else {
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2270
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2271
+					}
+
+					return 1; // L: 2273
+				} else if (var0 == ScriptOpcodes.IGNORE_TEST) {
+					var5 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 2276
+					var5 = AbstractWorldMapData.method4791(var5); // L: 2277
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GameEngine.friendSystem.isIgnored(new Username(var5, class194.loginType)) ? 1 : 0; // L: 2278
+					return 1; // L: 2279
+				} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2282
+					if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && Players.friendsChat.get(var3).getUsername().equals(class340.localPlayer.username)) { // L: 2283
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2284
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2286
+					}
+
+					return 1; // L: 2287
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
+					if (Players.friendsChat != null && Players.friendsChat.owner != null) { // L: 2290
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Players.friendsChat.owner; // L: 2291
+					} else {
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 2293
+					}
+
+					return 1; // L: 2294
+				} else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2297
+					if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && ((ClanMate)Players.friendsChat.get(var3)).isFriend()) { // L: 2298
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2299
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2301
+					}
+
+					return 1; // L: 2302
+				} else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
+					if (var0 == 3628) {
+						GameEngine.friendSystem.friendsList.removeComparator(); // L: 2313
+						return 1; // L: 2314
+					} else {
+						boolean var7;
+						if (var0 == 3629) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2317
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2318
+							return 1; // L: 2319
+						} else if (var0 == 3630) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2322
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2323
+							return 1; // L: 2324
+						} else if (var0 == 3631) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2327
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2328
+							return 1; // L: 2329
+						} else if (var0 == 3632) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2332
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2333
+							return 1; // L: 2334
+						} else if (var0 == 3633) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2337
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2338
+							return 1; // L: 2339
+						} else if (var0 == 3634) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2342
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2343
+							return 1; // L: 2344
+						} else if (var0 == 3635) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2347
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2348
+							return 1; // L: 2349
+						} else if (var0 == 3636) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2352
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2353
+							return 1; // L: 2354
+						} else if (var0 == 3637) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2357
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2358
+							return 1; // L: 2359
+						} else if (var0 == 3638) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2362
+							GameEngine.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2363
+							return 1; // L: 2364
+						} else if (var0 == 3639) {
+							GameEngine.friendSystem.friendsList.sort(); // L: 2367
+							return 1; // L: 2368
+						} else if (var0 == 3640) {
+							GameEngine.friendSystem.ignoreList.removeComparator(); // L: 2371
+							return 1; // L: 2372
+						} else if (var0 == 3641) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2375
+							GameEngine.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2376
+							return 1; // L: 2377
+						} else if (var0 == 3642) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2380
+							GameEngine.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2381
+							return 1; // L: 2382
+						} else if (var0 == 3643) {
+							GameEngine.friendSystem.ignoreList.sort(); // L: 2385
+							return 1; // L: 2386
+						} else if (var0 == 3644) {
+							if (Players.friendsChat != null) { // L: 2389
+								Players.friendsChat.removeComparator(); // L: 2390
+							}
+
+							return 1; // L: 2392
+						} else if (var0 == 3645) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2395
+							if (Players.friendsChat != null) { // L: 2396
+								Players.friendsChat.addComparator(new UserComparator1(var7)); // L: 2397
+							}
+
+							return 1; // L: 2399
+						} else if (var0 == 3646) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2402
+							if (Players.friendsChat != null) { // L: 2403
+								Players.friendsChat.addComparator(new UserComparator2(var7)); // L: 2404
+							}
+
+							return 1; // L: 2406
+						} else if (var0 == 3647) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2409
+							if (Players.friendsChat != null) { // L: 2410
+								Players.friendsChat.addComparator(new UserComparator3(var7)); // L: 2411
+							}
+
+							return 1; // L: 2413
+						} else if (var0 == 3648) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2416
+							if (Players.friendsChat != null) { // L: 2417
+								Players.friendsChat.addComparator(new UserComparator4(var7)); // L: 2418
+							}
+
+							return 1; // L: 2420
+						} else if (var0 == 3649) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2423
+							if (Players.friendsChat != null) { // L: 2424
+								Players.friendsChat.addComparator(new UserComparator5(var7)); // L: 2425
+							}
+
+							return 1; // L: 2427
+						} else if (var0 == 3650) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2430
+							if (Players.friendsChat != null) { // L: 2431
+								Players.friendsChat.addComparator(new UserComparator6(var7)); // L: 2432
+							}
+
+							return 1; // L: 2434
+						} else if (var0 == 3651) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2437
+							if (Players.friendsChat != null) { // L: 2438
+								Players.friendsChat.addComparator(new UserComparator7(var7)); // L: 2439
+							}
+
+							return 1; // L: 2441
+						} else if (var0 == 3652) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2444
+							if (Players.friendsChat != null) { // L: 2445
+								Players.friendsChat.addComparator(new UserComparator8(var7)); // L: 2446
+							}
+
+							return 1; // L: 2448
+						} else if (var0 == 3653) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2451
+							if (Players.friendsChat != null) { // L: 2452
+								Players.friendsChat.addComparator(new UserComparator9(var7)); // L: 2453
+							}
+
+							return 1; // L: 2455
+						} else if (var0 == 3654) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2458
+							if (Players.friendsChat != null) { // L: 2459
+								Players.friendsChat.addComparator(new UserComparator10(var7)); // L: 2460
+							}
+
+							return 1; // L: 2462
+						} else if (var0 == 3655) {
+							if (Players.friendsChat != null) { // L: 2465
+								Players.friendsChat.sort(); // L: 2466
+							}
+
+							return 1; // L: 2468
+						} else if (var0 == 3656) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2471
+							GameEngine.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2472
+							return 1; // L: 2473
+						} else if (var0 == 3657) {
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2476
+							if (Players.friendsChat != null) { // L: 2477
+								Players.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2478
+							}
+
+							return 1; // L: 2480
+						} else {
+							return 2; // L: 2482
+						}
+					}
+				} else {
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2305
+					if (Players.friendsChat != null && var3 < Players.friendsChat.getSize() && ((ClanMate)Players.friendsChat.get(var3)).isIgnored()) { // L: 2306
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2307
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2309
+					}
+
+					return 1; // L: 2310
+				}
 			}
 		}
-
-		ObjectSound.objectSounds.clear(); // L: 3188
-		WorldMapData_1.updateGameState(10); // L: 3190
-	} // L: 3191
+	}
 }
diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java
index 7d986a4563..df46d2ee93 100644
--- a/runescape-client/src/main/java/ServerPacket.java
+++ b/runescape-client/src/main/java/ServerPacket.java
@@ -4,617 +4,615 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ia")
+@ObfuscatedName("ix")
 @Implements("ServerPacket")
 public class ServerPacket {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2796;
-	@ObfuscatedName("w")
+	public static final ServerPacket field3013;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2874;
-	@ObfuscatedName("s")
+	public static final ServerPacket field2931;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2863;
-	@ObfuscatedName("a")
+	public static final ServerPacket field2983;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2865;
-	@ObfuscatedName("o")
+	public static final ServerPacket field2933;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2821;
-	@ObfuscatedName("g")
+	public static final ServerPacket field2934;
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2797;
-	@ObfuscatedName("e")
+	public static final ServerPacket field2930;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2798;
-	@ObfuscatedName("p")
+	public static final ServerPacket field2936;
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2799;
-	@ObfuscatedName("j")
+	public static final ServerPacket field2937;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2853;
-	@ObfuscatedName("b")
+	public static final ServerPacket field3000;
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2801;
-	@ObfuscatedName("x")
+	public static final ServerPacket field3003;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2802;
-	@ObfuscatedName("y")
+	public static final ServerPacket field2940;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2803;
-	@ObfuscatedName("k")
+	public static final ServerPacket field2941;
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2804;
-	@ObfuscatedName("t")
+	public static final ServerPacket field2942;
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2805;
-	@ObfuscatedName("l")
+	public static final ServerPacket field3006;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2870;
-	@ObfuscatedName("u")
+	public static final ServerPacket field2944;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2807;
-	@ObfuscatedName("n")
+	public static final ServerPacket field2945;
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2808;
-	@ObfuscatedName("z")
+	public static final ServerPacket field2946;
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2809;
-	@ObfuscatedName("q")
+	public static final ServerPacket field3008;
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2810;
-	@ObfuscatedName("d")
+	public static final ServerPacket field2948;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2855;
-	@ObfuscatedName("r")
+	public static final ServerPacket field2949;
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2812;
-	@ObfuscatedName("m")
+	public static final ServerPacket field2950;
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2813;
-	@ObfuscatedName("c")
+	public static final ServerPacket field2951;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2814;
-	@ObfuscatedName("f")
+	public static final ServerPacket field2961;
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2815;
-	@ObfuscatedName("h")
+	public static final ServerPacket field2982;
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2878;
-	@ObfuscatedName("v")
+	public static final ServerPacket field2954;
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2817;
-	@ObfuscatedName("ag")
+	public static final ServerPacket field2955;
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2818;
-	@ObfuscatedName("ae")
+	public static final ServerPacket field2956;
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2852;
-	@ObfuscatedName("aq")
+	public static final ServerPacket field2978;
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2820;
-	@ObfuscatedName("al")
+	public static final ServerPacket field2958;
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2831;
-	@ObfuscatedName("am")
+	public static final ServerPacket field2959;
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2822;
-	@ObfuscatedName("ai")
+	public static final ServerPacket field3029;
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2823;
-	@ObfuscatedName("ah")
+	public static final ServerPacket field2938;
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2824;
-	@ObfuscatedName("as")
+	public static final ServerPacket field2962;
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2825;
-	@ObfuscatedName("at")
+	public static final ServerPacket field2963;
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2826;
-	@ObfuscatedName("az")
+	public static final ServerPacket field2964;
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2827;
+	public static final ServerPacket field2965;
 	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2828;
-	@ObfuscatedName("ak")
+	public static final ServerPacket field3014;
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2829;
-	@ObfuscatedName("ab")
+	public static final ServerPacket field2986;
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2830;
+	public static final ServerPacket field2968;
 	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2887;
-	@ObfuscatedName("ad")
+	public static final ServerPacket field3005;
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2880;
-	@ObfuscatedName("an")
+	public static final ServerPacket field2997;
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2833;
-	@ObfuscatedName("ax")
+	public static final ServerPacket field2971;
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2834;
-	@ObfuscatedName("av")
+	public static final ServerPacket field2972;
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2835;
-	@ObfuscatedName("ap")
+	public static final ServerPacket field2932;
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2836;
-	@ObfuscatedName("au")
+	public static final ServerPacket field2974;
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2837;
-	@ObfuscatedName("aj")
+	public static final ServerPacket field2975;
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2838;
-	@ObfuscatedName("af")
+	public static final ServerPacket field2976;
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2839;
-	@ObfuscatedName("aw")
+	public static final ServerPacket field2987;
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2840;
-	@ObfuscatedName("ao")
+	public static final ServerPacket field2947;
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2841;
-	@ObfuscatedName("aa")
+	public static final ServerPacket field2979;
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2842;
-	@ObfuscatedName("ay")
+	public static final ServerPacket field2980;
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2843;
-	@ObfuscatedName("bg")
+	public static final ServerPacket field2981;
+	@ObfuscatedName("bp")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2844;
-	@ObfuscatedName("bl")
+	public static final ServerPacket field2957;
+	@ObfuscatedName("bd")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2845;
-	@ObfuscatedName("bx")
+	public static final ServerPacket field2939;
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2846;
-	@ObfuscatedName("bd")
+	public static final ServerPacket field2984;
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2800;
-	@ObfuscatedName("bt")
+	public static final ServerPacket field2985;
+	@ObfuscatedName("bg")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2885;
-	@ObfuscatedName("bf")
+	public static final ServerPacket field3016;
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2849;
-	@ObfuscatedName("bs")
+	public static final ServerPacket field3017;
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2850;
-	@ObfuscatedName("bh")
+	public static final ServerPacket field2943;
+	@ObfuscatedName("bm")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2811;
+	public static final ServerPacket field2989;
 	@ObfuscatedName("bw")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2793;
-	@ObfuscatedName("bm")
+	public static final ServerPacket field2990;
+	@ObfuscatedName("bl")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2847;
-	@ObfuscatedName("br")
+	public static final ServerPacket field2991;
+	@ObfuscatedName("bz")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2795;
-	@ObfuscatedName("bj")
+	public static final ServerPacket field2992;
+	@ObfuscatedName("bu")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2859;
-	@ObfuscatedName("bo")
+	public static final ServerPacket field2993;
+	@ObfuscatedName("bs")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2856;
+	public static final ServerPacket field2994;
 	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
-	)
-	public static final ServerPacket field2857;
-	@ObfuscatedName("bu")
-	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2858;
-	@ObfuscatedName("bz")
+	public static final ServerPacket field2995;
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2806;
+	public static final ServerPacket field2996;
 	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2860;
-	@ObfuscatedName("bi")
+	public static final ServerPacket field2952;
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2861;
-	@ObfuscatedName("bk")
+	public static final ServerPacket field2998;
+	@ObfuscatedName("bt")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2872;
-	@ObfuscatedName("bp")
+	public static final ServerPacket field2999;
+	@ObfuscatedName("bh")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2877;
+	public static final ServerPacket field2953;
 	@ObfuscatedName("bn")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2864;
-	@ObfuscatedName("be")
+	public static final ServerPacket field3001;
+	@ObfuscatedName("bj")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2851;
-	@ObfuscatedName("bb")
+	public static final ServerPacket field3002;
+	@ObfuscatedName("by")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2832;
-	@ObfuscatedName("by")
+	public static final ServerPacket field2960;
+	@ObfuscatedName("bk")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2867;
-	@ObfuscatedName("ba")
+	public static final ServerPacket field3004;
+	@ObfuscatedName("bo")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2868;
-	@ObfuscatedName("bq")
+	public static final ServerPacket field2966;
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2869;
-	@ObfuscatedName("ca")
+	public static final ServerPacket field2988;
+	@ObfuscatedName("be")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2819;
-	@ObfuscatedName("cq")
+	public static final ServerPacket field3007;
+	@ObfuscatedName("ce")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2871;
-	@ObfuscatedName("ck")
+	public static final ServerPacket field2967;
+	@ObfuscatedName("cl")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2792;
-	@ObfuscatedName("ci")
+	public static final ServerPacket field3009;
+	@ObfuscatedName("cp")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2873;
-	@ObfuscatedName("cx")
+	public static final ServerPacket field3010;
+	@ObfuscatedName("cd")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2890;
-	@ObfuscatedName("cn")
+	public static final ServerPacket field3011;
+	@ObfuscatedName("ck")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2862;
-	@ObfuscatedName("ct")
+	public static final ServerPacket field3012;
+	@ObfuscatedName("cg")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2876;
-	@ObfuscatedName("cd")
+	public static final ServerPacket field2969;
+	@ObfuscatedName("cy")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2875;
-	@ObfuscatedName("cj")
+	public static final ServerPacket field2970;
+	@ObfuscatedName("cn")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2816;
-	@ObfuscatedName("cl")
+	public static final ServerPacket field3015;
+	@ObfuscatedName("cv")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2879;
-	@ObfuscatedName("cs")
+	public static final ServerPacket field2935;
+	@ObfuscatedName("co")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2882;
-	@ObfuscatedName("ce")
+	public static final ServerPacket field3025;
+	@ObfuscatedName("cc")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2881;
-	@ObfuscatedName("cp")
+	public static final ServerPacket field3018;
+	@ObfuscatedName("cs")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2794;
-	@ObfuscatedName("cg")
+	public static final ServerPacket field3019;
+	@ObfuscatedName("cr")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2883;
-	@ObfuscatedName("cw")
+	public static final ServerPacket field3020;
+	@ObfuscatedName("cb")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2884;
-	@ObfuscatedName("cr")
+	public static final ServerPacket field3021;
+	@ObfuscatedName("cj")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2886;
-	@ObfuscatedName("cu")
+	public static final ServerPacket field3022;
+	@ObfuscatedName("ca")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2854;
-	@ObfuscatedName("cc")
+	public static final ServerPacket field3023;
+	@ObfuscatedName("cz")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2892;
-	@ObfuscatedName("ch")
+	public static final ServerPacket field3024;
+	@ObfuscatedName("cw")
 	@ObfuscatedSignature(
-		descriptor = "Lia;"
+		descriptor = "Lix;"
 	)
-	public static final ServerPacket field2888;
-	@ObfuscatedName("fz")
-	static int[] field2893;
-	@ObfuscatedName("hy")
+	public static final ServerPacket field2973;
+	@ObfuscatedName("ct")
 	@ObfuscatedSignature(
-		descriptor = "[Low;"
+		descriptor = "Lix;"
 	)
-	@Export("headIconPrayerSprites")
-	static SpritePixels[] headIconPrayerSprites;
-	@ObfuscatedName("cz")
+	public static final ServerPacket field3026;
+	@ObfuscatedName("ci")
+	@ObfuscatedSignature(
+		descriptor = "Lix;"
+	)
+	public static final ServerPacket field3027;
+	@ObfuscatedName("ch")
 	@ObfuscatedGetter(
-		intValue = 1996281945
+		intValue = -836596687
 	)
 	@Export("id")
 	public final int id;
-	@ObfuscatedName("cv")
+	@ObfuscatedName("cq")
 	@ObfuscatedGetter(
-		intValue = -1899080967
+		intValue = 230000835
 	)
 	@Export("length")
 	public final int length;
 
 	static {
-		field2796 = new ServerPacket(0, -1); // L: 5
-		field2874 = new ServerPacket(1, -2); // L: 6
-		field2863 = new ServerPacket(2, -2); // L: 7
-		field2865 = new ServerPacket(3, -1); // L: 8
-		field2821 = new ServerPacket(4, -2); // L: 9
-		field2797 = new ServerPacket(5, 1); // L: 10
-		field2798 = new ServerPacket(6, 2); // L: 11
-		field2799 = new ServerPacket(7, -1); // L: 12
-		field2853 = new ServerPacket(8, -2); // L: 13
-		field2801 = new ServerPacket(9, -1); // L: 14
-		field2802 = new ServerPacket(10, 3); // L: 15
-		field2803 = new ServerPacket(11, -2); // L: 16
-		field2804 = new ServerPacket(12, 5); // L: 17
-		field2805 = new ServerPacket(13, 2); // L: 18
-		field2870 = new ServerPacket(14, 0); // L: 19
-		field2807 = new ServerPacket(15, -2); // L: 20
-		field2808 = new ServerPacket(16, 4); // L: 21
-		field2809 = new ServerPacket(17, 7); // L: 22
-		field2810 = new ServerPacket(18, 2); // L: 23
-		field2855 = new ServerPacket(19, 4); // L: 24
-		field2812 = new ServerPacket(20, 15); // L: 25
-		field2813 = new ServerPacket(21, 28); // L: 26
-		field2814 = new ServerPacket(22, 1); // L: 27
-		field2815 = new ServerPacket(23, 6); // L: 28
-		field2878 = new ServerPacket(24, -1); // L: 29
-		field2817 = new ServerPacket(25, -2); // L: 30
-		field2818 = new ServerPacket(26, 6); // L: 31
-		field2852 = new ServerPacket(27, 6); // L: 32
-		field2820 = new ServerPacket(28, -2); // L: 33
-		field2831 = new ServerPacket(29, 6); // L: 34
-		field2822 = new ServerPacket(30, 2); // L: 35
-		field2823 = new ServerPacket(31, 5); // L: 36
-		field2824 = new ServerPacket(32, 3); // L: 37
-		field2825 = new ServerPacket(33, 10); // L: 38
-		field2826 = new ServerPacket(34, 6); // L: 39
-		field2827 = new ServerPacket(35, -1); // L: 40
-		field2828 = new ServerPacket(36, 8); // L: 41
-		field2829 = new ServerPacket(37, -1); // L: 42
-		field2830 = new ServerPacket(38, -2); // L: 43
-		field2887 = new ServerPacket(39, 2); // L: 44
-		field2880 = new ServerPacket(40, 6); // L: 45
-		field2833 = new ServerPacket(41, 6); // L: 46
-		field2834 = new ServerPacket(42, 8); // L: 47
-		field2835 = new ServerPacket(43, 4); // L: 48
-		field2836 = new ServerPacket(44, 2); // L: 49
-		field2837 = new ServerPacket(45, -2); // L: 50
-		field2838 = new ServerPacket(46, -2); // L: 51
-		field2839 = new ServerPacket(47, -2); // L: 52
-		field2840 = new ServerPacket(48, 2); // L: 53
-		field2841 = new ServerPacket(49, 1); // L: 54
-		field2842 = new ServerPacket(50, 8); // L: 55
-		field2843 = new ServerPacket(51, 6); // L: 56
-		field2844 = new ServerPacket(52, 0); // L: 57
-		field2845 = new ServerPacket(53, -2); // L: 58
-		field2846 = new ServerPacket(54, -2); // L: 59
-		field2800 = new ServerPacket(55, -2); // L: 60
-		field2885 = new ServerPacket(56, -2); // L: 61
-		field2849 = new ServerPacket(57, 7); // L: 62
-		field2850 = new ServerPacket(58, 6); // L: 63
-		field2811 = new ServerPacket(59, -2); // L: 64
-		field2793 = new ServerPacket(60, 0); // L: 65
-		field2847 = new ServerPacket(61, 4); // L: 66
-		field2795 = new ServerPacket(62, 10); // L: 67
-		field2859 = new ServerPacket(63, -2); // L: 68
-		field2856 = new ServerPacket(64, 0); // L: 69
-		field2857 = new ServerPacket(65, -2); // L: 70
-		field2858 = new ServerPacket(66, 4); // L: 71
-		field2806 = new ServerPacket(67, 6); // L: 72
-		field2860 = new ServerPacket(68, -1); // L: 73
-		field2861 = new ServerPacket(69, 2); // L: 74
-		field2872 = new ServerPacket(70, 4); // L: 75
-		field2877 = new ServerPacket(71, 12); // L: 76
-		field2864 = new ServerPacket(72, 0); // L: 77
-		field2851 = new ServerPacket(73, -2); // L: 78
-		field2832 = new ServerPacket(74, 1); // L: 79
-		field2867 = new ServerPacket(75, 1); // L: 80
-		field2868 = new ServerPacket(76, 0); // L: 81
-		field2869 = new ServerPacket(77, 2); // L: 82
-		field2819 = new ServerPacket(78, 0); // L: 83
-		field2871 = new ServerPacket(79, 5); // L: 84
-		field2792 = new ServerPacket(80, -2); // L: 85
-		field2873 = new ServerPacket(81, 14); // L: 86
-		field2890 = new ServerPacket(82, 20); // L: 87
-		field2862 = new ServerPacket(83, 5); // L: 88
-		field2876 = new ServerPacket(84, 6); // L: 89
-		field2875 = new ServerPacket(85, 1); // L: 90
-		field2816 = new ServerPacket(86, -1); // L: 91
-		field2879 = new ServerPacket(87, 0); // L: 92
-		field2882 = new ServerPacket(88, 0); // L: 93
-		field2881 = new ServerPacket(89, -2); // L: 94
-		field2794 = new ServerPacket(90, 4); // L: 95
-		field2883 = new ServerPacket(91, 2); // L: 96
-		field2884 = new ServerPacket(92, -2); // L: 97
-		field2886 = new ServerPacket(93, 8); // L: 98
-		field2854 = new ServerPacket(94, 5); // L: 99
-		field2892 = new ServerPacket(95, -2); // L: 100
-		field2888 = new ServerPacket(96, -2); // L: 101
+		field3013 = new ServerPacket(0, 6); // L: 5
+		field2931 = new ServerPacket(1, -1); // L: 6
+		field2983 = new ServerPacket(2, 7); // L: 7
+		field2933 = new ServerPacket(3, -2); // L: 8
+		field2934 = new ServerPacket(4, -2); // L: 9
+		field2930 = new ServerPacket(5, 8); // L: 10
+		field2936 = new ServerPacket(6, 0); // L: 11
+		field2937 = new ServerPacket(7, 7); // L: 12
+		field3000 = new ServerPacket(8, 6); // L: 13
+		field3003 = new ServerPacket(9, 5); // L: 14
+		field2940 = new ServerPacket(10, -2); // L: 15
+		field2941 = new ServerPacket(11, 2); // L: 16
+		field2942 = new ServerPacket(12, 6); // L: 17
+		field3006 = new ServerPacket(13, 4); // L: 18
+		field2944 = new ServerPacket(14, 1); // L: 19
+		field2945 = new ServerPacket(15, 2); // L: 20
+		field2946 = new ServerPacket(16, 2); // L: 21
+		field3008 = new ServerPacket(17, -2); // L: 22
+		field2948 = new ServerPacket(18, 4); // L: 23
+		field2949 = new ServerPacket(19, -1); // L: 24
+		field2950 = new ServerPacket(20, 1); // L: 25
+		field2951 = new ServerPacket(21, -2); // L: 26
+		field2961 = new ServerPacket(22, 0); // L: 27
+		field2982 = new ServerPacket(23, 14); // L: 28
+		field2954 = new ServerPacket(24, -2); // L: 29
+		field2955 = new ServerPacket(25, -1); // L: 30
+		field2956 = new ServerPacket(26, 3); // L: 31
+		field2978 = new ServerPacket(27, 10); // L: 32
+		field2958 = new ServerPacket(28, 0); // L: 33
+		field2959 = new ServerPacket(29, 6); // L: 34
+		field3029 = new ServerPacket(30, 8); // L: 35
+		field2938 = new ServerPacket(31, 2); // L: 36
+		field2962 = new ServerPacket(32, 2); // L: 37
+		field2963 = new ServerPacket(33, 4); // L: 38
+		field2964 = new ServerPacket(34, 6); // L: 39
+		field2965 = new ServerPacket(35, 0); // L: 40
+		field3014 = new ServerPacket(36, 1); // L: 41
+		field2986 = new ServerPacket(37, 0); // L: 42
+		field2968 = new ServerPacket(38, -2); // L: 43
+		field3005 = new ServerPacket(39, -1); // L: 44
+		field2997 = new ServerPacket(40, -2); // L: 45
+		field2971 = new ServerPacket(41, -1); // L: 46
+		field2972 = new ServerPacket(42, 5); // L: 47
+		field2932 = new ServerPacket(43, 6); // L: 48
+		field2974 = new ServerPacket(44, 4); // L: 49
+		field2975 = new ServerPacket(45, 2); // L: 50
+		field2976 = new ServerPacket(46, 4); // L: 51
+		field2987 = new ServerPacket(47, 6); // L: 52
+		field2947 = new ServerPacket(48, -2); // L: 53
+		field2979 = new ServerPacket(49, -1); // L: 54
+		field2980 = new ServerPacket(50, 2); // L: 55
+		field2981 = new ServerPacket(51, 0); // L: 56
+		field2957 = new ServerPacket(52, 6); // L: 57
+		field2939 = new ServerPacket(53, 2); // L: 58
+		field2984 = new ServerPacket(54, -2); // L: 59
+		field2985 = new ServerPacket(55, 4); // L: 60
+		field3016 = new ServerPacket(56, -2); // L: 61
+		field3017 = new ServerPacket(57, 5); // L: 62
+		field2943 = new ServerPacket(58, 0); // L: 63
+		field2989 = new ServerPacket(59, 1); // L: 64
+		field2990 = new ServerPacket(60, 20); // L: 65
+		field2991 = new ServerPacket(61, 5); // L: 66
+		field2992 = new ServerPacket(62, 6); // L: 67
+		field2993 = new ServerPacket(63, -2); // L: 68
+		field2994 = new ServerPacket(64, 15); // L: 69
+		field2995 = new ServerPacket(65, 28); // L: 70
+		field2996 = new ServerPacket(66, 2); // L: 71
+		field2952 = new ServerPacket(67, 6); // L: 72
+		field2998 = new ServerPacket(68, 0); // L: 73
+		field2999 = new ServerPacket(69, -1); // L: 74
+		field2953 = new ServerPacket(70, 8); // L: 75
+		field3001 = new ServerPacket(71, -2); // L: 76
+		field3002 = new ServerPacket(72, -1); // L: 77
+		field2960 = new ServerPacket(73, 8); // L: 78
+		field3004 = new ServerPacket(74, -2); // L: 79
+		field2966 = new ServerPacket(75, -2); // L: 80
+		field2988 = new ServerPacket(76, 12); // L: 81
+		field3007 = new ServerPacket(77, 6); // L: 82
+		field2967 = new ServerPacket(78, -2); // L: 83
+		field3009 = new ServerPacket(79, 1); // L: 84
+		field3010 = new ServerPacket(80, -2); // L: 85
+		field3011 = new ServerPacket(81, 5); // L: 86
+		field3012 = new ServerPacket(82, -2); // L: 87
+		field2969 = new ServerPacket(83, -1); // L: 88
+		field2970 = new ServerPacket(84, -2); // L: 89
+		field3015 = new ServerPacket(85, 1); // L: 90
+		field2935 = new ServerPacket(86, 10); // L: 91
+		field3025 = new ServerPacket(87, 0); // L: 92
+		field3018 = new ServerPacket(88, -2); // L: 93
+		field3019 = new ServerPacket(89, 4); // L: 94
+		field3020 = new ServerPacket(90, -2); // L: 95
+		field3021 = new ServerPacket(91, -2); // L: 96
+		field3022 = new ServerPacket(92, -2); // L: 97
+		field3023 = new ServerPacket(93, 2); // L: 98
+		field3024 = new ServerPacket(94, 3); // L: 99
+		field2973 = new ServerPacket(95, -2); // L: 100
+		field3026 = new ServerPacket(96, -2); // L: 101
+		field3027 = new ServerPacket(97, 4); // L: 102
 	}
 
 	ServerPacket(int var1, int var2) {
-		this.id = var1; // L: 110
-		this.length = var2; // L: 111
-	} // L: 112
+		this.id = var1; // L: 111
+		this.length = var2; // L: 112
+	} // L: 113
 }
diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java
index cd43d3cdfb..0c35a1586f 100644
--- a/runescape-client/src/main/java/Skeleton.java
+++ b/runescape-client/src/main/java/Skeleton.java
@@ -1,57 +1,1013 @@
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+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("ha")
+@ObfuscatedName("gi")
 @Implements("Skeleton")
 public class Skeleton extends Node {
-	@ObfuscatedName("tv")
-	@ObfuscatedGetter(
-		intValue = -946798709
-	)
-	@Export("foundItemIdCount")
-	static int foundItemIdCount;
-	@ObfuscatedName("i")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1178553901
+		intValue = -1331844199
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1443695477
+		intValue = -256285215
 	)
 	@Export("count")
 	int count;
-	@ObfuscatedName("s")
+	@ObfuscatedName("w")
 	@Export("transformTypes")
 	int[] transformTypes;
-	@ObfuscatedName("a")
+	@ObfuscatedName("n")
 	@Export("labels")
 	int[][] labels;
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "Lgq;"
+	)
+	class194 field2290;
 
-	Skeleton(int var1, byte[] var2) {
-		this.id = var1; // L: 13
-		Buffer var3 = new Buffer(var2); // L: 14
-		this.count = var3.readUnsignedByte(); // L: 15
-		this.transformTypes = new int[this.count]; // L: 16
-		this.labels = new int[this.count][]; // L: 17
+	public Skeleton(int var1, byte[] var2) {
+		this.id = var1; // L: 19
+		Buffer var3 = new Buffer(var2); // L: 20
+		this.count = var3.readUnsignedByte(); // L: 21
+		this.transformTypes = new int[this.count]; // L: 22
+		this.labels = new int[this.count][]; // L: 23
 
 		int var4;
-		for (var4 = 0; var4 < this.count; ++var4) { // L: 18
+		for (var4 = 0; var4 < this.count; ++var4) { // L: 24
 			this.transformTypes[var4] = var3.readUnsignedByte();
 		}
 
-		for (var4 = 0; var4 < this.count; ++var4) { // L: 19
+		for (var4 = 0; var4 < this.count; ++var4) { // L: 25
 			this.labels[var4] = new int[var3.readUnsignedByte()];
 		}
 
-		for (var4 = 0; var4 < this.count; ++var4) { // L: 20
-			for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { // L: 21
+		for (var4 = 0; var4 < this.count; ++var4) { // L: 26
+			for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { // L: 27
 				this.labels[var4][var5] = var3.readUnsignedByte();
 			}
 		}
 
-	} // L: 23
+		if (var3.offset < var3.array.length) { // L: 29
+			var4 = var3.readUnsignedShort(); // L: 30
+			if (var4 > 0) { // L: 31
+				this.field2290 = new class194(var3, var4); // L: 32
+			}
+		}
+
+	} // L: 35
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-2086831010"
+	)
+	public int method3949() {
+		return this.count;
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(I)Lgq;",
+		garbageValue = "1597567435"
+	)
+	public class194 method3943() {
+		return this.field2290;
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(IIIB)Lbn;",
+		garbageValue = "1"
+	)
+	@Export("getWorldMapScript")
+	static Script getWorldMapScript(int var0, int var1, int var2) {
+		int var3 = WorldMapSection2.method4414(var1, var0); // L: 38
+		Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16));
+		Script var4;
+		if (var5 != null) {
+			var4 = var5;
+		} else {
+			String var6 = String.valueOf(var3); // L: 46
+			int var7 = TaskHandler.archive12.getGroupId(var6); // L: 47
+			if (var7 == -1) { // L: 48
+				var4 = null; // L: 49
+			} else {
+				label59: {
+					byte[] var8 = TaskHandler.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 = class145.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
+						}
+					}
+
+					var4 = null; // L: 65
+				}
+			}
+		}
+
+		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 = TaskHandler.archive12.getGroupId(var9); // L: 84
+				if (var10 == -1) { // L: 85
+					var13 = null; // L: 86
+				} else {
+					byte[] var11 = TaskHandler.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
+						}
+
+						var14 = class145.newScript(var11); // L: 95
+						if (var14 != null) { // L: 96
+							Script.Script_cached.put(var14, (long)(var12 << 16)); // L: 97
+							var13 = var14; // L: 98
+							return var13 != null ? var13 : null;
+						}
+					}
+
+					var13 = null; // L: 102
+				}
+			}
+
+			return var13 != null ? var13 : null;
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Loz;ILjava/lang/String;B)Ljava/lang/String;",
+		garbageValue = "1"
+	)
+	static String method3948(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
+		}
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(IIZI)Ljava/lang/String;",
+		garbageValue = "211610749"
+	)
+	static String method3944(int var0, int var1, boolean var2) {
+		if (var1 >= 2 && var1 <= 36) { // L: 116
+			if (var2 && var0 >= 0) { // L: 117
+				int var3 = 2; // L: 118
+
+				for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 119 120 122
+					var4 /= var1; // L: 121
+				}
+
+				char[] var5 = new char[var3]; // L: 124
+				var5[0] = '+'; // L: 125
+
+				for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 126
+					int var7 = var0; // L: 127
+					var0 /= var1; // L: 128
+					int var8 = var7 - var0 * var1; // L: 129
+					if (var8 >= 10) { // L: 130
+						var5[var6] = (char)(var8 + 87);
+					} else {
+						var5[var6] = (char)(var8 + 48); // L: 131
+					}
+				}
+
+				return new String(var5); // L: 133
+			} else {
+				return Integer.toString(var0, var1);
+			}
+		} else {
+			throw new IllegalArgumentException("" + var1);
+		}
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Lam;Llx;I)V",
+		garbageValue = "1471521185"
+	)
+	static void method3947(GameEngine var0, Font var1) {
+		int var5;
+		if (Login.worldSelectOpen) { // L: 348
+			while (true) {
+				if (!NPCComposition.isKeyDown()) { // L: 350
+					if (MouseHandler.MouseHandler_lastButton != 1 && (class150.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { // L: 371
+						break;
+					}
+
+					int var2 = Login.xPadding + 280; // L: 372
+					if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 373
+						UserComparator3.changeWorldSelectSorting(0, 0); // L: 374
+						break; // L: 375
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 377
+						UserComparator3.changeWorldSelectSorting(0, 1); // L: 378
+						break; // L: 379
+					}
+
+					int var3 = Login.xPadding + 390; // L: 381
+					if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 382
+						UserComparator3.changeWorldSelectSorting(1, 0); // L: 383
+						break; // L: 384
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 386
+						UserComparator3.changeWorldSelectSorting(1, 1); // L: 387
+						break; // L: 388
+					}
+
+					int var35 = Login.xPadding + 500; // L: 390
+					if (MouseHandler.MouseHandler_lastPressedX >= var35 && MouseHandler.MouseHandler_lastPressedX <= var35 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 391
+						UserComparator3.changeWorldSelectSorting(2, 0); // L: 392
+						break; // L: 393
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= var35 + 15 && MouseHandler.MouseHandler_lastPressedX <= var35 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 395
+						UserComparator3.changeWorldSelectSorting(2, 1); // L: 396
+						break; // L: 397
+					}
+
+					var5 = Login.xPadding + 610; // L: 399
+					if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 400
+						UserComparator3.changeWorldSelectSorting(3, 0); // L: 401
+						break; // L: 402
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= var5 + 15 && MouseHandler.MouseHandler_lastPressedX <= var5 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 404
+						UserComparator3.changeWorldSelectSorting(3, 1); // L: 405
+						break; // L: 406
+					}
+
+					if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 408
+						Login.worldSelectOpen = false; // L: 410
+						WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 411
+						NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 412
+						Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 413
+						break; // L: 415
+					}
+
+					if (Login.hoveredWorldIndex != -1) { // L: 417
+						World var6 = class334.World_worlds[Login.hoveredWorldIndex]; // L: 418
+						BoundaryObject.changeWorld(var6); // L: 419
+						Login.worldSelectOpen = false; // L: 421
+						WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 422
+						NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 423
+						Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 424
+					} else {
+						if (Login.worldSelectPage > 0 && class11.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class11.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= BoundaryObject.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= BoundaryObject.canvasHeight / 2 + 50) { // L: 428
+							--Login.worldSelectPage; // L: 429
+						}
+
+						if (Login.worldSelectPage < Login.worldSelectPagesCount && UrlRequest.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class186.canvasWidth - UrlRequest.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class186.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= BoundaryObject.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= BoundaryObject.canvasHeight / 2 + 50) { // L: 431
+							++Login.worldSelectPage; // L: 432
+						}
+					}
+					break;
+				}
+
+				if (Players.field1247 == 13) { // L: 351
+					Login.worldSelectOpen = false; // L: 353
+					WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 354
+					NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 355
+					Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 356
+					break; // L: 358
+				}
+
+				if (Players.field1247 == 96) { // L: 360
+					if (Login.worldSelectPage > 0 && class11.worldSelectLeftSprite != null) { // L: 361
+						--Login.worldSelectPage; // L: 362
+					}
+				} else if (Players.field1247 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && UrlRequest.worldSelectRightSprite != null) { // L: 365 366
+					++Login.worldSelectPage; // L: 367
+				}
+			}
+
+		} else {
+			if ((MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 438
+				SecureRandomFuture.clientPreferences.titleMusicDisabled = !SecureRandomFuture.clientPreferences.titleMusicDisabled; // L: 439
+				class127.savePreferences(); // L: 440
+				if (!SecureRandomFuture.clientPreferences.titleMusicDisabled) { // L: 441
+					Players.method2382(WorldMapScaleHandler.archive6, "scape main", "", 255, false);
+				} else {
+					StructComposition.method3444(); // L: 442
+				}
+			}
+
+			if (Client.gameState != 5) { // L: 444
+				if (-1L == Login.field890) { // L: 445
+					Login.field890 = Ignored.method6459() + 1000L; // L: 446
+				}
+
+				long var22 = Ignored.method6459(); // L: 448
+				boolean var4;
+				if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 451
+					while (true) {
+						if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { // L: 455
+							var4 = true; // L: 463
+							break;
+						}
+
+						ArchiveLoader var24 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 456
+						if (!var24.isLoaded()) { // L: 457
+							var4 = false; // L: 458
+							break; // L: 459
+						}
+
+						++Client.archiveLoadersDone; // L: 461
+					}
+				} else {
+					var4 = true; // L: 452
+				}
+
+				if (var4 && -1L == Login.field869) { // L: 465 466
+					Login.field869 = var22; // L: 467
+					if (Login.field869 > Login.field890) { // L: 468
+						Login.field890 = Login.field869; // L: 469
+					}
+				}
+
+				if (Client.gameState == 10 || Client.gameState == 11) { // L: 473
+					if (Language.Language_EN == ScriptFrame.clientLanguage) { // L: 474
+						if (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 475
+							var5 = Login.xPadding + 5; // L: 476
+							short var25 = 463; // L: 477
+							byte var7 = 100; // L: 478
+							byte var8 = 35; // L: 479
+							if (MouseHandler.MouseHandler_lastPressedX >= var5 && MouseHandler.MouseHandler_lastPressedX <= var5 + var7 && MouseHandler.MouseHandler_lastPressedY >= var25 && MouseHandler.MouseHandler_lastPressedY <= var8 + var25) { // L: 480
+								if (PlayerComposition.loadWorlds()) { // L: 482
+									Login.worldSelectOpen = true; // L: 483
+									Login.worldSelectPage = 0; // L: 484
+									Login.worldSelectPagesCount = 0; // L: 485
+								}
+
+								return; // L: 488
+							}
+						}
+
+						if (HorizontalAlignment.World_request != null && PlayerComposition.loadWorlds()) { // L: 491 492
+							Login.worldSelectOpen = true; // L: 493
+							Login.worldSelectPage = 0; // L: 494
+							Login.worldSelectPagesCount = 0; // L: 495
+						}
+					}
+
+					var5 = MouseHandler.MouseHandler_lastButton; // L: 499
+					int var50 = MouseHandler.MouseHandler_lastPressedX; // L: 500
+					int var36 = MouseHandler.MouseHandler_lastPressedY; // L: 501
+					if (var5 == 0) { // L: 502
+						var50 = MouseHandler.MouseHandler_x; // L: 503
+						var36 = MouseHandler.MouseHandler_y; // L: 504
+					}
+
+					if (!class150.mouseCam && var5 == 4) { // L: 506
+						var5 = 1;
+					}
+
+					short var39;
+					int var41;
+					if (Login.loginIndex == 0) { // L: 507
+						boolean var48 = false; // L: 508
+
+						while (NPCComposition.isKeyDown()) { // L: 509
+							if (Players.field1247 == 84) { // L: 510
+								var48 = true; // L: 511
+							}
+						}
+
+						var41 = class138.loginBoxCenter - 80; // L: 514
+						var39 = 291; // L: 515
+						if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 516
+							WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 517
+						}
+
+						var41 = class138.loginBoxCenter + 80; // L: 519
+						if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20 || var48) { // L: 520
+							if ((Client.worldProperties & 33554432) != 0) { // L: 521
+								Login.Login_response0 = ""; // L: 522
+								Login.Login_response1 = "This is a <col=00ffff>Beta<col=ffffff> world."; // L: 523
+								Login.Login_response2 = "Your normal account will not be affected."; // L: 524
+								Login.Login_response3 = ""; // L: 525
+								PlayerType.method5521(1); // L: 526
+								WorldMapID.method4805(); // L: 527
+							} else if ((Client.worldProperties & 4) != 0) { // L: 529
+								if ((Client.worldProperties & 1024) != 0) { // L: 530
+									Login.Login_response1 = "This is a <col=ffff00>High Risk <col=ff0000>PvP<col=ffffff> world."; // L: 531
+									Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 532
+									Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 533
+								} else {
+									Login.Login_response1 = "This is a <col=ff0000>PvP<col=ffffff> world."; // L: 536
+									Login.Login_response2 = "Players can attack each other"; // L: 537
+									Login.Login_response3 = "almost everywhere."; // L: 538
+								}
+
+								Login.Login_response0 = "Warning!"; // L: 540
+								PlayerType.method5521(1); // L: 541
+								WorldMapID.method4805(); // L: 542
+							} else if ((Client.worldProperties & 1024) != 0) { // L: 544
+								Login.Login_response1 = "This is a <col=ffff00>High Risk<col=ffffff> world."; // L: 545
+								Login.Login_response2 = "The Protect Item prayer will"; // L: 546
+								Login.Login_response3 = "not work on this world."; // L: 547
+								Login.Login_response0 = "Warning!"; // L: 548
+								PlayerType.method5521(1); // L: 549
+								WorldMapID.method4805(); // L: 550
+							} else {
+								class67.Login_promptCredentials(false); // L: 553
+							}
+						}
+					} else {
+						short var9;
+						int var37;
+						if (Login.loginIndex == 1) { // L: 557
+							while (true) {
+								if (!NPCComposition.isKeyDown()) { // L: 558
+									var37 = class138.loginBoxCenter - 80; // L: 566
+									var9 = 321; // L: 567
+									if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 568
+										class67.Login_promptCredentials(false); // L: 569
+									}
+
+									var37 = class138.loginBoxCenter + 80; // L: 571
+									if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 572
+										PlayerType.method5521(0); // L: 573
+									}
+									break;
+								}
+
+								if (Players.field1247 == 84) { // L: 559
+									class67.Login_promptCredentials(false); // L: 560
+								} else if (Players.field1247 == 13) { // L: 562
+									PlayerType.method5521(0); // L: 563
+								}
+							}
+						} else {
+							int var12;
+							short var38;
+							boolean var40;
+							if (Login.loginIndex == 2) { // L: 576
+								var38 = 201; // L: 577
+								var37 = var38 + 52; // L: 578
+								if (var5 == 1 && var36 >= var37 - 12 && var36 < var37 + 2) { // L: 579
+									Login.currentLoginField = 0;
+								}
+
+								var37 += 15; // L: 580
+								if (var5 == 1 && var36 >= var37 - 12 && var36 < var37 + 2) { // L: 581
+									Login.currentLoginField = 1;
+								}
+
+								var37 += 15; // L: 582
+								var38 = 361; // L: 583
+								if (WorldMapData_1.field2652 != null) { // L: 584
+									var41 = WorldMapData_1.field2652.highX / 2; // L: 585
+									if (var5 == 1 && var50 >= WorldMapData_1.field2652.lowX - var41 && var50 <= var41 + WorldMapData_1.field2652.lowX && var36 >= var38 - 15 && var36 < var38) { // L: 586
+										switch(Login.field872) { // L: 587
+										case 1:
+											class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 590
+											PlayerType.method5521(5); // L: 591
+											return; // L: 592
+										case 2:
+											WorldMapSprite.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 596
+										}
+									}
+								}
+
+								var41 = class138.loginBoxCenter - 80; // L: 602
+								var39 = 321; // L: 603
+								if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 604
+									Login.Login_username = Login.Login_username.trim(); // L: 605
+									if (Login.Login_username.length() == 0) { // L: 606
+										class19.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 607
+										return; // L: 608
+									}
+
+									if (Login.Login_password.length() == 0) { // L: 610
+										class19.setLoginResponseString("", "Please enter your password.", ""); // L: 611
+										return; // L: 612
+									}
+
+									class19.setLoginResponseString("", "Connecting to server...", ""); // L: 614
+									FriendSystem.method1791(false); // L: 615
+									VertexNormal.updateGameState(20); // L: 616
+									return; // L: 617
+								}
+
+								var41 = Login.loginBoxX + 180 + 80; // L: 619
+								if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 620
+									PlayerType.method5521(0); // L: 621
+									Login.Login_username = ""; // L: 622
+									Login.Login_password = ""; // L: 623
+									class148.field1651 = 0; // L: 624
+									BufferedSource.otp = ""; // L: 625
+									Login.field882 = true; // L: 626
+								}
+
+								var41 = class138.loginBoxCenter + -117; // L: 628
+								var39 = 277; // L: 629
+								Login.field880 = var50 >= var41 && var50 < var41 + class315.field3918 && var36 >= var39 && var36 < var39 + Huffman.field3152; // L: 630
+								if (var5 == 1 && Login.field880) { // L: 631
+									Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 632
+									if (!Client.Login_isUsernameRemembered && SecureRandomFuture.clientPreferences.rememberedUsername != null) { // L: 633
+										SecureRandomFuture.clientPreferences.rememberedUsername = null; // L: 634
+										class127.savePreferences(); // L: 635
+									}
+								}
+
+								var41 = class138.loginBoxCenter + 24; // L: 638
+								var39 = 277; // L: 639
+								Login.field881 = var50 >= var41 && var50 < var41 + class315.field3918 && var36 >= var39 && var36 < var39 + Huffman.field3152; // L: 640
+								if (var5 == 1 && Login.field881) { // L: 641
+									SecureRandomFuture.clientPreferences.hideUsername = !SecureRandomFuture.clientPreferences.hideUsername; // L: 642
+									if (!SecureRandomFuture.clientPreferences.hideUsername) { // L: 643
+										Login.Login_username = ""; // L: 644
+										SecureRandomFuture.clientPreferences.rememberedUsername = null; // L: 645
+										WorldMapID.method4805(); // L: 646
+									}
+
+									class127.savePreferences(); // L: 648
+								}
+
+								label1392:
+								while (true) {
+									int var45;
+									Transferable var52;
+									do {
+										while (true) {
+											label1306:
+											do {
+												while (true) {
+													while (NPCComposition.isKeyDown()) { // L: 650
+														if (Players.field1247 != 13) { // L: 651
+															if (Login.currentLoginField != 0) { // L: 660
+																continue label1306;
+															}
+
+															char var42 = ModeWhere.field3954; // L: 661
+
+															for (var12 = 0; var12 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var42 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var12); ++var12) { // L: 663 664
+															}
+
+															if (Players.field1247 == 85 && Login.Login_username.length() > 0) { // L: 667
+																Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
+															}
+
+															if (Players.field1247 == 84 || Players.field1247 == 80) { // L: 668
+																Login.currentLoginField = 1;
+															}
+
+															char var13 = ModeWhere.field3954; // L: 670
+															boolean var43 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var13) != -1; // L: 672
+															if (var43 && Login.Login_username.length() < 320) { // L: 674
+																Login.Login_username = Login.Login_username + ModeWhere.field3954;
+															}
+														} else {
+															PlayerType.method5521(0); // L: 652
+															Login.Login_username = ""; // L: 653
+															Login.Login_password = ""; // L: 654
+															class148.field1651 = 0; // L: 655
+															BufferedSource.otp = ""; // L: 656
+															Login.field882 = true; // L: 657
+														}
+													}
+
+													return; // L: 1034
+												}
+											} while(Login.currentLoginField != 1); // L: 676
+
+											if (Players.field1247 == 85 && Login.Login_password.length() > 0) { // L: 677
+												Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 678
+											} else if (Players.field1247 == 84 || Players.field1247 == 80) { // L: 680
+												Login.currentLoginField = 0; // L: 681
+												if (Players.field1247 == 84) { // L: 682
+													Login.Login_username = Login.Login_username.trim(); // L: 683
+													if (Login.Login_username.length() == 0) { // L: 684
+														class19.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 685
+														return; // L: 686
+													}
+
+													if (Login.Login_password.length() == 0) { // L: 688
+														class19.setLoginResponseString("", "Please enter your password.", ""); // L: 689
+														return; // L: 690
+													}
+
+													class19.setLoginResponseString("", "Connecting to server...", ""); // L: 692
+													FriendSystem.method1791(false); // L: 693
+													VertexNormal.updateGameState(20); // L: 694
+													return; // L: 695
+												}
+											}
+
+											if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && Players.field1247 == 67) { // L: 698
+												Clipboard var51 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 699
+												var52 = var51.getContents(class295.client); // L: 700
+												var45 = 20 - Login.Login_password.length(); // L: 701
+												break;
+											}
+
+											char var46 = ModeWhere.field3954; // L: 751
+											if (var46 >= ' ' && var46 < 127 || var46 > 127 && var46 < 160 || var46 > 160 && var46 <= 255) { // L: 753
+												var40 = true; // L: 754
+											} else {
+												label1540: {
+													if (var46 != 0) { // L: 757
+														char[] var53 = class328.cp1252AsciiExtension; // L: 759
+
+														for (int var30 = 0; var30 < var53.length; ++var30) { // L: 760
+															char var15 = var53[var30]; // L: 761
+															if (var15 == var46) { // L: 763
+																var40 = true; // L: 764
+																break label1540; // L: 765
+															}
+														}
+													}
+
+													var40 = false; // L: 771
+												}
+											}
+
+											if (var40) { // L: 773
+												char var54 = ModeWhere.field3954; // L: 775
+												boolean var44 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var54) != -1; // L: 777
+												if (var44 && Login.Login_password.length() < 20) { // L: 779 780
+													Login.Login_password = Login.Login_password + ModeWhere.field3954; // L: 781
+												}
+											}
+										}
+									} while(var45 <= 0); // L: 702
+
+									try {
+										String var14 = (String)var52.getTransferData(DataFlavor.stringFlavor); // L: 704
+										int var47 = Math.min(var45, var14.length()); // L: 705
+										int var16 = 0;
+
+										while (true) {
+											if (var16 >= var47) {
+												Login.Login_password = Login.Login_password + var14.substring(0, var47); // L: 743
+												continue label1392;
+											}
+
+											char var18 = var14.charAt(var16); // L: 709
+											boolean var17;
+											if (var18 >= ' ' && var18 < 127 || var18 > 127 && var18 < 160 || var18 > 160 && var18 <= 255) { // L: 711
+												var17 = true; // L: 712
+											} else {
+												label1541: {
+													if (var18 != 0) { // L: 715
+														char[] var19 = class328.cp1252AsciiExtension; // L: 717
+
+														for (int var20 = 0; var20 < var19.length; ++var20) { // L: 718
+															char var21 = var19[var20]; // L: 719
+															if (var18 == var21) { // L: 721
+																var17 = true; // L: 722
+																break label1541; // L: 723
+															}
+														}
+													}
+
+													var17 = false; // L: 729
+												}
+											}
+
+											if (!var17) { // L: 731
+												break;
+											}
+
+											char var49 = var14.charAt(var16); // L: 733
+											boolean var28 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var49) != -1; // L: 735
+											if (!var28) { // L: 737
+												break;
+											}
+
+											++var16; // L: 706
+										}
+
+										PlayerType.method5521(3); // L: 739
+										return; // L: 740
+									} catch (UnsupportedFlavorException var33) { // L: 745
+									} catch (IOException var34) { // L: 746
+									}
+								}
+							} else if (Login.loginIndex == 3) { // L: 790
+								var37 = Login.loginBoxX + 180; // L: 791
+								var9 = 276; // L: 792
+								if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 793
+									class185.method3731(false); // L: 794
+								}
+
+								var37 = Login.loginBoxX + 180; // L: 796
+								var9 = 326; // L: 797
+								if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 798
+									class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 799
+									PlayerType.method5521(5); // L: 800
+									return; // L: 801
+								}
+							} else {
+								int var11;
+								if (Login.loginIndex == 4) { // L: 804
+									var37 = Login.loginBoxX + 180 - 80; // L: 805
+									var9 = 321; // L: 806
+									if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 807
+										BufferedSource.otp.trim(); // L: 808
+										if (BufferedSource.otp.length() != 6) { // L: 809
+											class19.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 810
+											return; // L: 811
+										}
+
+										class148.field1651 = Integer.parseInt(BufferedSource.otp); // L: 813
+										BufferedSource.otp = ""; // L: 814
+										FriendSystem.method1791(true); // L: 815
+										class19.setLoginResponseString("", "Connecting to server...", ""); // L: 816
+										VertexNormal.updateGameState(20); // L: 817
+										return; // L: 818
+									}
+
+									if (var5 == 1 && var50 >= Login.loginBoxX + 180 - 9 && var50 <= Login.loginBoxX + 180 + 130 && var36 >= 263 && var36 <= 296) { // L: 820
+										Login.field882 = !Login.field882; // L: 821
+									}
+
+									if (var5 == 1 && var50 >= Login.loginBoxX + 180 - 34 && var50 <= Login.loginBoxX + 34 + 180 && var36 >= 351 && var36 <= 363) { // L: 823
+										WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 824
+									}
+
+									var37 = Login.loginBoxX + 180 + 80; // L: 826
+									if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 827
+										PlayerType.method5521(0); // L: 828
+										Login.Login_username = ""; // L: 829
+										Login.Login_password = ""; // L: 830
+										class148.field1651 = 0; // L: 831
+										BufferedSource.otp = ""; // L: 832
+									}
+
+									while (NPCComposition.isKeyDown()) { // L: 834
+										boolean var10 = false; // L: 835
+
+										for (var11 = 0; var11 < "1234567890".length(); ++var11) { // L: 836
+											if (ModeWhere.field3954 == "1234567890".charAt(var11)) { // L: 837
+												var10 = true; // L: 838
+												break; // L: 839
+											}
+										}
+
+										if (Players.field1247 == 13) { // L: 842
+											PlayerType.method5521(0); // L: 843
+											Login.Login_username = ""; // L: 844
+											Login.Login_password = ""; // L: 845
+											class148.field1651 = 0; // L: 846
+											BufferedSource.otp = ""; // L: 847
+										} else {
+											if (Players.field1247 == 85 && BufferedSource.otp.length() > 0) { // L: 850
+												BufferedSource.otp = BufferedSource.otp.substring(0, BufferedSource.otp.length() - 1);
+											}
+
+											if (Players.field1247 == 84) { // L: 851
+												BufferedSource.otp.trim(); // L: 852
+												if (BufferedSource.otp.length() != 6) { // L: 853
+													class19.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 854
+													return; // L: 855
+												}
+
+												class148.field1651 = Integer.parseInt(BufferedSource.otp); // L: 857
+												BufferedSource.otp = ""; // L: 858
+												FriendSystem.method1791(true); // L: 859
+												class19.setLoginResponseString("", "Connecting to server...", ""); // L: 860
+												VertexNormal.updateGameState(20); // L: 861
+												return; // L: 862
+											}
+
+											if (var10 && BufferedSource.otp.length() < 6) { // L: 864
+												BufferedSource.otp = BufferedSource.otp + ModeWhere.field3954;
+											}
+										}
+									}
+								} else if (Login.loginIndex == 5) { // L: 868
+									var37 = Login.loginBoxX + 180 - 80; // L: 869
+									var9 = 321; // L: 870
+									if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 871
+										WorldMapRectangle.method4793(); // L: 872
+										return; // L: 873
+									}
+
+									var37 = Login.loginBoxX + 180 + 80; // L: 875
+									if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 876
+										class67.Login_promptCredentials(true); // L: 877
+									}
+
+									var39 = 361; // L: 879
+									if (MouseRecorder.field1044 != null) { // L: 880
+										var11 = MouseRecorder.field1044.highX / 2; // L: 881
+										if (var5 == 1 && var50 >= MouseRecorder.field1044.lowX - var11 && var50 <= var11 + MouseRecorder.field1044.lowX && var36 >= var39 - 15 && var36 < var39) { // L: 882
+											WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 883
+										}
+									}
+
+									while (NPCComposition.isKeyDown()) { // L: 886
+										var40 = false; // L: 887
+
+										for (var12 = 0; var12 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var12) { // L: 888
+											if (ModeWhere.field3954 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var12)) { // L: 889
+												var40 = true; // L: 890
+												break; // L: 891
+											}
+										}
+
+										if (Players.field1247 == 13) { // L: 894
+											class67.Login_promptCredentials(true); // L: 895
+										} else {
+											if (Players.field1247 == 85 && Login.Login_username.length() > 0) { // L: 898
+												Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
+											}
+
+											if (Players.field1247 == 84) { // L: 899
+												WorldMapRectangle.method4793(); // L: 900
+												return; // L: 901
+											}
+
+											if (var40 && Login.Login_username.length() < 320) { // L: 903
+												Login.Login_username = Login.Login_username + ModeWhere.field3954;
+											}
+										}
+									}
+								} else if (Login.loginIndex != 6) { // L: 907
+									if (Login.loginIndex == 7) { // L: 918
+										var37 = Login.loginBoxX + 180 - 80; // L: 919
+										var9 = 321; // L: 920
+										if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 921
+											WorldMapSprite.openURL(InterfaceParent.method2146("secure", true) + "m=dob/set_dob.ws", true, false); // L: 922
+											class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 923
+											PlayerType.method5521(6); // L: 924
+											return; // L: 925
+										}
+
+										var37 = Login.loginBoxX + 180 + 80; // L: 927
+										if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 928
+											class67.Login_promptCredentials(true); // L: 929
+										}
+									} else if (Login.loginIndex == 8) { // L: 932
+										var37 = Login.loginBoxX + 180 - 80; // L: 933
+										var9 = 321; // L: 934
+										if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 935
+											WorldMapSprite.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 936
+											class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 937
+											PlayerType.method5521(6); // L: 938
+											return; // L: 939
+										}
+
+										var37 = Login.loginBoxX + 180 + 80; // L: 941
+										if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 942
+											class67.Login_promptCredentials(true); // L: 943
+										}
+									} else if (Login.loginIndex == 9) { // L: 946
+										var37 = Login.loginBoxX + 180; // L: 947
+										var9 = 311; // L: 948
+										if (Players.field1247 == 84 || Players.field1247 == 13 || var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 949
+											class185.method3731(false); // L: 950
+										}
+									} else if (Login.loginIndex == 10) { // L: 953
+										var37 = Login.loginBoxX + 180; // L: 954
+										var9 = 209; // L: 955
+										if (Players.field1247 == 84 || var5 == 1 && var50 >= var37 - 109 && var50 <= var37 + 109 && var36 >= var9 && var36 <= var9 + 68) { // L: 956
+											class19.setLoginResponseString("", "Connecting to server...", ""); // L: 957
+											Client.field508 = class422.field4524; // L: 958
+											FriendSystem.method1791(false); // L: 959
+											VertexNormal.updateGameState(20); // L: 960
+										}
+									} else if (Login.loginIndex == 12) { // L: 963
+										var37 = class138.loginBoxCenter; // L: 964
+										var9 = 233; // L: 965
+										Bounds var31 = var1.method6091(0, 30, "<col=ffd200>terms of use</col>, <col=ffd200>privacy policy</col>, and <col=ffd200>end user licence</col>", var37, var9); // L: 966
+										Bounds var26 = var1.method6091(32, 32, "<col=ffd200>terms of use</col>, <col=ffd200>privacy policy</col>, and <col=ffd200>end user licence</col>", var37, var9); // L: 967
+										Bounds var27 = var1.method6091(70, 34, "<col=ffd200>terms of use</col>, <col=ffd200>privacy policy</col>, and <col=ffd200>end user licence</col>", var37, var9); // L: 968
+										var41 = var9 + 17; // L: 969
+										Bounds var29 = var1.method6091(0, 34, "<col=ffd200>agreement (EULA)</col>.", var37, var41); // L: 970
+										if (var5 == 1) { // L: 971
+											if (var31.method6577(var50, var36)) { // L: 972
+												WorldMapSprite.openURL("https://www.jagex.com/terms", true, false); // L: 973
+											} else if (var26.method6577(var50, var36)) { // L: 975
+												WorldMapSprite.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 976
+											} else if (var27.method6577(var50, var36) || var29.method6577(var50, var36)) { // L: 978
+												WorldMapSprite.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 979
+											}
+										}
+
+										var37 = class138.loginBoxCenter - 80; // L: 982
+										var9 = 311; // L: 983
+										if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 984
+											UserComparator6.method2549(); // L: 985
+											class185.method3731(true); // L: 986
+										}
+
+										var37 = class138.loginBoxCenter + 80; // L: 988
+										if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 989
+											Login.loginIndex = 13; // L: 990
+										}
+									} else if (Login.loginIndex == 13) { // L: 993
+										var37 = class138.loginBoxCenter; // L: 994
+										var9 = 321; // L: 995
+										if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 996
+											class185.method3731(true); // L: 997
+										}
+									} else if (Login.loginIndex == 14) { // L: 1000
+										String var32 = ""; // L: 1001
+										switch(Login.field871) { // L: 1002
+										case 0:
+											var32 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1007
+											break; // L: 1008
+										case 1:
+											var32 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1004
+											break; // L: 1005
+										default:
+											class67.Login_promptCredentials(false); // L: 1010
+										}
+
+										var41 = Login.loginBoxX + 180; // L: 1013
+										var39 = 276; // L: 1014
+										if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 1015
+											WorldMapSprite.openURL(var32, true, false); // L: 1016
+											class19.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1017
+											PlayerType.method5521(6); // L: 1018
+											return; // L: 1019
+										}
+
+										var41 = Login.loginBoxX + 180; // L: 1021
+										var39 = 326; // L: 1022
+										if (var5 == 1 && var50 >= var41 - 75 && var50 <= var41 + 75 && var36 >= var39 - 20 && var36 <= var39 + 20) { // L: 1023
+											class67.Login_promptCredentials(false); // L: 1024
+										}
+									} else if (Login.loginIndex == 24) { // L: 1027
+										var37 = Login.loginBoxX + 180; // L: 1028
+										var9 = 301; // L: 1029
+										if (var5 == 1 && var50 >= var37 - 75 && var50 <= var37 + 75 && var36 >= var9 - 20 && var36 <= var9 + 20) { // L: 1030
+											class185.method3731(false); // L: 1031
+										}
+									}
+								} else {
+									while (true) {
+										do {
+											if (!NPCComposition.isKeyDown()) { // L: 908
+												var38 = 321; // L: 913
+												if (var5 == 1 && var36 >= var38 - 20 && var36 <= var38 + 20) { // L: 914
+													class67.Login_promptCredentials(true); // L: 915
+												}
+
+												return;
+											}
+										} while(Players.field1247 != 84 && Players.field1247 != 13); // L: 909
+
+										class67.Login_promptCredentials(true); // L: 910
+									}
+								}
+							}
+						}
+					}
+
+				}
+			}
+		}
+	} // L: 436
+
+	@ObfuscatedName("kk")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "4"
+	)
+	@Export("FriendSystem_invalidateIgnoreds")
+	static final void FriendSystem_invalidateIgnoreds() {
+		BufferedSource.method6516(); // L: 12465
+		if (Players.friendsChat != null) { // L: 12466
+			Players.friendsChat.invalidateIgnoreds(); // L: 12467
+		}
+
+	} // L: 12469
 }
diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java
index 9273f8992b..312a4ce9d7 100644
--- a/runescape-client/src/main/java/Skills.java
+++ b/runescape-client/src/main/java/Skills.java
@@ -6,17 +6,12 @@
 @ObfuscatedName("ji")
 @Implements("Skills")
 public class Skills {
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("Skills_enabled")
 	public static final boolean[] Skills_enabled;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("Skills_experienceTable")
 	public static int[] Skills_experienceTable;
-	@ObfuscatedName("mg")
-	@ObfuscatedSignature(
-		descriptor = "Ljf;"
-	)
-	static Widget field3247;
 
 	static {
 		Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; // L: 5
@@ -32,19 +27,31 @@ public class Skills {
 
 	} // L: 16
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "-1228711203"
+		descriptor = "(Ljava/lang/CharSequence;I)I",
+		garbageValue = "-2099525491"
 	)
-	@Export("isCharPrintable")
-	public static boolean isCharPrintable(char var0) {
-		if (var0 >= ' ' && var0 <= '~') { // L: 205
-			return true;
-		} else if (var0 >= 160 && var0 <= 255) { // L: 206
-			return true;
-		} else {
-			return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 207
+	@Export("hashString")
+	public static int hashString(CharSequence var0) {
+		int var1 = var0.length(); // L: 137
+		int var2 = 0; // L: 138
+
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 139
+			var2 = (var2 << 5) - var2 + class372.charToByteCp1252(var0.charAt(var3));
 		}
+
+		return var2; // L: 140
 	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "708045213"
+	)
+	static final void method5487() {
+		Object var10000 = null; // L: 175
+		String var0 = "You can't add yourself to your own ignore list";
+		class194.addGameMessage(30, "", var0); // L: 177
+	} // L: 179
 }
diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java
index 138068b90d..624ed61fb0 100644
--- a/runescape-client/src/main/java/SoftWrapper.java
+++ b/runescape-client/src/main/java/SoftWrapper.java
@@ -3,10 +3,10 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("ix")
+@ObfuscatedName("iz")
 @Implements("SoftWrapper")
 public class SoftWrapper extends Wrapper {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("ref")
 	SoftReference ref;
 
@@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper {
 		this.ref = new SoftReference(var1); // L: 11
 	} // L: 12
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("get")
 	Object get() {
 		return this.ref.get(); // L: 15
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("isSoft")
 	boolean isSoft() {
 		return true; // L: 19
diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java
index 3458e74c60..4f9d17bc62 100644
--- a/runescape-client/src/main/java/SoundCache.java
+++ b/runescape-client/src/main/java/SoundCache.java
@@ -1,43 +1,46 @@
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.net.URLConnection;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ad")
+@ObfuscatedName("aa")
 @Implements("SoundCache")
 public class SoundCache {
-	@ObfuscatedName("i")
+	@ObfuscatedName("s")
+	@Export("Interpreter_intLocals")
+	static int[] Interpreter_intLocals;
+	@ObfuscatedName("w")
+	static byte[][][] field321;
+	@ObfuscatedName("a")
+	@Export("ByteArrayPool_alternativeSizes")
+	public static int[] ByteArrayPool_alternativeSizes;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("soundEffectIndex")
 	AbstractArchive soundEffectIndex;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("musicSampleIndex")
 	AbstractArchive musicSampleIndex;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("musicSamples")
 	NodeHashTable musicSamples;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lnq;"
+		descriptor = "Lon;"
 	)
 	@Export("rawSounds")
 	NodeHashTable rawSounds;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lko;Lko;)V"
+		descriptor = "(Lku;Lku;)V"
 	)
 	public SoundCache(AbstractArchive var1, AbstractArchive var2) {
 		this.musicSamples = new NodeHashTable(256); // L: 9
@@ -46,10 +49,10 @@ public SoundCache(AbstractArchive var1, AbstractArchive var2) {
 		this.musicSampleIndex = var2; // L: 14
 	} // L: 15
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II[IS)Laz;",
-		garbageValue = "-5017"
+		descriptor = "(II[IB)Laj;",
+		garbageValue = "-53"
 	)
 	@Export("getSoundEffect0")
 	RawSound getSoundEffect0(int var1, int var2, int[] var3) {
@@ -77,47 +80,47 @@ RawSound getSoundEffect0(int var1, int var2, int[] var3) {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(II[IB)Laz;",
-		garbageValue = "-25"
+		descriptor = "(II[II)Laj;",
+		garbageValue = "1434349687"
 	)
 	@Export("getMusicSample0")
 	RawSound getMusicSample0(int var1, int var2, int[] var3) {
-		int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 33
+		int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12);
 		var4 |= var1 << 16; // L: 34
 		long var5 = (long)var4 ^ 4294967296L; // L: 35
-		RawSound var7 = (RawSound)this.rawSounds.get(var5);
-		if (var7 != null) {
+		RawSound var7 = (RawSound)this.rawSounds.get(var5); // L: 36
+		if (var7 != null) { // L: 37
 			return var7;
-		} else if (var3 != null && var3[0] <= 0) {
+		} else if (var3 != null && var3[0] <= 0) { // L: 38
 			return null;
 		} else {
-			VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5);
-			if (var8 == null) {
-				var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2);
-				if (var8 == null) {
+			VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); // L: 39
+			if (var8 == null) { // L: 40
+				var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); // L: 41
+				if (var8 == null) { // L: 42
 					return null;
 				}
 
-				this.musicSamples.put(var8, var5);
+				this.musicSamples.put(var8, var5); // L: 43
 			}
 
-			var7 = var8.toRawSound(var3);
-			if (var7 == null) {
+			var7 = var8.toRawSound(var3); // L: 45
+			if (var7 == null) { // L: 46
 				return null;
 			} else {
 				var8.remove(); // L: 47
-				this.rawSounds.put(var7, var5);
-				return var7;
+				this.rawSounds.put(var7, var5); // L: 48
+				return var7; // L: 49
 			}
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I[II)Laz;",
-		garbageValue = "-1852597281"
+		descriptor = "(I[II)Laj;",
+		garbageValue = "-806437525"
 	)
 	@Export("getSoundEffect")
 	public RawSound getSoundEffect(int var1, int[] var2) {
@@ -126,232 +129,194 @@ public RawSound getSoundEffect(int var1, int[] var2) {
 		} else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) {
 			return this.getSoundEffect0(var1, 0, var2); // L: 54
 		} else {
-			throw new RuntimeException();
+			throw new RuntimeException(); // L: 55
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I[IB)Laz;",
-		garbageValue = "-64"
+		descriptor = "(I[II)Laj;",
+		garbageValue = "-1607899300"
 	)
 	@Export("getMusicSample")
 	public RawSound getMusicSample(int var1, int[] var2) {
-		if (this.musicSampleIndex.getGroupCount() == 1) {
+		if (this.musicSampleIndex.getGroupCount() == 1) { // L: 59
 			return this.getMusicSample0(0, var1, var2);
 		} else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) {
-			return this.getMusicSample0(var1, 0, var2);
+			return this.getMusicSample0(var1, 0, var2); // L: 60
 		} else {
 			throw new RuntimeException(); // L: 61
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)J",
-		garbageValue = "-566030562"
+		descriptor = "(II)I",
+		garbageValue = "919700872"
 	)
-	static long method807() {
-		try {
-			URL var0 = new URL(HealthBar.method2246("services", false) + "m=accountappeal/login.ws"); // L: 36
-			URLConnection var1 = var0.openConnection(); // L: 37
-			var1.setRequestProperty("connection", "close"); // L: 38
-			var1.setDoInput(true); // L: 39
-			var1.setDoOutput(true); // L: 40
-			var1.setConnectTimeout(5000); // L: 41
-			OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); // L: 42
-			var2.write("data1=req"); // L: 43
-			var2.flush(); // L: 44
-			InputStream var3 = var1.getInputStream(); // L: 45
-			Buffer var4 = new Buffer(new byte[1000]); // L: 46
-
-			do {
-				int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); // L: 48
-				if (var5 == -1) { // L: 49
-					var4.offset = 0; // L: 55
-					long var7 = var4.readLong(); // L: 56
-					return var7; // L: 57
-				}
-
-				var4.offset += var5; // L: 50
-			} while(var4.offset < 1000); // L: 51
+	public static int method833(int var0) {
+		return class378.field4233[var0 & 16383]; // L: 33
+	}
 
-			return 0L; // L: 52
-		} catch (Exception var9) { // L: 59
-			return 0L; // L: 60
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "2120721647"
+	)
+	static void method823() {
+		if (DirectByteArrayCopier.clearLoginScreen) { // L: 309
+			AbstractByteArrayCopier.titleboxSprite = null; // L: 310
+			class19.titlebuttonSprite = null; // L: 311
+			Login.runesSprite = null; // L: 312
+			WorldMapCacheName.leftTitleSprite = null; // L: 313
+			NPC.rightTitleSprite = null; // L: 314
+			Login.logoSprite = null; // L: 315
+			Login.title_muteSprite = null; // L: 316
+			KeyHandler.options_buttons_0Sprite = null; // L: 317
+			LoginType.options_buttons_2Sprite = null; // L: 318
+			class148.worldSelectBackSprites = null; // L: 319
+			AbstractArchive.worldSelectFlagSprites = null; // L: 320
+			UserComparator3.worldSelectArrows = null; // L: 321
+			class112.worldSelectStars = null; // L: 322
+			class21.field118 = null; // L: 323
+			Client.loginScreenRunesAnimation.method2280(); // L: 324
+			class260.musicPlayerStatus = 1; // L: 326
+			class124.musicTrackArchive = null; // L: 327
+			VarcInt.musicTrackGroupId = -1; // L: 328
+			class260.musicTrackFileId = -1; // L: 329
+			ChatChannel.musicTrackVolume = 0; // L: 330
+			DynamicObject.musicTrackBoolean = false; // L: 331
+			class260.pcmSampleLength = 2; // L: 332
+			ClientPreferences.method2297(true); // L: 334
+			DirectByteArrayCopier.clearLoginScreen = false; // L: 335
 		}
-	}
+	} // L: 336
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-1520493617"
+		descriptor = "(ILju;ZB)V",
+		garbageValue = "8"
 	)
-	static int method799(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2502
-			if (class67.guestClanSettings != null) { // L: 2503
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2504
-				SoundSystem.field287 = class67.guestClanSettings; // L: 2505
-			} else {
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2507
+	static void method831(int var0, Coord var1, boolean var2) {
+		WorldMapArea var3 = WorldMapRectangle.getWorldMap().getMapArea(var0); // L: 4527
+		int var4 = class340.localPlayer.plane; // L: 4528
+		int var5 = (class340.localPlayer.x >> 7) + class131.baseX; // L: 4529
+		int var6 = (class340.localPlayer.y >> 7) + TileItem.baseY; // L: 4530
+		Coord var7 = new Coord(var4, var5, var6); // L: 4531
+		WorldMapRectangle.getWorldMap().method6876(var3, var7, var1, var2); // L: 4532
+	} // L: 4533
+
+	@ObfuscatedName("ie")
+	@ObfuscatedSignature(
+		descriptor = "(IIIILjava/lang/String;I)V",
+		garbageValue = "-1022759307"
+	)
+	@Export("widgetDefaultMenuAction")
+	static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) {
+		Widget var5 = class126.getWidgetChild(var1, var2); // L: 9903
+		if (var5 != null) { // L: 9904
+			if (var5.onOp != null) { // L: 9905
+				ScriptEvent var6 = new ScriptEvent(); // L: 9906
+				var6.widget = var5; // L: 9907
+				var6.opIndex = var0; // L: 9908
+				var6.targetName = var4; // L: 9909
+				var6.args = var5.onOp; // L: 9910
+				class285.runScriptEvent(var6); // L: 9911
 			}
 
-			return 1; // L: 2508
-		} else {
-			int var3;
-			if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2510
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2511
-				if (Client.currentClanSettings[var3] != null) { // L: 2512
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2513
-					SoundSystem.field287 = Client.currentClanSettings[var3]; // L: 2514
-				} else {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2516
-				}
+			boolean var11 = true; // L: 9913
+			if (var5.contentType > 0) { // L: 9914
+				var11 = class19.method329(var5);
+			}
 
-				return 1; // L: 2517
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2519
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = SoundSystem.field287.name; // L: 2520
-				return 1; // L: 2521
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2523
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.allowGuests ? 1 : 0; // L: 2524
-				return 1; // L: 2525
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2527
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1444; // L: 2528
-				return 1; // L: 2529
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2531
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1439; // L: 2532
-				return 1; // L: 2533
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2535
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1446; // L: 2536
-				return 1; // L: 2537
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2539
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1447; // L: 2540
-				return 1; // L: 2541
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2543
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.memberCount; // L: 2544
-				return 1; // L: 2545
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2547
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2548
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = SoundSystem.field287.memberNames[var3]; // L: 2549
-				return 1; // L: 2550
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2552
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2553
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.memberRanks[var3]; // L: 2554
-				return 1; // L: 2555
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2557
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.bannedMemberCount; // L: 2558
-				return 1; // L: 2559
-			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2561
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2562
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = SoundSystem.field287.bannedMemberNames[var3]; // L: 2563
-				return 1; // L: 2564
-			} else {
-				int var5;
-				int var6;
-				if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2566
-					class14.Interpreter_intStackSize -= 3; // L: 2567
-					var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2568
-					var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2569
-					var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 2570
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.method2652(var3, var6, var5); // L: 2571
-					return 1; // L: 2572
-				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2574
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.currentOwner; // L: 2575
-					return 1; // L: 2576
-				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2578
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1438; // L: 2579
-					return 1; // L: 2580
-				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2582
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.method2649(Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]); // L: 2583
-					return 1; // L: 2584
-				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2586
-					Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1] = SoundSystem.field287.getSortedMembers()[Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1]]; // L: 2587
-					return 1; // L: 2588
-				} else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2590
-					class14.Interpreter_intStackSize -= 2; // L: 2591
-					var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2592
-					var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2593
-					class20.method298(var6, var3); // L: 2594
-					return 1; // L: 2595
-				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2597
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2598
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1453[var3]; // L: 2599
-					return 1; // L: 2600
-				} else {
-					if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2602
-						class14.Interpreter_intStackSize -= 3; // L: 2603
-						var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2604
-						boolean var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 2605
-						var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 2606
-						VarpDefinition.method3003(var5, var3, var4); // L: 2607
+			if (var11) { // L: 9915
+				int var8 = class363.getWidgetFlags(var5); // L: 9917
+				int var9 = var0 - 1; // L: 9918
+				boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 9920
+				if (var7) { // L: 9922
+					PacketBufferNode var10;
+					if (var0 == 1) { // L: 9925
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2891, Client.packetWriter.isaacCipher); // L: 9927
+						var10.packetBuffer.writeInt(var1); // L: 9928
+						var10.packetBuffer.writeShort(var2); // L: 9929
+						var10.packetBuffer.writeShort(var3); // L: 9930
+						Client.packetWriter.addNode(var10); // L: 9931
+					}
+
+					if (var0 == 2) { // L: 9933
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2880, Client.packetWriter.isaacCipher); // L: 9935
+						var10.packetBuffer.writeInt(var1); // L: 9936
+						var10.packetBuffer.writeShort(var2); // L: 9937
+						var10.packetBuffer.writeShort(var3); // L: 9938
+						Client.packetWriter.addNode(var10); // L: 9939
+					}
+
+					if (var0 == 3) { // L: 9941
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2834, Client.packetWriter.isaacCipher); // L: 9943
+						var10.packetBuffer.writeInt(var1); // L: 9944
+						var10.packetBuffer.writeShort(var2); // L: 9945
+						var10.packetBuffer.writeShort(var3); // L: 9946
+						Client.packetWriter.addNode(var10); // L: 9947
+					}
+
+					if (var0 == 4) { // L: 9949
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2821, Client.packetWriter.isaacCipher); // L: 9951
+						var10.packetBuffer.writeInt(var1); // L: 9952
+						var10.packetBuffer.writeShort(var2); // L: 9953
+						var10.packetBuffer.writeShort(var3); // L: 9954
+						Client.packetWriter.addNode(var10); // L: 9955
 					}
 
-					if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2609
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2610
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SoundSystem.field287.field1454[var3] ? 1 : 0; // L: 2611
-						return 1; // L: 2612
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2614
-						if (class115.guestClanChannel != null) { // L: 2615
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2616
-							WorldMapRegion.field2069 = class115.guestClanChannel; // L: 2617
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2619
-						}
+					if (var0 == 5) { // L: 9957
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2877, Client.packetWriter.isaacCipher); // L: 9959
+						var10.packetBuffer.writeInt(var1); // L: 9960
+						var10.packetBuffer.writeShort(var2); // L: 9961
+						var10.packetBuffer.writeShort(var3); // L: 9962
+						Client.packetWriter.addNode(var10); // L: 9963
+					}
+
+					if (var0 == 6) { // L: 9965
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2866, Client.packetWriter.isaacCipher); // L: 9967
+						var10.packetBuffer.writeInt(var1); // L: 9968
+						var10.packetBuffer.writeShort(var2); // L: 9969
+						var10.packetBuffer.writeShort(var3); // L: 9970
+						Client.packetWriter.addNode(var10); // L: 9971
+					}
+
+					if (var0 == 7) { // L: 9973
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2822, Client.packetWriter.isaacCipher); // L: 9975
+						var10.packetBuffer.writeInt(var1); // L: 9976
+						var10.packetBuffer.writeShort(var2); // L: 9977
+						var10.packetBuffer.writeShort(var3); // L: 9978
+						Client.packetWriter.addNode(var10); // L: 9979
+					}
 
-						return 1; // L: 2620
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2622
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2623
-						if (Client.currentClanChannels[var3] != null) { // L: 2624
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2625
-							WorldMapRegion.field2069 = Client.currentClanChannels[var3]; // L: 2626
-							class133.field1499 = var3; // L: 2627
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2629
-						}
+					if (var0 == 8) { // L: 9981
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2884, Client.packetWriter.isaacCipher); // L: 9983
+						var10.packetBuffer.writeInt(var1); // L: 9984
+						var10.packetBuffer.writeShort(var2); // L: 9985
+						var10.packetBuffer.writeShort(var3); // L: 9986
+						Client.packetWriter.addNode(var10); // L: 9987
+					}
+
+					if (var0 == 9) { // L: 9989
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2830, Client.packetWriter.isaacCipher); // L: 9991
+						var10.packetBuffer.writeInt(var1); // L: 9992
+						var10.packetBuffer.writeShort(var2); // L: 9993
+						var10.packetBuffer.writeShort(var3); // L: 9994
+						Client.packetWriter.addNode(var10); // L: 9995
+					}
 
-						return 1; // L: 2630
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2632
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = WorldMapRegion.field2069.name; // L: 2633
-						return 1; // L: 2634
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2636
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.field1511; // L: 2637
-						return 1; // L: 2638
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2640
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.field1516; // L: 2641
-						return 1; // L: 2642
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2644
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.method2809(); // L: 2645
-						return 1; // L: 2646
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2648
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2649
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ((ClanChannelMember)WorldMapRegion.field2069.members.get(var3)).username.getName(); // L: 2650
-						return 1; // L: 2651
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2653
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2654
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((ClanChannelMember)WorldMapRegion.field2069.members.get(var3)).rank; // L: 2655
-						return 1; // L: 2656
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2658
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2659
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((ClanChannelMember)WorldMapRegion.field2069.members.get(var3)).world; // L: 2660
-						return 1; // L: 2661
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2663
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2664
-						HitSplatDefinition.method3267(class133.field1499, var3); // L: 2665
-						return 1; // L: 2666
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2668
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.method2817(Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]); // L: 2669
-						return 1; // L: 2670
-					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2672
-						Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1] = WorldMapRegion.field2069.getSortedMembers()[Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1]]; // L: 2673
-						return 1; // L: 2674
-					} else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2676
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = NPC.field1210 != null ? 1 : 0; // L: 2677
-						return 1; // L: 2678
-					} else {
-						return 2; // L: 2680
+					if (var0 == 10) { // L: 9997
+						var10 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2853, Client.packetWriter.isaacCipher); // L: 9999
+						var10.packetBuffer.writeInt(var1); // L: 10000
+						var10.packetBuffer.writeShort(var2); // L: 10001
+						var10.packetBuffer.writeShort(var3); // L: 10002
+						Client.packetWriter.addNode(var10); // L: 10003
 					}
+
 				}
 			}
 		}
-	}
+	} // L: 9923 10005
 }
diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java
index d37a115832..fbe85279f2 100644
--- a/runescape-client/src/main/java/SoundEffect.java
+++ b/runescape-client/src/main/java/SoundEffect.java
@@ -3,24 +3,24 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("at")
+@ObfuscatedName("ac")
 @Implements("SoundEffect")
 public class SoundEffect {
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "[Lbg;"
+		descriptor = "[Lba;"
 	)
 	@Export("instruments")
 	Instrument[] instruments;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("start")
 	int start;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("end")
 	int end;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	SoundEffect(Buffer var1) {
 		this.instruments = new Instrument[10]; // L: 10
@@ -38,9 +38,9 @@ public class SoundEffect {
 		this.end = var1.readUnsignedShort(); // L: 29
 	} // L: 30
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "()Laz;"
+		descriptor = "()Laj;"
 	)
 	@Export("toRawSound")
 	public RawSound toRawSound() {
@@ -48,7 +48,7 @@ public RawSound toRawSound() {
 		return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("calculateDelay")
 	public final int calculateDelay() {
 		int var1 = 9999999; // L: 38
@@ -83,7 +83,7 @@ public final int calculateDelay() {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("mix")
 	final byte[] mix() {
 		int var1 = 0; // L: 57
@@ -122,9 +122,9 @@ final byte[] mix() {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;II)Lat;"
+		descriptor = "(Lku;II)Lac;"
 	)
 	@Export("readSoundEffect")
 	public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) {
diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java
index a8c8a2d842..8b12bdf501 100644
--- a/runescape-client/src/main/java/SoundEnvelope.java
+++ b/runescape-client/src/main/java/SoundEnvelope.java
@@ -3,40 +3,40 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ab")
+@ObfuscatedName("ag")
 @Implements("SoundEnvelope")
 public class SoundEnvelope {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("segments")
 	int segments;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("durations")
 	int[] durations;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("phases")
 	int[] phases;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("start")
 	int start;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("end")
 	int end;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("form")
 	int form;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("ticks")
 	int ticks;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("phaseIndex")
 	int phaseIndex;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("step")
 	int step;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("amplitude")
 	int amplitude;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("max")
 	int max;
 
@@ -50,9 +50,9 @@ public class SoundEnvelope {
 		this.phases[1] = 65535; // L: 27
 	} // L: 28
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	@Export("decode")
 	final void decode(Buffer var1) {
@@ -62,9 +62,9 @@ final void decode(Buffer var1) {
 		this.decodeSegments(var1); // L: 34
 	} // L: 35
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	@Export("decodeSegments")
 	final void decodeSegments(Buffer var1) {
@@ -79,7 +79,7 @@ final void decodeSegments(Buffer var1) {
 
 	} // L: 45
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("reset")
 	final void reset() {
 		this.ticks = 0; // L: 48
@@ -89,7 +89,7 @@ final void reset() {
 		this.max = 0; // L: 52
 	} // L: 53
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("doStep")
 	final int doStep(int var1) {
 		if (this.max >= this.ticks) { // L: 56
diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java
index bbe2c7d575..fc7e7f81e8 100644
--- a/runescape-client/src/main/java/SoundSystem.java
+++ b/runescape-client/src/main/java/SoundSystem.java
@@ -1,38 +1,17 @@
 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("ar")
+@ObfuscatedName("al")
 @Implements("SoundSystem")
 public class SoundSystem implements Runnable {
-	@ObfuscatedName("sb")
-	@ObfuscatedGetter(
-		intValue = 1952022621
-	)
-	static int field288;
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "Lle;"
-	)
-	@Export("ItemDefinition_fontPlain11")
-	public static Font ItemDefinition_fontPlain11;
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		descriptor = "Ldm;"
-	)
-	static ClanSettings field287;
-	@ObfuscatedName("iz")
-	@ObfuscatedGetter(
-		intValue = 580143713
-	)
-	@Export("selectedItemId")
-	static int selectedItemId;
-	@ObfuscatedName("i")
+	@ObfuscatedName("qt")
+	@Export("ClanChat_inClanChat")
+	static boolean ClanChat_inClanChat;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "[Lak;"
+		descriptor = "[Lar;"
 	)
 	@Export("players")
 	volatile PcmPlayer[] players;
@@ -43,485 +22,15 @@ public class SoundSystem implements Runnable {
 
 	public void run() {
 		try {
-			for (int var1 = 0; var1 < 2; ++var1) {
+			for (int var1 = 0; var1 < 2; ++var1) { // L: 12
 				PcmPlayer var2 = this.players[var1]; // L: 13
-				if (var2 != null) {
+				if (var2 != null) { // L: 14
 					var2.run();
 				}
 			}
-		} catch (Exception var4) {
-			MilliClock.RunException_sendStackTrace((String)null, var4);
+		} catch (Exception var4) { // L: 17
+			AccessFile.RunException_sendStackTrace((String)null, var4); // L: 18
 		}
 
 	} // L: 20
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIII)I",
-		garbageValue = "1003553351"
-	)
-	public static int method780(int var0, int var1, int var2, int var3, int var4, int var5) {
-		if ((var5 & 1) == 1) { // L: 9
-			int var6 = var3; // L: 10
-			var3 = var4; // L: 11
-			var4 = var6; // L: 12
-		}
-
-		var2 &= 3; // L: 14
-		if (var2 == 0) { // L: 15
-			return var0;
-		} else if (var2 == 1) { // L: 16
-			return var1;
-		} else {
-			return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 17 18
-		}
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lck;IIB)V",
-		garbageValue = "-35"
-	)
-	@Export("runScript")
-	static void runScript(ScriptEvent var0, int var1, int var2) {
-		Object[] var3 = var0.args; // L: 114
-		Script var4;
-		int var20;
-		if (class6.isWorldMapEvent(var0.type)) { // L: 116
-			class7.worldMapEvent = (WorldMapEvent)var3[0]; // L: 117
-			WorldMapElement var5 = ItemComposition.WorldMapElement_get(class7.worldMapEvent.mapElement); // L: 118
-			var4 = ObjectSound.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 119
-		} else {
-			var20 = (Integer)var3[0]; // L: 122
-			var4 = InvDefinition.getScript(var20); // L: 123
-		}
-
-		if (var4 != null) { // L: 125
-			class14.Interpreter_intStackSize = 0; // L: 128
-			class295.Interpreter_stringStackSize = 0; // L: 129
-			var20 = -1; // L: 130
-			int[] var6 = var4.opcodes; // L: 131
-			int[] var7 = var4.intOperands; // L: 132
-			byte var8 = -1; // L: 133
-			Interpreter.Interpreter_frameDepth = 0; // L: 134
-			Interpreter.field795 = false; // L: 135
-			boolean var9 = false; // L: 136
-			int var10 = 0; // L: 137
-			boolean var30 = false;
-
-			label989: {
-				label990: {
-					try {
-						int var13;
-						try {
-							var30 = true; // L: 139
-							class28.Interpreter_intLocals = new int[var4.localIntCount]; // L: 140
-							int var11 = 0; // L: 141
-							UserComparator7.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 142
-							int var12 = 0;
-
-							int var14;
-							String var21;
-							for (var13 = 1; var13 < var3.length; ++var13) { // L: 143
-								if (var3[var13] instanceof Integer) { // L: 144
-									var14 = (Integer)var3[var13]; // L: 145
-									if (var14 == -2147483647) { // L: 146
-										var14 = var0.mouseX;
-									}
-
-									if (var14 == -2147483646) { // L: 147
-										var14 = var0.mouseY;
-									}
-
-									if (var14 == -2147483645) { // L: 148
-										var14 = var0.widget != null ? var0.widget.id * 851670683 * -830177389 : -1;
-									}
-
-									if (var14 == -2147483644) { // L: 149
-										var14 = var0.opIndex;
-									}
-
-									if (var14 == -2147483643) { // L: 150
-										var14 = var0.widget != null ? var0.widget.childIndex * 855382617 * -349073943 : -1;
-									}
-
-									if (var14 == -2147483642) { // L: 151
-										var14 = var0.dragTarget != null ? var0.dragTarget.id * 851670683 * -830177389 : -1;
-									}
-
-									if (var14 == -2147483641) { // L: 152
-										var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 855382617 * -349073943 : -1;
-									}
-
-									if (var14 == -2147483640) { // L: 153
-										var14 = var0.keyTyped;
-									}
-
-									if (var14 == -2147483639) { // L: 154
-										var14 = var0.keyPressed;
-									}
-
-									class28.Interpreter_intLocals[var11++] = var14; // L: 155
-								} else if (var3[var13] instanceof String) { // L: 157
-									var21 = (String)var3[var13]; // L: 158
-									if (var21.equals("event_opbase")) { // L: 159
-										var21 = var0.targetName;
-									}
-
-									UserComparator7.Interpreter_stringLocals[var12++] = var21; // L: 160
-								}
-							}
-
-							Interpreter.field798 = var0.field1024; // L: 164
-
-							while (true) {
-								++var10; // L: 166
-								if (var10 > var1) { // L: 167
-									throw new RuntimeException();
-								}
-
-								++var20; // L: 168
-								int var33 = var6[var20];
-								if (var33 >= 100) { // L: 169
-									boolean var35;
-									if (var4.intOperands[var20] == 1) { // L: 387
-										var35 = true;
-									} else {
-										var35 = false; // L: 388
-									}
-
-									var14 = AbstractWorldMapIcon.method4026(var33, var4, var35); // L: 389
-									switch(var14) { // L: 390
-									case 0:
-										var30 = false;
-										break label990;
-									case 1:
-									default:
-										break;
-									case 2:
-										throw new IllegalStateException(); // L: 393
-									}
-								} else if (var33 == 0) { // L: 170
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7[var20]; // L: 171
-								} else if (var33 == ScriptOpcodes.GET_VARP) { // L: 174
-									var13 = var7[var20]; // L: 175
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 176
-								} else if (var33 == ScriptOpcodes.SET_VARP) { // L: 179
-									var13 = var7[var20]; // L: 180
-									Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 181
-									WorldMapLabelSize.changeGameOptions(var13); // L: 182
-								} else if (var33 == ScriptOpcodes.SCONST) { // L: 185
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 186
-								} else if (var33 == ScriptOpcodes.JUMP) { // L: 189
-									var20 += var7[var20]; // L: 190
-								} else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 193
-									class14.Interpreter_intStackSize -= 2; // L: 194
-									if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 195
-										var20 += var7[var20];
-									}
-								} else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 198
-									class14.Interpreter_intStackSize -= 2; // L: 199
-									if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 200
-										var20 += var7[var20];
-									}
-								} else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 203
-									class14.Interpreter_intStackSize -= 2; // L: 204
-									if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 205
-										var20 += var7[var20];
-									}
-								} else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 208
-									class14.Interpreter_intStackSize -= 2; // L: 209
-									if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 210
-										var20 += var7[var20];
-									}
-								} else if (var33 == ScriptOpcodes.RETURN) { // L: 213
-									if (Interpreter.Interpreter_frameDepth == 0) { // L: 214
-										var30 = false;
-										break;
-									}
-
-									ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 215
-									var4 = var40.script; // L: 216
-									var6 = var4.opcodes; // L: 217
-									var7 = var4.intOperands; // L: 218
-									var20 = var40.pc; // L: 219
-									class28.Interpreter_intLocals = var40.intLocals; // L: 220
-									UserComparator7.Interpreter_stringLocals = var40.stringLocals; // L: 221
-								} else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 224
-									var13 = var7[var20]; // L: 225
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class119.getVarbit(var13); // L: 226
-								} else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 229
-									var13 = var7[var20]; // L: 230
-									class123.method2616(var13, Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 231
-								} else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 234
-									class14.Interpreter_intStackSize -= 2; // L: 235
-									if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 236
-										var20 += var7[var20];
-									}
-								} else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 239
-									class14.Interpreter_intStackSize -= 2; // L: 240
-									if (Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]) { // L: 241
-										var20 += var7[var20];
-									}
-								} else if (var33 == ScriptOpcodes.ILOAD) { // L: 244
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class28.Interpreter_intLocals[var7[var20]]; // L: 245
-								} else if (var33 == ScriptOpcodes.ISTORE) { // L: 248
-									class28.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 249
-								} else if (var33 == ScriptOpcodes.SLOAD) { // L: 252
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = UserComparator7.Interpreter_stringLocals[var7[var20]]; // L: 253
-								} else if (var33 == ScriptOpcodes.SSTORE) { // L: 256
-									UserComparator7.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 257
-								} else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 260
-									var13 = var7[var20]; // L: 261
-									class295.Interpreter_stringStackSize -= var13; // L: 262
-									var21 = DynamicObject.method2003(Interpreter.Interpreter_stringStack, class295.Interpreter_stringStackSize, var13); // L: 263
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var21; // L: 264
-								} else if (var33 == ScriptOpcodes.POP_INT) { // L: 267
-									--class14.Interpreter_intStackSize; // L: 268
-								} else if (var33 == ScriptOpcodes.POP_STRING) { // L: 271
-									--class295.Interpreter_stringStackSize; // L: 272
-								} else {
-									int var17;
-									if (var33 != ScriptOpcodes.INVOKE) { // L: 275
-										if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 298
-											Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Message.varcs.getInt(var7[var20]); // L: 299
-										} else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 302
-											Message.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 303
-										} else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 306
-											var13 = var7[var20] >> 16; // L: 307
-											var14 = var7[var20] & 65535; // L: 308
-											int var24 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 309
-											if (var24 < 0 || var24 > 5000) { // L: 310
-												throw new RuntimeException(); // L: 311
-											}
-
-											Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 313
-											byte var25 = -1; // L: 314
-											if (var14 == 105) { // L: 315
-												var25 = 0;
-											}
-
-											for (var17 = 0; var17 < var24; ++var17) { // L: 316
-												Interpreter.Interpreter_arrays[var13][var17] = var25;
-											}
-										} else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 319
-											var13 = var7[var20]; // L: 320
-											var14 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 321
-											if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 322
-												throw new RuntimeException(); // L: 323
-											}
-
-											Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 325
-										} else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 328
-											var13 = var7[var20]; // L: 329
-											class14.Interpreter_intStackSize -= 2; // L: 330
-											var14 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 331
-											if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 332
-												throw new RuntimeException(); // L: 333
-											}
-
-											Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 335
-										} else {
-											String var22;
-											if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 338
-												var22 = Message.varcs.getStringOld(var7[var20]); // L: 339
-												if (var22 == null) { // L: 340
-													var22 = "null";
-												}
-
-												Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var22; // L: 341
-											} else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 344
-												Message.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]); // L: 345
-											} else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 348
-												var22 = Message.varcs.getString(var7[var20]); // L: 349
-												Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var22; // L: 350
-											} else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 353
-												Message.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]); // L: 354
-											} else if (var33 == ScriptOpcodes.SWITCH) { // L: 357
-												IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 358
-												IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 359
-												if (var37 != null) { // L: 360
-													var20 += var37.integer;
-												}
-											} else {
-												Integer var39;
-												if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 363
-													var39 = field287.getTitleGroupValue(var7[var20]); // L: 364
-													if (var39 == null) { // L: 365
-														Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 366
-													} else {
-														Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var39; // L: 369
-													}
-												} else {
-													if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 373
-														throw new IllegalStateException(); // L: 383
-													}
-
-													var39 = NPC.field1210.method6379(var7[var20]); // L: 374
-													if (var39 == null) { // L: 375
-														Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 376
-													} else {
-														Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var39; // L: 379
-													}
-												}
-											}
-										}
-									} else {
-										var13 = var7[var20]; // L: 276
-										Script var36 = InvDefinition.getScript(var13); // L: 277
-										int[] var15 = new int[var36.localIntCount]; // L: 278
-										String[] var16 = new String[var36.localStringCount]; // L: 279
-
-										for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 280
-											var15[var17] = Interpreter.Interpreter_intStack[var17 + (class14.Interpreter_intStackSize - var36.intArgumentCount)];
-										}
-
-										for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 281
-											var16[var17] = Interpreter.Interpreter_stringStack[var17 + (class295.Interpreter_stringStackSize - var36.stringArgumentCount)];
-										}
-
-										class14.Interpreter_intStackSize -= var36.intArgumentCount; // L: 282
-										class295.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 283
-										ScriptFrame var23 = new ScriptFrame(); // L: 284
-										var23.script = var4; // L: 285
-										var23.pc = var20; // L: 286
-										var23.intLocals = class28.Interpreter_intLocals; // L: 287
-										var23.stringLocals = UserComparator7.Interpreter_stringLocals; // L: 288
-										Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 289
-										var4 = var36; // L: 290
-										var6 = var36.opcodes; // L: 291
-										var7 = var36.intOperands; // L: 292
-										var20 = -1; // L: 293
-										class28.Interpreter_intLocals = var15; // L: 294
-										UserComparator7.Interpreter_stringLocals = var16; // L: 295
-									}
-								}
-							}
-						} catch (Exception var31) { // L: 403
-							var9 = true; // L: 404
-							StringBuilder var27 = new StringBuilder(30); // L: 406
-							var27.append("").append(var4.key).append(" "); // L: 407
-
-							for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 408
-								var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" ");
-							}
-
-							var27.append("").append(var8); // L: 409
-							MilliClock.RunException_sendStackTrace(var27.toString(), var31); // L: 410
-							var30 = false;
-							break label989;
-						}
-					} finally {
-						if (var30) {
-							if (Interpreter.field795) { // L: 414
-								Interpreter.field791 = true; // L: 415
-							}
-
-							while (Interpreter.field797.size() > 0) { // L: 417
-								class92 var19 = (class92)Interpreter.field797.remove(0); // L: 418
-								GrandExchangeEvents.widgetDefaultMenuAction(var19.method2277(), var19.method2279(), var19.method2278(), var19.method2281(), "");
-							}
-
-							if (Interpreter.field791) { // L: 421
-								class14.method191(); // L: 422
-								Interpreter.field791 = false; // L: 423
-								Interpreter.field795 = false; // L: 424
-							}
-
-							if (!var9 && var2 > 0 && var10 >= var2) {
-								MilliClock.RunException_sendStackTrace("Warning: Script " + var4.field928 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
-							}
-
-						}
-					}
-
-					if (Interpreter.field795) {
-						Interpreter.field791 = true;
-					}
-
-					while (Interpreter.field797.size() > 0) {
-						class92 var41 = (class92)Interpreter.field797.remove(0);
-						GrandExchangeEvents.widgetDefaultMenuAction(var41.method2277(), var41.method2279(), var41.method2278(), var41.method2281(), "");
-					}
-
-					if (Interpreter.field791) {
-						class14.method191();
-						Interpreter.field791 = false;
-						Interpreter.field795 = false;
-					}
-
-					if (!var9 && var2 > 0 && var10 >= var2) {
-						MilliClock.RunException_sendStackTrace("Warning: Script " + var4.field928 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
-					}
-
-					return;
-				}
-
-				if (Interpreter.field795) {
-					Interpreter.field791 = true;
-				}
-
-				while (Interpreter.field797.size() > 0) {
-					class92 var34 = (class92)Interpreter.field797.remove(0);
-					GrandExchangeEvents.widgetDefaultMenuAction(var34.method2277(), var34.method2279(), var34.method2278(), var34.method2281(), ""); // L: 419
-				}
-
-				if (Interpreter.field791) {
-					class14.method191();
-					Interpreter.field791 = false;
-					Interpreter.field795 = false;
-				}
-
-				if (!var9 && var2 > 0 && var10 >= var2) { // L: 426
-					MilliClock.RunException_sendStackTrace("Warning: Script " + var4.field928 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 427
-				}
-
-				return;
-			}
-
-			if (Interpreter.field795) {
-				Interpreter.field791 = true;
-			}
-
-			while (Interpreter.field797.size() > 0) {
-				class92 var26 = (class92)Interpreter.field797.remove(0);
-				GrandExchangeEvents.widgetDefaultMenuAction(var26.method2277(), var26.method2279(), var26.method2278(), var26.method2281(), "");
-			}
-
-			if (Interpreter.field791) {
-				class14.method191();
-				Interpreter.field791 = false;
-				Interpreter.field795 = false;
-			}
-
-			if (!var9 && var2 > 0 && var10 >= var2) {
-				MilliClock.RunException_sendStackTrace("Warning: Script " + var4.field928 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
-			}
-
-		}
-	} // L: 126 430
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-1676514787"
-	)
-	public static int method787(int var0) {
-		return class21.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 77
-	}
-
-	@ObfuscatedName("lf")
-	@ObfuscatedSignature(
-		descriptor = "(Ljf;IB)Ljava/lang/String;",
-		garbageValue = "-69"
-	)
-	static String method785(Widget var0, int var1) {
-		int var3 = PendingSpawn.getWidgetFlags(var0); // L: 11905
-		boolean var2 = (var3 >> var1 + 1 & 1) != 0; // L: 11907
-		if (!var2 && var0.onOp == null) { // L: 11909
-			return null;
-		} else {
-			return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; // L: 11910 11911 11913
-		}
-	}
 }
diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java
index c07cc1b4c2..d8df16b2d4 100644
--- a/runescape-client/src/main/java/SpotAnimationDefinition.java
+++ b/runescape-client/src/main/java/SpotAnimationDefinition.java
@@ -4,89 +4,90 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fh")
+@ObfuscatedName("fo")
 @Implements("SpotAnimationDefinition")
 public class SpotAnimationDefinition extends DualNode {
-	@ObfuscatedName("ss")
-	@ObfuscatedGetter(
-		intValue = 1292263875
-	)
-	static int field1761;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("SpotAnimationDefinition_archive")
-	public static AbstractArchive SpotAnimationDefinition_archive;
-	@ObfuscatedName("s")
+	static AbstractArchive SpotAnimationDefinition_archive;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("SpotAnimationDefinition_modelArchive")
+	static AbstractArchive SpotAnimationDefinition_modelArchive;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("SpotAnimationDefinition_cached")
 	static EvictingDualNodeHashTable SpotAnimationDefinition_cached;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("SpotAnimationDefinition_cachedModels")
 	static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -2092405137
+		intValue = 1041298401
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 913574013
+		intValue = -15968409
 	)
 	@Export("archive")
 	int archive;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1089324125
+		intValue = -373650937
 	)
 	@Export("sequence")
 	public int sequence;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("recolorFrom")
 	short[] recolorFrom;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("recolorTo")
 	short[] recolorTo;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("retextureFrom")
 	short[] retextureFrom;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("retextureTo")
 	short[] retextureTo;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1411126425
+		intValue = -2106085717
 	)
 	@Export("widthScale")
 	int widthScale;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1449901039
+		intValue = 153752537
 	)
 	@Export("heightScale")
 	int heightScale;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1987144689
+		intValue = -1577811829
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1401289239
+		intValue = -695708245
 	)
 	@Export("ambient")
 	int ambient;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1433437807
+		intValue = 176094243
 	)
 	@Export("contrast")
 	int contrast;
@@ -105,129 +106,175 @@ public class SpotAnimationDefinition extends DualNode {
 		this.contrast = 0; // L: 27
 	} // L: 29
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-140600950"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "9"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 44
-			if (var2 == 0) { // L: 45
-				return; // L: 48
+			int var2 = var1.readUnsignedByte(); // L: 49
+			if (var2 == 0) { // L: 50
+				return; // L: 53
 			}
 
-			this.decodeNext(var1, var2); // L: 46
+			this.decodeNext(var1, var2); // L: 51
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "2031603320"
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "99"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 51
+		if (var2 == 1) { // L: 56
 			this.archive = var1.readUnsignedShort();
-		} else if (var2 == 2) { // L: 52
+		} else if (var2 == 2) { // L: 57
 			this.sequence = var1.readUnsignedShort();
-		} else if (var2 == 4) { // L: 53
+		} else if (var2 == 4) { // L: 58
 			this.widthScale = var1.readUnsignedShort();
-		} else if (var2 == 5) { // L: 54
+		} else if (var2 == 5) { // L: 59
 			this.heightScale = var1.readUnsignedShort();
-		} else if (var2 == 6) { // L: 55
+		} else if (var2 == 6) { // L: 60
 			this.orientation = var1.readUnsignedShort();
-		} else if (var2 == 7) { // L: 56
+		} else if (var2 == 7) { // L: 61
 			this.ambient = var1.readUnsignedByte();
-		} else if (var2 == 8) { // L: 57
+		} else if (var2 == 8) { // L: 62
 			this.contrast = var1.readUnsignedByte();
 		} else {
 			int var3;
 			int var4;
-			if (var2 == 40) { // L: 58
-				var3 = var1.readUnsignedByte(); // L: 59
-				this.recolorFrom = new short[var3]; // L: 60
-				this.recolorTo = new short[var3]; // L: 61
-
-				for (var4 = 0; var4 < var3; ++var4) { // L: 62
-					this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63
-					this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64
+			if (var2 == 40) { // L: 63
+				var3 = var1.readUnsignedByte();
+				this.recolorFrom = new short[var3];
+				this.recolorTo = new short[var3];
+
+				for (var4 = 0; var4 < var3; ++var4) {
+					this.recolorFrom[var4] = (short)var1.readUnsignedShort();
+					this.recolorTo[var4] = (short)var1.readUnsignedShort();
 				}
-			} else if (var2 == 41) { // L: 67
-				var3 = var1.readUnsignedByte(); // L: 68
-				this.retextureFrom = new short[var3]; // L: 69
-				this.retextureTo = new short[var3]; // L: 70
-
-				for (var4 = 0; var4 < var3; ++var4) { // L: 71
-					this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72
-					this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73
+			} else if (var2 == 41) { // L: 72
+				var3 = var1.readUnsignedByte(); // L: 73
+				this.retextureFrom = new short[var3]; // L: 74
+				this.retextureTo = new short[var3]; // L: 75
+
+				for (var4 = 0; var4 < var3; ++var4) { // L: 76
+					this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 77
+					this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 78
 				}
 			}
 		}
 
-	} // L: 77
+	} // L: 82
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lhl;",
-		garbageValue = "630621817"
+		descriptor = "(IB)Lgo;",
+		garbageValue = "15"
 	)
 	@Export("getModel")
 	public final Model getModel(int var1) {
-		Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 80
-		if (var2 == null) { // L: 81
-			ModelData var3 = ModelData.ModelData_get(class389.SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 82
-			if (var3 == null) { // L: 83
+		Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 85
+		if (var2 == null) { // L: 86
+			ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 87
+			if (var3 == null) { // L: 88
 				return null;
 			}
 
 			int var4;
-			if (this.recolorFrom != null) { // L: 84
-				for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 85
-					var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 86
+			if (this.recolorFrom != null) { // L: 89
+				for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 90
+					var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 91
 				}
 			}
 
-			if (this.retextureFrom != null) { // L: 89
-				for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 90
-					var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 91
+			if (this.retextureFrom != null) { // L: 94
+				for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 95
+					var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 96
 				}
 			}
 
-			var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 94
-			SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 95
+			var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 99
+			SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 100
 		}
 
 		Model var5;
-		if (this.sequence != -1 && var1 != -1) { // L: 98
-			var5 = MouseHandler.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
+		if (this.sequence != -1 && var1 != -1) { // L: 103
+			var5 = UserComparator5.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
 		} else {
-			var5 = var2.toSharedSpotAnimationModel(true); // L: 99
+			var5 = var2.toSharedSpotAnimationModel(true); // L: 104
 		}
 
-		if (this.widthScale != 128 || this.heightScale != 128) { // L: 100
+		if (this.widthScale != 128 || this.heightScale != 128) { // L: 105
 			var5.scale(this.widthScale, this.heightScale, this.widthScale);
 		}
 
-		if (this.orientation != 0) { // L: 101
-			if (this.orientation == 90) { // L: 102
+		if (this.orientation != 0) { // L: 106
+			if (this.orientation == 90) { // L: 107
 				var5.rotateY90Ccw();
 			}
 
-			if (this.orientation == 180) { // L: 103
-				var5.rotateY90Ccw(); // L: 104
-				var5.rotateY90Ccw(); // L: 105
-			}
-
-			if (this.orientation == 270) { // L: 107
-				var5.rotateY90Ccw(); // L: 108
+			if (this.orientation == 180) { // L: 108
 				var5.rotateY90Ccw(); // L: 109
 				var5.rotateY90Ccw(); // L: 110
 			}
+
+			if (this.orientation == 270) { // L: 112
+				var5.rotateY90Ccw(); // L: 113
+				var5.rotateY90Ccw(); // L: 114
+				var5.rotateY90Ccw(); // L: 115
+			}
 		}
 
-		return var5; // L: 113
+		return var5; // L: 118
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lkw;",
+		garbageValue = "672996916"
+	)
+	@Export("PlayerType_values")
+	public static PlayerType[] PlayerType_values() {
+		return new PlayerType[]{PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_jagexModerator, PlayerType.field3795, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal, PlayerType.field3802, PlayerType.field3801, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman}; // L: 22
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(IB)I",
+		garbageValue = "84"
+	)
+	public static int method3362(int var0) {
+		--var0; // L: 64
+		var0 |= var0 >>> 1; // L: 65
+		var0 |= var0 >>> 2; // L: 66
+		var0 |= var0 >>> 4; // L: 67
+		var0 |= var0 >>> 8; // L: 68
+		var0 |= var0 >>> 16; // L: 69
+		return var0 + 1; // L: 70
+	}
+
+	@ObfuscatedName("lc")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;I)Ljm;",
+		garbageValue = "-123837697"
+	)
+	static Widget method3340(Widget var0) {
+		int var1 = Frames.method4149(class363.getWidgetFlags(var0)); // L: 12567
+		if (var1 == 0) { // L: 12568
+			return null;
+		} else {
+			for (int var2 = 0; var2 < var1; ++var2) { // L: 12569
+				var0 = ChatChannel.getWidget(var0.parentId); // L: 12570
+				if (var0 == null) { // L: 12571
+					return null;
+				}
+			}
+
+			return var0; // L: 12573
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java
index 6d1dfad9ea..7715a43e94 100644
--- a/runescape-client/src/main/java/SpriteMask.java
+++ b/runescape-client/src/main/java/SpriteMask.java
@@ -4,152 +4,52 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iw")
+@ObfuscatedName("jr")
 @Implements("SpriteMask")
 public class SpriteMask extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("s")
+	@Export("PcmPlayer_stereo")
+	public static boolean PcmPlayer_stereo;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 136807485
+		intValue = -1287182683
 	)
 	@Export("width")
 	public final int width;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1011180321
+		intValue = 511314941
 	)
 	@Export("height")
 	public final int height;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("xWidths")
 	public final int[] xWidths;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("xStarts")
 	public final int[] xStarts;
 
 	SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) {
-		this.width = var1; // L: 731
-		this.height = var2; // L: 732
-		this.xWidths = var3; // L: 733
-		this.xStarts = var4; // L: 734
-	} // L: 735
+		this.width = var1; // L: 747
+		this.height = var2; // L: 748
+		this.xWidths = var3; // L: 749
+		this.xStarts = var4; // L: 750
+	} // L: 751
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "75"
+		descriptor = "(III)Z",
+		garbageValue = "-520538241"
 	)
 	@Export("contains")
 	public boolean contains(int var1, int var2) {
-		if (var2 >= 0 && var2 < this.xStarts.length) { // L: 738
-			int var3 = this.xStarts[var2]; // L: 739
-			if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 740
+		if (var2 >= 0 && var2 < this.xStarts.length) { // L: 754
+			int var3 = this.xStarts[var2]; // L: 755
+			if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 756
 				return true;
 			}
 		}
 
-		return false; // L: 742
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Ljava/lang/String;",
-		garbageValue = "-23"
-	)
-	static String method4998(int var0) {
-		return "<img=" + var0 + ">"; // L: 18
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "1302166518"
-	)
-	@Export("isCharAlphabetic")
-	public static boolean isCharAlphabetic(char var0) {
-		return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 154
+		return false; // L: 758
 	}
-
-	@ObfuscatedName("gz")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIZI)V",
-		garbageValue = "-404139593"
-	)
-	@Export("setViewportShape")
-	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
-		if (var2 < 1) { // L: 4974
-			var2 = 1;
-		}
-
-		if (var3 < 1) { // L: 4975
-			var3 = 1;
-		}
-
-		int var5 = var3 - 334; // L: 4976
-		int var6;
-		if (var5 < 0) { // L: 4978
-			var6 = Client.field464;
-		} else if (var5 >= 100) { // L: 4979
-			var6 = Client.field550;
-		} else {
-			var6 = (Client.field550 - Client.field464) * var5 / 100 + Client.field464; // L: 4980
-		}
-
-		int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4981
-		int var8;
-		int var9;
-		short var15;
-		if (var7 < Client.field729) { // L: 4982
-			var15 = Client.field729; // L: 4983
-			var6 = var15 * var2 * 334 / (var3 * 512); // L: 4984
-			if (var6 > Client.field600) { // L: 4985
-				var6 = Client.field600; // L: 4986
-				var8 = var3 * var6 * 512 / (var15 * 334); // L: 4987
-				var9 = (var2 - var8) / 2; // L: 4988
-				if (var4) { // L: 4989
-					Rasterizer2D.Rasterizer2D_resetClip(); // L: 4990
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4991
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4992
-				}
-
-				var0 += var9; // L: 4994
-				var2 -= var9 * 2; // L: 4995
-			}
-		} else if (var7 > Client.field730) { // L: 4998
-			var15 = Client.field730; // L: 4999
-			var6 = var15 * var2 * 334 / (var3 * 512); // L: 5000
-			if (var6 < Client.field727) { // L: 5001
-				var6 = Client.field727; // L: 5002
-				var8 = var15 * var2 * 334 / (var6 * 512); // L: 5003
-				var9 = (var3 - var8) / 2; // L: 5004
-				if (var4) { // L: 5005
-					Rasterizer2D.Rasterizer2D_resetClip(); // L: 5006
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 5007
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 5008
-				}
-
-				var1 += var9; // L: 5010
-				var3 -= var9 * 2; // L: 5011
-			}
-		}
-
-		Client.viewportZoom = var3 * var6 / 334; // L: 5014
-		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 5015
-			int[] var14 = new int[9]; // L: 5017
-
-			for (var9 = 0; var9 < var14.length; ++var9) { // L: 5018
-				int var10 = var9 * 32 + 15 + 128; // L: 5019
-				int var11 = var10 * 3 + 600; // L: 5022
-				int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 5025
-				int var12 = class150.method2971(var11, var3); // L: 5026
-				var14[var9] = var12 * var13 >> 16; // L: 5027
-			}
-
-			Scene.Scene_buildVisiblityMap(var14, 500, 800, var2 * 334 / var3, 334); // L: 5029
-		}
-
-		Client.viewportOffsetX = var0; // L: 5032
-		Client.viewportOffsetY = var1; // L: 5033
-		Client.viewportWidth = var2; // L: 5034
-		Client.viewportHeight = var3; // L: 5035
-	} // L: 5036
 }
diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java
index 82d01d296d..f557c25e11 100644
--- a/runescape-client/src/main/java/SpritePixels.java
+++ b/runescape-client/src/main/java/SpritePixels.java
@@ -3,28 +3,28 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ow")
+@ObfuscatedName("pl")
 @Implements("SpritePixels")
 public final class SpritePixels extends Rasterizer2D {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("yOffset")
-	int yOffset;
-	@ObfuscatedName("g")
+	public int yOffset;
+	@ObfuscatedName("s")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("height")
 	public int height;
 
@@ -40,12 +40,12 @@ public SpritePixels(int var1, int var2) {
 		this(new int[var2 * var1], var1, var2); // L: 22
 	} // L: 23
 
-	SpritePixels() {
+	public SpritePixels() {
 	} // L: 19
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "()Low;"
+		descriptor = "()Lpl;"
 	)
 	@Export("mirrorHorizontally")
 	public SpritePixels mirrorHorizontally() {
@@ -64,9 +64,9 @@ public SpritePixels mirrorHorizontally() {
 		return var1; // L: 44
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "()Low;"
+		descriptor = "()Lpl;"
 	)
 	@Export("copyNormalized")
 	public SpritePixels copyNormalized() {
@@ -81,13 +81,13 @@ public SpritePixels copyNormalized() {
 		return var1; // L: 54
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("setRaster")
 	public void setRaster() {
 		Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58
 	} // L: 59
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("normalize")
 	public void normalize() {
 		if (this.subWidth != this.width || this.subHeight != this.height) { // L: 62
@@ -107,7 +107,7 @@ public void normalize() {
 		}
 	} // L: 74
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("pad")
 	public void pad(int var1) {
 		if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77
@@ -149,7 +149,7 @@ public void pad(int var1) {
 		}
 	} // L: 99
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("flipHorizontally")
 	public void flipHorizontally() {
 		int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102
@@ -165,7 +165,7 @@ public void flipHorizontally() {
 		this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108
 	} // L: 109
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("flipVertically")
 	public void flipVertically() {
 		int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112
@@ -181,7 +181,7 @@ public void flipVertically() {
 		this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118
 	} // L: 119
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("outline")
 	public void outline(int var1) {
 		int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122
@@ -209,7 +209,7 @@ public void outline(int var1) {
 		this.pixels = var2; // L: 136
 	} // L: 137
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("shadow")
 	public void shadow(int var1) {
 		for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140
@@ -224,7 +224,7 @@ public void shadow(int var1) {
 
 	} // L: 146
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset; // L: 149
@@ -270,7 +270,7 @@ public void drawAt(int var1, int var2) {
 		}
 	} // L: 182
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("drawTransBgAt")
 	public void drawTransBgAt(int var1, int var2) {
 		var1 += this.xOffset; // L: 203
@@ -316,7 +316,7 @@ public void drawTransBgAt(int var1, int var2) {
 		}
 	} // L: 236
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("drawScaledAt")
 	public void drawScaledAt(int var1, int var2, int var3, int var4) {
 		if (var3 > 0 && var4 > 0) { // L: 267
@@ -381,7 +381,7 @@ public void drawScaledAt(int var1, int var2, int var3, int var4) {
 		}
 	} // L: 310
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("drawTransOverlayAt")
 	public void drawTransOverlayAt(int var1, int var2, int var3, int var4) {
 		if (var3 == 256) { // L: 329
@@ -431,7 +431,7 @@ public void drawTransOverlayAt(int var1, int var2, int var3, int var4) {
 		}
 	} // L: 331 366
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("drawTransAt")
 	public void drawTransAt(int var1, int var2, int var3) {
 		var1 += this.xOffset; // L: 389
@@ -477,7 +477,7 @@ public void drawTransAt(int var1, int var2, int var3) {
 		}
 	} // L: 422
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@Export("drawTransScaledAt")
 	public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) {
 		if (var3 > 0 && var4 > 0) { // L: 441
@@ -542,8 +542,8 @@ public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5)
 		}
 	} // L: 484
 
-	@ObfuscatedName("m")
-	public void method7425(int var1, int var2, int var3) {
+	@ObfuscatedName("q")
+	public void method7809(int var1, int var2, int var3) {
 		var1 += this.xOffset; // L: 507
 		var2 += this.yOffset; // L: 508
 		int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 509
@@ -584,16 +584,16 @@ public void method7425(int var1, int var2, int var3) {
 
 		if (var7 > 0 && var6 > 0) { // L: 538
 			if (var3 == 256) {
-				method7405(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539
+				method7774(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539
 			} else {
-				method7431(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540
+				method7798(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540
 			}
 
 		}
 	} // L: 541
 
-	@ObfuscatedName("h")
-	public void method7407(int var1, int var2, int var3, int var4, int var5) {
+	@ObfuscatedName("i")
+	public void method7776(int var1, int var2, int var3, int var4, int var5) {
 		if (var3 > 0 && var4 > 0) { // L: 582
 			int var6 = this.subWidth; // L: 583
 			int var7 = this.subHeight; // L: 584
@@ -653,16 +653,16 @@ public void method7407(int var1, int var2, int var3, int var4, int var5) {
 			}
 
 			if (var5 == 256) { // L: 624
-				method7408(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6);
+				method7777(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6);
 			} else {
-				method7409(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625
+				method7780(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625
 			}
 
 		}
 	} // L: 626
 
-	@ObfuscatedName("ae")
-	public void method7410(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
+	@ObfuscatedName("ao")
+	public void method7779(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
 		int var9 = var2 < 0 ? -var2 : 0; // L: 675
 		int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 676
 		int var11 = var1 < 0 ? -var1 : 0; // L: 677
@@ -709,7 +709,7 @@ public void method7410(int var1, int var2, int var3, int var4, int var5, int var
 
 	} // L: 700
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@Export("drawRotatedMaskedCenteredAround")
 	public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) {
 		try {
@@ -744,8 +744,8 @@ public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int va
 
 	} // L: 729
 
-	@ObfuscatedName("al")
-	public void method7384(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
+	@ObfuscatedName("an")
+	public void method7807(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
 		try {
 			int var10 = -var3 / 2; // L: 733
 			int var11 = -var4 / 2; // L: 734
@@ -783,13 +783,13 @@ public void method7384(int var1, int var2, int var3, int var4, int var5, int var
 
 	} // L: 759
 
-	@ObfuscatedName("am")
-	public void method7445(int var1, int var2, int var3, int var4) {
-		this.method7414(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762
+	@ObfuscatedName("ax")
+	public void method7781(int var1, int var2, int var3, int var4) {
+		this.method7782(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762
 	} // L: 763
 
-	@ObfuscatedName("ai")
-	void method7414(int var1, int var2, int var3, int var4, int var5, int var6) {
+	@ObfuscatedName("am")
+	void method7782(int var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var6 != 0) { // L: 766
 			var1 -= this.xOffset << 4; // L: 767
 			var2 -= this.yOffset << 4; // L: 768
@@ -1257,7 +1257,7 @@ void method7414(int var1, int var2, int var3, int var4, int var5, int var6) {
 		}
 	} // L: 1076
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@Export("drawScaledWorldmap")
 	public void drawScaledWorldmap(int var1, int var2, int var3, int var4) {
 		if (var3 <= this.width && var4 <= this.height) { // L: 1079
@@ -1380,7 +1380,7 @@ public void drawScaledWorldmap(int var1, int var2, int var3, int var4) {
 		}
 	} // L: 1094 1151
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("Sprite_draw")
 	static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		for (int var8 = -var5; var8 < 0; ++var8) { // L: 185
@@ -1400,7 +1400,7 @@ static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, in
 
 	} // L: 200
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("Sprite_drawTransBg")
 	static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2); // L: 239
@@ -1453,7 +1453,7 @@ static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int v
 
 	} // L: 264
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("Sprite_drawScaled")
 	static void Sprite_drawScaled(int[] var0, int[] 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: 313
@@ -1479,7 +1479,7 @@ static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int va
 
 	} // L: 326
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("Sprite_drawTransOverlay")
 	static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
 		int var11 = 256 - var9; // L: 369
@@ -1505,7 +1505,7 @@ static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3,
 
 	} // L: 386
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@Export("Sprite_drawTransparent")
 	static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
 		int var10 = 256 - var9; // L: 425
@@ -1527,7 +1527,7 @@ static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, i
 
 	} // L: 438
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("Sprite_drawTransScaled")
 	static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) {
 		int var13 = 256 - var12; // L: 487
@@ -1555,8 +1555,8 @@ static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, i
 
 	} // L: 504
 
-	@ObfuscatedName("c")
-	static void method7405(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) {
+	@ObfuscatedName("x")
+	static void method7774(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) {
 		for (var8 = -var10; var8 < 0; ++var8) { // L: 544
 			for (var6 = -var9; var6 < 0; ++var6) { // L: 545
 				var0 = var4[var5++]; // L: 546
@@ -1577,8 +1577,8 @@ static void method7405(int var0, int var1, int var2, int[] var3, int[] var4, int
 
 	} // L: 559
 
-	@ObfuscatedName("f")
-	static void method7431(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) {
+	@ObfuscatedName("z")
+	static void method7798(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) {
 		for (var8 = -var10; var8 < 0; ++var8) { // L: 562
 			for (var6 = -var9; var6 < 0; ++var6) { // L: 563
 				var0 = var4[var5++]; // L: 564
@@ -1601,8 +1601,8 @@ static void method7431(int var0, int var1, int var2, int[] var3, int[] var4, int
 
 	} // L: 579
 
-	@ObfuscatedName("v")
-	static void method7408(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) {
+	@ObfuscatedName("y")
+	static void method7777(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) {
 		for (int var16 = var3; var8 < 0; ++var8) { // L: 629 630
 			var7 = var15 * (var9 >> 16); // L: 631
 
@@ -1628,8 +1628,8 @@ static void method7408(int var0, int var1, int var2, int var3, int[] var4, int[]
 
 	} // L: 648
 
-	@ObfuscatedName("ag")
-	static void method7409(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) {
+	@ObfuscatedName("ah")
+	static void method7780(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) {
 		for (int var17 = var3; var8 < 0; ++var8) { // L: 651 652
 			var7 = var15 * (var9 >> 16); // L: 653
 
diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java
index 8295f9548b..bb8ae13014 100644
--- a/runescape-client/src/main/java/Strings.java
+++ b/runescape-client/src/main/java/Strings.java
@@ -1,38 +1,102 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("jr")
+@ObfuscatedName("kl")
 @Implements("Strings")
 public class Strings {
-	@ObfuscatedName("bd")
-	public static String field3501;
-	@ObfuscatedName("cu")
-	public static String field3446;
-	@ObfuscatedName("jo")
-	public static String field3595;
-	@ObfuscatedName("jq")
-	public static String field3634;
-	@ObfuscatedName("ja")
-	public static String field3597;
+	@ObfuscatedName("bq")
+	public static String field3523;
+	@ObfuscatedName("cz")
+	public static String field3562;
+	@ObfuscatedName("jb")
+	public static String field3747;
+	@ObfuscatedName("jm")
+	public static String field3551;
+	@ObfuscatedName("je")
+	public static String field3749;
 
 	static {
-		field3501 = "Please visit the support page for assistance."; // L: 60
-		field3446 = "Please visit the support page for assistance."; // L: 99
-		field3595 = ""; // L: 284
-		field3634 = "Page has opened in a new window."; // L: 285
-		field3597 = "(Please check your popup blocker.)"; // L: 286
+		field3523 = "Please visit the support page for assistance."; // L: 60
+		field3562 = "Please visit the support page for assistance."; // L: 99
+		field3747 = ""; // L: 284
+		field3551 = "Page has opened in a new window."; // L: 285
+		field3749 = "(Please check your popup blocker.)"; // L: 286
 	} // L: 324
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(B)[Lnt;",
+		garbageValue = "82"
+	)
+	static class369[] method5508() {
+		return new class369[]{class369.field4220, class369.field4216, class369.field4215, class369.field4214}; // L: 16
+	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "504993723"
+	)
+	static int method5510(int var0, Script var1, boolean var2) {
+		Widget var7;
+		if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1221
+			int var4;
+			if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1238
+				var7 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1239
+				var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1240
+				if (var4 >= 1 && var4 <= 10) { // L: 1241
+					class92 var8 = new class92(var4, var7.id, var7.childIndex, var7.itemId); // L: 1244
+					Interpreter.field817.add(var8); // L: 1245
+					return 1; // L: 1246
+				} else {
+					throw new RuntimeException(); // L: 1242
+				}
+			} else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1248
+				IsaacCipher.Interpreter_intStackSize -= 3; // L: 1249
+				int var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1250
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1251
+				int var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 1252
+				if (var5 >= 1 && var5 <= 10) { // L: 1253
+					class92 var6 = new class92(var5, var3, var4, ChatChannel.getWidget(var3).itemId); // L: 1256
+					Interpreter.field817.add(var6); // L: 1257
+					return 1; // L: 1258
+				} else {
+					throw new RuntimeException(); // L: 1254
+				}
+			} else {
+				return 2; // L: 1260
+			}
+		} else if (Interpreter.field815 >= 10) { // L: 1222
+			throw new RuntimeException(); // L: 1223
+		} else {
+			if (var0 >= 2000) { // L: 1226
+				var7 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1227
+			} else {
+				var7 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1229
+			}
+
+			if (var7.onResize == null) { // L: 1230
+				return 0;
+			} else {
+				ScriptEvent var9 = new ScriptEvent(); // L: 1231
+				var9.widget = var7; // L: 1232
+				var9.args = var7.onResize; // L: 1233
+				var9.field1018 = Interpreter.field815 + 1; // L: 1234
+				Client.scriptEvents.addFirst(var9); // L: 1235
+				return 1; // L: 1236
+			}
+		}
+	}
+
+	@ObfuscatedName("ll")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1995982953"
+		garbageValue = "-151275200"
 	)
-	static void method5220() {
-		Messages.Messages_channels.clear(); // L: 54
-		Messages.Messages_hashTable.clear(); // L: 55
-		Messages.Messages_queue.clear(); // L: 56
-		Messages.Messages_count = 0; // L: 57
-	} // L: 58
+	static final void method5509() {
+		Client.field673 = Client.cycleCntr; // L: 12481
+		class121.field1470 = true; // L: 12482
+	} // L: 12483
 }
diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java
index af7320fc82..83c12ebdcb 100644
--- a/runescape-client/src/main/java/StructComposition.java
+++ b/runescape-client/src/main/java/StructComposition.java
@@ -3,24 +3,18 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ft")
+@ObfuscatedName("fp")
 @Implements("StructComposition")
 public class StructComposition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("StructDefinition_archive")
-	static AbstractArchive StructDefinition_archive;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("StructDefinition_cached")
-	public static EvictingDualNodeHashTable StructDefinition_cached;
-	@ObfuscatedName("s")
+	static EvictingDualNodeHashTable StructDefinition_cached;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Loz;"
 	)
 	@Export("params")
 	IterableNodeHashTable params;
@@ -32,19 +26,19 @@ public class StructComposition extends DualNode {
 	StructComposition() {
 	} // L: 16
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-61"
+		descriptor = "(I)V",
+		garbageValue = "-1697114474"
 	)
 	@Export("postDecode")
 	void postDecode() {
 	} // L: 33
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;B)V",
-		garbageValue = "0"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "260928351"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -58,36 +52,102 @@ void decode(Buffer var1) {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;IB)V",
-		garbageValue = "15"
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "76"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 249) {
-			this.params = class13.readStringIntParameters(var1, this.params); // L: 44
+			this.params = Canvas.readStringIntParameters(var1, this.params);
 		}
 
 	} // L: 46
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "-1033236073"
+		garbageValue = "-1808649424"
 	)
 	@Export("getIntParam")
 	public int getIntParam(int var1, int var2) {
-		return NPC.method2251(this.params, var1, var2); // L: 49
+		return class12.method158(this.params, var1, var2); // L: 49
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;B)Ljava/lang/String;",
-		garbageValue = "0"
+		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "-1725182955"
 	)
 	@Export("getStringParam")
 	public String getStringParam(int var1, String var2) {
-		return VarbitComposition.method3205(this.params, var1, var2); // L: 53
+		return Skeleton.method3948(this.params, var1, var2); // L: 53
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-64"
+	)
+	public static void method3444() {
+		class260.midiPcmStream.clear(); // L: 42
+		class260.musicPlayerStatus = 1; // L: 43
+		class124.musicTrackArchive = null; // L: 44
+	} // L: 45
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Z",
+		garbageValue = "2"
+	)
+	public static boolean method3424(int var0) {
+		return var0 >= 0 && var0 < 112 ? KeyHandler.field132[var0] : false; // L: 236 237
 	}
+
+	@ObfuscatedName("lv")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;ZI)V",
+		garbageValue = "488868822"
+	)
+	@Export("findItemDefinitions")
+	static void findItemDefinitions(String var0, boolean var1) {
+		var0 = var0.toLowerCase(); // L: 12615
+		short[] var2 = new short[16]; // L: 12616
+		int var3 = 0; // L: 12617
+
+		for (int var4 = 0; var4 < WorldMapLabelSize.ItemDefinition_fileCount; ++var4) { // L: 12618
+			ItemComposition var9 = UserComparator6.ItemDefinition_get(var4); // L: 12619
+			if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 12620 12621 12622
+				if (var3 >= 250) { // L: 12623
+					GraphicsDefaults.foundItemIdCount = -1; // L: 12624
+					class113.foundItemIds = null; // L: 12625
+					return; // L: 12626
+				}
+
+				if (var3 >= var2.length) { // L: 12628
+					short[] var6 = new short[var2.length * 2]; // L: 12629
+
+					for (int var7 = 0; var7 < var3; ++var7) { // L: 12630
+						var6[var7] = var2[var7];
+					}
+
+					var2 = var6; // L: 12631
+				}
+
+				var2[var3++] = (short)var4; // L: 12633
+			}
+		}
+
+		class113.foundItemIds = var2; // L: 12635
+		class336.foundItemIndex = 0; // L: 12636
+		GraphicsDefaults.foundItemIdCount = var3; // L: 12637
+		String[] var8 = new String[GraphicsDefaults.foundItemIdCount]; // L: 12638
+
+		for (int var5 = 0; var5 < GraphicsDefaults.foundItemIdCount; ++var5) { // L: 12639
+			var8[var5] = UserComparator6.ItemDefinition_get(var2[var5]).name;
+		}
+
+		KeyHandler.method390(var8, class113.foundItemIds); // L: 12640
+	} // L: 12641
 }
diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java
index 79a7128368..079708aefe 100644
--- a/runescape-client/src/main/java/StudioGame.java
+++ b/runescape-client/src/main/java/StudioGame.java
@@ -1,61 +1,62 @@
+import java.util.Date;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("jd")
+@ObfuscatedName("ko")
 @Implements("StudioGame")
 public enum StudioGame implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Lko;"
 	)
 	@Export("runescape")
 	runescape("runescape", "RuneScape", 0),
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Lko;"
 	)
 	@Export("stellardawn")
 	stellardawn("stellardawn", "Stellar Dawn", 1),
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Lko;"
 	)
 	@Export("game3")
 	game3("game3", "Game 3", 2),
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Lko;"
 	)
 	@Export("game4")
 	game4("game4", "Game 4", 3),
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Lko;"
 	)
 	@Export("game5")
 	game5("game5", "Game 5", 4),
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Lko;"
 	)
 	@Export("oldscape")
 	oldscape("oldscape", "RuneScape 2007", 5);
 
-	@ObfuscatedName("mt")
-	@ObfuscatedGetter(
-		intValue = 1344605477
+	@ObfuscatedName("ba")
+	@ObfuscatedSignature(
+		descriptor = "Lkd;"
 	)
-	@Export("menuHeight")
-	static int menuHeight;
-	@ObfuscatedName("e")
+	static GameBuild field3456;
+	@ObfuscatedName("j")
 	@Export("name")
 	public final String name;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -866380781
+		intValue = 2093064869
 	)
 	@Export("id")
 	final int id;
@@ -65,13 +66,202 @@ public enum StudioGame implements MouseWheel {
 		this.id = var5; // L: 22
 	} // L: 23
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id; // L: 26
 	}
+
+	@ObfuscatedName("am")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "1621243431"
+	)
+	static int method5500(int var0, Script var1, boolean var2) {
+		String var3;
+		int var9;
+		if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3056
+			var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3057
+			var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3058
+			Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3059
+			return 1; // L: 3060
+		} else {
+			String var4;
+			if (var0 == ScriptOpcodes.APPEND) { // L: 3062
+				class13.Interpreter_stringStackSize -= 2; // L: 3063
+				var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3064
+				var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3065
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3066
+				return 1; // L: 3067
+			} else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3069
+				var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3070
+				var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3071
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + ByteArrayPool.intToString(var9, true); // L: 3072
+				return 1; // L: 3073
+			} else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3075
+				var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3076
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3077
+				return 1; // L: 3078
+			} else {
+				int var6;
+				int var10;
+				if (var0 == ScriptOpcodes.FROMDATE) { // L: 3080
+					var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3081
+					long var13 = 86400000L * (11745L + (long)var10); // L: 3082
+					Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3083
+					var6 = Interpreter.Interpreter_calendar.get(5); // L: 3084
+					int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3085
+					int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3086
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3087
+					return 1; // L: 3088
+				} else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3090
+					if (var0 == ScriptOpcodes.TOSTRING) { // L: 3098
+						var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3099
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3100
+						return 1; // L: 3101
+					} else if (var0 == ScriptOpcodes.COMPARE) { // L: 3103
+						class13.Interpreter_stringStackSize -= 2; // L: 3104
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class194.method3926(class144.compareStrings(Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1], ScriptFrame.clientLanguage)); // L: 3105
+						return 1; // L: 3106
+					} else {
+						int var5;
+						byte[] var11;
+						Font var12;
+						if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3108
+							var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3109
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 3110
+							var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3111
+							var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3112
+							var11 = class1.archive13.takeFile(var5, 0); // L: 3113
+							var12 = new Font(var11); // L: 3114
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3115
+							return 1; // L: 3116
+						} else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3118
+							var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3119
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 3120
+							var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3121
+							var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3122
+							var11 = class1.archive13.takeFile(var5, 0); // L: 3123
+							var12 = new Font(var11); // L: 3124
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3125
+							return 1; // L: 3126
+						} else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3128
+							class13.Interpreter_stringStackSize -= 2; // L: 3129
+							var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3130
+							var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3131
+							if (Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1) { // L: 3132
+								Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3;
+							} else {
+								Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4; // L: 3133
+							}
+
+							return 1; // L: 3134
+						} else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3136
+							var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3137
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3138
+							return 1; // L: 3139
+						} else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3141
+							var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3142
+							var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3143
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3144
+							return 1; // L: 3145
+						} else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3147
+							var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3148
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = AbstractWorldMapData.isCharPrintable((char)var10) ? 1 : 0; // L: 3149
+							return 1; // L: 3150
+						} else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3152
+							var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3153
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = WorldMapIcon_0.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3154
+							return 1; // L: 3155
+						} else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3157
+							var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3158
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = HealthBarDefinition.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3159
+							return 1; // L: 3160
+						} else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3162
+							var10 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3163
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class277.isDigit((char)var10) ? 1 : 0; // L: 3164
+							return 1; // L: 3165
+						} else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3167
+							var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3168
+							if (var3 != null) { // L: 3169
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.length();
+							} else {
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3170
+							}
+
+							return 1; // L: 3171
+						} else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3173
+							var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3174
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 3175
+							var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3176
+							var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3177
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3178
+							return 1; // L: 3179
+						} else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3181
+							var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3182
+							StringBuilder var15 = new StringBuilder(var3.length()); // L: 3183
+							boolean var16 = false; // L: 3184
+
+							for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3185
+								char var7 = var3.charAt(var6); // L: 3186
+								if (var7 == '<') { // L: 3187
+									var16 = true;
+								} else if (var7 == '>') { // L: 3188
+									var16 = false;
+								} else if (!var16) { // L: 3189
+									var15.append(var7);
+								}
+							}
+
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3191
+							return 1; // L: 3192
+						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3194
+							var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3195
+							var9 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3196
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3197
+							return 1; // L: 3198
+						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3200
+							class13.Interpreter_stringStackSize -= 2; // L: 3201
+							var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3202
+							var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3203
+							var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3204
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3205
+							return 1; // L: 3206
+						} else if (var0 == 4122) { // L: 3208
+							var3 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3209
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3210
+							return 1; // L: 3211
+						} else {
+							return 2; // L: 3213
+						}
+					}
+				} else {
+					class13.Interpreter_stringStackSize -= 2; // L: 3091
+					var3 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3092
+					var4 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3093
+					if (class340.localPlayer.appearance != null && class340.localPlayer.appearance.isFemale) { // L: 3094
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4;
+					} else {
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3; // L: 3095
+					}
+
+					return 1; // L: 3096
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("lo")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;I)Z",
+		garbageValue = "1540402679"
+	)
+	@Export("isComponentHidden")
+	static boolean isComponentHidden(Widget var0) {
+		return var0.isHidden; // L: 12577
+	}
 }
diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java
index 34cf507902..24eaec4448 100644
--- a/runescape-client/src/main/java/Task.java
+++ b/runescape-client/src/main/java/Task.java
@@ -4,31 +4,31 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ev")
+@ObfuscatedName("fk")
 @Implements("Task")
 public class Task {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lev;"
+		descriptor = "Lfk;"
 	)
 	@Export("next")
 	Task next;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("status")
 	public volatile int status;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1160823875
+		intValue = -610240129
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("intArgument")
 	public int intArgument;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("objectArgument")
 	Object objectArgument;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("result")
 	public volatile Object result;
 
diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java
index 5c21b43758..2e15a4b1c7 100644
--- a/runescape-client/src/main/java/TaskHandler.java
+++ b/runescape-client/src/main/java/TaskHandler.java
@@ -7,28 +7,34 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ew")
+@ObfuscatedName("eb")
 @Implements("TaskHandler")
 public class TaskHandler implements Runnable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("javaVendor")
 	public static String javaVendor;
-	@ObfuscatedName("s")
+	@ObfuscatedName("eo")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive12")
+	static Archive archive12;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lev;"
+		descriptor = "Lfk;"
 	)
 	@Export("current")
 	Task current;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lev;"
+		descriptor = "Lfk;"
 	)
 	@Export("task")
 	Task task;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("isClosed")
 	boolean isClosed;
 
@@ -37,11 +43,11 @@ public TaskHandler() {
 		this.task = null; // L: 12
 		this.isClosed = false; // L: 14
 		javaVendor = "Unknown"; // L: 20
-		GrandExchangeOfferAgeComparator.javaVersion = "1.6"; // L: 21
+		NPC.javaVersion = "1.6"; // L: 21
 
 		try {
-			javaVendor = System.getProperty("java.vendor"); // L: 23
-			GrandExchangeOfferAgeComparator.javaVersion = System.getProperty("java.version"); // L: 24
+			javaVendor = System.getProperty("java.vendor");
+			NPC.javaVersion = System.getProperty("java.version");
 		} catch (Exception var2) { // L: 26
 		}
 
@@ -52,10 +58,10 @@ public TaskHandler() {
 		this.thread.start(); // L: 31
 	} // L: 32
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1038367564"
+		descriptor = "(S)V",
+		garbageValue = "-23939"
 	)
 	@Export("close")
 	public final void close() {
@@ -71,48 +77,48 @@ public final void close() {
 
 	} // L: 43
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIILjava/lang/Object;I)Lev;",
-		garbageValue = "-1716880810"
+		descriptor = "(IIILjava/lang/Object;I)Lfk;",
+		garbageValue = "838873650"
 	)
 	@Export("newTask")
 	final Task newTask(int var1, int var2, int var3, Object var4) {
-		Task var5 = new Task();
-		var5.type = var1;
-		var5.intArgument = var2;
-		var5.objectArgument = var4;
-		synchronized(this) {
-			if (this.task != null) {
-				this.task.next = var5;
-				this.task = var5;
+		Task var5 = new Task(); // L: 90
+		var5.type = var1; // L: 91
+		var5.intArgument = var2; // L: 92
+		var5.objectArgument = var4; // L: 93
+		synchronized(this) { // L: 94
+			if (this.task != null) { // L: 95
+				this.task.next = var5; // L: 96
+				this.task = var5; // L: 97
 			} else {
-				this.task = this.current = var5;
+				this.task = this.current = var5; // L: 100
 			}
 
-			this.notify();
+			this.notify(); // L: 102
 			return var5; // L: 104
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;II)Lev;",
-		garbageValue = "-137947903"
+		descriptor = "(Ljava/lang/String;II)Lfk;",
+		garbageValue = "1945864892"
 	)
 	@Export("newSocketTask")
 	public final Task newSocketTask(String var1, int var2) {
-		return this.newTask(1, var2, 0, var1);
+		return this.newTask(1, var2, 0, var1); // L: 108
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Runnable;II)Lev;",
-		garbageValue = "-1680555194"
+		descriptor = "(Ljava/lang/Runnable;II)Lfk;",
+		garbageValue = "-1633812322"
 	)
 	@Export("newThreadTask")
 	public final Task newThreadTask(Runnable var1, int var2) {
-		return this.newTask(2, var2, 0, var1);
+		return this.newTask(2, var2, 0, var1); // L: 112
 	}
 
 	public final void run() {
@@ -151,128 +157,27 @@ public final void run() {
 					var3.setPriority(var1.intArgument); // L: 72
 					var1.result = var3; // L: 73
 				} else if (var5 == 4) { // L: 75
-					var1.result = new DataInputStream(((URL)var1.objectArgument).openStream());
+					var1.result = new DataInputStream(((URL)var1.objectArgument).openStream()); // L: 76
 				}
 
 				var1.status = 1; // L: 78
 			} catch (ThreadDeath var6) { // L: 80
 				throw var6; // L: 81
 			} catch (Throwable var7) { // L: 83
-				var1.status = 2;
-			}
-		}
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lff;",
-		garbageValue = "-1590739193"
-	)
-	@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 = DirectByteArrayCopier.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 (!BuddyRankComparator.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 = Buffer.getParamDefinition((int)var4.key); // L: 110
-						if (var5.autoDisable) { // L: 111
-							var4.remove();
-						} else {
-							var6 = true; // L: 112
-						}
-					}
-
-					if (!var6) {
-						var1.params = null; // L: 114
-					}
-				}
+				var1.status = 2; // L: 84
 			}
-
-			ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117
-			return var1; // L: 118
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)I",
-		garbageValue = "1243234471"
+		descriptor = "([BI)[B",
+		garbageValue = "-1643511224"
 	)
-	public static int method2881(CharSequence var0) {
-		return AttackOption.method2304(var0, 10, true); // L: 76
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;II)Loe;",
-		garbageValue = "1045837880"
-	)
-	public static IndexedSprite method2882(AbstractArchive var0, int var1) {
-		byte[] var3 = var0.takeFileFlat(var1); // L: 129
-		boolean var2;
-		if (var3 == null) { // L: 130
-			var2 = false; // L: 131
-		} else {
-			Script.SpriteBuffer_decode(var3); // L: 134
-			var2 = true; // L: 135
-		}
-
-		return !var2 ? null : WorldMapArea.method3654(); // L: 137 138
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(I)[I",
-		garbageValue = "-753625264"
-	)
-	public static int[] method2879() {
-		int[] var0 = new int[KeyHandler.field135]; // L: 242
-
-		for (int var1 = 0; var1 < KeyHandler.field135; ++var1) { // L: 243
-			var0[var1] = KeyHandler.field127[var1]; // L: 244
-		}
-
-		return var0; // L: 246
+	public static byte[] method3047(byte[] var0) {
+		int var1 = var0.length; // L: 22
+		byte[] var2 = new byte[var1]; // L: 23
+		System.arraycopy(var0, 0, var2, 0, var1); // L: 24
+		return var2; // L: 25
 	}
 }
diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java
index bfb918162d..7c80de8bd1 100644
--- a/runescape-client/src/main/java/Texture.java
+++ b/runescape-client/src/main/java/Texture.java
@@ -3,46 +3,46 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gt")
+@ObfuscatedName("gs")
 @Implements("Texture")
 public class Texture extends Node {
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("Texture_animatedPixels")
 	static int[] Texture_animatedPixels;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("averageRGB")
 	int averageRGB;
-	@ObfuscatedName("g")
-	boolean field2297;
-	@ObfuscatedName("e")
+	@ObfuscatedName("s")
+	boolean field2206;
+	@ObfuscatedName("j")
 	@Export("fileIds")
 	int[] fileIds;
-	@ObfuscatedName("p")
-	int[] field2301;
-	@ObfuscatedName("j")
-	int[] field2302;
-	@ObfuscatedName("b")
-	int[] field2303;
-	@ObfuscatedName("x")
+	@ObfuscatedName("w")
+	int[] field2208;
+	@ObfuscatedName("n")
+	int[] field2209;
+	@ObfuscatedName("r")
+	int[] field2201;
+	@ObfuscatedName("o")
 	@Export("animationDirection")
 	int animationDirection;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("animationSpeed")
 	int animationSpeed;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("pixels")
 	int[] pixels;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("isLoaded")
 	boolean isLoaded;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	Texture(Buffer var1) {
 		this.isLoaded = false; // L: 25
 		this.averageRGB = var1.readUnsignedShort(); // L: 29
-		this.field2297 = var1.readUnsignedByte() == 1; // L: 30
+		this.field2206 = var1.readUnsignedByte() == 1; // L: 30
 		int var2 = var1.readUnsignedByte(); // L: 31
 		if (var2 >= 1 && var2 <= 4) { // L: 32
 			this.fileIds = new int[var2]; // L: 35
@@ -53,25 +53,25 @@ public class Texture extends Node {
 			}
 
 			if (var2 > 1) { // L: 37
-				this.field2301 = new int[var2 - 1]; // L: 38
+				this.field2208 = new int[var2 - 1]; // L: 38
 
 				for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39
-					this.field2301[var3] = var1.readUnsignedByte();
+					this.field2208[var3] = var1.readUnsignedByte();
 				}
 			}
 
 			if (var2 > 1) { // L: 41
-				this.field2302 = new int[var2 - 1]; // L: 42
+				this.field2209 = new int[var2 - 1]; // L: 42
 
 				for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43
-					this.field2302[var3] = var1.readUnsignedByte();
+					this.field2209[var3] = var1.readUnsignedByte();
 				}
 			}
 
-			this.field2303 = new int[var2]; // L: 45
+			this.field2201 = new int[var2]; // L: 45
 
 			for (var3 = 0; var3 < var2; ++var3) { // L: 46
-				this.field2303[var3] = var1.readInt();
+				this.field2201[var3] = var1.readInt();
 			}
 
 			this.animationDirection = var1.readUnsignedByte(); // L: 47
@@ -82,9 +82,9 @@ public class Texture extends Node {
 		}
 	} // L: 50
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(DILko;)Z"
+		descriptor = "(DILku;)Z"
 	)
 	@Export("load")
 	boolean load(double var1, int var3, AbstractArchive var4) {
@@ -99,11 +99,11 @@ boolean load(double var1, int var3, AbstractArchive var4) {
 		this.pixels = new int[var5]; // L: 57
 
 		for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58
-			IndexedSprite var7 = TaskHandler.method2882(var4, this.fileIds[var6]); // L: 59
+			IndexedSprite var7 = VarbitComposition.method3396(var4, this.fileIds[var6]); // L: 59
 			var7.normalize(); // L: 60
 			byte[] var8 = var7.pixels; // L: 61
 			int[] var9 = var7.palette; // L: 62
-			int var10 = this.field2303[var6]; // L: 63
+			int var10 = this.field2201[var6]; // L: 63
 			if ((var10 & -16777216) == 16777216) { // L: 64
 			}
 
@@ -134,7 +134,7 @@ boolean load(double var1, int var3, AbstractArchive var4) {
 			if (var6 == 0) { // L: 79
 				var11 = 0;
 			} else {
-				var11 = this.field2301[var6 - 1]; // L: 80
+				var11 = this.field2208[var6 - 1]; // L: 80
 			}
 
 			if (var11 == 0) { // L: 81
@@ -178,13 +178,13 @@ boolean load(double var1, int var3, AbstractArchive var4) {
 		return true; // L: 105
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("reset")
 	void reset() {
 		this.pixels = null; // L: 109
 	} // L: 110
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("animate")
 	void animate(int var1) {
 		if (this.pixels != null) { // L: 113
diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java
index df7eea3683..9cf0c0b552 100644
--- a/runescape-client/src/main/java/TextureLoader.java
+++ b/runescape-client/src/main/java/TextureLoader.java
@@ -3,36 +3,36 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ht")
+@ObfuscatedName("hj")
 @Implements("TextureLoader")
 public interface TextureLoader {
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(II)[I",
-		garbageValue = "-1224332246"
+		descriptor = "(IB)[I",
+		garbageValue = "38"
 	)
 	@Export("getTexturePixels")
 	int[] getTexturePixels(int var1);
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "1611848046"
+		garbageValue = "-1608258076"
 	)
 	@Export("getAverageTextureRGB")
 	int getAverageTextureRGB(int var1);
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-2069406256"
+		garbageValue = "-1579340371"
 	)
-	boolean vmethod4636(int var1);
+	boolean vmethod4324(int var1);
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "-40"
+		descriptor = "(II)Z",
+		garbageValue = "-1722756795"
 	)
 	@Export("isLowDetail")
 	boolean isLowDetail(int var1);
diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java
index 1687053644..f5838ab787 100644
--- a/runescape-client/src/main/java/TextureProvider.java
+++ b/runescape-client/src/main/java/TextureProvider.java
@@ -4,66 +4,51 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hr")
+@ObfuscatedName("gr")
 @Implements("TextureProvider")
 public class TextureProvider implements TextureLoader {
-	@ObfuscatedName("sp")
-	@ObfuscatedGetter(
-		intValue = -2090037953
-	)
-	static int field2484;
-	@ObfuscatedName("bj")
-	@ObfuscatedGetter(
-		intValue = -665510381
-	)
-	static int field2483;
-	@ObfuscatedName("fg")
-	@ObfuscatedGetter(
-		intValue = 1409941445
-	)
-	static int field2485;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "[Lgt;"
+		descriptor = "[Lgs;"
 	)
 	@Export("textures")
 	Texture[] textures;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lkn;"
+		descriptor = "Llh;"
 	)
 	@Export("deque")
 	NodeDeque deque;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 758475413
+		intValue = -966807461
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1477381643
+		intValue = 1967307723
 	)
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("brightness")
 	double brightness;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -274056047
+		intValue = -603237325
 	)
 	@Export("textureSize")
 	int textureSize;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("archive")
 	AbstractArchive archive;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lko;Lko;IDI)V"
+		descriptor = "(Lku;Lku;IDI)V"
 	)
 	public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) {
 		this.deque = new NodeDeque(); // L: 9
@@ -86,10 +71,10 @@ public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, dou
 
 	} // L: 29
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1152969240"
+		descriptor = "(B)I",
+		garbageValue = "-48"
 	)
 	@Export("getLoadedPercentage")
 	public int getLoadedPercentage() {
@@ -105,7 +90,7 @@ public int getLoadedPercentage() {
 
 				for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43
 					int var8 = var6[var7]; // L: 44
-					if (this.archive.method5359(var8)) { // L: 46
+					if (this.archive.method5595(var8)) { // L: 46
 						++var2; // L: 47
 					}
 				}
@@ -119,17 +104,17 @@ public int getLoadedPercentage() {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("setBrightness")
 	public void setBrightness(double var1) {
 		this.brightness = var1; // L: 60
 		this.clear(); // L: 61
 	} // L: 62
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(II)[I",
-		garbageValue = "-1224332246"
+		descriptor = "(IB)[I",
+		garbageValue = "38"
 	)
 	@Export("getTexturePixels")
 	public int[] getTexturePixels(int var1) {
@@ -137,12 +122,12 @@ public int[] getTexturePixels(int var1) {
 		if (var2 != null) { // L: 66
 			if (var2.pixels != null) { // L: 67
 				this.deque.addLast(var2); // L: 68
-				var2.isLoaded = true;
+				var2.isLoaded = true; // L: 69
 				return var2.pixels; // L: 70
 			}
 
 			boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); // L: 72
-			if (var3) {
+			if (var3) { // L: 73
 				if (this.remaining == 0) { // L: 74
 					Texture var4 = (Texture)this.deque.removeFirst(); // L: 75
 					var4.reset(); // L: 76
@@ -159,39 +144,39 @@ public int[] getTexturePixels(int var1) {
 		return null; // L: 84
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "1611848046"
+		garbageValue = "-1608258076"
 	)
 	@Export("getAverageTextureRGB")
 	public int getAverageTextureRGB(int var1) {
 		return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-2069406256"
+		garbageValue = "-1579340371"
 	)
-	public boolean vmethod4636(int var1) {
-		return this.textures[var1].field2297; // L: 93
+	public boolean vmethod4324(int var1) {
+		return this.textures[var1].field2206; // L: 93
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "-40"
+		descriptor = "(II)Z",
+		garbageValue = "-1722756795"
 	)
 	@Export("isLowDetail")
 	public boolean isLowDetail(int var1) {
 		return this.textureSize == 64; // L: 97
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1198154023"
+		descriptor = "(B)V",
+		garbageValue = "-37"
 	)
 	@Export("clear")
 	public void clear() {
@@ -205,10 +190,10 @@ public void clear() {
 		this.remaining = this.capacity; // L: 105
 	} // L: 106
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1882737028"
+		garbageValue = "1204074801"
 	)
 	@Export("animate")
 	public void animate(int var1) {
@@ -222,28 +207,17 @@ public void animate(int var1) {
 
 	} // L: 116
 
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "691023911"
-	)
-	public static int method4518(int var0) {
-		long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 69
-		int var1 = (int)(var2 >>> 7 & 127L); // L: 71
-		return var1; // L: 73
-	}
-
-	@ObfuscatedName("kv")
+	@ObfuscatedName("lk")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-19"
+		descriptor = "(IB)V",
+		garbageValue = "-28"
 	)
-	@Export("FriendSystem_invalidateIgnoreds")
-	static final void FriendSystem_invalidateIgnoreds() {
-		HealthBar.method2242(); // L: 11769
-		if (AbstractArchive.friendsChat != null) { // L: 11770
-			AbstractArchive.friendsChat.invalidateIgnoreds(); // L: 11771
+	static void method4185(int var0) {
+		for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 12553
+			if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 12554
+				var1.remove(); // L: 12555
+			}
 		}
 
-	} // L: 11773
+	} // L: 12558
 }
diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java
index 36d1aef66a..30f7b7575d 100644
--- a/runescape-client/src/main/java/Tile.java
+++ b/runescape-client/src/main/java/Tile.java
@@ -4,129 +4,129 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hm")
+@ObfuscatedName("gb")
 @Implements("Tile")
 public final class Tile extends Node {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1187368655
+		intValue = -1781341961
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1125314613
+		intValue = 263119953
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1288343165
+		intValue = 865601687
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -2016823625
+		intValue = -440521021
 	)
 	@Export("originalPlane")
 	int originalPlane;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lhg;"
+		descriptor = "Lgk;"
 	)
 	@Export("paint")
 	SceneTilePaint paint;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lgc;"
 	)
 	@Export("model")
 	SceneTileModel model;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lhb;"
+		descriptor = "Lhg;"
 	)
 	@Export("boundaryObject")
 	BoundaryObject boundaryObject;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lhn;"
+		descriptor = "Lhp;"
 	)
 	@Export("wallDecoration")
 	WallDecoration wallDecoration;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lgq;"
+		descriptor = "Lgx;"
 	)
 	@Export("floorDecoration")
 	FloorDecoration floorDecoration;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lgy;"
+		descriptor = "Lgw;"
 	)
 	@Export("itemLayer")
 	ItemLayer itemLayer;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -2026350351
+		intValue = 90618831
 	)
 	@Export("gameObjectsCount")
 	int gameObjectsCount;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "[Lhv;"
+		descriptor = "[Lhl;"
 	)
 	@Export("gameObjects")
 	GameObject[] gameObjects;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("gameObjectEdgeMasks")
 	int[] gameObjectEdgeMasks;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1565672135
+		intValue = -1586130785
 	)
 	@Export("gameObjectsEdgeMask")
 	int gameObjectsEdgeMask;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 871362815
+		intValue = -540503095
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("drawPrimary")
 	boolean drawPrimary;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("drawSecondary")
 	boolean drawSecondary;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@Export("drawGameObjects")
 	boolean drawGameObjects;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 46156027
+		intValue = 600140409
 	)
 	@Export("drawGameObjectEdges")
 	int drawGameObjectEdges;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1657117369
+		intValue = -163800571
 	)
-	int field2328;
-	@ObfuscatedName("r")
+	int field2246;
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1842034825
+		intValue = 248569123
 	)
-	int field2340;
-	@ObfuscatedName("m")
+	int field2247;
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 72830829
+		intValue = 1179396961
 	)
-	int field2334;
-	@ObfuscatedName("c")
+	int field2236;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Lhm;"
+		descriptor = "Lgb;"
 	)
 	@Export("linkedBelowTile")
 	Tile linkedBelowTile;
@@ -140,27 +140,61 @@ public final class Tile extends Node {
 		this.y = var3; // L: 33
 	} // L: 34
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lck;B)V",
-		garbageValue = "63"
-	)
-	@Export("runScriptEvent")
-	public static void runScriptEvent(ScriptEvent var0) {
-		SoundSystem.runScript(var0, 500000, 475000); // L: 110
-	} // L: 111
+		descriptor = "(IIB)V",
+		garbageValue = "-68"
+	)
+	public static void method3843(int var0, int var1) {
+		VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 48
+		VarbitComposition var2;
+		if (var3 != null) { // L: 49
+			var2 = var3; // L: 50
+		} else {
+			byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 53
+			var3 = new VarbitComposition(); // L: 54
+			if (var4 != null) { // L: 55
+				var3.decode(new Buffer(var4));
+			}
+
+			VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56
+			var2 = var3; // L: 57
+		}
+
+		int var8 = var2.baseVar; // L: 60
+		int var5 = var2.startBit; // L: 61
+		int var6 = var2.endBit; // L: 62
+		int var7 = Varps.Varps_masks[var6 - var5]; // L: 63
+		if (var1 < 0 || var1 > var7) { // L: 64
+			var1 = 0;
+		}
+
+		var7 <<= var5; // L: 65
+		Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 66
+	} // L: 67
 
 	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-839277763"
-	)
-	public static int method4199(int var0) {
-		var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 39
-		var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 40
-		var0 = var0 + (var0 >>> 4) & 252645135; // L: 41
-		var0 += var0 >>> 8; // L: 42
-		var0 += var0 >>> 16; // L: 43
-		return var0 & 255; // L: 44
-	}
+		descriptor = "(Ljava/lang/Float;Ljava/lang/Float;B)V",
+		garbageValue = "-1"
+	)
+	static void method3844(Float var0, Float var1) {
+		var1 = 1.0F - var1; // L: 336
+		if (var0 < 0.0F) { // L: 337
+			var0 = 0.0F;
+		}
+
+		if (var1 < 0.0F) { // L: 338
+			var1 = 0.0F;
+		}
+
+		if (var0 > 1.0F || var1 > 1.0F) { // L: 339
+			float var2 = (float)((double)(var0 * (var0 - 2.0F + var1)) + (double)var1 * ((double)var1 - 2.0D) + 1.0D); // L: 340
+			if (class112.field1361 + var2 > 0.0F) { // L: 341
+				HorizontalAlignment.method3294(var0, var1); // L: 342
+			}
+		}
+
+		var1 = 1.0F - var1; // L: 345
+	} // L: 346
 }
diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java
index 8afebd40b8..fdf6dfd6d9 100644
--- a/runescape-client/src/main/java/TileItem.java
+++ b/runescape-client/src/main/java/TileItem.java
@@ -3,23 +3,28 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("cu")
+@ObfuscatedName("cz")
 @Implements("TileItem")
 public final class TileItem extends Renderable {
-	@ObfuscatedName("b")
-	@Export("Tiles_hue")
-	static int[] Tiles_hue;
-	@ObfuscatedName("i")
+	@ObfuscatedName("gk")
+	@ObfuscatedGetter(
+		intValue = -1033887581
+	)
+	@Export("baseY")
+	static int baseY;
+	@ObfuscatedName("hw")
+	@Export("regionLandArchives")
+	static byte[][] regionLandArchives;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1808004397
+		intValue = -1624584431
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 86288183
+		intValue = -763742907
 	)
 	@Export("quantity")
 	int quantity;
@@ -27,163 +32,23 @@ public final class TileItem extends Renderable {
 	TileItem() {
 	} // L: 11
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lhl;",
-		garbageValue = "461766541"
+		descriptor = "(I)Lgo;",
+		garbageValue = "202861607"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		return TaskHandler.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(IS)Z",
-		garbageValue = "26741"
-	)
-	public static boolean method2316(int var0) {
-		return (var0 >> 29 & 1) != 0; // L: 29
-	}
-
-	@ObfuscatedName("ah")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZS)I",
-		garbageValue = "32102"
-	)
-	static int method2309(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == ScriptOpcodes.OC_NAME) { // L: 3220
-			var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3221
-			Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = TaskHandler.ItemDefinition_get(var3).name; // L: 3222
-			return 1; // L: 3223
-		} else {
-			int var4;
-			ItemComposition var5;
-			if (var0 == ScriptOpcodes.OC_OP) { // L: 3225
-				class14.Interpreter_intStackSize -= 2; // L: 3226
-				var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3227
-				var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3228
-				var5 = TaskHandler.ItemDefinition_get(var3); // L: 3229
-				if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3230
-				} else {
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3231
-				}
-
-				return 1; // L: 3232
-			} else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3234
-				class14.Interpreter_intStackSize -= 2; // L: 3235
-				var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3236
-				var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3237
-				var5 = TaskHandler.ItemDefinition_get(var3); // L: 3238
-				if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3239
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
-				} else {
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3240
-				}
-
-				return 1; // L: 3241
-			} else if (var0 == ScriptOpcodes.OC_COST) { // L: 3243
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3244
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = TaskHandler.ItemDefinition_get(var3).price; // L: 3245
-				return 1; // L: 3246
-			} else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3248
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3249
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = TaskHandler.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3250
-				return 1; // L: 3251
-			} else {
-				ItemComposition var7;
-				if (var0 == ScriptOpcodes.OC_CERT) { // L: 3253
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3254
-					var7 = TaskHandler.ItemDefinition_get(var3); // L: 3255
-					if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3256
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.note;
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 3257
-					}
-
-					return 1; // L: 3258
-				} else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3260
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3261
-					var7 = TaskHandler.ItemDefinition_get(var3); // L: 3262
-					if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3263
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.note;
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 3264
-					}
-
-					return 1; // L: 3265
-				} else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3267
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3268
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = TaskHandler.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3269
-					return 1; // L: 3270
-				} else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3272
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3273
-					var7 = TaskHandler.ItemDefinition_get(var3); // L: 3274
-					if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3275
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.placeholder;
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 3276
-					}
-
-					return 1; // L: 3277
-				} else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3279
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3280
-					var7 = TaskHandler.ItemDefinition_get(var3); // L: 3281
-					if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3282
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.placeholder;
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 3283
-					}
-
-					return 1; // L: 3284
-				} else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3286
-					String var6 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3287
-					var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3288
-					KeyHandler.findItemDefinitions(var6, var4 == 1); // L: 3289
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Skeleton.foundItemIdCount; // L: 3290
-					return 1; // L: 3291
-				} else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3293
-					if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3298
-						ClanSettings.foundItemIndex = 0; // L: 3299
-						return 1; // L: 3300
-					} else if (var0 == 4213) { // L: 3302
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3303
-						var4 = TaskHandler.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3304
-						if (var4 == -1) { // L: 3305
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4; // L: 3306
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4 + 1; // L: 3309
-						}
-
-						return 1; // L: 3311
-					} else {
-						return 2; // L: 3313
-					}
-				} else {
-					if (Language.foundItemIds != null && ClanSettings.foundItemIndex < Skeleton.foundItemIdCount) { // L: 3294
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Language.foundItemIds[++ClanSettings.foundItemIndex - 1] & '\uffff'; // L: 3295
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1;
-					}
-
-					return 1; // L: 3296
-				}
-			}
-		}
+		return UserComparator6.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14
 	}
 
-	@ObfuscatedName("kq")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-120"
+		descriptor = "(Lku;Lku;B)V",
+		garbageValue = "37"
 	)
-	static final void method2315() {
-		for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11776
-			Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11777
-			var1.clearIsInFriendsChat(); // L: 11778
-		}
-
-	} // L: 11780
+	public static void method2368(AbstractArchive var0, AbstractArchive var1) {
+		SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; // L: 32
+		SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33
+	} // L: 34
 }
diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java
index e7d5874403..789db42b44 100644
--- a/runescape-client/src/main/java/Tiles.java
+++ b/runescape-client/src/main/java/Tiles.java
@@ -4,105 +4,111 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bb")
+@ObfuscatedName("bk")
 @Implements("Tiles")
 public final class Tiles {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("Tiles_heights")
 	static int[][][] Tiles_heights;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("Tiles_renderFlags")
 	static byte[][][] Tiles_renderFlags;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -543574297
+		intValue = -197978705
 	)
 	@Export("Tiles_minPlane")
 	static int Tiles_minPlane;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("Tiles_underlays")
 	static byte[][][] Tiles_underlays;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("Tiles_overlays")
 	static byte[][][] Tiles_overlays;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("Tiles_shapes")
 	static byte[][][] Tiles_shapes;
-	@ObfuscatedName("e")
-	static byte[][][] field969;
-	@ObfuscatedName("y")
+	@ObfuscatedName("r")
+	@Export("Tiles_hue")
+	static int[] Tiles_hue;
+	@ObfuscatedName("v")
 	@Export("Tiles_lightness")
 	static int[] Tiles_lightness;
+	@ObfuscatedName("k")
+	static final int[] field969;
+	@ObfuscatedName("f")
+	static final int[] field970;
 	@ObfuscatedName("l")
-	static int[][][] field962;
+	static final int[] field976;
 	@ObfuscatedName("q")
-	static final int[] field964;
-	@ObfuscatedName("d")
-	static final int[] field967;
-	@ObfuscatedName("r")
 	static final int[] field966;
-	@ObfuscatedName("m")
-	static final int[] field960;
-	@ObfuscatedName("c")
-	static final int[] field957;
-	@ObfuscatedName("f")
-	static final int[] field970;
-	@ObfuscatedName("h")
+	@ObfuscatedName("x")
+	static final int[] field973;
+	@ObfuscatedName("z")
+	static final int[] field974;
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 172929931
+		intValue = -870044793
 	)
 	@Export("rndHue")
 	static int rndHue;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1118962133
+		intValue = 1761339733
 	)
 	@Export("rndLightness")
 	static int rndLightness;
-	@ObfuscatedName("bv")
-	@Export("otp")
-	static String otp;
+	@ObfuscatedName("ho")
+	@Export("regionMapArchiveIds")
+	static int[] regionMapArchiveIds;
 
 	static {
 		Tiles_heights = new int[4][105][105]; // L: 16
 		Tiles_renderFlags = new byte[4][104][104]; // L: 17
 		Tiles_minPlane = 99; // L: 18
-		field964 = new int[]{1, 2, 4, 8}; // L: 34
-		field967 = new int[]{16, 32, 64, 128}; // L: 35
-		field966 = new int[]{1, 0, -1, 0}; // L: 36
-		field960 = new int[]{0, -1, 0, 1}; // L: 37
-		field957 = new int[]{1, -1, -1, 1}; // L: 38
-		field970 = new int[]{-1, -1, 1, 1}; // L: 39
+		field969 = new int[]{1, 2, 4, 8}; // L: 34
+		field970 = new int[]{16, 32, 64, 128}; // L: 35
+		field976 = new int[]{1, 0, -1, 0}; // L: 36
+		field966 = new int[]{0, -1, 0, 1}; // L: 37
+		field973 = new int[]{1, -1, -1, 1}; // L: 38
+		field974 = new int[]{-1, -1, 1, 1}; // L: 39
 		rndHue = (int)(Math.random() * 17.0D) - 8; // L: 40
 		rndLightness = (int)(Math.random() * 33.0D) - 16; // L: 41
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("jd")
 	@ObfuscatedSignature(
-		descriptor = "(IS)Z",
-		garbageValue = "151"
+		descriptor = "(III)Ljava/lang/String;",
+		garbageValue = "1455768075"
 	)
-	public static boolean method2045(int var0) {
-		return (var0 >> 30 & 1) != 0; // L: 33
+	static final String method2108(int var0, int var1) {
+		int var2 = var1 - var0; // L: 10359
+		if (var2 < -9) { // L: 10360
+			return UserComparator5.colorStartTag(16711680);
+		} else if (var2 < -6) { // L: 10361
+			return UserComparator5.colorStartTag(16723968);
+		} else if (var2 < -3) { // L: 10362
+			return UserComparator5.colorStartTag(16740352);
+		} else if (var2 < 0) { // L: 10363
+			return UserComparator5.colorStartTag(16756736);
+		} else if (var2 > 9) { // L: 10364
+			return UserComparator5.colorStartTag(65280);
+		} else if (var2 > 6) { // L: 10365
+			return UserComparator5.colorStartTag(4259584);
+		} else if (var2 > 3) { // L: 10366
+			return UserComparator5.colorStartTag(8453888);
+		} else {
+			return var2 > 0 ? UserComparator5.colorStartTag(12648192) : UserComparator5.colorStartTag(16776960); // L: 10367 10368
+		}
 	}
 
-	@ObfuscatedName("ic")
+	@ObfuscatedName("je")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Ljava/lang/String;",
-		garbageValue = "-98"
+		descriptor = "(I)Z",
+		garbageValue = "1582084757"
 	)
-	@Export("formatItemStacks")
-	static final String formatItemStacks(int var0) {
-		String var1 = Integer.toString(var0); // L: 10199
-
-		for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 10200
-			var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 10201
-		}
-
-		if (var1.length() > 9) { // L: 10203
-			return " " + MouseHandler.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
-		} else {
-			return var1.length() > 6 ? " " + MouseHandler.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + MouseHandler.colorStartTag(16776960) + var1 + "</col>"; // L: 10204 10205
-		}
+	@Export("getTapToDrop")
+	static boolean getTapToDrop() {
+		return Client.tapToDrop; // L: 11372
 	}
 }
diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java
index 980f97a95d..7cbec7b2ff 100644
--- a/runescape-client/src/main/java/Timer.java
+++ b/runescape-client/src/main/java/Timer.java
@@ -4,149 +4,182 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lo")
+@ObfuscatedName("lg")
 @Implements("Timer")
 public class Timer {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = 4485476439573351559L
+		longValue = -887996437388493325L
 	)
-	long field3896;
-	@ObfuscatedName("w")
+	long field4041;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		longValue = 6376917815787743615L
+		longValue = -5378491660972395407L
 	)
-	long field3895;
-	@ObfuscatedName("s")
-	public boolean field3900;
-	@ObfuscatedName("a")
+	long field4048;
+	@ObfuscatedName("p")
+	public boolean field4043;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = 357962707005069125L
+		longValue = 462489706516465413L
 	)
-	long field3897;
-	@ObfuscatedName("o")
+	long field4044;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		longValue = -7413813924228279315L
+		longValue = 2942582294320251895L
 	)
-	long field3898;
-	@ObfuscatedName("g")
+	long field4045;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		longValue = -3703343557375834617L
+		longValue = -7148108535853774599L
 	)
-	long field3894;
-	@ObfuscatedName("e")
+	long field4050;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1540289443
+		intValue = 271135193
 	)
-	int field3899;
-	@ObfuscatedName("p")
+	int field4046;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 407913171
+		intValue = -664442429
 	)
-	int field3901;
-	@ObfuscatedName("j")
+	int field4047;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1614050671
+		intValue = -615508399
 	)
-	int field3902;
-	@ObfuscatedName("b")
+	int field4049;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -18152441
+		intValue = 1914912277
 	)
-	int field3903;
+	int field4042;
 
 	public Timer() {
-		this.field3896 = -1L; // L: 7
-		this.field3895 = -1L; // L: 8
-		this.field3900 = false; // L: 9
-		this.field3897 = 0L; // L: 10
-		this.field3898 = 0L; // L: 11
-		this.field3894 = 0L; // L: 12
-		this.field3899 = 0; // L: 13
-		this.field3901 = 0; // L: 14
-		this.field3902 = 0; // L: 15
-		this.field3903 = 0; // L: 16
+		this.field4041 = -1L; // L: 7
+		this.field4048 = -1L; // L: 8
+		this.field4043 = false; // L: 9
+		this.field4044 = 0L; // L: 10
+		this.field4045 = 0L; // L: 11
+		this.field4050 = 0L; // L: 12
+		this.field4046 = 0; // L: 13
+		this.field4047 = 0; // L: 14
+		this.field4049 = 0; // L: 15
+		this.field4042 = 0; // L: 16
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "65280"
+		garbageValue = "59649257"
 	)
-	public void method5972() {
-		this.field3896 = class111.method2516(); // L: 19
+	public void method6253() {
+		this.field4041 = Ignored.method6459(); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1321149777"
+		garbageValue = "511000597"
 	)
-	public void method5978() {
-		if (-1L != this.field3896) { // L: 23
-			this.field3898 = class111.method2516() - this.field3896; // L: 24
-			this.field3896 = -1L; // L: 25
+	public void method6231() {
+		if (-1L != this.field4041) { // L: 23
+			this.field4045 = Ignored.method6459() - this.field4041; // L: 24
+			this.field4041 = -1L; // L: 25
 		}
 
 	} // L: 27
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "119"
+		descriptor = "(II)V",
+		garbageValue = "1146982108"
 	)
-	public void method5973(int var1) {
-		this.field3895 = class111.method2516(); // L: 30
-		this.field3899 = var1; // L: 31
+	public void method6232(int var1) {
+		this.field4048 = Ignored.method6459(); // L: 30
+		this.field4046 = var1; // L: 31
 	} // L: 32
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "229876245"
+		garbageValue = "-14983826"
 	)
-	public void method5974() {
-		if (this.field3895 != -1L) { // L: 35
-			this.field3897 = class111.method2516() - this.field3895; // L: 36
-			this.field3895 = -1L; // L: 37
+	public void method6234() {
+		if (this.field4048 != -1L) { // L: 35
+			this.field4044 = Ignored.method6459() - this.field4048; // L: 36
+			this.field4048 = -1L; // L: 37
 		}
 
-		++this.field3902; // L: 39
-		this.field3900 = true; // L: 40
+		++this.field4049; // L: 39
+		this.field4043 = true; // L: 40
 	} // L: 41
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1931068869"
+		garbageValue = "1689549111"
 	)
-	public void method5975() {
-		this.field3900 = false; // L: 44
-		this.field3901 = 0; // L: 45
+	public void method6238() {
+		this.field4043 = false; // L: 44
+		this.field4047 = 0; // L: 45
 	} // L: 46
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1431059239"
+		garbageValue = "145143672"
 	)
-	public void method5970() {
-		this.method5974(); // L: 49
+	public void method6244() {
+		this.method6234(); // L: 49
 	} // L: 50
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "417956413"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "-405863584"
 	)
 	@Export("write")
 	public void write(Buffer var1) {
-		class264.method5144(var1, this.field3898); // L: 53
-		class264.method5144(var1, this.field3897); // L: 54
-		class264.method5144(var1, this.field3894); // L: 55
-		var1.writeShort(this.field3899); // L: 56
-		var1.writeShort(this.field3901); // L: 57
-		var1.writeShort(this.field3902); // L: 58
-		var1.writeShort(this.field3903); // L: 59
-	} // L: 60
+		long var2 = this.field4045; // L: 53
+		var2 /= 10L; // L: 55
+		if (var2 < 0L) { // L: 56
+			var2 = 0L;
+		} else if (var2 > 65535L) { // L: 57
+			var2 = 65535L;
+		}
+
+		var1.writeShort((int)var2); // L: 58
+		long var4 = this.field4044; // L: 60
+		var4 /= 10L; // L: 62
+		if (var4 < 0L) { // L: 63
+			var4 = 0L;
+		} else if (var4 > 65535L) { // L: 64
+			var4 = 65535L;
+		}
+
+		var1.writeShort((int)var4); // L: 65
+		long var6 = this.field4050; // L: 67
+		var6 /= 10L; // L: 69
+		if (var6 < 0L) { // L: 70
+			var6 = 0L;
+		} else if (var6 > 65535L) { // L: 71
+			var6 = 65535L;
+		}
+
+		var1.writeShort((int)var6); // L: 72
+		var1.writeShort(this.field4046); // L: 74
+		var1.writeShort(this.field4047); // L: 75
+		var1.writeShort(this.field4049); // L: 76
+		var1.writeShort(this.field4042); // L: 77
+	} // L: 78
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lif;",
+		garbageValue = "1360000717"
+	)
+	public static class253[] method6230() {
+		return new class253[]{class253.field2918, class253.field2911, class253.field2912, class253.field2913, class253.field2914, class253.field2915, class253.field2916, class253.field2917, class253.field2920, class253.field2919}; // L: 17
+	}
 }
diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java
index 1e3168cfbc..09f327adf9 100644
--- a/runescape-client/src/main/java/TriBool.java
+++ b/runescape-client/src/main/java/TriBool.java
@@ -1,40 +1,30 @@
-import java.io.File;
-import java.io.RandomAccessFile;
 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("mv")
+@ObfuscatedName("mu")
 @Implements("TriBool")
 public class TriBool {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("TriBool_unknown")
 	public static final TriBool TriBool_unknown;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("TriBool_true")
 	public static final TriBool TriBool_true;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmu;"
 	)
 	@Export("TriBool_false")
 	public static final TriBool TriBool_false;
-	@ObfuscatedName("c")
-	@Export("userHomeDirectory")
-	static String userHomeDirectory;
-	@ObfuscatedName("hh")
-	@ObfuscatedSignature(
-		descriptor = "[Loe;"
-	)
-	@Export("mapSceneSprites")
-	static IndexedSprite[] mapSceneSprites;
 
 	static {
 		TriBool_unknown = new TriBool(); // L: 4
@@ -45,47 +35,129 @@ public class TriBool {
 	TriBool() {
 	} // L: 8
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;S)Ljava/io/File;",
-		garbageValue = "17902"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-1397883931"
 	)
-	@Export("getFile")
-	static File getFile(String var0) {
-		if (!FileSystem.FileSystem_hasPermissions) { // L: 22
-			throw new RuntimeException("");
+	static int method6472(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == ScriptOpcodes.OC_NAME) { // L: 3217
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3218
+			Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = UserComparator6.ItemDefinition_get(var3).name; // L: 3219
+			return 1; // L: 3220
 		} else {
-			File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23
-			if (var1 != null) { // L: 24
-				return var1;
+			int var4;
+			ItemComposition var5;
+			if (var0 == ScriptOpcodes.OC_OP) { // L: 3222
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 3223
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3224
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3225
+				var5 = UserComparator6.ItemDefinition_get(var3); // L: 3226
+				if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3227
+				} else {
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3228
+				}
+
+				return 1; // L: 3229
+			} else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3231
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 3232
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3233
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3234
+				var5 = UserComparator6.ItemDefinition_get(var3); // L: 3235
+				if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3236
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
+				} else {
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3237
+				}
+
+				return 1; // L: 3238
+			} else if (var0 == ScriptOpcodes.OC_COST) { // L: 3240
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3241
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).price; // L: 3242
+				return 1; // L: 3243
+			} else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3245
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3246
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3247
+				return 1; // L: 3248
 			} else {
-				File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 25
-				RandomAccessFile var3 = null; // L: 26
+				ItemComposition var7;
+				if (var0 == ScriptOpcodes.OC_CERT) { // L: 3250
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3251
+					var7 = UserComparator6.ItemDefinition_get(var3); // L: 3252
+					if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3253
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.note;
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 3254
+					}
 
-				try {
-					File var4 = new File(var2.getParent()); // L: 28
-					if (!var4.exists()) { // L: 29
-						throw new RuntimeException("");
+					return 1; // L: 3255
+				} else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3257
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3258
+					var7 = UserComparator6.ItemDefinition_get(var3); // L: 3259
+					if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3260
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.note;
 					} else {
-						var3 = new RandomAccessFile(var2, "rw"); // L: 30
-						int var5 = var3.read(); // L: 31
-						var3.seek(0L); // L: 32
-						var3.write(var5); // L: 33
-						var3.seek(0L); // L: 34
-						var3.close(); // L: 35
-						FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36
-						return var2; // L: 37
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 3261
 					}
-				} catch (Exception var8) {
-					try {
-						if (var3 != null) { // L: 41
-							var3.close(); // L: 42
-							var3 = null; // L: 43
+
+					return 1; // L: 3262
+				} else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3264
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3265
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = UserComparator6.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3266
+					return 1; // L: 3267
+				} else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3269
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3270
+					var7 = UserComparator6.ItemDefinition_get(var3); // L: 3271
+					if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3272
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.placeholder;
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 3273
+					}
+
+					return 1; // L: 3274
+				} else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3276
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3277
+					var7 = UserComparator6.ItemDefinition_get(var3); // L: 3278
+					if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3279
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var7.placeholder;
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 3280
+					}
+
+					return 1; // L: 3281
+				} else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3283
+					String var6 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3284
+					var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3285
+					StructComposition.findItemDefinitions(var6, var4 == 1); // L: 3286
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = GraphicsDefaults.foundItemIdCount; // L: 3287
+					return 1; // L: 3288
+				} else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3290
+					if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3295
+						class336.foundItemIndex = 0; // L: 3296
+						return 1; // L: 3297
+					} else if (var0 == 4213) { // L: 3299
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3300
+						var4 = UserComparator6.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3301
+						if (var4 == -1) { // L: 3302
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4; // L: 3303
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4 + 1; // L: 3306
 						}
-					} catch (Exception var7) { // L: 46
+
+						return 1; // L: 3308
+					} else {
+						return 2; // L: 3310
+					}
+				} else {
+					if (class113.foundItemIds != null && class336.foundItemIndex < GraphicsDefaults.foundItemIdCount) { // L: 3291
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class113.foundItemIds[++class336.foundItemIndex - 1] & '\uffff'; // L: 3292
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1;
 					}
 
-					throw new RuntimeException(); // L: 48
+					return 1; // L: 3293
 				}
 			}
 		}
diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java
index 1dc21d1681..2a7bd8f7db 100644
--- a/runescape-client/src/main/java/UrlRequest.java
+++ b/runescape-client/src/main/java/UrlRequest.java
@@ -1,82 +1,129 @@
 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("cm")
+@ObfuscatedName("cf")
 @Implements("UrlRequest")
 public class UrlRequest {
-	@ObfuscatedName("sk")
-	@ObfuscatedGetter(
-		intValue = -669025737
+	@ObfuscatedName("ce")
+	@ObfuscatedSignature(
+		descriptor = "Lpa;"
 	)
-	static int field1298;
-	@ObfuscatedName("i")
+	@Export("worldSelectRightSprite")
+	static IndexedSprite worldSelectRightSprite;
+	@ObfuscatedName("c")
 	@Export("url")
 	final URL url;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("isDone0")
 	volatile boolean isDone0;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("response0")
 	volatile byte[] response0;
 
 	UrlRequest(URL var1) {
-		this.url = var1; // L: 96
-	} // L: 97
+		this.url = var1; // L: 97
+	} // L: 98
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-2"
+		descriptor = "(I)Z",
+		garbageValue = "-11682805"
 	)
 	@Export("isDone")
 	public boolean isDone() {
-		return this.isDone0; // L: 100
+		return this.isDone0; // L: 101
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)[B",
-		garbageValue = "-1773825191"
+		garbageValue = "309471456"
 	)
 	@Export("getResponse")
 	public byte[] getResponse() {
-		return this.response0; // L: 104
+		return this.response0; // L: 105
 	}
 
-	@ObfuscatedName("fy")
+	@ObfuscatedName("fc")
 	@ObfuscatedSignature(
-		descriptor = "(IZZZB)Lkd;",
-		garbageValue = "0"
+		descriptor = "(I)V",
+		garbageValue = "1703812589"
 	)
-	@Export("newArchive")
-	static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
-		ArchiveDisk var4 = null; // L: 2418
-		if (JagexCache.JagexCache_dat2File != null) { // L: 2419
-			var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, WorldMapID.JagexCache_idxFiles[var0], 1000000);
-		}
-
-		return new Archive(var4, WorldMapArea.masterDisk, var0, var1, var2, var3); // L: 2420
-	}
+	static final void method2496() {
+		class364.method6623(); // L: 3587
+		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 3589
+		ScriptFrame.method1110(); // L: 3591
+		UserComparator5.method2524(); // L: 3592
+		NPCComposition.NpcDefinition_cached.clear(); // L: 3594
+		NPCComposition.NpcDefinition_cachedModels.clear(); // L: 3595
+		ItemComposition.ItemDefinition_cached.clear(); // L: 3598
+		ItemComposition.ItemDefinition_cachedModels.clear(); // L: 3599
+		ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 3600
+		SequenceDefinition.SequenceDefinition_cached.clear(); // L: 3603
+		SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 3604
+		SequenceDefinition.field2086.clear(); // L: 3605
+		InterfaceParent.method2143(); // L: 3607
+		class1.method8(); // L: 3608
+		VarpDefinition.VarpDefinition_cached.clear(); // L: 3610
+		AbstractSocket.HitSplatDefinition_cachedSprites.method7216(); // L: 3612
+		Ignored.HitSplatDefinition_cached.method7216(); // L: 3613
+		ObjectSound.method1796(); // L: 3614
+		HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 3616
+		HealthBarDefinition.field1795.clear(); // L: 3617
+		ObjectComposition.method3542(); // L: 3619
+		ParamComposition.ParamDefinition_cached.clear(); // L: 3621
+		WorldMapElement.PlayerAppearance_cachedModels.clear(); // L: 3624
+		PlayerComposition.Widget_cachedSprites.clear(); // L: 3627
+		WorldMapSection2.method4417(); // L: 3629
+		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3630
+		Script.Script_cached.clear(); // L: 3631
+		class115.archive1.clearFiles(); // L: 3632
+		class9.archive3.clearFiles(); // L: 3633
+		class19.archive4.clearFiles(); // L: 3634
+		KeyHandler.field151.clearFiles(); // L: 3635
+		class140.archive5.clearFiles(); // L: 3636
+		WorldMapScaleHandler.archive6.clearFiles(); // L: 3637
+		class115.archive7.clearFiles(); // L: 3638
+		UserComparator6.archive8.clearFiles(); // L: 3639
+		NetSocket.archive9.clearFiles(); // L: 3640
+		class257.archive10.clearFiles(); // L: 3641
+		Players.archive11.clearFiles(); // L: 3642
+		TaskHandler.archive12.clearFiles(); // L: 3643
+	} // L: 3644
 
-	@ObfuscatedName("ix")
+	@ObfuscatedName("hk")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "9"
+		descriptor = "(I)V",
+		garbageValue = "-1546953811"
 	)
-	static final boolean method2446(int var0) {
-		if (var0 < 0) { // L: 8251
-			return false;
-		} else {
-			int var1 = Client.menuOpcodes[var0]; // L: 8252
-			if (var1 >= 2000) { // L: 8253
-				var1 -= 2000;
-			}
+	static void method2489() {
+		Client.menuOptionsCount = 0; // L: 8781
+		Client.isMenuOpen = false; // L: 8782
+	} // L: 8783
 
-			return var1 == 1007; // L: 8254
+	@ObfuscatedName("iz")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "-101999626"
+	)
+	@Export("selectSpell")
+	static void selectSpell(int var0, int var1, int var2, int var3) {
+		Widget var4 = class126.getWidgetChild(var0, var1); // L: 9865
+		if (var4 != null && var4.onTargetEnter != null) { // L: 9866
+			ScriptEvent var5 = new ScriptEvent(); // L: 9867
+			var5.widget = var4; // L: 9868
+			var5.args = var4.onTargetEnter; // L: 9869
+			class285.runScriptEvent(var5); // L: 9870
 		}
-	}
+
+		Client.field633 = var3; // L: 9872
+		Client.isSpellSelected = true; // L: 9873
+		class20.selectedSpellWidget = var0; // L: 9874
+		Client.selectedSpellChildIndex = var1; // L: 9875
+		class91.selectedSpellFlags = var2; // L: 9876
+		SecureRandomCallable.invalidateWidget(var4); // L: 9877
+	} // L: 9878
 }
diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java
index e6d133774a..4d5c6793ee 100644
--- a/runescape-client/src/main/java/UrlRequester.java
+++ b/runescape-client/src/main/java/UrlRequester.java
@@ -11,19 +11,16 @@
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("cf")
+@ObfuscatedName("cq")
 @Implements("UrlRequester")
 public class UrlRequester implements Runnable {
-	@ObfuscatedName("g")
-	@Export("SpriteBuffer_spriteWidths")
-	public static int[] SpriteBuffer_spriteWidths;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("thread")
 	final Thread thread;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("isClosed")
 	volatile boolean isClosed;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("requests")
 	Queue requests;
 
@@ -34,232 +31,150 @@ public UrlRequester() {
 		this.thread.start(); // L: 20
 	} // L: 21
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/net/URL;B)Lcm;",
-		garbageValue = "56"
+		descriptor = "(Ljava/net/URL;I)Lcf;",
+		garbageValue = "-1357643641"
 	)
 	@Export("request")
 	public UrlRequest request(URL var1) {
-		UrlRequest var2 = new UrlRequest(var1); // L: 71
-		synchronized(this) { // L: 72
-			this.requests.add(var2); // L: 73
-			this.notify(); // L: 74
-			return var2; // L: 76
+		UrlRequest var2 = new UrlRequest(var1); // L: 72
+		synchronized(this) { // L: 73
+			this.requests.add(var2); // L: 74
+			this.notify(); // L: 75
+			return var2; // L: 77
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "103"
+		descriptor = "(I)V",
+		garbageValue = "397818236"
 	)
 	@Export("close")
 	public void close() {
-		this.isClosed = true; // L: 80
+		this.isClosed = true; // L: 81
 
 		try {
-			synchronized(this) { // L: 82
-				this.notify(); // L: 83
-			} // L: 84
+			synchronized(this) { // L: 83
+				this.notify(); // L: 84
+			} // L: 85
 
-			this.thread.join(); // L: 85
-		} catch (InterruptedException var4) { // L: 87
+			this.thread.join(); // L: 86
+		} catch (InterruptedException var4) { // L: 88
 		}
 
-	} // L: 88
+	} // L: 89
 
 	public void run() {
-		while (!this.isClosed) { // L: 24
+		while (!this.isClosed) { // L: 25
 			try {
 				UrlRequest var1;
-				synchronized(this) { // L: 27
-					var1 = (UrlRequest)this.requests.poll(); // L: 28
-					if (var1 == null) { // L: 29
+				synchronized(this) { // L: 28
+					var1 = (UrlRequest)this.requests.poll(); // L: 29
+					if (var1 == null) { // L: 30
 						try {
-							this.wait(); // L: 31
-						} catch (InterruptedException var13) { // L: 33
+							this.wait(); // L: 32
+						} catch (InterruptedException var13) { // L: 34
 						}
 						continue;
 					}
 				}
 
-				DataInputStream var2 = null; // L: 37
-				URLConnection var3 = null; // L: 38
+				DataInputStream var2 = null; // L: 38
+				URLConnection var3 = null; // L: 39
 
 				try {
-					var3 = var1.url.openConnection(); // L: 40
-					var3.setConnectTimeout(5000); // L: 41
-					var3.setReadTimeout(5000); // L: 42
-					var3.setUseCaches(false); // L: 43
-					var3.setRequestProperty("Connection", "close"); // L: 44
-					int var7 = var3.getContentLength(); // L: 45
-					if (var7 >= 0) { // L: 46
-						byte[] var5 = new byte[var7]; // L: 47
-						var2 = new DataInputStream(var3.getInputStream()); // L: 48
-						var2.readFully(var5); // L: 49
-						var1.response0 = var5; // L: 50
+					var3 = var1.url.openConnection(); // L: 41
+					var3.setConnectTimeout(5000); // L: 42
+					var3.setReadTimeout(5000); // L: 43
+					var3.setUseCaches(false); // L: 44
+					var3.setRequestProperty("Connection", "close"); // L: 45
+					int var7 = var3.getContentLength(); // L: 46
+					if (var7 >= 0) { // L: 47
+						byte[] var5 = new byte[var7]; // L: 48
+						var2 = new DataInputStream(var3.getInputStream()); // L: 49
+						var2.readFully(var5); // L: 50
+						var1.response0 = var5; // L: 51
 					}
 
-					var1.isDone0 = true; // L: 52
-				} catch (IOException var14) { // L: 54
-					var1.isDone0 = true; // L: 55
+					var1.isDone0 = true; // L: 53
+				} catch (IOException var14) { // L: 55
+					var1.isDone0 = true; // L: 56
 				} finally {
-					if (var2 != null) { // L: 58
+					if (var2 != null) { // L: 59
 						var2.close();
 					}
 
-					if (var3 != null && var3 instanceof HttpURLConnection) { // L: 59
-						((HttpURLConnection)var3).disconnect(); // L: 60
+					if (var3 != null && var3 instanceof HttpURLConnection) { // L: 60
+						((HttpURLConnection)var3).disconnect(); // L: 61
 					}
 
 				}
-			} catch (Exception var17) { // L: 64
-				MilliClock.RunException_sendStackTrace((String)null, var17); // L: 65
+			} catch (Exception var17) { // L: 65
+				AccessFile.RunException_sendStackTrace((String)null, var17); // L: 66
 			}
 		}
 
-	} // L: 68
+	} // L: 69
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-1444939304"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-33577073"
 	)
-	static int method2427(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1916
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.cycle; // L: 1917
-			return 1; // L: 1918
+	static int method2486(int var0, Script var1, boolean var2) {
+		Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1293
+		if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1294
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1295
+			return 1; // L: 1296
+		} else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1298
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1299
+			return 1; // L: 1300
+		} else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1302
+			Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.text; // L: 1303
+			return 1; // L: 1304
+		} else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1306
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1307
+			return 1; // L: 1308
+		} else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1310
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1311
+			return 1; // L: 1312
+		} else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1314
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1315
+			return 1; // L: 1316
+		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1318
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1319
+			return 1; // L: 1320
+		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1322
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1323
+			return 1; // L: 1324
+		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1326
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1327
+			return 1; // L: 1328
+		} else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1330
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1331
+			return 1; // L: 1332
+		} else if (var0 == 2610) { // L: 1334
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1335
+			return 1; // L: 1336
+		} else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1338
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color; // L: 1339
+			return 1; // L: 1340
+		} else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1342
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.color2; // L: 1343
+			return 1; // L: 1344
+		} else if (var0 == 2613) { // L: 1346
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1347
+			return 1; // L: 1348
+		} else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1350
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1351
+			return 1; // L: 1352
+		} else if (var0 != 2615 && var0 != 2616) { // L: 1354
+			return 2; // L: 1358
 		} else {
-			int var3;
-			int var4;
-			if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1920
-				class14.Interpreter_intStackSize -= 2; // L: 1921
-				var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1922
-				var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1923
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Script.method1988(var3, var4); // L: 1924
-				return 1; // L: 1925
-			} else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1927
-				class14.Interpreter_intStackSize -= 2; // L: 1928
-				var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1929
-				var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1930
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ScriptFrame.ItemContainer_getCount(var3, var4); // L: 1931
-				return 1; // L: 1932
-			} else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1934
-				class14.Interpreter_intStackSize -= 2; // L: 1935
-				var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 1936
-				var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1937
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapSectionType.method3920(var3, var4); // L: 1938
-				return 1; // L: 1939
-			} else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1941
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1942
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = AttackOption.getInvDefinition(var3).size; // L: 1943
-				return 1; // L: 1944
-			} else if (var0 == ScriptOpcodes.STAT) { // L: 1946
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1947
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1948
-				return 1; // L: 1949
-			} else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1951
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1952
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1953
-				return 1; // L: 1954
-			} else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1956
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1957
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1958
-				return 1; // L: 1959
-			} else {
-				int var5;
-				if (var0 == ScriptOpcodes.COORD) { // L: 1961
-					var3 = GrandExchangeOfferTotalQuantityComparator.Client_plane; // L: 1962
-					var4 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX; // L: 1963
-					var5 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY; // L: 1964
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1965
-					return 1; // L: 1966
-				} else if (var0 == ScriptOpcodes.COORDX) { // L: 1968
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1969
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1970
-					return 1; // L: 1971
-				} else if (var0 == ScriptOpcodes.COORDZ) { // L: 1973
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1974
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1975
-					return 1; // L: 1976
-				} else if (var0 == ScriptOpcodes.COORDY) { // L: 1978
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1979
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1980
-					return 1; // L: 1981
-				} else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1983
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1984
-					return 1; // L: 1985
-				} else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1987
-					class14.Interpreter_intStackSize -= 2; // L: 1988
-					var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] + 32768; // L: 1989
-					var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1990
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Script.method1988(var3, var4); // L: 1991
-					return 1; // L: 1992
-				} else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1994
-					class14.Interpreter_intStackSize -= 2; // L: 1995
-					var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] + 32768; // L: 1996
-					var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 1997
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ScriptFrame.ItemContainer_getCount(var3, var4); // L: 1998
-					return 1; // L: 1999
-				} else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 2001
-					class14.Interpreter_intStackSize -= 2; // L: 2002
-					var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] + 32768; // L: 2003
-					var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2004
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapSectionType.method3920(var3, var4); // L: 2005
-					return 1; // L: 2006
-				} else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2008
-					if (Client.staffModLevel >= 2) { // L: 2009
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.staffModLevel;
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2010
-					}
-
-					return 1; // L: 2011
-				} else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2013
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2014
-					return 1; // L: 2015
-				} else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2017
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.worldId; // L: 2018
-					return 1; // L: 2019
-				} else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2021
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2022
-					return 1; // L: 2023
-				} else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2025
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.weight; // L: 2026
-					return 1; // L: 2027
-				} else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2029
-					if (Client.playerMod) { // L: 2030
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1;
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2031
-					}
-
-					return 1; // L: 2032
-				} else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2034
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2035
-					return 1; // L: 2036
-				} else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2038
-					class14.Interpreter_intStackSize -= 4; // L: 2039
-					var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2040
-					var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2041
-					var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 2042
-					int var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 2043
-					var3 += var4 << 14; // L: 2044
-					var3 += var5 << 28; // L: 2045
-					var3 += var6; // L: 2046
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3; // L: 2047
-					return 1; // L: 2048
-				} else if (var0 == 3326) { // L: 2050
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.field475; // L: 2051
-					return 1; // L: 2052
-				} else if (var0 == 3327) { // L: 2054
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.field476; // L: 2055
-					return 1; // L: 2056
-				} else {
-					return 2; // L: 2058
-				}
-			}
+			++IsaacCipher.Interpreter_intStackSize; // L: 1355
+			return 1; // L: 1356
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java
index 6c914358ef..fb391e01a7 100644
--- a/runescape-client/src/main/java/User.java
+++ b/runescape-client/src/main/java/User.java
@@ -3,18 +3,21 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("la")
+@ObfuscatedName("mv")
 @Implements("User")
 public class User implements Comparable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("o")
+	@Export("Tiles_saturation")
+	static int[] Tiles_saturation;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lpb;"
+		descriptor = "Lpo;"
 	)
 	@Export("username")
 	Username username;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lpb;"
+		descriptor = "Lpo;"
 	)
 	@Export("previousUsername")
 	Username previousUsername;
@@ -22,50 +25,50 @@ public class User implements Comparable {
 	User() {
 	} // L: 9
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;I)I",
-		garbageValue = "-1073614160"
+		descriptor = "(Lmv;I)I",
+		garbageValue = "-1921032172"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
 		return this.username.compareToTyped(var1.username); // L: 32
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lpb;",
-		garbageValue = "-1294008122"
+		descriptor = "(I)Lpo;",
+		garbageValue = "-1892150119"
 	)
 	@Export("getUsername")
 	public Username getUsername() {
 		return this.username; // L: 12
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "598510100"
+		garbageValue = "-1161917268"
 	)
 	@Export("getName")
 	public String getName() {
 		return this.username == null ? "" : this.username.getName(); // L: 16 17
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "56"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "1892612192"
 	)
 	@Export("getPreviousName")
 	public String getPreviousName() {
 		return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 21 22
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;Lpb;I)V",
-		garbageValue = "1723391677"
+		descriptor = "(Lpo;Lpo;I)V",
+		garbageValue = "-1829748918"
 	)
 	@Export("set")
 	void set(Username var1, Username var2) {
@@ -80,4 +83,22 @@ void set(Username var1, Username var2) {
 	public int compareTo(Object var1) {
 		return this.compareTo_user((User)var1); // L: 36
 	}
+
+	@ObfuscatedName("kq")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;IIIB)V",
+		garbageValue = "-87"
+	)
+	@Export("drawCompass")
+	static final void drawCompass(Widget var0, int var1, int var2, int var3) {
+		SpriteMask var4 = var0.getSpriteMask(false); // L: 12409
+		if (var4 != null) { // L: 12410
+			if (Client.minimapState < 3) { // L: 12411
+				LoginScreenAnimation.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
+			} else {
+				Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 12412
+			}
+
+		}
+	} // L: 12413
 }
diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java
index 2f47f283e5..126d3e6679 100644
--- a/runescape-client/src/main/java/UserComparator1.java
+++ b/runescape-client/src/main/java/UserComparator1.java
@@ -4,10 +4,10 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ox")
+@ObfuscatedName("pd")
 @Implements("UserComparator1")
 public class UserComparator1 implements Comparator {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -15,10 +15,10 @@ public UserComparator1(boolean var1) {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;Lla;S)I",
-		garbageValue = "-7375"
+		descriptor = "(Lmv;Lmv;B)I",
+		garbageValue = "4"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(User var1, User var2) {
@@ -32,32 +32,4 @@ public int compare(Object var1, Object var2) {
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 22
 	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;Lko;Ljava/lang/String;Ljava/lang/String;I)Lle;",
-		garbageValue = "976267291"
-	)
-	public static Font method7234(AbstractArchive var0, AbstractArchive var1, String var2, String var3) {
-		int var4 = var0.getGroupId(var2); // L: 102
-		int var5 = var0.getFileId(var4, var3); // L: 103
-		Font var6;
-		if (!BuddyRankComparator.method2502(var0, var4, var5)) { // L: 106
-			var6 = null; // L: 107
-		} else {
-			byte[] var8 = var1.takeFile(var4, var5); // L: 111
-			Font var7;
-			if (var8 == null) { // L: 113
-				var7 = null; // L: 114
-			} else {
-				Font var9 = new Font(var8, class414.SpriteBuffer_xOffsets, class414.SpriteBuffer_yOffsets, UrlRequester.SpriteBuffer_spriteWidths, class414.SpriteBuffer_spriteHeights, HitSplatDefinition.SpriteBuffer_spritePalette, class295.SpriteBuffer_pixels); // L: 117
-				PacketBuffer.method6913(); // L: 118
-				var7 = var9; // L: 119
-			}
-
-			var6 = var7; // L: 121
-		}
-
-		return var6; // L: 123
-	}
 }
diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java
index d15a505ec5..52b68e6675 100644
--- a/runescape-client/src/main/java/UserComparator10.java
+++ b/runescape-client/src/main/java/UserComparator10.java
@@ -1,18 +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("dw")
+@ObfuscatedName("dv")
 @Implements("UserComparator10")
 public class UserComparator10 extends AbstractUserComparator {
-	@ObfuscatedName("ig")
-	@ObfuscatedSignature(
-		descriptor = "[Low;"
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = 1996697933
+	)
+	public static int field1339;
+	@ObfuscatedName("ie")
+	@ObfuscatedGetter(
+		intValue = 1340087327
 	)
-	@Export("crossSprites")
-	static SpritePixels[] crossSprites;
-	@ObfuscatedName("i")
+	@Export("cameraZ")
+	static int cameraZ;
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -20,10 +26,10 @@ public UserComparator10(boolean var1) {
 		this.reversed = var1; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;Lmt;I)I",
-		garbageValue = "2093372885"
+		descriptor = "(Lmp;Lmp;B)I",
+		garbageValue = "77"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -38,16 +44,672 @@ public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22
 	}
 
-	@ObfuscatedName("kl")
+	@ObfuscatedName("fb")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "-4813"
+		descriptor = "(I)V",
+		garbageValue = "-1506932580"
 	)
-	static final void method2494() {
-		for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11783
-			Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11784
-			var1.method2105(); // L: 11785
+	@Export("load")
+	static void load() {
+		int var18;
+		if (Client.titleLoadingStage == 0) { // L: 2172
+			class7.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 2173
+
+			for (var18 = 0; var18 < 4; ++var18) { // L: 2174
+				Client.collisionMaps[var18] = new CollisionMap(104, 104);
+			}
+
+			class29.sceneMinimapSprite = new SpritePixels(512, 512); // L: 2175
+			Login.Login_loadingText = "Starting game engine..."; // L: 2176
+			Login.Login_loadingPercent = 5; // L: 2177
+			Client.titleLoadingStage = 20; // L: 2178
+		} else if (Client.titleLoadingStage == 20) { // L: 2181
+			Login.Login_loadingText = "Prepared visibility map"; // L: 2182
+			Login.Login_loadingPercent = 10; // L: 2183
+			Client.titleLoadingStage = 30; // L: 2184
+		} else if (Client.titleLoadingStage == 30) { // L: 2187
+			class115.archive1 = VarcInt.newArchive(0, false, true, true); // L: 2188
+			class9.archive3 = VarcInt.newArchive(1, false, true, true); // L: 2189
+			class131.archive2 = VarcInt.newArchive(2, true, false, true); // L: 2190
+			class19.archive4 = VarcInt.newArchive(3, false, true, true); // L: 2191
+			KeyHandler.field151 = VarcInt.newArchive(4, false, true, true); // L: 2192
+			class140.archive5 = VarcInt.newArchive(5, true, true, true); // L: 2193
+			WorldMapScaleHandler.archive6 = VarcInt.newArchive(6, true, true, true); // L: 2194
+			class115.archive7 = VarcInt.newArchive(7, false, true, true); // L: 2195
+			UserComparator6.archive8 = VarcInt.newArchive(8, false, true, true); // L: 2196
+			NetSocket.archive9 = VarcInt.newArchive(9, false, true, true); // L: 2197
+			class257.archive10 = VarcInt.newArchive(10, false, true, true); // L: 2198
+			Players.archive11 = VarcInt.newArchive(11, false, true, true); // L: 2199
+			TaskHandler.archive12 = VarcInt.newArchive(12, false, true, true); // L: 2200
+			class1.archive13 = VarcInt.newArchive(13, true, false, true); // L: 2201
+			ChatChannel.archive14 = VarcInt.newArchive(14, false, true, true); // L: 2202
+			class133.archive15 = VarcInt.newArchive(15, false, true, true); // L: 2203
+			class126.archive17 = VarcInt.newArchive(17, true, true, true); // L: 2204
+			VertexNormal.archive18 = VarcInt.newArchive(18, false, true, true); // L: 2205
+			class148.archive19 = VarcInt.newArchive(19, false, true, true); // L: 2206
+			HealthBarUpdate.archive20 = VarcInt.newArchive(20, false, true, true); // L: 2207
+			Login.Login_loadingText = "Connecting to update server"; // L: 2208
+			Login.Login_loadingPercent = 20; // L: 2209
+			Client.titleLoadingStage = 40; // L: 2210
+		} else if (Client.titleLoadingStage == 40) { // L: 2213
+			byte var41 = 0; // L: 2214
+			var18 = var41 + class115.archive1.percentage() * 4 / 100; // L: 2215
+			var18 += class9.archive3.percentage() * 4 / 100; // L: 2216
+			var18 += class131.archive2.percentage() * 2 / 100; // L: 2217
+			var18 += class19.archive4.percentage() * 2 / 100; // L: 2218
+			var18 += KeyHandler.field151.percentage() * 6 / 100; // L: 2219
+			var18 += class140.archive5.percentage() * 4 / 100; // L: 2220
+			var18 += WorldMapScaleHandler.archive6.percentage() * 2 / 100; // L: 2221
+			var18 += class115.archive7.percentage() * 56 / 100; // L: 2222
+			var18 += UserComparator6.archive8.percentage() * 2 / 100; // L: 2223
+			var18 += NetSocket.archive9.percentage() * 2 / 100; // L: 2224
+			var18 += class257.archive10.percentage() * 2 / 100; // L: 2225
+			var18 += Players.archive11.percentage() * 2 / 100; // L: 2226
+			var18 += TaskHandler.archive12.percentage() * 2 / 100; // L: 2227
+			var18 += class1.archive13.percentage() * 2 / 100; // L: 2228
+			var18 += ChatChannel.archive14.percentage() * 2 / 100; // L: 2229
+			var18 += class133.archive15.percentage() * 2 / 100; // L: 2230
+			var18 += class148.archive19.percentage() / 100; // L: 2231
+			var18 += VertexNormal.archive18.percentage() / 100; // L: 2232
+			var18 += HealthBarUpdate.archive20.percentage() / 100; // L: 2233
+			var18 += class126.archive17.method5540() && class126.archive17.isFullyLoaded() ? 1 : 0; // L: 2234
+			if (var18 != 100) { // L: 2235
+				if (var18 != 0) { // L: 2236
+					Login.Login_loadingText = "Checking for updates - " + var18 + "%";
+				}
+
+				Login.Login_loadingPercent = 30; // L: 2237
+			} else {
+				NetFileRequest.method5587(class115.archive1, "Animations"); // L: 2240
+				NetFileRequest.method5587(class9.archive3, "Skeletons"); // L: 2241
+				NetFileRequest.method5587(KeyHandler.field151, "Sound FX"); // L: 2242
+				NetFileRequest.method5587(class140.archive5, "Maps"); // L: 2243
+				NetFileRequest.method5587(WorldMapScaleHandler.archive6, "Music Tracks"); // L: 2244
+				NetFileRequest.method5587(class115.archive7, "Models"); // L: 2245
+				NetFileRequest.method5587(UserComparator6.archive8, "Sprites"); // L: 2246
+				NetFileRequest.method5587(Players.archive11, "Music Jingles"); // L: 2247
+				NetFileRequest.method5587(ChatChannel.archive14, "Music Samples"); // L: 2248
+				NetFileRequest.method5587(class133.archive15, "Music Patches"); // L: 2249
+				NetFileRequest.method5587(class148.archive19, "World Map"); // L: 2250
+				NetFileRequest.method5587(VertexNormal.archive18, "World Map Geography"); // L: 2251
+				NetFileRequest.method5587(HealthBarUpdate.archive20, "World Map Ground"); // L: 2252
+				class6.spriteIds = new GraphicsDefaults(); // L: 2253
+				class6.spriteIds.decode(class126.archive17); // L: 2254
+				Login.Login_loadingText = "Loaded update list"; // L: 2255
+				Login.Login_loadingPercent = 30; // L: 2256
+				Client.titleLoadingStage = 45; // L: 2257
+			}
+		} else {
+			Archive var2;
+			if (Client.titleLoadingStage == 45) { // L: 2260
+				boolean var40 = !Client.isLowDetail; // L: 2261
+				class339.field4058 = 22050; // L: 2264
+				SpriteMask.PcmPlayer_stereo = var40; // L: 2265
+				field1339 = 2; // L: 2266
+				MidiPcmStream var37 = new MidiPcmStream(); // L: 2268
+				var37.method5079(9, 128); // L: 2269
+				JagexCache.pcmPlayer0 = class4.method29(GameEngine.taskHandler, 0, 22050); // L: 2270
+				JagexCache.pcmPlayer0.setStream(var37); // L: 2271
+				var2 = class133.archive15; // L: 2272
+				Archive var39 = ChatChannel.archive14; // L: 2273
+				Archive var29 = KeyHandler.field151; // L: 2274
+				class260.musicPatchesArchive = var2; // L: 2276
+				class331.musicSamplesArchive = var39; // L: 2277
+				class260.soundEffectsArchive = var29; // L: 2278
+				class260.midiPcmStream = var37; // L: 2279
+				PacketWriter.pcmPlayer1 = class4.method29(GameEngine.taskHandler, 1, 2048); // L: 2281
+				class281.pcmStreamMixer = new PcmStreamMixer(); // L: 2282
+				PacketWriter.pcmPlayer1.setStream(class281.pcmStreamMixer); // L: 2283
+				BoundaryObject.decimator = new Decimator(22050, class339.field4058); // L: 2284
+				Login.Login_loadingText = "Prepared sound engine"; // L: 2285
+				Login.Login_loadingPercent = 35; // L: 2286
+				Client.titleLoadingStage = 50; // L: 2287
+				class126.WorldMapElement_fonts = new Fonts(UserComparator6.archive8, class1.archive13); // L: 2288
+			} else {
+				int var19;
+				if (Client.titleLoadingStage == 50) { // L: 2291
+					FontName[] var27 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12}; // L: 2294
+					var19 = var27.length; // L: 2296
+					Fonts var30 = class126.WorldMapElement_fonts; // L: 2297
+					FontName[] var25 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_plain11, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12}; // L: 2300
+					Client.fontsMap = var30.createMap(var25); // L: 2302
+					if (Client.fontsMap.size() < var19) { // L: 2303
+						Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var19 + "%"; // L: 2304
+						Login.Login_loadingPercent = 40; // L: 2305
+					} else {
+						class307.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 2308
+						class114.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 2309
+						class136.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 2310
+						Interpreter.platformInfo = Client.platformInfoProvider.get(); // L: 2311
+						Login.Login_loadingText = "Loaded fonts"; // L: 2312
+						Login.Login_loadingPercent = 40; // L: 2313
+						Client.titleLoadingStage = 60; // L: 2314
+					}
+				} else if (Client.titleLoadingStage == 60) { // L: 2317
+					var18 = WorldMapArea.method4490(class257.archive10, UserComparator6.archive8); // L: 2318
+					var19 = Login.field893.length + Login.field892.length; // L: 2321
+					if (var18 < var19) { // L: 2324
+						Login.Login_loadingText = "Loading title screen - " + var18 * 100 / var19 + "%"; // L: 2325
+						Login.Login_loadingPercent = 50; // L: 2326
+					} else {
+						Login.Login_loadingText = "Loaded title screen"; // L: 2329
+						Login.Login_loadingPercent = 50; // L: 2330
+						VertexNormal.updateGameState(5); // L: 2331
+						Client.titleLoadingStage = 70; // L: 2332
+					}
+				} else if (Client.titleLoadingStage == 70) { // L: 2335
+					if (!class131.archive2.isFullyLoaded()) { // L: 2336
+						Login.Login_loadingText = "Loading config - " + class131.archive2.loadPercent() + "%"; // L: 2337
+						Login.Login_loadingPercent = 60; // L: 2338
+					} else {
+						Archive var26 = class131.archive2; // L: 2341
+						FloorOverlayDefinition.FloorOverlayDefinition_archive = var26; // L: 2343
+						class19.method330(class131.archive2); // L: 2345
+						GrandExchangeOfferTotalQuantityComparator.method5725(class131.archive2, class115.archive7); // L: 2346
+						class186.method3740(class131.archive2, class115.archive7, Client.isLowDetail); // L: 2347
+						class258.method5047(class131.archive2, class115.archive7); // L: 2348
+						class221.method4700(class131.archive2); // L: 2349
+						Archive var35 = class131.archive2; // L: 2350
+						var2 = class115.archive7; // L: 2351
+						boolean var32 = Client.isMembersWorld; // L: 2352
+						Font var4 = class307.fontPlain11; // L: 2353
+						ItemComposition.ItemDefinition_archive = var35; // L: 2355
+						ItemComposition.ItemDefinition_modelArchive = var2; // L: 2356
+						ItemComposition.ItemDefinition_inMembersWorld = var32; // L: 2357
+						WorldMapLabelSize.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); // L: 2358
+						ItemComposition.ItemDefinition_fontPlain11 = var4; // L: 2359
+						Archive var34 = class131.archive2; // L: 2361
+						Archive var22 = class115.archive1; // L: 2362
+						Archive var36 = class9.archive3; // L: 2363
+						Canvas.SequenceDefinition_archive = var34; // L: 2365
+						SequenceDefinition.SequenceDefinition_animationsArchive = var22; // L: 2366
+						class118.SequenceDefinition_skeletonsArchive = var36; // L: 2367
+						TileItem.method2368(class131.archive2, class115.archive7); // L: 2369
+						Archive var23 = class131.archive2; // L: 2370
+						VarbitComposition.VarbitDefinition_archive = var23; // L: 2372
+						Archive var38 = class131.archive2; // L: 2374
+						VarpDefinition.VarpDefinition_archive = var38; // L: 2376
+						class433.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 2377
+						class194.method3937(class19.archive4, class115.archive7, UserComparator6.archive8, class1.archive13); // L: 2379
+						Archive var24 = class131.archive2; // L: 2380
+						InvDefinition.InvDefinition_archive = var24; // L: 2382
+						Archive var11 = class131.archive2; // L: 2384
+						EnumComposition.EnumDefinition_archive = var11; // L: 2386
+						Archive var12 = class131.archive2; // L: 2388
+						VarcInt.VarcInt_archive = var12; // L: 2390
+						Archive var13 = class131.archive2; // L: 2392
+						InterfaceParent.method2145(class131.archive2); // L: 2394
+						AbstractSocket.HitSplatDefinition_cachedSprites = new class404(class338.field4054, 54, ScriptFrame.clientLanguage, class131.archive2); // L: 2395
+						Ignored.HitSplatDefinition_cached = new class404(class338.field4054, 47, ScriptFrame.clientLanguage, class131.archive2); // L: 2396
+						class339.varcs = new Varcs(); // L: 2397
+						class331.method6174(class131.archive2, UserComparator6.archive8, class1.archive13); // L: 2398
+						ObjectSound.method1803(class131.archive2, UserComparator6.archive8); // L: 2399
+						Archive var14 = class131.archive2; // L: 2400
+						Archive var15 = UserComparator6.archive8; // L: 2401
+						WorldMapElement.WorldMapElement_archive = var15; // L: 2403
+						if (var14.isFullyLoaded()) { // L: 2404
+							class408.WorldMapElement_count = var14.getGroupFileCount(35); // L: 2407
+							WorldMapElement.WorldMapElement_cached = new WorldMapElement[class408.WorldMapElement_count]; // L: 2408
+
+							for (int var16 = 0; var16 < class408.WorldMapElement_count; ++var16) { // L: 2409
+								byte[] var17 = var14.takeFile(35, var16); // L: 2410
+								WorldMapElement.WorldMapElement_cached[var16] = new WorldMapElement(var16); // L: 2411
+								if (var17 != null) { // L: 2412
+									WorldMapElement.WorldMapElement_cached[var16].decode(new Buffer(var17)); // L: 2413
+									WorldMapElement.WorldMapElement_cached[var16].method3173(); // L: 2414
+								}
+							}
+						}
+
+						Login.Login_loadingText = "Loaded config"; // L: 2418
+						Login.Login_loadingPercent = 60; // L: 2419
+						Client.titleLoadingStage = 80; // L: 2420
+					}
+				} else if (Client.titleLoadingStage == 80) { // L: 2423
+					var18 = 0; // L: 2424
+					if (LoginScreenAnimation.compass == null) { // L: 2425
+						LoginScreenAnimation.compass = class6.SpriteBuffer_getSprite(UserComparator6.archive8, class6.spriteIds.compass, 0);
+					} else {
+						++var18; // L: 2426
+					}
+
+					if (PcmPlayer.redHintArrowSprite == null) { // L: 2427
+						PcmPlayer.redHintArrowSprite = class6.SpriteBuffer_getSprite(UserComparator6.archive8, class6.spriteIds.field4163, 0);
+					} else {
+						++var18; // L: 2428
+					}
+
+					IndexedSprite[] var1;
+					int var3;
+					IndexedSprite[] var5;
+					int var6;
+					IndexedSprite var7;
+					if (AbstractWorldMapData.mapSceneSprites == null) { // L: 2429
+						var2 = UserComparator6.archive8; // L: 2431
+						var3 = class6.spriteIds.mapScenes; // L: 2432
+						if (!class147.method3009(var2, var3, 0)) { // L: 2434
+							var1 = null; // L: 2435
+						} else {
+							var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 2440
+
+							for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { // L: 2441
+								var7 = var5[var6] = new IndexedSprite(); // L: 2442
+								var7.width = class432.SpriteBuffer_spriteWidth; // L: 2443
+								var7.height = class432.SpriteBuffer_spriteHeight; // L: 2444
+								var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2445
+								var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2446
+								var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2447
+								var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2448
+								var7.palette = class432.SpriteBuffer_spritePalette; // L: 2449
+								var7.pixels = class369.SpriteBuffer_pixels[var6]; // L: 2450
+							}
+
+							UserComparator3.method2529(); // L: 2452
+							var1 = var5; // L: 2455
+						}
+
+						AbstractWorldMapData.mapSceneSprites = var1; // L: 2457
+					} else {
+						++var18; // L: 2459
+					}
+
+					int var8;
+					byte[] var9;
+					int var10;
+					SpritePixels[] var28;
+					SpritePixels[] var31;
+					SpritePixels var33;
+					if (class286.headIconPkSprites == null) { // L: 2460
+						var2 = UserComparator6.archive8; // L: 2462
+						var3 = class6.spriteIds.headIconsPk; // L: 2463
+						if (!class147.method3009(var2, var3, 0)) { // L: 2465
+							var28 = null; // L: 2466
+						} else {
+							var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2471
+							var6 = 0;
+
+							while (true) {
+								if (var6 >= class440.SpriteBuffer_spriteCount) {
+									UserComparator3.method2529(); // L: 2485
+									var28 = var31; // L: 2488
+									break;
+								}
+
+								var33 = var31[var6] = new SpritePixels(); // L: 2473
+								var33.width = class432.SpriteBuffer_spriteWidth; // L: 2474
+								var33.height = class432.SpriteBuffer_spriteHeight; // L: 2475
+								var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2476
+								var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2477
+								var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2478
+								var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2479
+								var8 = var33.subHeight * var33.subWidth; // L: 2480
+								var9 = class369.SpriteBuffer_pixels[var6]; // L: 2481
+								var33.pixels = new int[var8]; // L: 2482
+
+								for (var10 = 0; var10 < var8; ++var10) { // L: 2483
+									var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255];
+								}
+
+								++var6; // L: 2472
+							}
+						}
+
+						class286.headIconPkSprites = var28; // L: 2490
+					} else {
+						++var18; // L: 2492
+					}
+
+					if (PlayerComposition.headIconPrayerSprites == null) { // L: 2493
+						var2 = UserComparator6.archive8; // L: 2495
+						var3 = class6.spriteIds.field4166; // L: 2496
+						if (!class147.method3009(var2, var3, 0)) { // L: 2498
+							var28 = null; // L: 2499
+						} else {
+							var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2504
+							var6 = 0;
+
+							while (true) {
+								if (var6 >= class440.SpriteBuffer_spriteCount) {
+									UserComparator3.method2529(); // L: 2518
+									var28 = var31; // L: 2521
+									break;
+								}
+
+								var33 = var31[var6] = new SpritePixels(); // L: 2506
+								var33.width = class432.SpriteBuffer_spriteWidth; // L: 2507
+								var33.height = class432.SpriteBuffer_spriteHeight; // L: 2508
+								var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2509
+								var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2510
+								var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2511
+								var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2512
+								var8 = var33.subHeight * var33.subWidth; // L: 2513
+								var9 = class369.SpriteBuffer_pixels[var6]; // L: 2514
+								var33.pixels = new int[var8]; // L: 2515
+
+								for (var10 = 0; var10 < var8; ++var10) { // L: 2516
+									var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255];
+								}
+
+								++var6; // L: 2505
+							}
+						}
+
+						PlayerComposition.headIconPrayerSprites = var28; // L: 2523
+					} else {
+						++var18; // L: 2525
+					}
+
+					if (class260.headIconHintSprites == null) { // L: 2526
+						var2 = UserComparator6.archive8; // L: 2528
+						var3 = class6.spriteIds.field4173; // L: 2529
+						if (!class147.method3009(var2, var3, 0)) { // L: 2531
+							var28 = null; // L: 2532
+						} else {
+							var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2537
+							var6 = 0;
+
+							while (true) {
+								if (var6 >= class440.SpriteBuffer_spriteCount) {
+									UserComparator3.method2529(); // L: 2551
+									var28 = var31; // L: 2554
+									break;
+								}
+
+								var33 = var31[var6] = new SpritePixels(); // L: 2539
+								var33.width = class432.SpriteBuffer_spriteWidth; // L: 2540
+								var33.height = class432.SpriteBuffer_spriteHeight; // L: 2541
+								var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2542
+								var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2543
+								var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2544
+								var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2545
+								var8 = var33.subHeight * var33.subWidth; // L: 2546
+								var9 = class369.SpriteBuffer_pixels[var6]; // L: 2547
+								var33.pixels = new int[var8]; // L: 2548
+
+								for (var10 = 0; var10 < var8; ++var10) { // L: 2549
+									var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255];
+								}
+
+								++var6; // L: 2538
+							}
+						}
+
+						class260.headIconHintSprites = var28; // L: 2556
+					} else {
+						++var18; // L: 2558
+					}
+
+					if (UserComparator7.mapMarkerSprites == null) { // L: 2559
+						var2 = UserComparator6.archive8; // L: 2561
+						var3 = class6.spriteIds.field4169; // L: 2562
+						if (!class147.method3009(var2, var3, 0)) { // L: 2564
+							var28 = null; // L: 2565
+						} else {
+							var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2570
+							var6 = 0;
+
+							while (true) {
+								if (var6 >= class440.SpriteBuffer_spriteCount) {
+									UserComparator3.method2529(); // L: 2584
+									var28 = var31; // L: 2587
+									break;
+								}
+
+								var33 = var31[var6] = new SpritePixels(); // L: 2572
+								var33.width = class432.SpriteBuffer_spriteWidth; // L: 2573
+								var33.height = class432.SpriteBuffer_spriteHeight; // L: 2574
+								var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2575
+								var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2576
+								var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2577
+								var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2578
+								var8 = var33.subHeight * var33.subWidth; // L: 2579
+								var9 = class369.SpriteBuffer_pixels[var6]; // L: 2580
+								var33.pixels = new int[var8]; // L: 2581
+
+								for (var10 = 0; var10 < var8; ++var10) { // L: 2582
+									var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255];
+								}
+
+								++var6; // L: 2571
+							}
+						}
+
+						UserComparator7.mapMarkerSprites = var28; // L: 2589
+					} else {
+						++var18; // L: 2591
+					}
+
+					if (UserComparator5.crossSprites == null) { // L: 2592
+						var2 = UserComparator6.archive8; // L: 2594
+						var3 = class6.spriteIds.field4168; // L: 2595
+						if (!class147.method3009(var2, var3, 0)) { // L: 2597
+							var28 = null; // L: 2598
+						} else {
+							var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2603
+							var6 = 0;
+
+							while (true) {
+								if (var6 >= class440.SpriteBuffer_spriteCount) {
+									UserComparator3.method2529(); // L: 2617
+									var28 = var31; // L: 2620
+									break;
+								}
+
+								var33 = var31[var6] = new SpritePixels(); // L: 2605
+								var33.width = class432.SpriteBuffer_spriteWidth; // L: 2606
+								var33.height = class432.SpriteBuffer_spriteHeight; // L: 2607
+								var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2608
+								var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2609
+								var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2610
+								var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2611
+								var8 = var33.subHeight * var33.subWidth; // L: 2612
+								var9 = class369.SpriteBuffer_pixels[var6]; // L: 2613
+								var33.pixels = new int[var8]; // L: 2614
+
+								for (var10 = 0; var10 < var8; ++var10) { // L: 2615
+									var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255];
+								}
+
+								++var6; // L: 2604
+							}
+						}
+
+						UserComparator5.crossSprites = var28; // L: 2622
+					} else {
+						++var18; // L: 2624
+					}
+
+					if (class111.mapDotSprites == null) { // L: 2625
+						var2 = UserComparator6.archive8; // L: 2627
+						var3 = class6.spriteIds.field4170; // L: 2628
+						if (!class147.method3009(var2, var3, 0)) { // L: 2630
+							var28 = null; // L: 2631
+						} else {
+							var31 = new SpritePixels[class440.SpriteBuffer_spriteCount]; // L: 2636
+							var6 = 0;
+
+							while (true) {
+								if (var6 >= class440.SpriteBuffer_spriteCount) {
+									UserComparator3.method2529(); // L: 2650
+									var28 = var31; // L: 2653
+									break;
+								}
+
+								var33 = var31[var6] = new SpritePixels(); // L: 2638
+								var33.width = class432.SpriteBuffer_spriteWidth; // L: 2639
+								var33.height = class432.SpriteBuffer_spriteHeight; // L: 2640
+								var33.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2641
+								var33.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2642
+								var33.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2643
+								var33.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2644
+								var8 = var33.subWidth * var33.subHeight; // L: 2645
+								var9 = class369.SpriteBuffer_pixels[var6]; // L: 2646
+								var33.pixels = new int[var8]; // L: 2647
+
+								for (var10 = 0; var10 < var8; ++var10) { // L: 2648
+									var33.pixels[var10] = class432.SpriteBuffer_spritePalette[var9[var10] & 255];
+								}
+
+								++var6; // L: 2637
+							}
+						}
+
+						class111.mapDotSprites = var28; // L: 2655
+					} else {
+						++var18; // L: 2657
+					}
+
+					if (AbstractWorldMapData.scrollBarSprites == null) { // L: 2658
+						var2 = UserComparator6.archive8; // L: 2660
+						var3 = class6.spriteIds.field4171; // L: 2661
+						if (!class147.method3009(var2, var3, 0)) { // L: 2663
+							var1 = null; // L: 2664
+						} else {
+							var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 2669
+
+							for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { // L: 2670
+								var7 = var5[var6] = new IndexedSprite(); // L: 2671
+								var7.width = class432.SpriteBuffer_spriteWidth; // L: 2672
+								var7.height = class432.SpriteBuffer_spriteHeight; // L: 2673
+								var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2674
+								var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2675
+								var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2676
+								var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2677
+								var7.palette = class432.SpriteBuffer_spritePalette; // L: 2678
+								var7.pixels = class369.SpriteBuffer_pixels[var6]; // L: 2679
+							}
+
+							UserComparator3.method2529(); // L: 2681
+							var1 = var5; // L: 2684
+						}
+
+						AbstractWorldMapData.scrollBarSprites = var1; // L: 2686
+					} else {
+						++var18; // L: 2688
+					}
+
+					if (World.modIconSprites == null) { // L: 2689
+						var2 = UserComparator6.archive8; // L: 2691
+						var3 = class6.spriteIds.field4172; // L: 2692
+						if (!class147.method3009(var2, var3, 0)) { // L: 2694
+							var1 = null; // L: 2695
+						} else {
+							var5 = new IndexedSprite[class440.SpriteBuffer_spriteCount]; // L: 2700
+
+							for (var6 = 0; var6 < class440.SpriteBuffer_spriteCount; ++var6) { // L: 2701
+								var7 = var5[var6] = new IndexedSprite(); // L: 2702
+								var7.width = class432.SpriteBuffer_spriteWidth; // L: 2703
+								var7.height = class432.SpriteBuffer_spriteHeight; // L: 2704
+								var7.xOffset = class141.SpriteBuffer_xOffsets[var6]; // L: 2705
+								var7.yOffset = RouteStrategy.SpriteBuffer_yOffsets[var6]; // L: 2706
+								var7.subWidth = class432.SpriteBuffer_spriteWidths[var6]; // L: 2707
+								var7.subHeight = class330.SpriteBuffer_spriteHeights[var6]; // L: 2708
+								var7.palette = class432.SpriteBuffer_spritePalette; // L: 2709
+								var7.pixels = class369.SpriteBuffer_pixels[var6]; // L: 2710
+							}
+
+							UserComparator3.method2529(); // L: 2712
+							var1 = var5; // L: 2715
+						}
+
+						World.modIconSprites = var1; // L: 2717
+					} else {
+						++var18; // L: 2719
+					}
+
+					if (var18 < 11) { // L: 2720
+						Login.Login_loadingText = "Loading sprites - " + var18 * 100 / 12 + "%"; // L: 2721
+						Login.Login_loadingPercent = 70; // L: 2722
+					} else {
+						AbstractFont.AbstractFont_modIconSprites = World.modIconSprites; // L: 2725
+						PcmPlayer.redHintArrowSprite.normalize(); // L: 2726
+						var19 = (int)(Math.random() * 21.0D) - 10; // L: 2727
+						int var20 = (int)(Math.random() * 21.0D) - 10; // L: 2728
+						var3 = (int)(Math.random() * 21.0D) - 10; // L: 2729
+						int var21 = (int)(Math.random() * 41.0D) - 20; // L: 2730
+						AbstractWorldMapData.mapSceneSprites[0].shiftColors(var21 + var19, var20 + var21, var3 + var21); // L: 2731
+						Login.Login_loadingText = "Loaded sprites"; // L: 2732
+						Login.Login_loadingPercent = 70; // L: 2733
+						Client.titleLoadingStage = 90; // L: 2734
+					}
+				} else if (Client.titleLoadingStage == 90) { // L: 2737
+					if (!NetSocket.archive9.isFullyLoaded()) { // L: 2738
+						Login.Login_loadingText = "Loading textures - " + "0%"; // L: 2739
+						Login.Login_loadingPercent = 90; // L: 2740
+					} else {
+						ItemContainer.textureProvider = new TextureProvider(NetSocket.archive9, UserComparator6.archive8, 20, SecureRandomFuture.clientPreferences.brightness, Client.isLowDetail ? 64 : 128); // L: 2743
+						Rasterizer3D.Rasterizer3D_setTextureLoader(ItemContainer.textureProvider); // L: 2744
+						Rasterizer3D.Rasterizer3D_setBrightness(SecureRandomFuture.clientPreferences.brightness); // L: 2745
+						Client.titleLoadingStage = 100; // L: 2746
+					}
+				} else if (Client.titleLoadingStage == 100) { // L: 2749
+					var18 = ItemContainer.textureProvider.getLoadedPercentage(); // L: 2750
+					if (var18 < 100) { // L: 2751
+						Login.Login_loadingText = "Loading textures - " + var18 + "%"; // L: 2752
+						Login.Login_loadingPercent = 90; // L: 2753
+					} else {
+						Login.Login_loadingText = "Loaded textures"; // L: 2756
+						Login.Login_loadingPercent = 90; // L: 2757
+						Client.titleLoadingStage = 110; // L: 2758
+					}
+				} else if (Client.titleLoadingStage == 110) { // L: 2761
+					Client.mouseRecorder = new MouseRecorder(); // L: 2762
+					GameEngine.taskHandler.newThreadTask(Client.mouseRecorder, 10); // L: 2763
+					Login.Login_loadingText = "Loaded input handler"; // L: 2764
+					Login.Login_loadingPercent = 92; // L: 2765
+					Client.titleLoadingStage = 120; // L: 2766
+				} else if (Client.titleLoadingStage == 120) { // L: 2769
+					if (!class257.archive10.tryLoadFileByNames("huffman", "")) { // L: 2770
+						Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2771
+						Login.Login_loadingPercent = 94; // L: 2772
+					} else {
+						Huffman var0 = new Huffman(class257.archive10.takeFileByNames("huffman", "")); // L: 2775
+						class410.huffman = var0; // L: 2777
+						Login.Login_loadingText = "Loaded wordpack"; // L: 2779
+						Login.Login_loadingPercent = 94; // L: 2780
+						Client.titleLoadingStage = 130; // L: 2781
+					}
+				} else if (Client.titleLoadingStage == 130) { // L: 2784
+					if (!class19.archive4.isFullyLoaded()) { // L: 2785
+						Login.Login_loadingText = "Loading interfaces - " + class19.archive4.loadPercent() * 4 / 5 + "%"; // L: 2786
+						Login.Login_loadingPercent = 96; // L: 2787
+					} else if (!TaskHandler.archive12.isFullyLoaded()) { // L: 2790
+						Login.Login_loadingText = "Loading interfaces - " + (80 + TaskHandler.archive12.loadPercent() / 6) + "%"; // L: 2791
+						Login.Login_loadingPercent = 96; // L: 2792
+					} else if (!class1.archive13.isFullyLoaded()) { // L: 2795
+						Login.Login_loadingText = "Loading interfaces - " + (96 + class1.archive13.loadPercent() / 50) + "%"; // L: 2796
+						Login.Login_loadingPercent = 96; // L: 2797
+					} else {
+						Login.Login_loadingText = "Loaded interfaces"; // L: 2800
+						Login.Login_loadingPercent = 98; // L: 2801
+						Client.titleLoadingStage = 140; // L: 2802
+					}
+				} else if (Client.titleLoadingStage == 140) { // L: 2805
+					Login.Login_loadingPercent = 100; // L: 2806
+					if (!class148.archive19.tryLoadGroupByName(WorldMapCacheName.field2768.name)) { // L: 2807
+						Login.Login_loadingText = "Loading world map - " + class148.archive19.groupLoadPercentByName(WorldMapCacheName.field2768.name) / 10 + "%"; // L: 2808
+					} else {
+						if (Varcs.worldMap == null) { // L: 2811
+							Varcs.worldMap = new WorldMap(); // L: 2812
+							Varcs.worldMap.init(class148.archive19, VertexNormal.archive18, HealthBarUpdate.archive20, class136.fontBold12, Client.fontsMap, AbstractWorldMapData.mapSceneSprites); // L: 2813
+						}
+
+						Login.Login_loadingText = "Loaded world map"; // L: 2815
+						Client.titleLoadingStage = 150; // L: 2816
+					}
+				} else if (Client.titleLoadingStage == 150) { // L: 2819
+					VertexNormal.updateGameState(10); // L: 2820
+				}
+			}
 		}
+	} // L: 2179 2185 2211 2238 2258 2289 2306 2315 2327 2333 2339 2421 2723 2735 2741 2747 2754 2759 2767 2773 2782 2788 2793 2798 2803 2809 2817 2821 2823
 
-	} // L: 11787
+	@ObfuscatedName("iw")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1832124278"
+	)
+	static final int method2543() {
+		return Client.menuOptionsCount - 1; // L: 10059
+	}
 }
diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java
index 0bd43d3cdf..76a78221e9 100644
--- a/runescape-client/src/main/java/UserComparator2.java
+++ b/runescape-client/src/main/java/UserComparator2.java
@@ -1,19 +1,13 @@
 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("oy")
+@ObfuscatedName("pr")
 @Implements("UserComparator2")
 public class UserComparator2 implements Comparator {
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = 419330147
-	)
-	public static int field4359;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -21,21 +15,235 @@ public UserComparator2(boolean var1) {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;Lla;B)I",
-		garbageValue = "86"
+		descriptor = "(Lmv;Lmv;B)I",
+		garbageValue = "-16"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(User var1, User var2) {
 		return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14
 	}
 
+	public boolean equals(Object var1) {
+		return super.equals(var1); // L: 22
+	}
+
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((User)var1, (User)var2); // L: 18
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 22
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(IIILgv;Lgf;I)Z",
+		garbageValue = "-1521057603"
+	)
+	public static final boolean method7617(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) {
+		int var5 = var0; // L: 137
+		int var6 = var1; // L: 138
+		byte var7 = 64; // L: 139
+		byte var8 = 64; // L: 140
+		int var9 = var0 - var7; // L: 141
+		int var10 = var1 - var8; // L: 142
+		class186.directions[var7][var8] = 99; // L: 143
+		class186.distances[var7][var8] = 0; // L: 144
+		byte var11 = 0; // L: 145
+		int var12 = 0; // L: 146
+		class186.bufferX[var11] = var0; // L: 147
+		int var20 = var11 + 1;
+		class186.bufferY[var11] = var1; // L: 148
+		int[][] var13 = var4.flags; // L: 149
+
+		while (true) {
+			label305:
+			while (true) {
+				int var14;
+				int var15;
+				int var16;
+				int var17;
+				int var18;
+				int var19;
+				do {
+					do {
+						do {
+							label282:
+							do {
+								if (var12 == var20) { // L: 150
+									class186.field2129 = var5; // L: 269
+									class186.field2130 = var6; // L: 270
+									return false; // L: 271
+								}
+
+								var5 = class186.bufferX[var12]; // L: 151
+								var6 = class186.bufferY[var12]; // L: 152
+								var12 = var12 + 1 & 4095; // L: 153
+								var18 = var5 - var9; // L: 154
+								var19 = var6 - var10; // L: 155
+								var14 = var5 - var4.xInset; // L: 156
+								var15 = var6 - var4.yInset; // L: 157
+								if (var3.hasArrived(var2, var5, var6, var4)) { // L: 158
+									class186.field2129 = var5; // L: 159
+									class186.field2130 = var6; // L: 160
+									return true; // L: 161
+								}
+
+								var16 = class186.distances[var18][var19] + 1; // L: 163
+								if (var18 > 0 && class186.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 164 165 166 167
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2 - 1) {
+											class186.bufferX[var20] = var5 - 1; // L: 171
+											class186.bufferY[var20] = var6; // L: 172
+											var20 = var20 + 1 & 4095; // L: 173
+											class186.directions[var18 - 1][var19] = 2; // L: 174
+											class186.distances[var18 - 1][var19] = var16; // L: 175
+											break;
+										}
+
+										if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { // L: 169
+											break;
+										}
+
+										++var17; // L: 168
+									}
+								}
+
+								if (var18 < 128 - var2 && class186.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 177 178 179 180
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2 - 1) {
+											class186.bufferX[var20] = var5 + 1; // L: 184
+											class186.bufferY[var20] = var6; // L: 185
+											var20 = var20 + 1 & 4095; // L: 186
+											class186.directions[var18 + 1][var19] = 8; // L: 187
+											class186.distances[var18 + 1][var19] = var16; // L: 188
+											break;
+										}
+
+										if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 182
+											break;
+										}
+
+										++var17; // L: 181
+									}
+								}
+
+								if (var19 > 0 && class186.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 190 191 192 193
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2 - 1) {
+											class186.bufferX[var20] = var5; // L: 197
+											class186.bufferY[var20] = var6 - 1; // L: 198
+											var20 = var20 + 1 & 4095; // L: 199
+											class186.directions[var18][var19 - 1] = 1; // L: 200
+											class186.distances[var18][var19 - 1] = var16; // L: 201
+											break;
+										}
+
+										if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 195
+											break;
+										}
+
+										++var17; // L: 194
+									}
+								}
+
+								if (var19 < 128 - var2 && class186.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 203 204 205 206
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2 - 1) {
+											class186.bufferX[var20] = var5; // L: 210
+											class186.bufferY[var20] = var6 + 1; // L: 211
+											var20 = var20 + 1 & 4095; // L: 212
+											class186.directions[var18][var19 + 1] = 4; // L: 213
+											class186.distances[var18][var19 + 1] = var16; // L: 214
+											break;
+										}
+
+										if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { // L: 208
+											break;
+										}
+
+										++var17; // L: 207
+									}
+								}
+
+								if (var18 > 0 && var19 > 0 && class186.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 216 217 218
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2) {
+											class186.bufferX[var20] = var5 - 1; // L: 223
+											class186.bufferY[var20] = var6 - 1; // L: 224
+											var20 = var20 + 1 & 4095; // L: 225
+											class186.directions[var18 - 1][var19 - 1] = 3; // L: 226
+											class186.distances[var18 - 1][var19 - 1] = var16; // L: 227
+											break;
+										}
+
+										if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 220 221
+											break;
+										}
+
+										++var17; // L: 219
+									}
+								}
+
+								if (var18 < 128 - var2 && var19 > 0 && class186.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 229 230 231
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2) {
+											class186.bufferX[var20] = var5 + 1; // L: 236
+											class186.bufferY[var20] = var6 - 1; // L: 237
+											var20 = var20 + 1 & 4095; // L: 238
+											class186.directions[var18 + 1][var19 - 1] = 9; // L: 239
+											class186.distances[var18 + 1][var19 - 1] = var16; // L: 240
+											break;
+										}
+
+										if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 233 234
+											break;
+										}
+
+										++var17; // L: 232
+									}
+								}
+
+								if (var18 > 0 && var19 < 128 - var2 && class186.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 242 243 244
+									for (var17 = 1; var17 < var2; ++var17) { // L: 245
+										if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 246 247
+											continue label282;
+										}
+									}
+
+									class186.bufferX[var20] = var5 - 1; // L: 249
+									class186.bufferY[var20] = var6 + 1; // L: 250
+									var20 = var20 + 1 & 4095; // L: 251
+									class186.directions[var18 - 1][var19 + 1] = 6; // L: 252
+									class186.distances[var18 - 1][var19 + 1] = var16; // L: 253
+								}
+							} while(var18 >= 128 - var2); // L: 255
+						} while(var19 >= 128 - var2);
+					} while(class186.directions[var18 + 1][var19 + 1] != 0); // L: 256
+				} while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 257
+
+				for (var17 = 1; var17 < var2; ++var17) { // L: 258
+					if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 259 260
+						continue label305;
+					}
+				}
+
+				class186.bufferX[var20] = var5 + 1; // L: 262
+				class186.bufferY[var20] = var6 + 1; // L: 263
+				var20 = var20 + 1 & 4095; // L: 264
+				class186.directions[var18 + 1][var19 + 1] = 12; // L: 265
+				class186.distances[var18 + 1][var19 + 1] = var16; // L: 266
+			}
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java
index e13361b9c0..140c81ca28 100644
--- a/runescape-client/src/main/java/UserComparator3.java
+++ b/runescape-client/src/main/java/UserComparator3.java
@@ -1,14 +1,44 @@
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InvalidClassException;
+import java.io.ObjectInputStream;
+import java.io.OptionalDataException;
+import java.io.StreamCorruptedException;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import 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("df")
+@ObfuscatedName("dr")
 @Implements("UserComparator3")
 public class UserComparator3 extends AbstractUserComparator {
-	@ObfuscatedName("br")
-	static String field1316;
-	@ObfuscatedName("i")
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -1268713199
+	)
+	@Export("cacheGamebuild")
+	public static int cacheGamebuild;
+	@ObfuscatedName("a")
+	@Export("cacheParentPaths")
+	public static String[] cacheParentPaths;
+	@ObfuscatedName("bk")
+	@ObfuscatedSignature(
+		descriptor = "[Lpa;"
+	)
+	@Export("worldSelectArrows")
+	static IndexedSprite[] worldSelectArrows;
+	@ObfuscatedName("mf")
+	@ObfuscatedGetter(
+		intValue = -1173193887
+	)
+	@Export("menuHeight")
+	static int menuHeight;
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -16,10 +46,10 @@ public UserComparator3(boolean var1) {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;Lmt;I)I",
-		garbageValue = "1201701875"
+		descriptor = "(Lmp;Lmp;I)I",
+		garbageValue = "1528597285"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -33,4 +63,159 @@ int compareBuddy(Buddy var1, Buddy var2) {
 	public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
 	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpj;B)V",
+		garbageValue = "-38"
+	)
+	@Export("performReflectionCheck")
+	public static void performReflectionCheck(PacketBuffer var0) {
+		ReflectionCheck var1 = (ReflectionCheck)class33.reflectionChecks.last(); // L: 25
+		if (var1 != null) { // L: 26
+			int var2 = var0.offset; // L: 27
+			var0.writeInt(var1.id); // L: 28
+
+			for (int var3 = 0; var3 < var1.size; ++var3) { // L: 29
+				if (var1.creationErrors[var3] != 0) { // L: 30
+					var0.writeByte(var1.creationErrors[var3]); // L: 31
+				} else {
+					try {
+						int var4 = var1.operations[var3]; // L: 35
+						Field var5;
+						int var6;
+						if (var4 == 0) { // L: 36
+							var5 = var1.fields[var3]; // L: 37
+							var6 = Reflection.getInt(var5, (Object)null); // L: 38
+							var0.writeByte(0); // L: 39
+							var0.writeInt(var6); // L: 40
+						} else if (var4 == 1) { // L: 42
+							var5 = var1.fields[var3]; // L: 43
+							Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 44
+							var0.writeByte(0); // L: 45
+						} else if (var4 == 2) { // L: 47
+							var5 = var1.fields[var3]; // L: 48
+							var6 = var5.getModifiers(); // L: 49
+							var0.writeByte(0); // L: 50
+							var0.writeInt(var6); // L: 51
+						}
+
+						Method var25;
+						if (var4 != 3) { // L: 53
+							if (var4 == 4) { // L: 73
+								var25 = var1.methods[var3]; // L: 74
+								var6 = var25.getModifiers();
+								var0.writeByte(0);
+								var0.writeInt(var6);
+							}
+						} else {
+							var25 = var1.methods[var3]; // L: 54
+							byte[][] var10 = var1.arguments[var3]; // L: 55
+							Object[] var7 = new Object[var10.length]; // L: 56
+
+							for (int var8 = 0; var8 < var10.length; ++var8) { // L: 57
+								ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 58
+								var7[var8] = var9.readObject(); // L: 59
+							}
+
+							Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 61
+							if (var11 == null) { // L: 62
+								var0.writeByte(0);
+							} else if (var11 instanceof Number) {
+								var0.writeByte(1);
+								var0.writeLong(((Number)var11).longValue());
+							} else if (var11 instanceof String) {
+								var0.writeByte(2);
+								var0.writeStringCp1252NullTerminated((String)var11);
+							} else {
+								var0.writeByte(4);
+							}
+						}
+					} catch (ClassNotFoundException var13) { // L: 80
+						var0.writeByte(-10); // L: 81
+					} catch (InvalidClassException var14) { // L: 83
+						var0.writeByte(-11); // L: 84
+					} catch (StreamCorruptedException var15) { // L: 86
+						var0.writeByte(-12); // L: 87
+					} catch (OptionalDataException var16) { // L: 89
+						var0.writeByte(-13); // L: 90
+					} catch (IllegalAccessException var17) { // L: 92
+						var0.writeByte(-14); // L: 93
+					} catch (IllegalArgumentException var18) { // L: 95
+						var0.writeByte(-15); // L: 96
+					} catch (InvocationTargetException var19) { // L: 98
+						var0.writeByte(-16); // L: 99
+					} catch (SecurityException var20) { // L: 101
+						var0.writeByte(-17); // L: 102
+					} catch (IOException var21) { // L: 104
+						var0.writeByte(-18); // L: 105
+					} catch (NullPointerException var22) { // L: 107
+						var0.writeByte(-19); // L: 108
+					} catch (Exception var23) { // L: 110
+						var0.writeByte(-20); // L: 111
+					} catch (Throwable var24) { // L: 113
+						var0.writeByte(-21); // L: 114
+					}
+				}
+			}
+
+			var0.writeCrc(var2); // L: 117
+			var1.remove(); // L: 118
+		}
+	} // L: 119
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-42355532"
+	)
+	@Export("changeWorldSelectSorting")
+	static void changeWorldSelectSorting(int var0, int var1) {
+		int[] var2 = new int[4]; // L: 63
+		int[] var3 = new int[4]; // L: 64
+		var2[0] = var0; // L: 65
+		var3[0] = var1; // L: 66
+		int var4 = 1; // L: 67
+
+		for (int var5 = 0; var5 < 4; ++var5) { // L: 68
+			if (World.World_sortOption1[var5] != var0) { // L: 69
+				var2[var4] = World.World_sortOption1[var5]; // L: 70
+				var3[var4] = World.World_sortOption2[var5]; // L: 71
+				++var4; // L: 72
+			}
+		}
+
+		World.World_sortOption1 = var2; // L: 75
+		World.World_sortOption2 = var3; // L: 76
+		UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77
+	} // L: 78
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "101"
+	)
+	public static void method2529() {
+		class141.SpriteBuffer_xOffsets = null; // L: 146
+		RouteStrategy.SpriteBuffer_yOffsets = null; // L: 147
+		class432.SpriteBuffer_spriteWidths = null; // L: 148
+		class330.SpriteBuffer_spriteHeights = null; // L: 149
+		class432.SpriteBuffer_spritePalette = null; // L: 150
+		class369.SpriteBuffer_pixels = null; // L: 151
+	} // L: 152
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;IIII)V",
+		garbageValue = "265387422"
+	)
+	@Export("Widget_setKeyRate")
+	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+		if (var0.field3302 == null) { // L: 996
+			throw new RuntimeException(); // L: 997
+		} else {
+			var0.field3302[var1] = var2; // L: 999
+			var0.field3303[var1] = var3; // L: 1000
+		}
+	} // L: 1001
 }
diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java
index 604a4320eb..59dfb24b5d 100644
--- a/runescape-client/src/main/java/UserComparator4.java
+++ b/runescape-client/src/main/java/UserComparator4.java
@@ -1,17 +1,13 @@
-import java.security.SecureRandom;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("co")
+@ObfuscatedName("cu")
 @Implements("UserComparator4")
 public class UserComparator4 implements Comparator {
-	@ObfuscatedName("fv")
-	@Export("secureRandom")
-	static SecureRandom secureRandom;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -19,10 +15,10 @@ public UserComparator4(boolean var1) {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;Lmt;I)I",
-		garbageValue = "1981135103"
+		descriptor = "(Lmp;Lmp;I)I",
+		garbageValue = "-427505933"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(Buddy var1, Buddy var2) {
@@ -30,29 +26,213 @@ int compare_bridged(Buddy var1, Buddy var2) {
 	}
 
 	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((Buddy)var1, (Buddy)var2);
+		return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18
 	}
 
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 22
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([Lkl;IB)Lkl;",
-		garbageValue = "1"
+		descriptor = "(Low;I)I",
+		garbageValue = "801134739"
 	)
-	@Export("findEnumerated")
-	public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) {
-		MouseWheel[] var2 = var0; // L: 17
-
-		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18
-			MouseWheel var4 = var2[var3]; // L: 19
-			if (var1 == var4.rsOrdinal()) {
-				return var4; // L: 21
+	static final int method2508(LoginType var0) {
+		if (var0 == null) { // L: 16
+			return 12; // L: 17
+		} else {
+			switch(var0.field4406) { // L: 19
+			case 5:
+				return 20; // L: 21
+			default:
+				return 12; // L: 23
 			}
 		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "([Lbw;II[I[II)V",
+		garbageValue = "388391303"
+	)
+	@Export("sortWorlds")
+	static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
+		if (var1 < var2) { // L: 81
+			int var5 = var1 - 1; // L: 82
+			int var6 = var2 + 1; // L: 83
+			int var7 = (var2 + var1) / 2; // L: 84
+			World var8 = var0[var7]; // L: 85
+			var0[var7] = var0[var1]; // L: 86
+			var0[var1] = var8; // L: 87
+
+			while (var5 < var6) { // L: 88
+				boolean var9 = true; // L: 89
+
+				int var10;
+				int var11;
+				int var12;
+				do {
+					--var6; // L: 91
+
+					for (var10 = 0; var10 < 4; ++var10) { // L: 92
+						if (var3[var10] == 2) { // L: 95
+							var11 = var0[var6].index; // L: 96
+							var12 = var8.index; // L: 97
+						} else if (var3[var10] == 1) { // L: 99
+							var11 = var0[var6].population; // L: 100
+							var12 = var8.population; // L: 101
+							if (var11 == -1 && var4[var10] == 1) { // L: 102
+								var11 = 2001;
+							}
+
+							if (var12 == -1 && var4[var10] == 1) { // L: 103
+								var12 = 2001;
+							}
+						} else if (var3[var10] == 3) { // L: 105
+							var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106
+							var12 = var8.isMembersOnly() ? 1 : 0; // L: 107
+						} else {
+							var11 = var0[var6].id; // L: 110
+							var12 = var8.id; // L: 111
+						}
+
+						if (var12 != var11) { // L: 113
+							if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117
+								var9 = false; // L: 119
+							}
+							break;
+						}
+
+						if (var10 == 3) { // L: 114
+							var9 = false;
+						}
+					}
+				} while(var9);
+
+				var9 = true; // L: 124
+
+				do {
+					++var5; // L: 126
+
+					for (var10 = 0; var10 < 4; ++var10) { // L: 127
+						if (var3[var10] == 2) { // L: 130
+							var11 = var0[var5].index; // L: 131
+							var12 = var8.index; // L: 132
+						} else if (var3[var10] == 1) { // L: 134
+							var11 = var0[var5].population; // L: 135
+							var12 = var8.population; // L: 136
+							if (var11 == -1 && var4[var10] == 1) { // L: 137
+								var11 = 2001;
+							}
+
+							if (var12 == -1 && var4[var10] == 1) { // L: 138
+								var12 = 2001;
+							}
+						} else if (var3[var10] == 3) { // L: 140
+							var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141
+							var12 = var8.isMembersOnly() ? 1 : 0; // L: 142
+						} else {
+							var11 = var0[var5].id; // L: 145
+							var12 = var8.id; // L: 146
+						}
+
+						if (var12 != var11) { // L: 148
+							if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152
+								var9 = false; // L: 154
+							}
+							break;
+						}
+
+						if (var10 == 3) { // L: 149
+							var9 = false;
+						}
+					}
+				} while(var9);
+
+				if (var5 < var6) { // L: 159
+					World var13 = var0[var5]; // L: 160
+					var0[var5] = var0[var6]; // L: 161
+					var0[var6] = var13; // L: 162
+				}
+			}
+
+			sortWorlds(var0, var1, var6, var3, var4); // L: 165
+			sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166
+		}
 
-		return null; // L: 25
+	} // L: 168
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Ldn;[F[FS)V",
+		garbageValue = "5664"
+	)
+	static void method2504(class115 var0, float[] var1, float[] var2) {
+		if (var0 != null) { // L: 288
+			var0.field1406 = var1[0]; // L: 291
+			float var3 = var1[3] - var1[0]; // L: 292
+			float var4 = var2[3] - var2[0]; // L: 293
+			float var5 = var1[1] - var1[0]; // L: 294
+			float var6 = 0.0F; // L: 295
+			float var7 = 0.0F; // L: 296
+			if ((double)var5 != 0.0D) { // L: 297
+				var6 = (var2[1] - var2[0]) / var5; // L: 298
+			}
+
+			var5 = var1[3] - var1[2]; // L: 300
+			if (0.0D != (double)var5) { // L: 301
+				var7 = (var2[3] - var2[2]) / var5; // L: 302
+			}
+
+			float var8 = 1.0F / (var3 * var3); // L: 304
+			float var9 = var6 * var3; // L: 305
+			float var10 = var7 * var3; // L: 306
+			var0.field1401[0] = var8 * (var9 + var10 - var4 - var4) / var3; // L: 307
+			var0.field1401[1] = (var4 + var4 + var4 - var9 - var9 - var10) * var8; // L: 308
+			var0.field1401[2] = var6; // L: 309
+			var0.field1401[3] = var2[0]; // L: 310
+		}
+	} // L: 289 311
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Lbw;Lbw;IZIZB)I",
+		garbageValue = "-82"
+	)
+	static int method2506(World var0, World var1, int var2, boolean var3, int var4, boolean var5) {
+		int var6 = ReflectionCheck.compareWorlds(var0, var1, var2, var3); // L: 199
+		if (var6 != 0) { // L: 200
+			return var3 ? -var6 : var6; // L: 201
+		} else if (var4 == -1) { // L: 204
+			return 0;
+		} else {
+			int var7 = ReflectionCheck.compareWorlds(var0, var1, var4, var5); // L: 205
+			return var5 ? -var7 : var7; // L: 206
+		}
 	}
+
+	@ObfuscatedName("lm")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-452202636"
+	)
+	static void method2499(String var0) {
+		class1.field3 = var0; // L: 12602
+
+		try {
+			String var1 = class295.client.getParameter(Integer.toString(18)); // L: 12604
+			String var2 = class295.client.getParameter(Integer.toString(13)); // L: 12605
+			String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 12606
+			if (var0.length() == 0) { // L: 12607
+				var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
+			} else {
+				var3 = var3 + "; Expires=" + class13.method195(Ignored.method6459() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 12608
+			}
+
+			class27.method432(class295.client, "document.cookie=\"" + var3 + "\""); // L: 12609
+		} catch (Throwable var4) { // L: 12611
+		}
+
+	} // L: 12612
 }
diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java
index ba1796144c..a5c03603f7 100644
--- a/runescape-client/src/main/java/UserComparator5.java
+++ b/runescape-client/src/main/java/UserComparator5.java
@@ -3,10 +3,25 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dq")
+@ObfuscatedName("dm")
 @Implements("UserComparator5")
 public class UserComparator5 extends AbstractUserComparator {
-	@ObfuscatedName("i")
+	@ObfuscatedName("rk")
+	@ObfuscatedSignature(
+		descriptor = "Lei;"
+	)
+	@Export("guestClanChannel")
+	static ClanChannel guestClanChannel;
+	@ObfuscatedName("d")
+	@Export("Tiles_hueMultiplier")
+	static int[] Tiles_hueMultiplier;
+	@ObfuscatedName("ij")
+	@ObfuscatedSignature(
+		descriptor = "[Lpl;"
+	)
+	@Export("crossSprites")
+	static SpritePixels[] crossSprites;
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -14,10 +29,10 @@ public UserComparator5(boolean var1) {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;Lmt;I)I",
-		garbageValue = "-1513288255"
+		descriptor = "(Lmp;Lmp;I)I",
+		garbageValue = "-1224894671"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -25,8 +40,8 @@ int compareBuddy(Buddy var1, Buddy var2) {
 			if (var2.world == 0) { // L: 15
 				return this.reversed ? -1 : 1;
 			}
-		} else if (var2.world != 0) {
-			return this.reversed ? 1 : -1; // L: 18
+		} else if (var2.world != 0) { // L: 18
+			return this.reversed ? 1 : -1;
 		}
 
 		return this.compareUser(var1, var2); // L: 20
@@ -36,21 +51,48 @@ public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;IIB)[Loe;",
-		garbageValue = "2"
+		descriptor = "(II)Lgn;",
+		garbageValue = "354960359"
 	)
-	public static IndexedSprite[] method2478(AbstractArchive var0, int var1, int var2) {
-		byte[] var4 = var0.takeFile(var1, var2); // L: 25
-		boolean var3;
-		if (var4 == null) { // L: 26
-			var3 = false; // L: 27
+	@Export("SequenceDefinition_get")
+	public static SequenceDefinition SequenceDefinition_get(int var0) {
+		SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 46
+		if (var1 != null) { // L: 47
+			return var1;
 		} else {
-			Script.SpriteBuffer_decode(var4); // L: 30
-			var3 = true; // L: 31
+			byte[] var2 = Canvas.SequenceDefinition_archive.takeFile(12, var0); // L: 48
+			var1 = new SequenceDefinition(); // L: 49
+			if (var2 != null) { // L: 50
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode(); // L: 51
+			SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 52
+			return var1; // L: 53
 		}
+	}
 
-		return !var3 ? null : AbstractWorldMapData.method3958(); // L: 33 34
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Ljava/lang/String;",
+		garbageValue = "83"
+	)
+	@Export("colorStartTag")
+	static String colorStartTag(int var0) {
+		return "<col=" + Integer.toHexString(var0) + ">"; // L: 22
 	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1519607580"
+	)
+	public static void method2524() {
+		ObjectComposition.ObjectDefinition_cached.clear(); // L: 415
+		ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 416
+		ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 417
+		ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 418
+	} // L: 419
 }
diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java
index e2d0718a09..057fe18832 100644
--- a/runescape-client/src/main/java/UserComparator6.java
+++ b/runescape-client/src/main/java/UserComparator6.java
@@ -1,21 +1,18 @@
-import java.io.File;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dc")
+@ObfuscatedName("dt")
 @Implements("UserComparator6")
 public class UserComparator6 extends AbstractUserComparator {
-	@ObfuscatedName("aj")
-	static String field1340;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("ej")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
+		descriptor = "Lkz;"
 	)
-	@Export("worldSelectLeftSprite")
-	static IndexedSprite worldSelectLeftSprite;
-	@ObfuscatedName("i")
+	@Export("archive8")
+	static Archive archive8;
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -23,17 +20,17 @@ public UserComparator6(boolean var1) {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;Lmt;B)I",
-		garbageValue = "1"
+		descriptor = "(Lmp;Lmp;I)I",
+		garbageValue = "579656332"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
 		if (var1.world != 0 && var2.world != 0) { // L: 14
 			return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 15
 		} else {
-			return this.compareUser(var1, var2);
+			return this.compareUser(var1, var2); // L: 17
 		}
 	}
 
@@ -41,114 +38,152 @@ public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1965177576"
+		descriptor = "(II)Lfx;",
+		garbageValue = "-2085388383"
 	)
-	static void method2513() {
-		class300.field3765 = new int[2000]; // L: 25
-		int var0 = 0; // L: 26
-		int var1 = 240; // L: 27
-
-		int var3;
-		for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28
-			var3 = SequenceDefinition.method3461((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var0 / 16.0F)); // L: 30
-			class300.field3765[var0] = var3; // L: 31
-			++var0; // L: 29
-		}
+	@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 = 48; // L: 33
+			var1.post(); // L: 90
+			if (var1.noteTemplate != -1) { // L: 91
+				var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note));
+			}
 
-		for (int var5 = var1 / 6; var0 < class300.field3765.length; var1 -= var5) { // L: 34 35 41
-			var3 = var0 * 2; // L: 36
+			if (var1.notedId != -1) { // L: 92
+				var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId));
+			}
 
-			for (int var4 = SequenceDefinition.method3461((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class300.field3765.length; ++var0) { // L: 37 38
-				class300.field3765[var0] = var4; // L: 39
+			if (var1.placeholderTemplate != -1) { // L: 93
+				var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder));
+			}
+
+			if (!ItemComposition.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 = VerticalAlignment.getParamDefinition((int)var4.key); // L: 110
+						if (var5.autoDisable) { // L: 111
+							var4.remove();
+						} else {
+							var6 = true; // L: 112
+						}
+					}
+
+					if (!var6) {
+						var1.params = null; // L: 114
+					}
+				}
 			}
-		}
 
-	} // L: 43
+			ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117
+			return var1; // L: 118
+		}
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/io/File;I)V",
-		garbageValue = "-1996074579"
+		descriptor = "(IB)Lfn;",
+		garbageValue = "81"
 	)
-	static void method2508(File var0) {
-		FileSystem.FileSystem_cacheDir = var0; // L: 16
-		if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17
-			throw new RuntimeException("");
+	public static HitSplatDefinition method2554(int var0) {
+		HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cachedSprites.get((long)var0); // L: 52
+		if (var1 != null) { // L: 53
+			return var1;
 		} else {
-			FileSystem.FileSystem_hasPermissions = true; // L: 18
+			byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54
+			var1 = new HitSplatDefinition(); // L: 55
+			if (var2 != null) { // L: 56
+				var1.decode(new Buffer(var2));
+			}
+
+			HitSplatDefinition.HitSplatDefinition_cachedSprites.put(var1, (long)var0); // L: 57
+			return var1; // L: 58
 		}
-	} // L: 19
+	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "112"
+		descriptor = "(ZB)V",
+		garbageValue = "-77"
 	)
-	public static int method2512(int var0) {
-		return class361.field4047[var0 & 16383]; // L: 32
-	}
+	public static void method2552(boolean var0) {
+		if (var0 != ItemComposition.ItemDefinition_inMembersWorld) { // L: 552
+			ItemComposition.ItemDefinition_cached.clear(); // L: 554
+			ItemComposition.ItemDefinition_cachedModels.clear(); // L: 555
+			ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 556
+			ItemComposition.ItemDefinition_inMembersWorld = var0; // L: 558
+		}
+
+	} // L: 560
 
-	@ObfuscatedName("jk")
+	@ObfuscatedName("kp")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;IIB)V",
-		garbageValue = "100"
+		descriptor = "(I)V",
+		garbageValue = "88961888"
 	)
-	@Export("clickWidget")
-	static final void clickWidget(Widget var0, int var1, int var2) {
-		if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11156
-			if (var0 != null) { // L: 11158
-				Widget var4 = BuddyRankComparator.method2501(var0); // L: 11161
-				if (var4 == null) { // L: 11162
-					var4 = var0.parent;
-				}
-
-				if (var4 != null) { // L: 11165
-					Client.clickedWidget = var0; // L: 11169
-					var4 = BuddyRankComparator.method2501(var0); // L: 11172
-					if (var4 == null) { // L: 11173
-						var4 = var0.parent;
+	static void method2551() {
+		for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 12038
+			int var1 = var0.group; // L: 12039
+			if (class242.loadInterface(var1)) { // L: 12040
+				boolean var2 = true; // L: 12041
+				Widget[] var3 = MouseRecorder.Widget_interfaceComponents[var1]; // L: 12042
+
+				int var4;
+				for (var4 = 0; var4 < var3.length; ++var4) { // L: 12043
+					if (var3[var4] != null) { // L: 12044
+						var2 = var3[var4].isIf3; // L: 12045
+						break;
 					}
+				}
 
-					Client.clickedWidgetParent = var4; // L: 11176
-					Client.widgetClickX = var1; // L: 11177
-					Client.widgetClickY = var2; // L: 11178
-					class134.widgetDragDuration = 0; // L: 11179
-					Client.isDraggingWidget = false; // L: 11180
-					int var6 = Client.menuOptionsCount - 1; // L: 11183
-					if (var6 != -1) { // L: 11186
-						class12.method170(var6);
+				if (!var2) { // L: 12049
+					var4 = (int)var0.key; // L: 12050
+					Widget var5 = ChatChannel.getWidget(var4); // L: 12051
+					if (var5 != null) { // L: 12052
+						SecureRandomCallable.invalidateWidget(var5);
 					}
-
-					return; // L: 11187
 				}
 			}
-
 		}
-	} // L: 11167
 
-	@ObfuscatedName("ks")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1324364806"
-	)
-	static final void method2509() {
-		Client.field681 = Client.cycleCntr; // L: 11799
-		class29.field162 = true; // L: 11800
-	} // L: 11801
+	} // L: 12056
 
-	@ObfuscatedName("lr")
+	@ObfuscatedName("ms")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1910834630"
+		descriptor = "(I)V",
+		garbageValue = "1260552521"
 	)
-	static void method2503(int var0) {
-		if (var0 != Client.loginState) { // L: 12057
-			Client.loginState = var0; // L: 12058
-		}
-	} // L: 12059
+	static void method2549() {
+		SecureRandomFuture.clientPreferences.field1197 = Client.field473; // L: 12728
+		class127.savePreferences(); // L: 12729
+	} // L: 12730
 }
diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java
index a4321ab2f7..a91103783a 100644
--- a/runescape-client/src/main/java/UserComparator7.java
+++ b/runescape-client/src/main/java/UserComparator7.java
@@ -1,23 +1,36 @@
-import java.io.File;
-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("cb")
+@ObfuscatedName("cm")
 @Implements("UserComparator7")
 public class UserComparator7 extends AbstractUserComparator {
-	@ObfuscatedName("e")
-	@Export("Interpreter_stringLocals")
-	static String[] Interpreter_stringLocals;
-	@ObfuscatedName("be")
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		longValue = 1289611995135137433L
+	)
+	public static long field1319;
+	@ObfuscatedName("hx")
 	@ObfuscatedSignature(
-		descriptor = "[Loe;"
+		descriptor = "[Lpl;"
+	)
+	@Export("mapMarkerSprites")
+	static SpritePixels[] mapMarkerSprites;
+	@ObfuscatedName("iq")
+	@ObfuscatedGetter(
+		intValue = -427505933
+	)
+	@Export("cameraX")
+	static int cameraX;
+	@ObfuscatedName("in")
+	@ObfuscatedGetter(
+		intValue = 1941000053
 	)
-	@Export("worldSelectFlagSprites")
-	static IndexedSprite[] worldSelectFlagSprites;
-	@ObfuscatedName("i")
+	@Export("cameraPitch")
+	static int cameraPitch;
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -25,10 +38,10 @@ public UserComparator7(boolean var1) {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;Lmt;I)I",
-		garbageValue = "52692374"
+		descriptor = "(Lmp;Lmp;I)I",
+		garbageValue = "742897399"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -43,45 +56,17 @@ public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
 	}
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;B)V",
-		garbageValue = "110"
-	)
-	public static void method2463(AbstractArchive var0) {
-		EnumComposition.EnumDefinition_archive = var0; // L: 25
-	} // L: 26
-
-	@ObfuscatedName("w")
+	@ObfuscatedName("hj")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/io/File;Ljava/io/File;B)V",
-		garbageValue = "9"
+		descriptor = "(I)I",
+		garbageValue = "-1366394197"
 	)
-	static void method2470(File var0, File var1) {
-		try {
-			AccessFile var2 = new AccessFile(class351.JagexCache_locationFile, "rw", 10000L); // L: 188
-			Buffer var3 = new Buffer(500); // L: 189
-			var3.writeByte(3); // L: 190
-			var3.writeByte(var1 != null ? 1 : 0); // L: 191
-			var3.writeCESU8(var0.getPath()); // L: 192
-			if (var1 != null) {
-				var3.writeCESU8(""); // L: 193
-			}
-
-			var2.write(var3.array, 0, var3.offset); // L: 194
-			var2.close(); // L: 195
-		} catch (IOException var4) { // L: 197
-			var4.printStackTrace(); // L: 198
+	static final int method2518() {
+		if (SecureRandomFuture.clientPreferences.roofsHidden) { // L: 5571
+			return class20.Client_plane;
+		} else {
+			int var0 = FaceNormal.getTileHeight(cameraX, UserComparator10.cameraZ, class20.Client_plane); // L: 5572
+			return var0 - AbstractByteArrayCopier.cameraY < 800 && (Tiles.Tiles_renderFlags[class20.Client_plane][cameraX >> 7][UserComparator10.cameraZ >> 7] & 4) != 0 ? class20.Client_plane : 3; // L: 5573 5574
 		}
-
-	} // L: 200
-
-	@ObfuscatedName("ji")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1682455199"
-	)
-	static boolean method2466() {
-		return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10618
 	}
 }
diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java
index 1f85429e41..f8a39d9970 100644
--- a/runescape-client/src/main/java/UserComparator8.java
+++ b/runescape-client/src/main/java/UserComparator8.java
@@ -1,19 +1,12 @@
-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("cy")
+@ObfuscatedName("cx")
 @Implements("UserComparator8")
 public class UserComparator8 extends AbstractUserComparator {
-	@ObfuscatedName("sm")
-	@ObfuscatedGetter(
-		intValue = -1318815651
-	)
-	static int field1305;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -21,10 +14,10 @@ public UserComparator8(boolean var1) {
 		this.reversed = var1; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;Lmt;I)I",
-		garbageValue = "-1806283560"
+		descriptor = "(Lmp;Lmp;B)I",
+		garbageValue = "121"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -42,59 +35,4 @@ int compareBuddy(Buddy var1, Buddy var2) {
 	public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25
 	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-906484483"
-	)
-	static final int method2456(int var0, int var1) {
-		if (var0 == -1) { // L: 571
-			return 12345678;
-		} else {
-			var1 = (var0 & 127) * var1 / 128; // L: 572
-			if (var1 < 2) { // L: 573
-				var1 = 2;
-			} else if (var1 > 126) { // L: 574
-				var1 = 126;
-			}
-
-			return (var0 & 65408) + var1; // L: 575
-		}
-	}
-
-	@ObfuscatedName("fw")
-	@ObfuscatedSignature(
-		descriptor = "(Lkd;Ljava/lang/String;B)V",
-		garbageValue = "0"
-	)
-	static void method2460(Archive var0, String var1) {
-		ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1977
-		Client.archiveLoaders.add(var2); // L: 1978
-		Client.field745 += var2.groupCount; // L: 1979
-	} // L: 1980
-
-	@ObfuscatedName("kp")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "14"
-	)
-	static final void method2462() {
-		for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11751
-			Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11752
-			var1.clearIsFriend(); // L: 11753
-		}
-
-		Iterator var2 = Messages.Messages_hashTable.iterator(); // L: 11756
-
-		while (var2.hasNext()) {
-			Message var3 = (Message)var2.next(); // L: 11757
-			var3.clearIsFromFriend(); // L: 11759
-		}
-
-		if (AbstractArchive.friendsChat != null) { // L: 11763
-			AbstractArchive.friendsChat.clearFriends(); // L: 11764
-		}
-
-	} // L: 11766
 }
diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java
index 99bc3e203f..4e5c9a22d8 100644
--- a/runescape-client/src/main/java/UserComparator9.java
+++ b/runescape-client/src/main/java/UserComparator9.java
@@ -4,15 +4,20 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("da")
+@ObfuscatedName("ds")
 @Implements("UserComparator9")
 public class UserComparator9 extends AbstractUserComparator {
-	@ObfuscatedName("bm")
+	@ObfuscatedName("sq")
 	@ObfuscatedGetter(
-		intValue = -1416799975
+		intValue = -1619133469
 	)
-	static int field1326;
-	@ObfuscatedName("i")
+	static int field1335;
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Lpa;"
+	)
+	static IndexedSprite field1336;
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -20,10 +25,10 @@ public UserComparator9(boolean var1) {
 		this.reversed = var1; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;Lmt;I)I",
-		garbageValue = "-1547709141"
+		descriptor = "(Lmp;Lmp;I)I",
+		garbageValue = "-346257464"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -37,23 +42,4 @@ int compareBuddy(Buddy var1, Buddy var2) {
 	public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22
 	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(IS)Ljf;",
-		garbageValue = "-28609"
-	)
-	@Export("getWidget")
-	public static Widget getWidget(int var0) {
-		int var1 = var0 >> 16; // L: 199
-		int var2 = var0 & 65535; // L: 200
-		if (WorldMapSection1.Widget_interfaceComponents[var1] == null || WorldMapSection1.Widget_interfaceComponents[var1][var2] == null) { // L: 201
-			boolean var3 = class174.loadInterface(var1); // L: 202
-			if (!var3) { // L: 203
-				return null;
-			}
-		}
-
-		return WorldMapSection1.Widget_interfaceComponents[var1][var2]; // L: 205
-	}
 }
diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java
index 6cae57329e..770535e5de 100644
--- a/runescape-client/src/main/java/UserList.java
+++ b/runescape-client/src/main/java/UserList.java
@@ -7,34 +7,34 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mx")
+@ObfuscatedName("mo")
 @Implements("UserList")
 public abstract class UserList {
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -2120232859
+		intValue = -1781747119
 	)
 	@Export("capacity")
 	final int capacity;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1042330893
+		intValue = -1097399689
 	)
 	@Export("size")
 	int size;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "[Lla;"
+		descriptor = "[Lmv;"
 	)
 	@Export("array")
 	User[] array;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("usernamesMap")
 	HashMap usernamesMap;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("previousUsernamesMap")
 	HashMap previousUsernamesMap;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("comparator")
 	Comparator comparator;
 
@@ -47,26 +47,26 @@ public abstract class UserList {
 		this.previousUsernamesMap = new HashMap(var1 / 8); // L: 20
 	} // L: 21
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lla;",
-		garbageValue = "-450730044"
+		descriptor = "(B)Lmv;",
+		garbageValue = "2"
 	)
 	@Export("newInstance")
 	abstract User newInstance();
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[Lla;",
-		garbageValue = "91"
+		descriptor = "(II)[Lmv;",
+		garbageValue = "-813912346"
 	)
 	@Export("newTypedArray")
 	abstract User[] newTypedArray(int var1);
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "63968071"
+		garbageValue = "17075718"
 	)
 	@Export("clear")
 	public void clear() {
@@ -76,30 +76,30 @@ public void clear() {
 		this.previousUsernamesMap.clear(); // L: 27
 	} // L: 28
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1005728784"
+		descriptor = "(B)I",
+		garbageValue = "-3"
 	)
 	@Export("getSize")
 	public int getSize() {
 		return this.size; // L: 31
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "4"
+		descriptor = "(I)Z",
+		garbageValue = "2022472115"
 	)
 	@Export("isFull")
 	public boolean isFull() {
 		return this.size == this.capacity; // L: 35
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;I)Z",
-		garbageValue = "1083581266"
+		descriptor = "(Lpo;I)Z",
+		garbageValue = "-1621761472"
 	)
 	@Export("contains")
 	public boolean contains(Username var1) {
@@ -110,10 +110,10 @@ public boolean contains(Username var1) {
 		}
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;I)Lla;",
-		garbageValue = "-1249028509"
+		descriptor = "(Lpo;I)Lmv;",
+		garbageValue = "981419574"
 	)
 	@Export("getByUsername")
 	public User getByUsername(Username var1) {
@@ -121,30 +121,30 @@ public User getByUsername(Username var1) {
 		return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 46 47
 	}
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;I)Lla;",
-		garbageValue = "1290274036"
+		descriptor = "(Lpo;I)Lmv;",
+		garbageValue = "-1608136690"
 	)
 	@Export("getByCurrentUsername")
 	User getByCurrentUsername(Username var1) {
 		return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 51 52
 	}
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;B)Lla;",
-		garbageValue = "1"
+		descriptor = "(Lpo;I)Lmv;",
+		garbageValue = "-2078394585"
 	)
 	@Export("getByPreviousUsername")
 	User getByPreviousUsername(Username var1) {
 		return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 56 57
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;B)Z",
-		garbageValue = "1"
+		descriptor = "(Lpo;I)Z",
+		garbageValue = "-1330621985"
 	)
 	@Export("removeByUsername")
 	public final boolean removeByUsername(Username var1) {
@@ -157,10 +157,10 @@ public final boolean removeByUsername(Username var1) {
 		}
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;I)V",
-		garbageValue = "-1555884949"
+		descriptor = "(Lmv;I)V",
+		garbageValue = "-230761700"
 	)
 	@Export("remove")
 	final void remove(User var1) {
@@ -171,38 +171,34 @@ final void remove(User var1) {
 		}
 	} // L: 72
 
-	@ObfuscatedName("az")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;I)Lla;",
-		garbageValue = "-947812103"
+		descriptor = "(Lpo;B)Lmv;",
+		garbageValue = "-4"
 	)
 	@Export("addLastNoPreviousUsername")
 	User addLastNoPreviousUsername(Username var1) {
 		return this.addLast(var1, (Username)null); // L: 75
 	}
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;Lpb;I)Lla;",
-		garbageValue = "-1127655179"
+		descriptor = "(Lpo;Lpo;I)Lmv;",
+		garbageValue = "290354448"
 	)
 	@Export("addLast")
 	User addLast(Username var1, Username var2) {
-		if (this.getByCurrentUsername(var1) != null) { // L: 79
-			throw new IllegalStateException();
-		} else {
-			User var3 = this.newInstance(); // L: 80
-			var3.set(var1, var2); // L: 81
-			this.arrayAddLast(var3); // L: 82
-			this.mapPut(var3); // L: 83
-			return var3; // L: 84
-		}
+		User var3 = this.newInstance(); // L: 80
+		var3.set(var1, var2); // L: 81
+		this.arrayAddLast(var3); // L: 82
+		this.mapPut(var3); // L: 83
+		return var3; // L: 84
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lla;",
-		garbageValue = "1290152106"
+		descriptor = "(IB)Lmv;",
+		garbageValue = "108"
 	)
 	@Export("get")
 	public final User get(int var1) {
@@ -213,10 +209,10 @@ public final User get(int var1) {
 		}
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-17"
+		descriptor = "(I)V",
+		garbageValue = "822595962"
 	)
 	@Export("sort")
 	public final void sort() {
@@ -228,10 +224,10 @@ public final void sort() {
 
 	} // L: 99
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;Lpb;Lpb;B)V",
-		garbageValue = "96"
+		descriptor = "(Lmv;Lpo;Lpo;B)V",
+		garbageValue = "20"
 	)
 	@Export("changeName")
 	final void changeName(User var1, Username var2, Username var3) {
@@ -240,10 +236,10 @@ final void changeName(User var1, Username var2, Username var3) {
 		this.mapPut(var1); // L: 104
 	} // L: 105
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;B)I",
-		garbageValue = "0"
+		descriptor = "(Lmv;I)I",
+		garbageValue = "1978039321"
 	)
 	@Export("indexOf")
 	final int indexOf(User var1) {
@@ -256,37 +252,33 @@ final int indexOf(User var1) {
 		return -1; // L: 111
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;B)V",
-		garbageValue = "49"
+		descriptor = "(Lmv;B)V",
+		garbageValue = "-50"
 	)
 	@Export("mapRemove")
 	final void mapRemove(User var1) {
-		if (this.usernamesMap.remove(var1.username) == null) { // L: 115
-			throw new IllegalStateException();
-		} else {
-			if (var1.previousUsername != null) {
-				this.previousUsernamesMap.remove(var1.previousUsername); // L: 116
-			}
-
+		if (var1.previousUsername != null) {
+			this.previousUsernamesMap.remove(var1.previousUsername); // L: 116
 		}
+
 	} // L: 117
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;B)V",
-		garbageValue = "12"
+		descriptor = "(Lmv;I)V",
+		garbageValue = "2060796938"
 	)
 	@Export("arrayAddLast")
 	final void arrayAddLast(User var1) {
 		this.array[++this.size - 1] = var1; // L: 120
 	} // L: 121
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;I)V",
-		garbageValue = "-1447603702"
+		descriptor = "(Lmv;B)V",
+		garbageValue = "67"
 	)
 	@Export("mapPut")
 	final void mapPut(User var1) {
@@ -300,10 +292,10 @@ final void mapPut(User var1) {
 
 	} // L: 131
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1966671685"
+		garbageValue = "-2019912678"
 	)
 	@Export("arrayRemove")
 	final void arrayRemove(int var1) {
@@ -314,20 +306,20 @@ final void arrayRemove(int var1) {
 
 	} // L: 138
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "64"
+		descriptor = "(I)V",
+		garbageValue = "2074989504"
 	)
 	@Export("removeComparator")
 	public final void removeComparator() {
 		this.comparator = null; // L: 144
 	} // L: 145
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/Comparator;B)V",
-		garbageValue = "-61"
+		garbageValue = "2"
 	)
 	@Export("addComparator")
 	public final void addComparator(Comparator var1) {
diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java
index 40cc677ee4..48aa4972ec 100644
--- a/runescape-client/src/main/java/Username.java
+++ b/runescape-client/src/main/java/Username.java
@@ -3,96 +3,96 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("pb")
+@ObfuscatedName("po")
 @Implements("Username")
 public class Username implements Comparable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("name")
 	String name;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("cleanName")
 	String cleanName;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Lni;)V"
+		descriptor = "(Ljava/lang/String;Low;)V"
 	)
 	public Username(String var1, LoginType var2) {
 		this.name = var1; // L: 16
-		this.cleanName = GameEngine.method585(var1, var2); // L: 17
+		this.cleanName = VarbitComposition.method3395(var1, var2); // L: 17
 	} // L: 18
 
 	public Username(String var1) {
 		this.name = var1; // L: 11
-		this.cleanName = GameEngine.method585(var1, LoginType.oldscape); // L: 12
+		this.cleanName = VarbitComposition.method3395(var1, LoginType.oldscape); // L: 12
 	} // L: 13
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "98"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "-1445770894"
 	)
 	@Export("getName")
 	public String getName() {
 		return this.name; // L: 21
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-74292372"
+		descriptor = "(B)Ljava/lang/String;",
+		garbageValue = "0"
 	)
-	public String method7579() {
+	public String method7914() {
 		return this.cleanName; // L: 25
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "89"
+		descriptor = "(I)Z",
+		garbageValue = "1835118352"
 	)
 	@Export("hasCleanName")
 	public boolean hasCleanName() {
 		return this.cleanName != null; // L: 29
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lpb;B)I",
-		garbageValue = "6"
+		descriptor = "(Lpo;B)I",
+		garbageValue = "-127"
 	)
 	@Export("compareToTyped")
 	public int compareToTyped(Username var1) {
-		if (this.cleanName == null) { // L: 53
-			return var1.cleanName == null ? 0 : 1; // L: 54 55
+		if (this.cleanName == null) { // L: 56
+			return var1.cleanName == null ? 0 : 1; // L: 57 58
 		} else {
-			return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 57 58
+			return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 60 61
 		}
 	}
 
 	public boolean equals(Object var1) {
-		if (var1 instanceof Username) { // L: 33
-			Username var2 = (Username)var1; // L: 34
+		if (var1 instanceof Username) { // L: 34
+			Username var2 = (Username)var1; // L: 35
 			if (this.cleanName == null) {
-				return var2.cleanName == null; // L: 35
-			} else if (var2.cleanName == null) { // L: 36
+				return var2.cleanName == null; // L: 36
+			} else if (var2.cleanName == null) { // L: 37
 				return false;
 			} else {
-				return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 37 38
+				return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 38 39
 			}
 		} else {
-			return false; // L: 40
+			return false; // L: 41
 		}
 	}
 
 	public int hashCode() {
-		return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 44 45
+		return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 46 47
 	}
 
-	public String toString() {
-		return this.getName(); // L: 49
+	public int compareTo(Object var1) {
+		return this.compareToTyped((Username)var1); // L: 65
 	}
 
-	public int compareTo(Object var1) {
-		return this.compareToTyped((Username)var1); // L: 62
+	public String toString() {
+		return this.getName(); // L: 52
 	}
 }
diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java
index 21178e46b4..c230c154c4 100644
--- a/runescape-client/src/main/java/Usernamed.java
+++ b/runescape-client/src/main/java/Usernamed.java
@@ -3,13 +3,13 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lc")
+@ObfuscatedName("mz")
 @Implements("Usernamed")
 public interface Usernamed {
-	@ObfuscatedName("lb")
+	@ObfuscatedName("lu")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lpb;",
-		garbageValue = "-1245448697"
+		descriptor = "(I)Lpo;",
+		garbageValue = "-1191894118"
 	)
 	@Export("username")
 	Username username();
diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java
index 38e5d34f61..8413987714 100644
--- a/runescape-client/src/main/java/VarbitComposition.java
+++ b/runescape-client/src/main/java/VarbitComposition.java
@@ -4,115 +4,305 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fy")
+@ObfuscatedName("fa")
 @Implements("VarbitComposition")
 public class VarbitComposition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("VarbitDefinition_archive")
-	static AbstractArchive VarbitDefinition_archive;
-	@ObfuscatedName("w")
+	public static AbstractArchive VarbitDefinition_archive;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("VarbitDefinition_cached")
 	public static EvictingDualNodeHashTable VarbitDefinition_cached;
-	@ObfuscatedName("g")
-	static final int[] field1780;
-	@ObfuscatedName("fh")
-	@ObfuscatedGetter(
-		intValue = -71897969
-	)
-	static int field1775;
 	@ObfuscatedName("s")
+	static final int[] field1905;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 207149791
+		intValue = 1455193379
 	)
 	@Export("baseVar")
 	public int baseVar;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 348615607
+		intValue = 1681216867
 	)
 	@Export("startBit")
 	public int startBit;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1999695007
+		intValue = -1158305531
 	)
 	@Export("endBit")
 	public int endBit;
 
 	static {
 		VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11
-		field1780 = new int[32]; // L: 15
+		field1905 = new int[32]; // L: 15
 		int var0 = 2; // L: 18
 
 		for (int var1 = 0; var1 < 32; ++var1) { // L: 19
-			field1780[var1] = var0 - 1; // L: 20
+			field1905[var1] = var0 - 1; // L: 20
 			var0 += var0; // L: 21
 		}
 
 	} // L: 23
 
-	VarbitComposition() {
-	} // L: 25
-
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;S)V",
-		garbageValue = "3911"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "442770466"
 	)
 	@Export("decode")
-	void decode(Buffer var1) {
+	public void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 43
-			if (var2 == 0) { // L: 44
-				return; // L: 47
+			int var2 = var1.readUnsignedByte(); // L: 27
+			if (var2 == 0) { // L: 28
+				return; // L: 31
 			}
 
-			this.decodeNext(var1, var2); // L: 45
+			this.decodeNext(var1, var2); // L: 29
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "-1096806966"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "1766433531"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 50
+		if (var2 == 1) {
 			this.baseVar = var1.readUnsignedShort();
 			this.startBit = var1.readUnsignedByte();
 			this.endBit = var1.readUnsignedByte();
 		}
 
-	} // L: 56
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)[Ljb;",
-		garbageValue = "51"
+		descriptor = "(Ljava/lang/CharSequence;Low;I)Ljava/lang/String;",
+		garbageValue = "402019438"
 	)
-	@Export("PlayerType_values")
-	public static PlayerType[] PlayerType_values() {
-		return new PlayerType[]{PlayerType.field3652, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3650, PlayerType.PlayerType_ironman, PlayerType.PlayerType_ultimateIronman, PlayerType.field3649}; // L: 22
+	public static String method3395(CharSequence var0, LoginType var1) {
+		if (var0 == null) { // L: 32
+			return null;
+		} else {
+			int var2 = 0; // L: 33
+
+			int var3;
+			for (var3 = var0.length(); var2 < var3 && NetSocket.method3119(var0.charAt(var2)); ++var2) { // L: 34 35
+			}
+
+			while (var3 > var2 && NetSocket.method3119(var0.charAt(var3 - 1))) { // L: 36
+				--var3;
+			}
+
+			int var4 = var3 - var2; // L: 37
+			if (var4 >= 1 && var4 <= UserComparator4.method2508(var1)) { // L: 38
+				StringBuilder var5 = new StringBuilder(var4); // L: 39
+
+				for (int var6 = var2; var6 < var3; ++var6) { // L: 40
+					char var7 = var0.charAt(var6); // L: 41
+					boolean var8;
+					if (Character.isISOControl(var7)) { // L: 44
+						var8 = false; // L: 45
+					} else if (WorldMapIcon_0.isAlphaNumeric(var7)) { // L: 48
+						var8 = true; // L: 49
+					} else {
+						char[] var9 = class400.field4411;
+						int var10 = 0;
+
+						label91:
+						while (true) {
+							char var11;
+							if (var10 >= var9.length) {
+								var9 = class400.field4410;
+
+								for (var10 = 0; var10 < var9.length; ++var10) {
+									var11 = var9[var10];
+									if (var7 == var11) { // L: 66
+										var8 = true; // L: 67
+										break label91;
+									}
+								}
+
+								var8 = false; // L: 72
+								break;
+							}
+
+							var11 = var9[var10]; // L: 55
+							if (var11 == var7) {
+								var8 = true;
+								break;
+							}
+
+							++var10; // L: 54
+						}
+					}
+
+					if (var8) { // L: 74
+						char var12;
+						switch(var7) { // L: 77
+						case ' ':
+						case '-':
+						case '_':
+						case ' ':
+							var12 = '_'; // L: 157
+							break;
+						case '#':
+						case '[':
+						case ']':
+							var12 = var7; // L: 85
+							break; // L: 86
+						case 'À':
+						case 'Á':
+						case 'Â':
+						case 'Ã':
+						case 'Ä':
+						case 'à':
+						case 'á':
+						case 'â':
+						case 'ã':
+						case 'ä':
+							var12 = 'a'; // L: 101
+							break; // L: 102
+						case 'Ç':
+						case 'ç':
+							var12 = 'c'; // L: 89
+							break; // L: 90
+						case 'È':
+						case 'É':
+						case 'Ê':
+						case 'Ë':
+						case 'è':
+						case 'é':
+						case 'ê':
+						case 'ë':
+							var12 = 'e'; // L: 140
+							break; // L: 141
+						case 'Í':
+						case 'Î':
+						case 'Ï':
+						case 'í':
+						case 'î':
+						case 'ï':
+							var12 = 'i'; // L: 151
+							break;
+						case 'Ñ':
+						case 'ñ':
+							var12 = 'n'; // L: 80
+							break;
+						case 'Ò':
+						case 'Ó':
+						case 'Ô':
+						case 'Õ':
+						case 'Ö':
+						case 'ò':
+						case 'ó':
+						case 'ô':
+						case 'õ':
+						case 'ö':
+							var12 = 'o'; // L: 120
+							break; // L: 121
+						case 'Ù':
+						case 'Ú':
+						case 'Û':
+						case 'Ü':
+						case 'ù':
+						case 'ú':
+						case 'û':
+						case 'ü':
+							var12 = 'u'; // L: 130
+							break; // L: 131
+						case 'ß':
+							var12 = 'b'; // L: 108
+							break; // L: 109
+						case 'ÿ':
+						case 'Ÿ':
+							var12 = 'y'; // L: 105
+							break; // L: 106
+						default:
+							var12 = Character.toLowerCase(var7); // L: 143
+						}
+
+						if (var12 != 0) { // L: 162
+							var5.append(var12); // L: 163
+						}
+					}
+				}
+
+				if (var5.length() == 0) { // L: 165
+					return null;
+				} else {
+					return var5.toString(); // L: 166
+				}
+			} else {
+				return null;
+			}
+		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnf;ILjava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "1356427947"
+		descriptor = "(Lku;II)Lpa;",
+		garbageValue = "120991325"
 	)
-	static String method3205(IterableNodeHashTable var0, int var1, String var2) {
-		if (var0 == null) { // L: 51
-			return var2;
+	public static IndexedSprite method3396(AbstractArchive var0, int var1) {
+		if (!class174.method3382(var0, var1)) { // L: 53
+			return null;
 		} else {
-			ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 52
-			return var3 == null ? var2 : (String)var3.obj; // L: 53 54
+			IndexedSprite var3 = new IndexedSprite(); // L: 56
+			var3.width = class432.SpriteBuffer_spriteWidth; // L: 57
+			var3.height = class432.SpriteBuffer_spriteHeight; // L: 58
+			var3.xOffset = class141.SpriteBuffer_xOffsets[0]; // L: 59
+			var3.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; // L: 60
+			var3.subWidth = class432.SpriteBuffer_spriteWidths[0]; // L: 61
+			var3.subHeight = class330.SpriteBuffer_spriteHeights[0]; // L: 62
+			var3.palette = class432.SpriteBuffer_spritePalette; // L: 63
+			var3.pixels = class369.SpriteBuffer_pixels[0]; // L: 64
+			UserComparator3.method2529(); // L: 65
+			return var3; // L: 68
 		}
 	}
+
+	@ObfuscatedName("jo")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;Lfx;IIZI)V",
+		garbageValue = "718071935"
+	)
+	@Export("addWidgetItemMenuItem")
+	static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) {
+		String[] var5 = var1.inventoryActions; // L: 11144
+		byte var6 = -1; // L: 11145
+		String var7 = null; // L: 11146
+		if (var5 != null && var5[var3] != null) { // L: 11147
+			if (var3 == 0) { // L: 11148
+				var6 = 33;
+			} else if (var3 == 1) { // L: 11149
+				var6 = 34;
+			} else if (var3 == 2) {
+				var6 = 35; // L: 11150
+			} else if (var3 == 3) { // L: 11151
+				var6 = 36;
+			} else {
+				var6 = 37; // L: 11152
+			}
+
+			var7 = var5[var3]; // L: 11153
+		} else if (var3 == 4) { // L: 11156
+			var6 = 37; // L: 11157
+			var7 = "Drop"; // L: 11158
+		}
+
+		if (var6 != -1 && var7 != null) { // L: 11161
+			class21.insertMenuItem(var7, UserComparator5.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 11162
+		}
+
+	} // L: 11164
 }
diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java
index c12cde7749..02fe1927bd 100644
--- a/runescape-client/src/main/java/VarcInt.java
+++ b/runescape-client/src/main/java/VarcInt.java
@@ -1,26 +1,31 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eq")
+@ObfuscatedName("fg")
 @Implements("VarcInt")
 public class VarcInt extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("VarcInt_archive")
 	public static AbstractArchive VarcInt_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("VarcInt_cached")
 	public static EvictingDualNodeHashTable VarcInt_cached;
-	@ObfuscatedName("ar")
-	protected static String field1645;
-	@ObfuscatedName("s")
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -1738406105
+	)
+	@Export("musicTrackGroupId")
+	public static int musicTrackGroupId;
+	@ObfuscatedName("p")
 	@Export("persist")
 	public boolean persist;
 
@@ -32,40 +37,46 @@ public VarcInt() {
 		this.persist = false; // L: 12
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1726990903"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1771326033"
 	)
-	public void method3026(Buffer var1) {
+	public void method3198(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 20
-			if (var2 == 0) { // L: 21
-				return; // L: 24
+			int var2 = var1.readUnsignedByte(); // L: 16
+			if (var2 == 0) { // L: 17
+				return; // L: 20
 			}
 
-			this.method3027(var1, var2); // L: 22
+			this.method3197(var1, var2); // L: 18
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "-1102307189"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-1864154623"
 	)
-	void method3027(Buffer var1, int var2) {
-		if (var2 == 2) { // L: 27
-			this.persist = true; // L: 28
+	void method3197(Buffer var1, int var2) {
+		if (var2 == 2) { // L: 23
+			this.persist = true; // L: 24
 		}
 
-	} // L: 31
+	} // L: 27
 
-	@ObfuscatedName("ke")
+	@ObfuscatedName("fj")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "2018767281"
+		descriptor = "(IZZZI)Lkz;",
+		garbageValue = "-2019338802"
 	)
-	static final void method3033() {
-		Client.field679 = Client.cycleCntr; // L: 11790
-	} // L: 11791
+	@Export("newArchive")
+	static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
+		ArchiveDisk var4 = null; // L: 2826
+		if (JagexCache.JagexCache_dat2File != null) { // L: 2827
+			var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000);
+		}
+
+		return new Archive(var4, ParamComposition.masterDisk, var0, var1, var2, var3); // L: 2828
+	}
 }
diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java
index f95c9d474b..7b9e2a45a2 100644
--- a/runescape-client/src/main/java/Varcs.java
+++ b/runescape-client/src/main/java/Varcs.java
@@ -1,6 +1,4 @@
 import java.io.EOFException;
-import java.io.File;
-import java.io.RandomAccessFile;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -11,382 +9,432 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ch")
+@Deprecated
+@ObfuscatedName("ct")
 @Implements("Varcs")
 public class Varcs {
-	@ObfuscatedName("ka")
+	@ObfuscatedName("uk")
 	@ObfuscatedSignature(
-		descriptor = "Lhr;"
+		descriptor = "Lov;"
 	)
-	@Export("textureProvider")
-	static TextureProvider textureProvider;
-	@ObfuscatedName("or")
-	@ObfuscatedGetter(
-		intValue = -908008497
-	)
-	static int field1263;
-	@ObfuscatedName("s")
+	@Export("worldMap")
+	static WorldMap worldMap;
+	@ObfuscatedName("p")
 	@Export("intsPersistence")
 	boolean[] intsPersistence;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("map")
 	Map map;
-	@ObfuscatedName("o")
+	/** @deprecated */
+	@ObfuscatedName("t")
 	@Export("strings")
 	String[] strings;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("unwrittenChanges")
 	boolean unwrittenChanges;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = 7843770770834716127L
+		longValue = -4836717580474471841L
 	)
-	long field1261;
+	long field1267;
 
 	Varcs() {
-		this.unwrittenChanges = false; // L: 22
-		int var1 = class1.archive2.getGroupFileCount(19); // L: 26
-		this.map = new HashMap(); // L: 27
-		this.intsPersistence = new boolean[var1]; // L: 28
+		this.unwrittenChanges = false; // L: 25
+		int var1 = class131.archive2.getGroupFileCount(19); // L: 29
+		this.map = new HashMap(); // L: 30
+		this.intsPersistence = new boolean[var1]; // L: 31
 
 		int var2;
-		for (var2 = 0; var2 < var1; ++var2) { // L: 29
-			VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); // L: 32
+		for (var2 = 0; var2 < var1; ++var2) { // L: 32
+			VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); // L: 35
 			VarcInt var3;
-			if (var4 != null) { // L: 33
-				var3 = var4; // L: 34
+			if (var4 != null) { // L: 36
+				var3 = var4; // L: 37
 			} else {
-				byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); // L: 37
-				var4 = new VarcInt(); // L: 38
+				byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); // L: 40
+				var4 = new VarcInt(); // L: 41
 				if (var5 != null) {
-					var4.method3026(new Buffer(var5)); // L: 39
+					var4.method3198(new Buffer(var5)); // L: 42
 				}
 
-				VarcInt.VarcInt_cached.put(var4, (long)var2); // L: 40
-				var3 = var4; // L: 41
+				VarcInt.VarcInt_cached.put(var4, (long)var2); // L: 43
+				var3 = var4; // L: 44
 			}
 
-			this.intsPersistence[var2] = var3.persist; // L: 44
+			this.intsPersistence[var2] = var3.persist; // L: 47
 		}
 
-		var2 = 0; // L: 46
-		if (class1.archive2.method5270(15)) { // L: 47
-			var2 = class1.archive2.getGroupFileCount(15); // L: 48
+		var2 = 0; // L: 49
+		if (class131.archive2.method5584(15)) { // L: 50
+			var2 = class131.archive2.getGroupFileCount(15); // L: 51
 		}
 
-		this.strings = new String[var2]; // L: 50
-		this.read(); // L: 51
-	} // L: 52
+		this.strings = new String[var2]; // L: 53
+		this.read(); // L: 54
+	} // L: 55
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(IIB)V",
-		garbageValue = "118"
+		garbageValue = "1"
 	)
 	@Export("setInt")
 	void setInt(int var1, int var2) {
-		this.map.put(var1, var2); // L: 55
+		this.map.put(var1, var2); // L: 58
 		if (this.intsPersistence[var1]) {
-			this.unwrittenChanges = true; // L: 56
+			this.unwrittenChanges = true; // L: 59
 		}
 
-	} // L: 57
+	} // L: 60
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "1775073178"
+		garbageValue = "1323241994"
 	)
 	@Export("getInt")
 	int getInt(int var1) {
-		Object var2 = this.map.get(var1); // L: 60
-		return var2 instanceof Integer ? (Integer)var2 : -1; // L: 61 62 64
+		Object var2 = this.map.get(var1); // L: 63
+		return var2 instanceof Integer ? (Integer)var2 : -1; // L: 64 65 67
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;I)V",
-		garbageValue = "1662383192"
+		garbageValue = "1511387186"
 	)
 	@Export("setString")
 	void setString(int var1, String var2) {
-		this.map.put(var1, var2); // L: 68
-	} // L: 69
+		this.map.put(var1, var2); // L: 71
+	} // L: 72
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(IB)Ljava/lang/String;",
-		garbageValue = "1"
+		garbageValue = "34"
 	)
 	@Export("getString")
 	String getString(int var1) {
-		Object var2 = this.map.get(var1); // L: 72
-		return var2 instanceof String ? (String)var2 : ""; // L: 73 74 76
+		Object var2 = this.map.get(var1); // L: 75
+		return var2 instanceof String ? (String)var2 : ""; // L: 76 77 79
 	}
 
-	@ObfuscatedName("o")
+	/** @deprecated */
+	@Deprecated
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;B)V",
-		garbageValue = "114"
+		descriptor = "(ILjava/lang/String;I)V",
+		garbageValue = "827123605"
 	)
 	@Export("setStringOld")
 	void setStringOld(int var1, String var2) {
-		this.strings[var1] = var2; // L: 80
-	} // L: 81
+		this.strings[var1] = var2; // L: 84
+	} // L: 85
 
-	@ObfuscatedName("g")
+	/** @deprecated */
+	@Deprecated
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-2025393561"
+		garbageValue = "-254051098"
 	)
 	@Export("getStringOld")
 	String getStringOld(int var1) {
-		return this.strings[var1]; // L: 84
+		return this.strings[var1]; // L: 89
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "34"
+		descriptor = "(I)V",
+		garbageValue = "-1102785873"
 	)
 	@Export("clearTransient")
 	void clearTransient() {
 		int var1;
-		for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 88
-			if (!this.intsPersistence[var1]) { // L: 89
-				this.map.remove(var1); // L: 90
+		for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 93
+			if (!this.intsPersistence[var1]) { // L: 94
+				this.map.remove(var1); // L: 95
 			}
 		}
 
-		for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 93
-			this.strings[var1] = null; // L: 94
+		for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 98
+			this.strings[var1] = null; // L: 99
 		}
 
-	} // L: 96
+	} // L: 101
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)Lnv;",
-		garbageValue = "679727155"
+		descriptor = "(ZI)Loa;",
+		garbageValue = "-624786284"
 	)
 	@Export("getPreferencesFile")
 	AccessFile getPreferencesFile(boolean var1) {
-		return DevicePcmPlayerProvider.getPreferencesFile("2", RouteStrategy.field1986.name, var1); // L: 99
+		return class231.getPreferencesFile("2", class338.field4054.name, var1); // L: 104
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-847294066"
+		garbageValue = "-1424242195"
 	)
 	@Export("write")
 	void write() {
-		AccessFile var1 = this.getPreferencesFile(true); // L: 103
+		AccessFile var1 = this.getPreferencesFile(true); // L: 108
 
 		try {
-			int var2 = 3; // L: 105
-			int var3 = 0; // L: 106
-			Iterator var4 = this.map.entrySet().iterator(); // L: 107
+			int var2 = 3; // L: 110
+			int var3 = 0; // L: 111
+			Iterator var4 = this.map.entrySet().iterator(); // L: 112
 
 			while (var4.hasNext()) {
-				Entry var5 = (Entry)var4.next(); // L: 108
-				int var6 = (Integer)var5.getKey(); // L: 110
-				if (this.intsPersistence[var6]) { // L: 111
-					Object var7 = var5.getValue(); // L: 112
-					var2 += 3; // L: 113
-					if (var7 instanceof Integer) { // L: 114
+				Entry var5 = (Entry)var4.next(); // L: 113
+				int var6 = (Integer)var5.getKey(); // L: 115
+				if (this.intsPersistence[var6]) { // L: 116
+					Object var7 = var5.getValue(); // L: 117
+					var2 += 3; // L: 118
+					if (var7 instanceof Integer) { // L: 119
 						var2 += 4;
-					} else if (var7 instanceof String) { // L: 115
-						var2 += Client.stringCp1252NullTerminatedByteSize((String)var7);
+					} else if (var7 instanceof String) {
+						var2 += class116.stringCp1252NullTerminatedByteSize((String)var7); // L: 120
 					}
 
-					++var3; // L: 116
+					++var3; // L: 121
 				}
 			}
 
-			Buffer var26 = new Buffer(var2); // L: 120
-			var26.writeByte(2); // L: 121
-			var26.writeShort(var3); // L: 122
-			Iterator var27 = this.map.entrySet().iterator(); // L: 123
-
-			while (var27.hasNext()) {
-				Entry var15 = (Entry)var27.next(); // L: 124
-				int var16 = (Integer)var15.getKey(); // L: 126
-				if (this.intsPersistence[var16]) { // L: 127
-					var26.writeShort(var16); // L: 128
-					Object var8 = var15.getValue(); // L: 129
-					class392 var9 = class392.method6856(var8.getClass()); // L: 130
-					var26.writeByte(var9.field4273); // L: 131
-					Class var11 = var8.getClass(); // L: 134
-					class392 var12 = class392.method6856(var11); // L: 136
-					if (var12 == null) { // L: 137
-						throw new IllegalArgumentException();
-					}
-
-					class388 var10 = var12.field4275; // L: 138
-					var10.vmethod6878(var8, var26); // L: 141
+			Buffer var23 = new Buffer(var2); // L: 125
+			var23.writeByte(2); // L: 126
+			var23.writeShort(var3); // L: 127
+			Iterator var24 = this.map.entrySet().iterator(); // L: 128
+
+			while (var24.hasNext()) {
+				Entry var12 = (Entry)var24.next(); // L: 129
+				int var13 = (Integer)var12.getKey(); // L: 131
+				if (this.intsPersistence[var13]) { // L: 132
+					var23.writeShort(var13); // L: 133
+					Object var8 = var12.getValue(); // L: 134
+					class409 var9 = class409.method7247(var8.getClass()); // L: 135
+					var23.writeByte(var9.field4452); // L: 136
+					class409.method7255(var8, var23); // L: 137
 				}
 			}
 
-			var1.write(var26.array, 0, var26.offset); // L: 146
-		} catch (Exception var24) { // L: 148
+			var1.write(var23.array, 0, var23.offset); // L: 141
+		} catch (Exception var21) { // L: 143
 		} finally {
 			try {
-				var1.close(); // L: 151
-			} catch (Exception var23) { // L: 153
+				var1.close(); // L: 146
+			} catch (Exception var20) { // L: 148
 			}
 
 		}
 
-		this.unwrittenChanges = false; // L: 155
-		this.field1261 = class111.method2516(); // L: 156
-	} // L: 157
+		this.unwrittenChanges = false; // L: 150
+		this.field1267 = Ignored.method6459(); // L: 151
+	} // L: 152
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1233938263"
+		garbageValue = "-1176168777"
 	)
 	@Export("read")
 	void read() {
-		AccessFile var1 = this.getPreferencesFile(false); // L: 160
+		AccessFile var1 = this.getPreferencesFile(false); // L: 155
 
-		label212: {
+		label226: {
 			try {
-				byte[] var2 = new byte[(int)var1.length()]; // L: 162
+				byte[] var2 = new byte[(int)var1.length()]; // L: 157
 
 				int var4;
-				for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 163 164 167
-					var4 = var1.read(var2, var3, var2.length - var3); // L: 165
-					if (var4 == -1) { // L: 166
+				for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 158 159 162
+					var4 = var1.read(var2, var3, var2.length - var3); // L: 160
+					if (var4 == -1) { // L: 161
 						throw new EOFException();
 					}
 				}
 
-				Buffer var14 = new Buffer(var2); // L: 169
-				if (var14.array.length - var14.offset >= 1) { // L: 170
-					int var15 = var14.readUnsignedByte(); // L: 171
-					if (var15 < 0 || var15 > 2) { // L: 172
-						return;
-					}
-
-					int var7;
-					int var8;
-					int var9;
-					int var16;
-					if (var15 >= 2) { // L: 173
-						var16 = var14.readUnsignedShort(); // L: 174
-						var7 = 0;
-
-						while (true) {
-							if (var7 >= var16) {
-								break label212;
+				Buffer var15 = new Buffer(var2); // L: 164
+				if (var15.array.length - var15.offset >= 1) {
+					int var16 = var15.readUnsignedByte(); // L: 166
+					if (var16 >= 0 && var16 <= 2) {
+						int var7;
+						int var8;
+						int var9;
+						int var17;
+						if (var16 >= 2) { // L: 168
+							var17 = var15.readUnsignedShort(); // L: 169
+							var7 = 0;
+
+							while (true) {
+								if (var7 >= var17) {
+									break label226;
+								}
+
+								var8 = var15.readUnsignedShort(); // L: 171
+								var9 = var15.readUnsignedByte(); // L: 172
+								class409[] var10 = new class409[]{class409.field4442, class409.field4449, class409.field4445}; // L: 175
+								class409 var11 = (class409)class130.findEnumerated(var10, var9); // L: 177
+								Object var12 = var11.method7250(var15); // L: 178
+								if (this.intsPersistence[var8]) { // L: 179
+									this.map.put(var8, var12); // L: 180
+								}
+
+								++var7; // L: 170
 							}
-
-							var8 = var14.readUnsignedShort(); // L: 176
-							var9 = var14.readUnsignedByte(); // L: 177
-							class392 var10 = (class392)UserComparator4.findEnumerated(class392.method6855(), var9); // L: 178
-							Object var11 = var10.method6858(var14); // L: 179
-							if (this.intsPersistence[var8]) { // L: 180
-								this.map.put(var8, var11); // L: 181
+						} else {
+							var17 = var15.readUnsignedShort(); // L: 185
+
+							for (var7 = 0; var7 < var17; ++var7) { // L: 186
+								var8 = var15.readUnsignedShort(); // L: 187
+								var9 = var15.readInt(); // L: 188
+								if (this.intsPersistence[var8]) { // L: 189
+									this.map.put(var8, var9); // L: 190
+								}
 							}
 
-							++var7; // L: 175
-						}
-					} else {
-						var16 = var14.readUnsignedShort(); // L: 186
-
-						for (var7 = 0; var7 < var16; ++var7) { // L: 187
-							var8 = var14.readUnsignedShort(); // L: 188
-							var9 = var14.readInt(); // L: 189
-							if (this.intsPersistence[var8]) { // L: 190
-								this.map.put(var8, var9); // L: 191
-							}
-						}
+							var7 = var15.readUnsignedShort(); // L: 193
+							var8 = 0;
 
-						var7 = var14.readUnsignedShort(); // L: 194
-						var8 = 0;
+							while (true) {
+								if (var8 >= var7) {
+									break label226;
+								}
 
-						while (true) {
-							if (var8 >= var7) {
-								break label212;
+								var15.readUnsignedShort(); // L: 195
+								var15.readStringCp1252NullTerminated(); // L: 196
+								++var8; // L: 194
 							}
-
-							var14.readUnsignedShort(); // L: 196
-							var14.readStringCp1252NullTerminated(); // L: 197
-							++var8; // L: 195
 						}
 					}
+
+					return; // L: 167
 				}
-			} catch (Exception var25) { // L: 201
-				break label212;
+			} catch (Exception var26) { // L: 200
+				break label226;
 			} finally {
 				try {
-					var1.close();
-				} catch (Exception var24) {
+					var1.close(); // L: 203
+				} catch (Exception var25) { // L: 205
 				}
 
 			}
 
-			return;
+			return; // L: 165
 		}
 
-		this.unwrittenChanges = false;
-	}
+		this.unwrittenChanges = false; // L: 207
+	} // L: 208
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-153672255"
+		garbageValue = "1321758199"
 	)
 	@Export("tryWrite")
 	void tryWrite() {
-		if (this.unwrittenChanges && this.field1261 < class111.method2516() - 60000L) { // L: 212
-			this.write();
+		if (this.unwrittenChanges && this.field1267 < Ignored.method6459() - 60000L) { // L: 211
+			this.write(); // L: 212
 		}
 
-	} // L: 215
+	} // L: 214
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "675810598"
+		garbageValue = "-1397883931"
 	)
 	@Export("hasUnwrittenChanges")
 	boolean hasUnwrittenChanges() {
-		return this.unwrittenChanges; // L: 218
+		return this.unwrittenChanges; // L: 217
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("fi")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/io/File;ZB)Z",
-		garbageValue = "16"
+		descriptor = "(I)V",
+		garbageValue = "-397371798"
 	)
-	static boolean method2359(File var0, boolean var1) {
-		try {
-			RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 204
-			int var3 = var2.read(); // L: 205
-			var2.seek(0L); // L: 206
-			var2.write(var3); // L: 207
-			var2.seek(0L); // L: 208
-			var2.close(); // L: 209
-			if (var1) { // L: 210
-				var0.delete();
+	static final void method2411() {
+		if (Client.logoutTimer > 0) { // L: 3647
+			LoginScreenAnimation.logOut(); // L: 3648
+		} else {
+			Client.timer.method6231(); // L: 3651
+			VertexNormal.updateGameState(40); // L: 3652
+			Coord.field3186 = Client.packetWriter.getSocket(); // L: 3653
+			Client.packetWriter.removeSocket(); // L: 3654
+		}
+	} // L: 3649 3655
+
+	@ObfuscatedName("fa")
+	@ObfuscatedSignature(
+		descriptor = "(Lgn;IIIB)V",
+		garbageValue = "23"
+	)
+	static void method2427(SequenceDefinition var0, int var1, int var2, int var3) {
+		if (Client.soundEffectCount < 50 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0) { // L: 4309
+			if (var0.field2075 != null && var0.field2075.containsKey(var1)) { // L: 4310
+				class315.method5816((Integer)var0.field2075.get(var1), var2, var3); // L: 4311
 			}
+		}
+	} // L: 4312
 
-			return true; // L: 211
-		} catch (Exception var4) { // L: 213
-			return false; // L: 214
+	@ObfuscatedName("hv")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIIIIB)V",
+		garbageValue = "-39"
+	)
+	@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: 7932
+
+		for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7933 7934 7939
+			if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7935
+				var9 = var10; // L: 7936
+				break;
+			}
+		}
+
+		if (var9 == null) { // L: 7941
+			var9 = new PendingSpawn(); // L: 7942
+			var9.plane = var0; // L: 7943
+			var9.type = var3; // L: 7944
+			var9.x = var1; // L: 7945
+			var9.y = var2; // L: 7946
+			class4.method26(var9); // L: 7947
+			Client.pendingSpawns.addFirst(var9); // L: 7948
 		}
-	}
 
-	@ObfuscatedName("ls")
+		var9.id = var4; // L: 7950
+		var9.field1075 = var5; // L: 7951
+		var9.orientation = var6; // L: 7952
+		var9.delay = var7; // L: 7953
+		var9.hitpoints = var8; // L: 7954
+	} // L: 7955
+
+	@ObfuscatedName("km")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;B)Z",
-		garbageValue = "-63"
+		descriptor = "(II)V",
+		garbageValue = "-1218655419"
 	)
-	@Export("isComponentHidden")
-	static boolean isComponentHidden(Widget var0) {
-		return var0.isHidden; // L: 11900
-	}
+	static final void method2426(int var0) {
+		var0 = Math.min(Math.max(var0, 0), 255); // L: 12129
+		if (var0 != SecureRandomFuture.clientPreferences.musicVolume) { // L: 12130
+			if (SecureRandomFuture.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 12131
+				NetSocket.method3118(WorldMapScaleHandler.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 12132
+				Client.field743 = false; // L: 12133
+			} else if (var0 == 0) { // L: 12135
+				StructComposition.method3444(); // L: 12136
+				Client.field743 = false; // L: 12137
+			} else if (class260.musicPlayerStatus != 0) { // L: 12140
+				ChatChannel.musicTrackVolume = var0;
+			} else {
+				class260.midiPcmStream.setPcmStreamVolume(var0); // L: 12141
+			}
+
+			SecureRandomFuture.clientPreferences.musicVolume = var0; // L: 12143
+			class127.savePreferences(); // L: 12144
+		}
+
+	} // L: 12146
 }
diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java
index 2cb4f53371..9467807093 100644
--- a/runescape-client/src/main/java/VarpDefinition.java
+++ b/runescape-client/src/main/java/VarpDefinition.java
@@ -4,36 +4,32 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ef")
+@ObfuscatedName("fb")
 @Implements("VarpDefinition")
 public class VarpDefinition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("sw")
+	@ObfuscatedGetter(
+		intValue = 2043894385
+	)
+	static int field1748;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("VarpDefinition_archive")
-	static AbstractArchive VarpDefinition_archive;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -426793897
-	)
-	@Export("VarpDefinition_fileCount")
-	public static int VarpDefinition_fileCount;
-	@ObfuscatedName("s")
+	public static AbstractArchive VarpDefinition_archive;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("VarpDefinition_cached")
 	public static EvictingDualNodeHashTable VarpDefinition_cached;
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "[Loe;"
-	)
-	@Export("title_muteSprite")
-	static IndexedSprite[] title_muteSprite;
-	@ObfuscatedName("a")
+	@ObfuscatedName("he")
+	@Export("regionMapArchives")
+	static byte[][] regionMapArchives;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 830934537
+		intValue = 1559119131
 	)
 	@Export("type")
 	public int type;
@@ -46,77 +42,51 @@ public class VarpDefinition extends DualNode {
 		this.type = 0; // L: 13
 	} // L: 15
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;B)V",
-		garbageValue = "19"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "-1334778255"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 34
-			if (var2 == 0) { // L: 35
-				return; // L: 38
+			int var2 = var1.readUnsignedByte(); // L: 29
+			if (var2 == 0) { // L: 30
+				return; // L: 33
 			}
 
-			this.decodeNext(var1, var2); // L: 36
+			this.decodeNext(var1, var2); // L: 31
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "-2104841656"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-1795168464"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 5) { // L: 41
+		if (var2 == 5) { // L: 36
 			this.type = var1.readUnsignedShort();
 		}
 
-	} // L: 43
+	} // L: 38
 
-	@ObfuscatedName("gj")
+	@ObfuscatedName("ho")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1448622036"
+		descriptor = "(Lcy;II)V",
+		garbageValue = "827099258"
 	)
-	static final void method3004() {
-		for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 5108 5109 5116
-			if (var0.plane == GrandExchangeOfferTotalQuantityComparator.Client_plane && !var0.isFinished) { // L: 5110
-				if (Client.cycle >= var0.cycleStart) { // L: 5111
-					var0.advance(Client.field531); // L: 5112
-					if (var0.isFinished) {
-						var0.remove(); // L: 5113
-					} else {
-						GameBuild.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 5114
-					}
-				}
-			} else {
-				var0.remove();
-			}
-		}
-
-	} // L: 5118
+	static final void method3167(Actor var0, int var1) {
+		ModeWhere.worldToScreen(var0.x, var0.y, var1); // L: 6045
+	} // L: 6046
 
-	@ObfuscatedName("ky")
+	@ObfuscatedName("le")
 	@ObfuscatedSignature(
-		descriptor = "(IIZI)V",
-		garbageValue = "1840015615"
+		descriptor = "(IS)V",
+		garbageValue = "13655"
 	)
-	static final void method3003(int var0, int var1, boolean var2) {
-		if (Client.currentClanChannels[var0] != null) { // L: 11857
-			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2809()) { // L: 11858
-				ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11859
-				PacketWriter var4 = Client.packetWriter; // L: 11860
-				PacketBufferNode var5 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2765, var4.isaacCipher); // L: 11861
-				var5.packetBuffer.writeByte(4 + Client.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 11862
-				var5.packetBuffer.writeByte(var0); // L: 11863
-				var5.packetBuffer.writeShort(var1); // L: 11864
-				var5.packetBuffer.writeBoolean(var2); // L: 11865
-				var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 11866
-				var4.addNode(var5); // L: 11867
-			}
-		}
-	} // L: 11868
+	static void method3168(int var0) {
+		Client.oculusOrbState = var0; // L: 12684
+	} // L: 12685
 }
diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java
index 2924afdf5e..acc4d70f30 100644
--- a/runescape-client/src/main/java/Varps.java
+++ b/runescape-client/src/main/java/Varps.java
@@ -1,22 +1,19 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iq")
+@ObfuscatedName("jg")
 @Implements("Varps")
 public class Varps {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("Varps_masks")
 	static int[] Varps_masks;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("Varps_temp")
 	public static int[] Varps_temp;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("Varps_main")
 	public static int[] Varps_main;
-	@ObfuscatedName("x")
-	public static short[] field3013;
 
 	static {
 		Varps_masks = new int[32]; // L: 6
@@ -30,48 +27,4 @@ public class Varps {
 		Varps_temp = new int[4000]; // L: 16
 		Varps_main = new int[4000]; // L: 17
 	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-1911470841"
-	)
-	public static boolean method5007(int var0) {
-		return var0 >= 0 && var0 < 112 ? KeyHandler.field118[var0] : false; // L: 219 220
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(Ljf;I[B[BS)V",
-		garbageValue = "20257"
-	)
-	@Export("Widget_setKey")
-	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
-		if (var0.field3180 == null) { // L: 975
-			if (var2 == null) { // L: 976
-				return; // L: 982
-			}
-
-			var0.field3180 = new byte[11][]; // L: 977
-			var0.field3105 = new byte[11][]; // L: 978
-			var0.field3128 = new int[11]; // L: 979
-			var0.field3129 = new int[11]; // L: 980
-		}
-
-		var0.field3180[var1] = var2; // L: 984
-		if (var2 != null) {
-			var0.field3125 = true; // L: 985
-		} else {
-			var0.field3125 = false; // L: 987
-
-			for (int var4 = 0; var4 < var0.field3180.length; ++var4) { // L: 988
-				if (var0.field3180[var4] != null) { // L: 989
-					var0.field3125 = true; // L: 990
-					break;
-				}
-			}
-		}
-
-		var0.field3105[var1] = var3; // L: 995
-	} // L: 996
 }
diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java
index da1a3f7272..78f2fa25ff 100644
--- a/runescape-client/src/main/java/VertexNormal.java
+++ b/runescape-client/src/main/java/VertexNormal.java
@@ -4,30 +4,36 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hp")
+@ObfuscatedName("ga")
 @Implements("VertexNormal")
 public class VertexNormal {
-	@ObfuscatedName("i")
+	@ObfuscatedName("ei")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive18")
+	static Archive archive18;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -755097021
+		intValue = 571778343
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -2006486583
+		intValue = -1513329049
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1176524853
+		intValue = -73747775
 	)
 	@Export("z")
 	int z;
-	@ObfuscatedName("a")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 836304425
+		intValue = 89505295
 	)
 	@Export("magnitude")
 	int magnitude;
@@ -36,7 +42,7 @@ public class VertexNormal {
 	} // L: 9
 
 	@ObfuscatedSignature(
-		descriptor = "(Lhp;)V"
+		descriptor = "(Lga;)V"
 	)
 	VertexNormal(VertexNormal var1) {
 		this.x = var1.x; // L: 12
@@ -45,15 +51,72 @@ public class VertexNormal {
 		this.magnitude = var1.magnitude; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("gf")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1811785448"
+		descriptor = "(II)I",
+		garbageValue = "339374654"
 	)
-	static void method4623() {
-		if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 5045
-			class132.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 5046
+	@Export("Messages_getLastChatID")
+	static int Messages_getLastChatID(int var0) {
+		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73
+		if (var1 == null) { // L: 74
+			return -1;
+		} else {
+			return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76
 		}
+	}
+
+	@ObfuscatedName("ew")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-2020888732"
+	)
+	@Export("updateGameState")
+	static void updateGameState(int var0) {
+		if (var0 != Client.gameState) { // L: 1959
+			if (Client.gameState == 0) { // L: 1960
+				class295.client.method498();
+			}
 
-	} // L: 5048
+			if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1961
+				PacketBufferNode.method5016(0); // L: 1962
+				Client.field545 = 0; // L: 1963
+				Client.field541 = 0; // L: 1964
+				Client.timer.method6232(var0); // L: 1965
+				if (var0 != 20) { // L: 1966
+					FriendSystem.method1791(false);
+				}
+			}
+
+			if (var0 != 20 && var0 != 40 && Coord.field3186 != null) { // L: 1968 1969
+				Coord.field3186.close(); // L: 1970
+				Coord.field3186 = null; // L: 1971
+			}
+
+			if (Client.gameState == 25) { // L: 1974
+				Client.field602 = 0; // L: 1975
+				Client.field529 = 0; // L: 1976
+				Client.field530 = 1; // L: 1977
+				Client.field617 = 0; // L: 1978
+				Client.field532 = 1; // L: 1979
+			}
+
+			int var1;
+			if (var0 != 5 && var0 != 10) { // L: 1981
+				if (var0 == 20) { // L: 1985
+					var1 = Client.gameState == 11 ? 4 : 0; // L: 1986
+					DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, true, var1); // L: 1987
+				} else if (var0 == 11) { // L: 1989
+					DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, false, 4); // L: 1990
+				} else {
+					SoundCache.method823(); // L: 1992
+				}
+			} else {
+				var1 = AttackOption.method2356() ? 0 : 12; // L: 1982
+				DefaultsGroup.method6568(class257.archive10, UserComparator6.archive8, true, var1); // L: 1983
+			}
+
+			Client.gameState = var0; // L: 1993
+		}
+	} // L: 1994
 }
diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java
index d994d5c57d..bd430c5184 100644
--- a/runescape-client/src/main/java/VerticalAlignment.java
+++ b/runescape-client/src/main/java/VerticalAlignment.java
@@ -4,35 +4,37 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fg")
+@ObfuscatedName("fs")
 @Implements("VerticalAlignment")
 public enum VerticalAlignment implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lfg;"
+		descriptor = "Lfs;"
 	)
-	field1743(2, 0),
-	@ObfuscatedName("w")
+	field1870(2, 0),
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lfg;"
+		descriptor = "Lfs;"
 	)
 	@Export("VerticalAlignment_centered")
-	VerticalAlignment_centered(0, 1),
-	@ObfuscatedName("s")
+	VerticalAlignment_centered(1, 1),
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lfg;"
+		descriptor = "Lfs;"
 	)
-	field1744(1, 2);
+	field1869(0, 2);
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("h")
+	static int[] field1874;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1028915727
+		intValue = -1994152567
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1836218951
+		intValue = -927577259
 	)
 	@Export("id")
 	final int id;
@@ -42,43 +44,45 @@ public enum VerticalAlignment implements MouseWheel {
 		this.id = var4; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 23
+		return this.id; // L: 24
 	}
 
-	@ObfuscatedName("gv")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-29"
+		descriptor = "(IB)Lfr;",
+		garbageValue = "65"
 	)
-	static final void method3159() {
-		int var0 = Players.Players_count; // L: 4244
-		int[] var1 = Players.Players_indices; // L: 4245
-
-		for (int var2 = 0; var2 < var0; ++var2) { // L: 4246
-			Player var3 = Client.players[var1[var2]]; // L: 4247
-			if (var3 != null) { // L: 4248
-				class135.updateActorSequence(var3, 1); // L: 4249
+	@Export("getParamDefinition")
+	public static ParamComposition getParamDefinition(int var0) {
+		ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25
+		if (var1 != null) { // L: 26
+			return var1;
+		} else {
+			byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27
+			var1 = new ParamComposition(); // L: 28
+			if (var2 != null) { // L: 29
+				var1.decode(new Buffer(var2));
 			}
-		}
 
-	} // L: 4252
+			var1.postDecode(); // L: 30
+			ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31
+			return var1; // L: 32
+		}
+	}
 
-	@ObfuscatedName("gr")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-375267443"
+		descriptor = "(B)V",
+		garbageValue = "21"
 	)
-	static void method3157() {
-		if (Client.renderSelf) { // L: 5039
-			class132.addPlayerToScene(HealthBarDefinition.localPlayer, false); // L: 5040
-		}
-
-	} // L: 5042
+	public static void method3338() {
+		ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 548
+	} // L: 549
 }
diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java
index 24d7eebc9c..2b40de7e1f 100644
--- a/runescape-client/src/main/java/ViewportMouse.java
+++ b/runescape-client/src/main/java/ViewportMouse.java
@@ -3,56 +3,40 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("hk")
+@ObfuscatedName("gz")
 @Implements("ViewportMouse")
 public class ViewportMouse {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("ViewportMouse_isInViewport")
 	public static boolean ViewportMouse_isInViewport;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1767898875
+		intValue = 533460423
 	)
 	@Export("ViewportMouse_x")
-	static int ViewportMouse_x;
-	@ObfuscatedName("s")
+	public static int ViewportMouse_x;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1574858815
+		intValue = 1696550227
 	)
 	@Export("ViewportMouse_y")
-	static int ViewportMouse_y;
-	@ObfuscatedName("a")
+	public static int ViewportMouse_y;
+	@ObfuscatedName("m")
 	@Export("ViewportMouse_false0")
-	static boolean ViewportMouse_false0;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = -1627779879
-	)
-	static int field2582;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 388017149
-	)
-	static int field2579;
-	@ObfuscatedName("p")
+	public static boolean ViewportMouse_false0;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1496218799
+		intValue = -2019317565
 	)
-	static int field2584;
-	@ObfuscatedName("b")
+	static int field2503;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1501353273
-	)
-	static int field2590;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = -1561495595
+		intValue = 194867713
 	)
 	@Export("ViewportMouse_entityCount")
 	public static int ViewportMouse_entityCount;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("ViewportMouse_entityTags")
 	public static long[] ViewportMouse_entityTags;
 
@@ -65,33 +49,36 @@ public class ViewportMouse {
 		ViewportMouse_entityTags = new long[1000]; // L: 18
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("bo")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "598393616"
+		descriptor = "([BB)[B",
+		garbageValue = "14"
 	)
-	static int method4622(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1087
-		if (var0 == ScriptOpcodes.CC_GETX) { // L: 1088
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.x; // L: 1089
-			return 1; // L: 1090
-		} else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1092
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.y; // L: 1093
-			return 1; // L: 1094
-		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1096
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.width; // L: 1097
-			return 1; // L: 1098
-		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1100
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.height; // L: 1101
-			return 1; // L: 1102
-		} else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1104
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1105
-			return 1; // L: 1106
-		} else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1108
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.parentId; // L: 1109
-			return 1; // L: 1110
+	@Export("decompressBytes")
+	static final byte[] decompressBytes(byte[] var0) {
+		Buffer var1 = new Buffer(var0); // L: 424
+		int var2 = var1.readUnsignedByte(); // L: 425
+		int var3 = var1.readInt(); // L: 426
+		if (var3 < 0 || AbstractArchive.field3843 != 0 && var3 > AbstractArchive.field3843) { // L: 427
+			throw new RuntimeException(); // L: 428
+		} else if (var2 == 0) { // L: 430
+			byte[] var6 = new byte[var3]; // L: 431
+			var1.readBytes(var6, 0, var3); // L: 432
+			return var6; // L: 433
 		} else {
-			return 2; // L: 1112
+			int var4 = var1.readInt(); // L: 436
+			if (var4 >= 0 && (AbstractArchive.field3843 == 0 || var4 <= AbstractArchive.field3843)) { // L: 437
+				byte[] var5 = new byte[var4]; // L: 440
+				if (var2 == 1) { // L: 441
+					BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9);
+				} else {
+					AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 442
+				}
+
+				return var5; // L: 443
+			} else {
+				throw new RuntimeException(); // L: 438
+			}
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java
index 74ee2270b8..d6b3fd5b30 100644
--- a/runescape-client/src/main/java/VorbisCodebook.java
+++ b/runescape-client/src/main/java/VorbisCodebook.java
@@ -2,122 +2,122 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("aj")
+@ObfuscatedName("ay")
 @Implements("VorbisCodebook")
 public class VorbisCodebook {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("dimensions")
 	int dimensions;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("entries")
 	int entries;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("lengthMap")
 	int[] lengthMap;
-	@ObfuscatedName("a")
-	int[] field331;
-	@ObfuscatedName("o")
-	float[][] field328;
-	@ObfuscatedName("g")
+	@ObfuscatedName("m")
+	int[] field355;
+	@ObfuscatedName("t")
+	float[][] field356;
+	@ObfuscatedName("s")
 	@Export("keys")
 	int[] keys;
 
 	VorbisCodebook() {
-		VorbisSample.readBits(24); // L: 22
-		this.dimensions = VorbisSample.readBits(16); // L: 23
-		this.entries = VorbisSample.readBits(24); // L: 24
-		this.lengthMap = new int[this.entries]; // L: 25
-		boolean var1 = VorbisSample.readBit() != 0; // L: 26
+		VorbisSample.readBits(24); // L: 41
+		this.dimensions = VorbisSample.readBits(16); // L: 42
+		this.entries = VorbisSample.readBits(24); // L: 43
+		this.lengthMap = new int[this.entries]; // L: 44
+		boolean var1 = VorbisSample.readBit() != 0; // L: 45
 		int var2;
 		int var3;
 		int var5;
-		if (var1) { // L: 27
-			var2 = 0; // L: 28
+		if (var1) { // L: 46
+			var2 = 0; // L: 47
 
-			for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33
-				int var4 = VorbisSample.readBits(class65.iLog(this.entries - var2)); // L: 31
+			for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52
+				int var4 = VorbisSample.readBits(DynamicObject.iLog(this.entries - var2)); // L: 50
 
-				for (var5 = 0; var5 < var4; ++var5) { // L: 32
+				for (var5 = 0; var5 < var4; ++var5) { // L: 51
 					this.lengthMap[var2++] = var3;
 				}
 			}
 		} else {
-			boolean var14 = VorbisSample.readBit() != 0; // L: 37
+			boolean var14 = VorbisSample.readBit() != 0; // L: 56
 
-			for (var3 = 0; var3 < this.entries; ++var3) { // L: 38
-				if (var14 && VorbisSample.readBit() == 0) { // L: 39
+			for (var3 = 0; var3 < this.entries; ++var3) { // L: 57
+				if (var14 && VorbisSample.readBit() == 0) { // L: 58
 					this.lengthMap[var3] = 0;
 				} else {
-					this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 40
+					this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 59
 				}
 			}
 		}
 
-		this.method1005(); // L: 43
-		var2 = VorbisSample.readBits(4); // L: 44
-		if (var2 > 0) { // L: 45
-			float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46
-			float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 47
-			var5 = VorbisSample.readBits(4) + 1; // L: 48
-			boolean var6 = VorbisSample.readBit() != 0; // L: 49
+		this.method1012(); // L: 62
+		var2 = VorbisSample.readBits(4); // L: 63
+		if (var2 > 0) { // L: 64
+			float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 65
+			float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 66
+			var5 = VorbisSample.readBits(4) + 1; // L: 67
+			boolean var6 = VorbisSample.readBit() != 0; // L: 68
 			int var7;
-			if (var2 == 1) { // L: 51
+			if (var2 == 1) { // L: 70
 				var7 = mapType1QuantValues(this.entries, this.dimensions);
 			} else {
-				var7 = this.entries * this.dimensions; // L: 52
+				var7 = this.entries * this.dimensions; // L: 71
 			}
 
-			this.field331 = new int[var7]; // L: 53
+			this.field355 = new int[var7]; // L: 72
 
 			int var8;
-			for (var8 = 0; var8 < var7; ++var8) { // L: 54
-				this.field331[var8] = VorbisSample.readBits(var5);
+			for (var8 = 0; var8 < var7; ++var8) { // L: 73
+				this.field355[var8] = VorbisSample.readBits(var5);
 			}
 
-			this.field328 = new float[this.entries][this.dimensions]; // L: 55
+			this.field356 = new float[this.entries][this.dimensions]; // L: 74
 			float var9;
 			int var10;
 			int var11;
-			if (var2 == 1) { // L: 56
-				for (var8 = 0; var8 < this.entries; ++var8) { // L: 57
-					var9 = 0.0F; // L: 58
-					var10 = 1; // L: 59
-
-					for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60
-						int var12 = var8 / var10 % var7; // L: 61
-						float var13 = (float)this.field331[var12] * var16 + var15 + var9; // L: 62
-						this.field328[var8][var11] = var13; // L: 63
-						if (var6) { // L: 64
+			if (var2 == 1) { // L: 75
+				for (var8 = 0; var8 < this.entries; ++var8) { // L: 76
+					var9 = 0.0F; // L: 77
+					var10 = 1; // L: 78
+
+					for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79
+						int var12 = var8 / var10 % var7; // L: 80
+						float var13 = (float)this.field355[var12] * var16 + var15 + var9; // L: 81
+						this.field356[var8][var11] = var13; // L: 82
+						if (var6) { // L: 83
 							var9 = var13;
 						}
 
-						var10 *= var7; // L: 65
+						var10 *= var7; // L: 84
 					}
 				}
 			} else {
-				for (var8 = 0; var8 < this.entries; ++var8) { // L: 70
-					var9 = 0.0F; // L: 71
-					var10 = var8 * this.dimensions; // L: 72
-
-					for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73
-						float var17 = (float)this.field331[var10] * var16 + var15 + var9; // L: 74
-						this.field328[var8][var11] = var17; // L: 75
-						if (var6) { // L: 76
+				for (var8 = 0; var8 < this.entries; ++var8) { // L: 89
+					var9 = 0.0F; // L: 90
+					var10 = var8 * this.dimensions; // L: 91
+
+					for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92
+						float var17 = (float)this.field355[var10] * var16 + var15 + var9; // L: 93
+						this.field356[var8][var11] = var17; // L: 94
+						if (var6) { // L: 95
 							var9 = var17;
 						}
 
-						++var10; // L: 77
+						++var10; // L: 96
 					}
 				}
 			}
 		}
 
-	} // L: 82
+	} // L: 101
 
-	@ObfuscatedName("w")
-	void method1005() {
-		int[] var1 = new int[this.entries]; // L: 85
-		int[] var2 = new int[33]; // L: 87
+	@ObfuscatedName("b")
+	void method1012() {
+		int[] var1 = new int[this.entries]; // L: 104
+		int[] var2 = new int[33]; // L: 106
 
 		int var3;
 		int var4;
@@ -126,109 +126,132 @@ void method1005() {
 		int var7;
 		int var8;
 		int var10;
-		for (var3 = 0; var3 < this.entries; ++var3) { // L: 88
-			var4 = this.lengthMap[var3]; // L: 89
-			if (var4 != 0) { // L: 90
-				var5 = 1 << 32 - var4; // L: 91
-				var6 = var2[var4]; // L: 92
-				var1[var3] = var6; // L: 93
+		for (var3 = 0; var3 < this.entries; ++var3) { // L: 107
+			var4 = this.lengthMap[var3]; // L: 108
+			if (var4 != 0) { // L: 109
+				var5 = 1 << 32 - var4; // L: 110
+				var6 = var2[var4]; // L: 111
+				var1[var3] = var6; // L: 112
 				int var12;
-				if ((var6 & var5) != 0) { // L: 95
-					var7 = var2[var4 - 1]; // L: 96
+				if ((var6 & var5) != 0) { // L: 114
+					var7 = var2[var4 - 1]; // L: 115
 				} else {
-					var7 = var6 | var5; // L: 99
+					var7 = var6 | var5; // L: 118
 
-					for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 100
-						var12 = var2[var8]; // L: 101
-						if (var12 != var6) { // L: 102
+					for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 119
+						var12 = var2[var8]; // L: 120
+						if (var12 != var6) { // L: 121
 							break;
 						}
 
-						var10 = 1 << 32 - var8; // L: 103
-						if ((var12 & var10) != 0) { // L: 104
-							var2[var8] = var2[var8 - 1]; // L: 105
-							break; // L: 106
+						var10 = 1 << 32 - var8; // L: 122
+						if ((var12 & var10) != 0) { // L: 123
+							var2[var8] = var2[var8 - 1]; // L: 124
+							break; // L: 125
 						}
 
-						var2[var8] = var12 | var10; // L: 109
+						var2[var8] = var12 | var10; // L: 128
 					}
 				}
 
-				var2[var4] = var7; // L: 115
+				var2[var4] = var7; // L: 134
 
-				for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 116
-					var12 = var2[var8]; // L: 117
-					if (var12 == var6) { // L: 118
+				for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 135
+					var12 = var2[var8]; // L: 136
+					if (var12 == var6) { // L: 137
 						var2[var8] = var7;
 					}
 				}
 			}
 		}
 
-		this.keys = new int[8]; // L: 122
-		int var11 = 0; // L: 123
+		this.keys = new int[8]; // L: 141
+		int var11 = 0; // L: 142
 
-		for (var3 = 0; var3 < this.entries; ++var3) { // L: 124
-			var4 = this.lengthMap[var3]; // L: 125
-			if (var4 != 0) { // L: 126
-				var5 = var1[var3]; // L: 127
-				var6 = 0; // L: 128
+		for (var3 = 0; var3 < this.entries; ++var3) { // L: 143
+			var4 = this.lengthMap[var3]; // L: 144
+			if (var4 != 0) { // L: 145
+				var5 = var1[var3]; // L: 146
+				var6 = 0; // L: 147
 
-				for (var7 = 0; var7 < var4; ++var7) { // L: 129
-					var8 = Integer.MIN_VALUE >>> var7; // L: 130
-					if ((var5 & var8) != 0) { // L: 131
-						if (this.keys[var6] == 0) { // L: 132
+				for (var7 = 0; var7 < var4; ++var7) { // L: 148
+					var8 = Integer.MIN_VALUE >>> var7; // L: 149
+					if ((var5 & var8) != 0) { // L: 150
+						if (this.keys[var6] == 0) { // L: 151
 							this.keys[var6] = var11;
 						}
 
-						var6 = this.keys[var6]; // L: 133
+						var6 = this.keys[var6]; // L: 152
 					} else {
-						++var6; // L: 136
+						++var6; // L: 155
 					}
 
-					if (var6 >= this.keys.length) { // L: 138
-						int[] var9 = new int[this.keys.length * 2]; // L: 139
+					if (var6 >= this.keys.length) { // L: 157
+						int[] var9 = new int[this.keys.length * 2]; // L: 158
 
-						for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 140
+						for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 159
 							var9[var10] = this.keys[var10];
 						}
 
-						this.keys = var9; // L: 141
+						this.keys = var9; // L: 160
 					}
 
-					var8 >>>= 1; // L: 143
+					var8 >>>= 1; // L: 162
 				}
 
-				this.keys[var6] = ~var3; // L: 145
-				if (var6 >= var11) { // L: 146
+				this.keys[var6] = ~var3; // L: 164
+				if (var6 >= var11) { // L: 165
 					var11 = var6 + 1;
 				}
 			}
 		}
 
-	} // L: 148
+	} // L: 167
 
-	@ObfuscatedName("s")
-	int method1006() {
+	@ObfuscatedName("p")
+	int method1013() {
 		int var1;
-		for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152
+		for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 170 171
 		}
 
-		return ~this.keys[var1]; // L: 153
+		return ~this.keys[var1]; // L: 172
 	}
 
-	@ObfuscatedName("a")
-	float[] method1008() {
-		return this.field328[this.method1006()]; // L: 157
+	@ObfuscatedName("m")
+	float[] method1014() {
+		return this.field356[this.method1013()]; // L: 176
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("mapType1QuantValues")
 	static int mapType1QuantValues(int var0, int var1) {
-		int var2;
-		for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; class317.method5852(var2, var1) > var0; --var2) { // L: 16 17
-		}
+		int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16
+
+		while (true) {
+			int var4 = var2; // L: 19
+			int var5 = var1; // L: 20
+
+			int var6;
+			for (var6 = 1; var5 > 1; var5 >>= 1) { // L: 22 23 26
+				if ((var5 & 1) != 0) { // L: 24
+					var6 *= var4;
+				}
 
-		return var2; // L: 18
+				var4 *= var4; // L: 25
+			}
+
+			int var3;
+			if (var5 == 1) { // L: 28
+				var3 = var4 * var6; // L: 29
+			} else {
+				var3 = var6; // L: 32
+			}
+
+			if (var3 <= var0) { // L: 34
+				return var2; // L: 37
+			}
+
+			--var2; // L: 35
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java
index e2c4dd47a3..42221415db 100644
--- a/runescape-client/src/main/java/VorbisFloor.java
+++ b/runescape-client/src/main/java/VorbisFloor.java
@@ -2,43 +2,43 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("ac")
+@ObfuscatedName("af")
 @Implements("VorbisFloor")
 public class VorbisFloor {
-	@ObfuscatedName("i")
-	static final int[] field247;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
+	static final int[] field274;
+	@ObfuscatedName("b")
 	@Export("VorbisFloor_decibelStatics")
 	static final float[] VorbisFloor_decibelStatics;
-	@ObfuscatedName("b")
-	static int[] field239;
-	@ObfuscatedName("x")
-	static int[] field249;
-	@ObfuscatedName("y")
-	static boolean[] field250;
-	@ObfuscatedName("s")
-	int[] field241;
-	@ObfuscatedName("a")
+	@ObfuscatedName("r")
+	static int[] field279;
+	@ObfuscatedName("o")
+	static int[] field278;
+	@ObfuscatedName("v")
+	static boolean[] field277;
+	@ObfuscatedName("p")
+	int[] field268;
+	@ObfuscatedName("m")
 	@Export("multiplier")
 	int multiplier;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("partitionClassList")
 	int[] partitionClassList;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("classDimensions")
 	int[] classDimensions;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("classSubClasses")
 	int[] classSubClasses;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("classMasterbooks")
 	int[] classMasterbooks;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("subclassBooks")
 	int[][] subclassBooks;
 
 	static {
-		field247 = new int[]{256, 128, 86, 64}; // L: 8
+		field274 = new int[]{256, 128, 86, 64}; // L: 8
 		VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; // L: 9
 	}
 
@@ -92,30 +92,30 @@ public class VorbisFloor {
 				var5 += this.classDimensions[this.partitionClassList[var6]];
 			}
 
-			this.field241 = new int[var5]; // L: 137
-			this.field241[0] = 0; // L: 138
-			this.field241[1] = 1 << var4; // L: 139
+			this.field268 = new int[var5]; // L: 137
+			this.field268[0] = 0; // L: 138
+			this.field268[1] = 1 << var4; // L: 139
 			var5 = 2; // L: 140
 
 			for (var6 = 0; var6 < var2; ++var6) { // L: 141
 				var7 = this.partitionClassList[var6]; // L: 142
 
 				for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143
-					this.field241[var5++] = VorbisSample.readBits(var4);
+					this.field268[var5++] = VorbisSample.readBits(var4);
 				}
 			}
 
-			if (field239 == null || field239.length < var5) { // L: 145
-				field239 = new int[var5]; // L: 146
-				field249 = new int[var5]; // L: 147
-				field250 = new boolean[var5]; // L: 148
+			if (field279 == null || field279.length < var5) { // L: 145
+				field279 = new int[var5]; // L: 146
+				field278 = new int[var5]; // L: 147
+				field277 = new boolean[var5]; // L: 148
 			}
 
 		}
 	} // L: 150
 
-	@ObfuscatedName("s")
-	int method688(int var1, int var2, int var3, int var4, int var5) {
+	@ObfuscatedName("p")
+	int method726(int var1, int var2, int var3, int var4, int var5) {
 		int var6 = var4 - var2; // L: 50
 		int var7 = var3 - var1; // L: 51
 		int var8 = var6 < 0 ? -var6 : var6; // L: 52
@@ -124,8 +124,8 @@ int method688(int var1, int var2, int var3, int var4, int var5) {
 		return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55
 	}
 
-	@ObfuscatedName("a")
-	void method689(int var1, int var2, int var3, int var4, float[] var5, int var6) {
+	@ObfuscatedName("m")
+	void method723(int var1, int var2, int var3, int var4, float[] var5, int var6) {
 		int var7 = var4 - var2; // L: 59
 		int var8 = var3 - var1; // L: 60
 		int var9 = var7 < 0 ? -var7 : var7; // L: 61
@@ -153,54 +153,54 @@ void method689(int var1, int var2, int var3, int var4, float[] var5, int var6) {
 
 	} // L: 80
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("VarbisFloor_sort")
 	void VarbisFloor_sort(int var1, int var2) {
 		if (var1 < var2) { // L: 83
 			int var3 = var1; // L: 84
-			int var4 = field239[var1]; // L: 85
-			int var5 = field249[var1]; // L: 86
-			boolean var6 = field250[var1]; // L: 87
+			int var4 = field279[var1]; // L: 85
+			int var5 = field278[var1]; // L: 86
+			boolean var6 = field277[var1]; // L: 87
 
 			for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88
-				int var8 = field239[var7]; // L: 89
+				int var8 = field279[var7]; // L: 89
 				if (var8 < var4) { // L: 90
-					field239[var3] = var8; // L: 91
-					field249[var3] = field249[var7]; // L: 92
-					field250[var3] = field250[var7]; // L: 93
+					field279[var3] = var8; // L: 91
+					field278[var3] = field278[var7]; // L: 92
+					field277[var3] = field277[var7]; // L: 93
 					++var3; // L: 94
-					field239[var7] = field239[var3]; // L: 95
-					field249[var7] = field249[var3]; // L: 96
-					field250[var7] = field250[var3]; // L: 97
+					field279[var7] = field279[var3]; // L: 95
+					field278[var7] = field278[var3]; // L: 96
+					field277[var7] = field277[var3]; // L: 97
 				}
 			}
 
-			field239[var3] = var4; // L: 100
-			field249[var3] = var5; // L: 101
-			field250[var3] = var6; // L: 102
+			field279[var3] = var4; // L: 100
+			field278[var3] = var5; // L: 101
+			field277[var3] = var6; // L: 102
 			this.VarbisFloor_sort(var1, var3 - 1); // L: 103
 			this.VarbisFloor_sort(var3 + 1, var2); // L: 104
 		}
 	} // L: 105
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("readSubmapFloor")
 	boolean readSubmapFloor() {
 		boolean var1 = VorbisSample.readBit() != 0; // L: 153
 		if (!var1) { // L: 154
 			return false;
 		} else {
-			int var2 = this.field241.length; // L: 155
+			int var2 = this.field268.length; // L: 155
 
 			int var3;
 			for (var3 = 0; var3 < var2; ++var3) { // L: 156
-				field239[var3] = this.field241[var3];
+				field279[var3] = this.field268[var3];
 			}
 
-			var3 = field247[this.multiplier - 1]; // L: 157
-			int var4 = class65.iLog(var3 - 1); // L: 158
-			field249[0] = VorbisSample.readBits(var4); // L: 159
-			field249[1] = VorbisSample.readBits(var4); // L: 160
+			var3 = field274[this.multiplier - 1]; // L: 157
+			int var4 = DynamicObject.iLog(var3 - 1); // L: 158
+			field278[0] = VorbisSample.readBits(var4); // L: 159
+			field278[1] = VorbisSample.readBits(var4); // L: 160
 			int var5 = 2; // L: 161
 
 			for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162
@@ -210,13 +210,13 @@ boolean readSubmapFloor() {
 				int var10 = (1 << var9) - 1; // L: 166
 				int var11 = 0; // L: 167
 				if (var9 > 0) { // L: 168
-					var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1006();
+					var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1013();
 				}
 
 				for (int var12 = 0; var12 < var8; ++var12) { // L: 169
 					int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170
 					var11 >>>= var9; // L: 171
-					field249[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1006() : 0; // L: 172
+					field278[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1013() : 0; // L: 172
 				}
 			}
 
@@ -224,12 +224,12 @@ boolean readSubmapFloor() {
 		}
 	}
 
-	@ObfuscatedName("e")
-	void method692(float[] var1, int var2) {
-		int var3 = this.field241.length; // L: 179
-		int var4 = field247[this.multiplier - 1]; // L: 180
-		boolean[] var5 = field250; // L: 181
-		field250[1] = true; // L: 182
+	@ObfuscatedName("j")
+	void method728(float[] var1, int var2) {
+		int var3 = this.field268.length; // L: 179
+		int var4 = field274[this.multiplier - 1]; // L: 180
+		boolean[] var5 = field277; // L: 181
+		field277[1] = true; // L: 182
 		var5[0] = true; // L: 183
 
 		int var6;
@@ -238,37 +238,37 @@ void method692(float[] var1, int var2) {
 		int var9;
 		int var10;
 		for (var6 = 2; var6 < var3; ++var6) { // L: 184
-			var7 = method697(field239, var6); // L: 185
-			var8 = method705(field239, var6); // L: 186
-			var9 = this.method688(field239[var7], field249[var7], field239[var8], field249[var8], field239[var6]); // L: 187
-			var10 = field249[var6]; // L: 188
+			var7 = method722(field279, var6); // L: 185
+			var8 = method721(field279, var6); // L: 186
+			var9 = this.method726(field279[var7], field278[var7], field279[var8], field278[var8], field279[var6]); // L: 187
+			var10 = field278[var6]; // L: 188
 			int var11 = var4 - var9; // L: 189
 			int var13 = (var11 < var9 ? var11 : var9) << 1; // L: 191
 			if (var10 != 0) { // L: 192
-				boolean[] var14 = field250; // L: 193
-				field250[var8] = true; // L: 195
+				boolean[] var14 = field277; // L: 193
+				field277[var8] = true; // L: 195
 				var14[var7] = true; // L: 196
-				field250[var6] = true; // L: 197
+				field277[var6] = true; // L: 197
 				if (var10 >= var13) { // L: 198
-					field249[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199
+					field278[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199
 				} else {
-					field249[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202
+					field278[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202
 				}
 			} else {
-				field250[var6] = false; // L: 206
-				field249[var6] = var9; // L: 207
+				field277[var6] = false; // L: 206
+				field278[var6] = var9; // L: 207
 			}
 		}
 
 		this.VarbisFloor_sort(0, var3 - 1); // L: 210
 		var6 = 0; // L: 211
-		var7 = field249[0] * this.multiplier; // L: 212
+		var7 = field278[0] * this.multiplier; // L: 212
 
 		for (var8 = 1; var8 < var3; ++var8) { // L: 213
-			if (field250[var8]) { // L: 214
-				var9 = field239[var8]; // L: 215
-				var10 = field249[var8] * this.multiplier; // L: 216
-				this.method689(var6, var7, var9, var10, var1, var2); // L: 217
+			if (field277[var8]) { // L: 214
+				var9 = field279[var8]; // L: 215
+				var10 = field278[var8] * this.multiplier; // L: 216
+				this.method723(var6, var7, var9, var10, var1, var2); // L: 217
 				if (var9 >= var2) { // L: 218
 					return;
 				}
@@ -286,8 +286,8 @@ void method692(float[] var1, int var2) {
 
 	} // L: 225
 
-	@ObfuscatedName("i")
-	static int method697(int[] var0, int var1) {
+	@ObfuscatedName("c")
+	static int method722(int[] var0, int var1) {
 		int var2 = var0[var1]; // L: 22
 		int var3 = -1; // L: 23
 		int var4 = Integer.MIN_VALUE; // L: 24
@@ -303,8 +303,8 @@ static int method697(int[] var0, int var1) {
 		return var3; // L: 32
 	}
 
-	@ObfuscatedName("w")
-	static int method705(int[] var0, int var1) {
+	@ObfuscatedName("b")
+	static int method721(int[] var0, int var1) {
 		int var2 = var0[var1]; // L: 36
 		int var3 = -1; // L: 37
 		int var4 = Integer.MAX_VALUE; // L: 38
diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java
index 7929c0cf7e..ac7cdbf1c8 100644
--- a/runescape-client/src/main/java/VorbisMapping.java
+++ b/runescape-client/src/main/java/VorbisMapping.java
@@ -2,19 +2,19 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("ap")
+@ObfuscatedName("aq")
 @Implements("VorbisMapping")
 public class VorbisMapping {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("submaps")
 	int submaps;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("mappingMux")
 	int mappingMux;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("submapFloor")
 	int[] submapFloor;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("submapResidue")
 	int[] submapResidue;
 
diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java
index bd18dbcb16..2265938a05 100644
--- a/runescape-client/src/main/java/VorbisResidue.java
+++ b/runescape-client/src/main/java/VorbisResidue.java
@@ -2,28 +2,28 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("an")
+@ObfuscatedName("as")
 @Implements("VorbisResidue")
 public class VorbisResidue {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("residueType")
 	int residueType;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("begin")
 	int begin;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("end")
 	int end;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("partitionSize")
 	int partitionSize;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("classifications")
 	int classifications;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("classbook")
 	int classbook;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("cascade")
 	int[] cascade;
 
@@ -56,8 +56,8 @@ public class VorbisResidue {
 
 	} // L: 31
 
-	@ObfuscatedName("i")
-	void method810(float[] var1, int var2, boolean var3) {
+	@ObfuscatedName("c")
+	void method834(float[] var1, int var2, boolean var3) {
 		int var4;
 		for (var4 = 0; var4 < var2; ++var4) { // L: 34
 			var1[var4] = 0.0F;
@@ -76,7 +76,7 @@ void method810(float[] var1, int var2, boolean var3) {
 					int var10;
 					int var11;
 					if (var8 == 0) { // L: 43
-						var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1006(); // L: 45
+						var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1013(); // L: 45
 
 						for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46
 							if (var9 + var11 < var6) { // L: 47
@@ -98,7 +98,7 @@ void method810(float[] var1, int var2, boolean var3) {
 								var15 = this.partitionSize / var14.dimensions; // L: 60
 
 								for (int var19 = 0; var19 < var15; ++var19) { // L: 61
-									float[] var20 = var14.method1008(); // L: 62
+									float[] var20 = var14.method1014(); // L: 62
 
 									for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63
 										var1[var13 + var19 + var18 * var15] += var20[var18];
@@ -108,7 +108,7 @@ void method810(float[] var1, int var2, boolean var3) {
 								var15 = 0; // L: 67
 
 								while (var15 < this.partitionSize) { // L: 68
-									float[] var16 = var14.method1008(); // L: 69
+									float[] var16 = var14.method1014(); // L: 69
 
 									for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70
 										var1[var13 + var15] += var16[var17]; // L: 71
diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java
index 6bf447b535..17ad9c6be6 100644
--- a/runescape-client/src/main/java/VorbisSample.java
+++ b/runescape-client/src/main/java/VorbisSample.java
@@ -3,115 +3,115 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("af")
+@ObfuscatedName("ae")
 @Implements("VorbisSample")
 public class VorbisSample extends Node {
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("VorbisSample_bytes")
 	static byte[] VorbisSample_bytes;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("VorbisSample_byteOffset")
 	static int VorbisSample_byteOffset;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("VorbisSample_bitOffset")
 	static int VorbisSample_bitOffset;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("VorbisSample_blockSize0")
 	static int VorbisSample_blockSize0;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("VorbisSample_blockSize1")
 	static int VorbisSample_blockSize1;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "[Laj;"
+		descriptor = "[Lay;"
 	)
 	@Export("VorbisSample_codebooks")
 	static VorbisCodebook[] VorbisSample_codebooks;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "[Lac;"
+		descriptor = "[Laf;"
 	)
 	@Export("VorbisSample_floors")
 	static VorbisFloor[] VorbisSample_floors;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "[Lan;"
+		descriptor = "[Las;"
 	)
 	@Export("VorbisSample_residues")
 	static VorbisResidue[] VorbisSample_residues;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "[Lap;"
+		descriptor = "[Laq;"
 	)
 	@Export("VorbisSample_mappings")
 	static VorbisMapping[] VorbisSample_mappings;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("VorbisSample_blockFlags")
 	static boolean[] VorbisSample_blockFlags;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@Export("VorbisSample_mapping")
 	static int[] VorbisSample_mapping;
+	@ObfuscatedName("u")
+	static boolean field388;
+	@ObfuscatedName("x")
+	static float[] field380;
 	@ObfuscatedName("z")
-	static boolean field342;
-	@ObfuscatedName("c")
-	static float[] field356;
-	@ObfuscatedName("f")
-	static float[] field357;
-	@ObfuscatedName("h")
-	static float[] field358;
-	@ObfuscatedName("v")
-	static float[] field359;
-	@ObfuscatedName("ag")
-	static float[] field360;
-	@ObfuscatedName("ae")
-	static float[] field361;
-	@ObfuscatedName("aq")
-	static float[] field350;
-	@ObfuscatedName("al")
-	static int[] field363;
-	@ObfuscatedName("am")
-	static int[] field364;
+	static float[] field381;
 	@ObfuscatedName("i")
-	byte[][] field334;
-	@ObfuscatedName("w")
+	static float[] field382;
+	@ObfuscatedName("y")
+	static float[] field383;
+	@ObfuscatedName("ah")
+	static float[] field363;
+	@ObfuscatedName("ao")
+	static float[] field378;
+	@ObfuscatedName("ab")
+	static float[] field367;
+	@ObfuscatedName("an")
+	static int[] field358;
+	@ObfuscatedName("ax")
+	static int[] field384;
+	@ObfuscatedName("c")
+	byte[][] field375;
+	@ObfuscatedName("b")
 	@Export("sampleRate")
 	int sampleRate;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("sampleCount")
 	int sampleCount;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("start")
 	int start;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("end")
 	int end;
-	@ObfuscatedName("g")
-	boolean field339;
+	@ObfuscatedName("s")
+	boolean field368;
+	@ObfuscatedName("k")
+	float[] field387;
+	@ObfuscatedName("f")
+	int field377;
+	@ObfuscatedName("l")
+	int field376;
 	@ObfuscatedName("q")
-	float[] field353;
-	@ObfuscatedName("d")
-	int field349;
-	@ObfuscatedName("r")
-	int field343;
-	@ObfuscatedName("m")
-	boolean field362;
-	@ObfuscatedName("ai")
+	boolean field379;
+	@ObfuscatedName("am")
 	@Export("samples")
 	byte[] samples;
-	@ObfuscatedName("ah")
-	int field366;
-	@ObfuscatedName("as")
-	int field367;
+	@ObfuscatedName("az")
+	int field371;
+	@ObfuscatedName("au")
+	int field391;
 
 	static {
-		field342 = false; // L: 28
+		field388 = false; // L: 28
 	}
 
 	VorbisSample(byte[] var1) {
-		this.read(var1); // L: 417
-	} // L: 418
+		this.read(var1); // L: 401
+	} // L: 402
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("read")
 	void read(byte[] var1) {
 		Buffer var2 = new Buffer(var1); // L: 89
@@ -121,11 +121,11 @@ void read(byte[] var1) {
 		this.end = var2.readInt(); // L: 93
 		if (this.end < 0) { // L: 94
 			this.end = ~this.end; // L: 95
-			this.field339 = true; // L: 96
+			this.field368 = true; // L: 96
 		}
 
 		int var3 = var2.readInt(); // L: 98
-		this.field334 = new byte[var3][]; // L: 99
+		this.field375 = new byte[var3][]; // L: 99
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 100
 			int var5 = 0; // L: 101
@@ -138,320 +138,320 @@ void read(byte[] var1) {
 
 			byte[] var7 = new byte[var5]; // L: 107
 			var2.readBytes(var7, 0, var5); // L: 108
-			this.field334[var4] = var7; // L: 109
+			this.field375[var4] = var7; // L: 109
 		}
 
 	} // L: 111
 
-	@ObfuscatedName("e")
-	float[] method1026(int var1) {
-		VorbisSample_setData(this.field334[var1], 0); // L: 198
-		readBit(); // L: 199
-		int var2 = readBits(class65.iLog(VorbisSample_mapping.length - 1)); // L: 200
-		boolean var3 = VorbisSample_blockFlags[var2]; // L: 201
-		int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 202
-		boolean var5 = false; // L: 203
-		boolean var6 = false; // L: 204
-		if (var3) { // L: 205
-			var5 = readBit() != 0; // L: 206
-			var6 = readBit() != 0; // L: 207
+	@ObfuscatedName("j")
+	float[] method1032(int var1) {
+		VorbisSample_setData(this.field375[var1], 0); // L: 182
+		readBit(); // L: 183
+		int var2 = readBits(DynamicObject.iLog(VorbisSample_mapping.length - 1)); // L: 184
+		boolean var3 = VorbisSample_blockFlags[var2]; // L: 185
+		int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 186
+		boolean var5 = false; // L: 187
+		boolean var6 = false; // L: 188
+		if (var3) { // L: 189
+			var5 = readBit() != 0; // L: 190
+			var6 = readBit() != 0; // L: 191
 		}
 
-		int var7 = var4 >> 1; // L: 209
+		int var7 = var4 >> 1; // L: 193
 		int var8;
 		int var9;
 		int var10;
-		if (var3 && !var5) { // L: 213
-			var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 214
-			var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 215
-			var10 = VorbisSample_blockSize0 >> 1; // L: 216
+		if (var3 && !var5) { // L: 197
+			var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 198
+			var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 199
+			var10 = VorbisSample_blockSize0 >> 1; // L: 200
 		} else {
-			var8 = 0; // L: 219
-			var9 = var7; // L: 220
-			var10 = var4 >> 1; // L: 221
+			var8 = 0; // L: 203
+			var9 = var7; // L: 204
+			var10 = var4 >> 1; // L: 205
 		}
 
 		int var11;
 		int var12;
 		int var13;
-		if (var3 && !var6) { // L: 226
-			var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 227
-			var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 228
-			var13 = VorbisSample_blockSize0 >> 1; // L: 229
+		if (var3 && !var6) { // L: 210
+			var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 211
+			var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 212
+			var13 = VorbisSample_blockSize0 >> 1; // L: 213
 		} else {
-			var11 = var7; // L: 232
-			var12 = var4; // L: 233
-			var13 = var4 >> 1; // L: 234
+			var11 = var7; // L: 216
+			var12 = var4; // L: 217
+			var13 = var4 >> 1; // L: 218
 		}
 
-		VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 236
-		int var16 = var14.mappingMux; // L: 239
-		int var17 = var14.submapFloor[var16]; // L: 240
-		boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 241
-		boolean var45 = var15; // L: 243
+		VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 220
+		int var16 = var14.mappingMux; // L: 223
+		int var17 = var14.submapFloor[var16]; // L: 224
+		boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 225
+		boolean var45 = var15; // L: 227
 
-		for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244
-			VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245
-			float[] var44 = field356; // L: 246
-			var42.method810(var44, var4 >> 1, var45); // L: 247
+		for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228
+			VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229
+			float[] var44 = field380; // L: 230
+			var42.method834(var44, var4 >> 1, var45); // L: 231
 		}
 
 		int var18;
-		if (!var15) { // L: 250
-			var17 = var14.mappingMux; // L: 251
-			var18 = var14.submapFloor[var17]; // L: 252
-			VorbisSample_floors[var18].method692(field356, var4 >> 1); // L: 253
+		if (!var15) { // L: 234
+			var17 = var14.mappingMux; // L: 235
+			var18 = var14.submapFloor[var17]; // L: 236
+			VorbisSample_floors[var18].method728(field380, var4 >> 1); // L: 237
 		}
 
 		int var19;
-		if (var15) { // L: 256
-			for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257
-				field356[var17] = 0.0F;
+		if (var15) { // L: 240
+			for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241
+				field380[var17] = 0.0F;
 			}
 		} else {
-			var17 = var4 >> 1; // L: 260
-			var18 = var4 >> 2; // L: 261
-			var19 = var4 >> 3; // L: 262
-			float[] var20 = field356; // L: 263
+			var17 = var4 >> 1; // L: 244
+			var18 = var4 >> 2; // L: 245
+			var19 = var4 >> 3; // L: 246
+			float[] var20 = field380; // L: 247
 
 			int var21;
-			for (var21 = 0; var21 < var17; ++var21) { // L: 264
+			for (var21 = 0; var21 < var17; ++var21) { // L: 248
 				var20[var21] *= 0.5F;
 			}
 
-			for (var21 = var17; var21 < var4; ++var21) { // L: 265
+			for (var21 = var17; var21 < var4; ++var21) { // L: 249
 				var20[var21] = -var20[var4 - var21 - 1];
 			}
 
-			float[] var40 = var3 ? field360 : field357; // L: 266
-			float[] var22 = var3 ? field361 : field358; // L: 267
-			float[] var23 = var3 ? field350 : field359; // L: 268
-			int[] var24 = var3 ? field364 : field363; // L: 269
+			float[] var40 = var3 ? field363 : field381; // L: 250
+			float[] var22 = var3 ? field378 : field382; // L: 251
+			float[] var23 = var3 ? field367 : field383; // L: 252
+			int[] var24 = var3 ? field384 : field358; // L: 253
 
 			int var25;
 			float var26;
 			float var27;
 			float var28;
 			float var29;
-			for (var25 = 0; var25 < var18; ++var25) { // L: 270
-				var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 271
-				var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 272
-				var28 = var40[var25 * 2]; // L: 273
-				var29 = var40[var25 * 2 + 1]; // L: 274
-				var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 275
-				var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 276
+			for (var25 = 0; var25 < var18; ++var25) { // L: 254
+				var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 255
+				var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 256
+				var28 = var40[var25 * 2]; // L: 257
+				var29 = var40[var25 * 2 + 1]; // L: 258
+				var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 259
+				var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 260
 			}
 
 			float var30;
 			float var31;
-			for (var25 = 0; var25 < var19; ++var25) { // L: 278
-				var26 = var20[var17 + var25 * 4 + 3]; // L: 279
-				var27 = var20[var17 + var25 * 4 + 1]; // L: 280
-				var28 = var20[var25 * 4 + 3]; // L: 281
-				var29 = var20[var25 * 4 + 1]; // L: 282
-				var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 283
-				var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 284
-				var30 = var40[var17 - 4 - var25 * 4]; // L: 285
-				var31 = var40[var17 - 3 - var25 * 4]; // L: 286
-				var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 287
-				var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288
+			for (var25 = 0; var25 < var19; ++var25) { // L: 262
+				var26 = var20[var17 + var25 * 4 + 3]; // L: 263
+				var27 = var20[var17 + var25 * 4 + 1]; // L: 264
+				var28 = var20[var25 * 4 + 3]; // L: 265
+				var29 = var20[var25 * 4 + 1]; // L: 266
+				var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 267
+				var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 268
+				var30 = var40[var17 - 4 - var25 * 4]; // L: 269
+				var31 = var40[var17 - 3 - var25 * 4]; // L: 270
+				var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 271
+				var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 272
 			}
 
-			var25 = class65.iLog(var4 - 1); // L: 290
+			var25 = DynamicObject.iLog(var4 - 1); // L: 274
 
 			int var46;
 			int var47;
 			int var48;
 			int var49;
-			for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 291
-				var47 = var4 >> var46 + 2; // L: 292
-				var48 = 8 << var46; // L: 293
-
-				for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 294
-					int var50 = var4 - var47 * var49 * 2; // L: 295
-					int var51 = var4 - var47 * (var49 * 2 + 1); // L: 296
-
-					for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 297
-						int var33 = var32 * 4; // L: 298
-						float var34 = var20[var50 - 1 - var33]; // L: 299
-						float var35 = var20[var50 - 3 - var33]; // L: 300
-						float var36 = var20[var51 - 1 - var33]; // L: 301
-						float var37 = var20[var51 - 3 - var33]; // L: 302
-						var20[var50 - 1 - var33] = var34 + var36; // L: 303
-						var20[var50 - 3 - var33] = var35 + var37; // L: 304
-						float var38 = var40[var32 * var48]; // L: 305
-						float var39 = var40[var32 * var48 + 1]; // L: 306
-						var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 307
-						var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 308
+			for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275
+				var47 = var4 >> var46 + 2; // L: 276
+				var48 = 8 << var46; // L: 277
+
+				for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 278
+					int var50 = var4 - var47 * var49 * 2; // L: 279
+					int var51 = var4 - var47 * (var49 * 2 + 1); // L: 280
+
+					for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 281
+						int var33 = var32 * 4; // L: 282
+						float var34 = var20[var50 - 1 - var33]; // L: 283
+						float var35 = var20[var50 - 3 - var33]; // L: 284
+						float var36 = var20[var51 - 1 - var33]; // L: 285
+						float var37 = var20[var51 - 3 - var33]; // L: 286
+						var20[var50 - 1 - var33] = var34 + var36; // L: 287
+						var20[var50 - 3 - var33] = var35 + var37; // L: 288
+						float var38 = var40[var32 * var48]; // L: 289
+						float var39 = var40[var32 * var48 + 1]; // L: 290
+						var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 291
+						var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 292
 					}
 				}
 			}
 
-			for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 312
-				var47 = var24[var46]; // L: 313
-				if (var46 < var47) { // L: 314
-					var48 = var46 * 8; // L: 315
-					var49 = var47 * 8; // L: 316
-					var30 = var20[var48 + 1]; // L: 318
-					var20[var48 + 1] = var20[var49 + 1]; // L: 319
-					var20[var49 + 1] = var30; // L: 320
-					var30 = var20[var48 + 3]; // L: 321
-					var20[var48 + 3] = var20[var49 + 3]; // L: 322
-					var20[var49 + 3] = var30; // L: 323
-					var30 = var20[var48 + 5]; // L: 324
-					var20[var48 + 5] = var20[var49 + 5]; // L: 325
-					var20[var49 + 5] = var30; // L: 326
-					var30 = var20[var48 + 7]; // L: 327
-					var20[var48 + 7] = var20[var49 + 7]; // L: 328
-					var20[var49 + 7] = var30; // L: 329
+			for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 296
+				var47 = var24[var46]; // L: 297
+				if (var46 < var47) { // L: 298
+					var48 = var46 * 8; // L: 299
+					var49 = var47 * 8; // L: 300
+					var30 = var20[var48 + 1]; // L: 302
+					var20[var48 + 1] = var20[var49 + 1]; // L: 303
+					var20[var49 + 1] = var30; // L: 304
+					var30 = var20[var48 + 3]; // L: 305
+					var20[var48 + 3] = var20[var49 + 3]; // L: 306
+					var20[var49 + 3] = var30; // L: 307
+					var30 = var20[var48 + 5]; // L: 308
+					var20[var48 + 5] = var20[var49 + 5]; // L: 309
+					var20[var49 + 5] = var30; // L: 310
+					var30 = var20[var48 + 7]; // L: 311
+					var20[var48 + 7] = var20[var49 + 7]; // L: 312
+					var20[var49 + 7] = var30; // L: 313
 				}
 			}
 
-			for (var46 = 0; var46 < var17; ++var46) { // L: 332
+			for (var46 = 0; var46 < var17; ++var46) { // L: 316
 				var20[var46] = var20[var46 * 2 + 1];
 			}
 
-			for (var46 = 0; var46 < var19; ++var46) { // L: 333
-				var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 334
-				var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 335
-				var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 336
-				var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 337
+			for (var46 = 0; var46 < var19; ++var46) { // L: 317
+				var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 318
+				var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 319
+				var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 320
+				var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 321
 			}
 
-			for (var46 = 0; var46 < var19; ++var46) { // L: 339
-				var27 = var23[var46 * 2]; // L: 340
-				var28 = var23[var46 * 2 + 1]; // L: 341
-				var29 = var20[var17 + var46 * 2]; // L: 342
-				var30 = var20[var17 + var46 * 2 + 1]; // L: 343
-				var31 = var20[var4 - 2 - var46 * 2]; // L: 344
-				float var52 = var20[var4 - 1 - var46 * 2]; // L: 345
-				float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 346
-				var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 347
-				var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 348
-				var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 349
-				var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 350
-				var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 351
+			for (var46 = 0; var46 < var19; ++var46) { // L: 323
+				var27 = var23[var46 * 2]; // L: 324
+				var28 = var23[var46 * 2 + 1]; // L: 325
+				var29 = var20[var17 + var46 * 2]; // L: 326
+				var30 = var20[var17 + var46 * 2 + 1]; // L: 327
+				var31 = var20[var4 - 2 - var46 * 2]; // L: 328
+				float var52 = var20[var4 - 1 - var46 * 2]; // L: 329
+				float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 330
+				var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 331
+				var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 332
+				var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 333
+				var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 334
+				var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 335
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 353
-				var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 354
-				var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 355
+			for (var46 = 0; var46 < var18; ++var46) { // L: 337
+				var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 338
+				var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 339
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 357
+			for (var46 = 0; var46 < var18; ++var46) { // L: 341
 				var20[var46 + (var4 - var18)] = -var20[var46];
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 358
+			for (var46 = 0; var46 < var18; ++var46) { // L: 342
 				var20[var46] = var20[var18 + var46];
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 359
+			for (var46 = 0; var46 < var18; ++var46) { // L: 343
 				var20[var18 + var46] = -var20[var18 - var46 - 1];
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 360
+			for (var46 = 0; var46 < var18; ++var46) { // L: 344
 				var20[var17 + var46] = var20[var4 - var46 - 1];
 			}
 
 			float[] var10000;
-			for (var46 = var8; var46 < var9; ++var46) { // L: 361
-				var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362
-				var10000 = field356; // L: 363
+			for (var46 = var8; var46 < var9; ++var46) { // L: 345
+				var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 346
+				var10000 = field380; // L: 347
 				var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
 			}
 
-			for (var46 = var11; var46 < var12; ++var46) { // L: 365
-				var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366
-				var10000 = field356; // L: 367
+			for (var46 = var11; var46 < var12; ++var46) { // L: 349
+				var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 350
+				var10000 = field380; // L: 351
 				var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
 			}
 		}
 
-		float[] var41 = null; // L: 370
-		if (this.field349 > 0) { // L: 371
-			var18 = var4 + this.field349 >> 2; // L: 372
-			var41 = new float[var18]; // L: 373
+		float[] var41 = null; // L: 354
+		if (this.field377 > 0) { // L: 355
+			var18 = var4 + this.field377 >> 2; // L: 356
+			var41 = new float[var18]; // L: 357
 			int var43;
-			if (!this.field362) { // L: 374
-				for (var19 = 0; var19 < this.field343; ++var19) { // L: 375
-					var43 = var19 + (this.field349 >> 1); // L: 376
-					var41[var19] += this.field353[var43]; // L: 377
+			if (!this.field379) { // L: 358
+				for (var19 = 0; var19 < this.field376; ++var19) { // L: 359
+					var43 = var19 + (this.field377 >> 1); // L: 360
+					var41[var19] += this.field387[var43]; // L: 361
 				}
 			}
 
-			if (!var15) { // L: 380
-				for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381
-					var43 = var41.length - (var4 >> 1) + var19; // L: 382
-					var41[var43] += field356[var19]; // L: 383
+			if (!var15) { // L: 364
+				for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365
+					var43 = var41.length - (var4 >> 1) + var19; // L: 366
+					var41[var43] += field380[var19]; // L: 367
 				}
 			}
 		}
 
-		float[] var54 = this.field353; // L: 387
-		this.field353 = field356; // L: 388
-		field356 = var54; // L: 389
-		this.field349 = var4; // L: 390
-		this.field343 = var12 - (var4 >> 1); // L: 391
-		this.field362 = var15; // L: 392
-		return var41; // L: 393
+		float[] var54 = this.field387; // L: 371
+		this.field387 = field380; // L: 372
+		field380 = var54; // L: 373
+		this.field377 = var4; // L: 374
+		this.field376 = var12 - (var4 >> 1); // L: 375
+		this.field379 = var15; // L: 376
+		return var41; // L: 377
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "([I)Laz;"
+		descriptor = "([I)Laj;"
 	)
 	@Export("toRawSound")
 	RawSound toRawSound(int[] var1) {
-		if (var1 != null && var1[0] <= 0) { // L: 421
+		if (var1 != null && var1[0] <= 0) { // L: 405
 			return null;
 		} else {
-			if (this.samples == null) { // L: 422
-				this.field349 = 0; // L: 423
-				this.field353 = new float[VorbisSample_blockSize1]; // L: 424
-				this.samples = new byte[this.sampleCount]; // L: 425
-				this.field366 = 0; // L: 426
-				this.field367 = 0; // L: 427
+			if (this.samples == null) { // L: 406
+				this.field377 = 0; // L: 407
+				this.field387 = new float[VorbisSample_blockSize1]; // L: 408
+				this.samples = new byte[this.sampleCount]; // L: 409
+				this.field371 = 0; // L: 410
+				this.field391 = 0; // L: 411
 			}
 
-			for (; this.field367 < this.field334.length; ++this.field367) { // L: 429 444
-				if (var1 != null && var1[0] <= 0) { // L: 430
+			for (; this.field391 < this.field375.length; ++this.field391) { // L: 413 428
+				if (var1 != null && var1[0] <= 0) { // L: 414
 					return null;
 				}
 
-				float[] var2 = this.method1026(this.field367); // L: 431
-				if (var2 != null) { // L: 432
-					int var3 = this.field366; // L: 433
-					int var4 = var2.length; // L: 434
-					if (var4 > this.sampleCount - var3) { // L: 435
+				float[] var2 = this.method1032(this.field391); // L: 415
+				if (var2 != null) { // L: 416
+					int var3 = this.field371; // L: 417
+					int var4 = var2.length; // L: 418
+					if (var4 > this.sampleCount - var3) { // L: 419
 						var4 = this.sampleCount - var3;
 					}
 
-					for (int var5 = 0; var5 < var4; ++var5) { // L: 436
-						int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 437
-						if ((var6 & -256) != 0) { // L: 438
+					for (int var5 = 0; var5 < var4; ++var5) { // L: 420
+						int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 421
+						if ((var6 & -256) != 0) { // L: 422
 							var6 = ~var6 >> 31;
 						}
 
-						this.samples[var3++] = (byte)(var6 - 128); // L: 439
+						this.samples[var3++] = (byte)(var6 - 128); // L: 423
 					}
 
-					if (var1 != null) { // L: 441
-						var1[0] -= var3 - this.field366;
+					if (var1 != null) { // L: 425
+						var1[0] -= var3 - this.field371;
 					}
 
-					this.field366 = var3; // L: 442
+					this.field371 = var3; // L: 426
 				}
 			}
 
-			this.field353 = null; // L: 446
-			byte[] var7 = this.samples; // L: 447
-			this.samples = null; // L: 448
-			return new RawSound(this.sampleRate, var7, this.start, this.end, this.field339); // L: 449
+			this.field387 = null; // L: 430
+			byte[] var7 = this.samples; // L: 431
+			this.samples = null; // L: 432
+			return new RawSound(this.sampleRate, var7, this.start, this.end, this.field368); // L: 433
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("float32Unpack")
 	static float float32Unpack(int var0) {
 		int var1 = var0 & 2097151; // L: 47
@@ -464,7 +464,7 @@ static float float32Unpack(int var0) {
 		return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("VorbisSample_setData")
 	static void VorbisSample_setData(byte[] var0, int var1) {
 		VorbisSample_bytes = var0; // L: 55
@@ -472,7 +472,7 @@ static void VorbisSample_setData(byte[] var0, int var1) {
 		VorbisSample_bitOffset = 0; // L: 57
 	} // L: 58
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("readBit")
 	static int readBit() {
 		int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61
@@ -482,7 +482,7 @@ static int readBit() {
 		return var0; // L: 65
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("readBits")
 	static int readBits(int var0) {
 		int var1 = 0; // L: 69
@@ -507,12 +507,12 @@ static int readBits(int var0) {
 		return var1; // L: 85
 	}
 
-	@ObfuscatedName("g")
-	static void method1025(byte[] var0) {
+	@ObfuscatedName("s")
+	static void method1031(byte[] var0) {
 		VorbisSample_setData(var0, 0); // L: 114
 		VorbisSample_blockSize0 = 1 << readBits(4); // L: 115
 		VorbisSample_blockSize1 = 1 << readBits(4); // L: 116
-		field356 = new float[VorbisSample_blockSize1]; // L: 117
+		field380 = new float[VorbisSample_blockSize1]; // L: 117
 
 		int var1;
 		int var2;
@@ -524,133 +524,124 @@ static void method1025(byte[] var0) {
 			var3 = var2 >> 1; // L: 120
 			var4 = var2 >> 2; // L: 121
 			var5 = var2 >> 3; // L: 122
-			float[] var18 = new float[var3]; // L: 123
+			float[] var12 = new float[var3]; // L: 123
 
 			for (int var7 = 0; var7 < var4; ++var7) { // L: 124
-				var18[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125
-				var18[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126
+				var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125
+				var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126
 			}
 
-			float[] var19 = new float[var3]; // L: 128
+			float[] var13 = new float[var3]; // L: 128
 
 			for (int var8 = 0; var8 < var4; ++var8) { // L: 129
-				var19[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130
-				var19[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131
+				var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130
+				var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131
 			}
 
-			float[] var20 = new float[var4]; // L: 133
+			float[] var14 = new float[var4]; // L: 133
 
 			for (int var9 = 0; var9 < var5; ++var9) { // L: 134
-				var20[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135
-				var20[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136
+				var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135
+				var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136
 			}
 
-			int[] var21 = new int[var5]; // L: 138
-			int var10 = class65.iLog(var5 - 1); // L: 139
+			int[] var15 = new int[var5]; // L: 138
+			int var10 = DynamicObject.iLog(var5 - 1); // L: 139
 
 			for (int var11 = 0; var11 < var5; ++var11) { // L: 140
-				int var15 = var11; // L: 144
-				int var16 = var10; // L: 145
-
-				int var17;
-				for (var17 = 0; var16 > 0; --var16) { // L: 147 148 151
-					var17 = var17 << 1 | var15 & 1; // L: 149
-					var15 >>>= 1; // L: 150
-				}
-
-				var21[var11] = var17; // L: 155
+				var15[var11] = FontName.method7074(var11, var10);
 			}
 
-			if (var1 != 0) { // L: 157
-				field360 = var18; // L: 158
-				field361 = var19; // L: 159
-				field350 = var20; // L: 160
-				field364 = var21; // L: 161
+			if (var1 != 0) { // L: 141
+				field363 = var12; // L: 142
+				field378 = var13; // L: 143
+				field367 = var14; // L: 144
+				field384 = var15; // L: 145
 			} else {
-				field357 = var18; // L: 164
-				field358 = var19; // L: 165
-				field359 = var20; // L: 166
-				field363 = var21; // L: 167
+				field381 = var12; // L: 148
+				field382 = var13; // L: 149
+				field383 = var14; // L: 150
+				field358 = var15; // L: 151
 			}
 		}
 
-		var1 = readBits(8) + 1; // L: 170
-		VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 171
+		var1 = readBits(8) + 1; // L: 154
+		VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155
 
-		for (var2 = 0; var2 < var1; ++var2) { // L: 172
+		for (var2 = 0; var2 < var1; ++var2) { // L: 156
 			VorbisSample_codebooks[var2] = new VorbisCodebook();
 		}
 
-		var2 = readBits(6) + 1; // L: 174
+		var2 = readBits(6) + 1; // L: 158
 
-		for (var3 = 0; var3 < var2; ++var3) { // L: 175
+		for (var3 = 0; var3 < var2; ++var3) { // L: 159
 			readBits(16);
 		}
 
-		var2 = readBits(6) + 1; // L: 177
-		VorbisSample_floors = new VorbisFloor[var2]; // L: 178
+		var2 = readBits(6) + 1; // L: 161
+		VorbisSample_floors = new VorbisFloor[var2]; // L: 162
 
-		for (var3 = 0; var3 < var2; ++var3) { // L: 179
+		for (var3 = 0; var3 < var2; ++var3) { // L: 163
 			VorbisSample_floors[var3] = new VorbisFloor();
 		}
 
-		var3 = readBits(6) + 1; // L: 180
-		VorbisSample_residues = new VorbisResidue[var3]; // L: 181
+		var3 = readBits(6) + 1; // L: 164
+		VorbisSample_residues = new VorbisResidue[var3]; // L: 165
 
-		for (var4 = 0; var4 < var3; ++var4) { // L: 182
+		for (var4 = 0; var4 < var3; ++var4) { // L: 166
 			VorbisSample_residues[var4] = new VorbisResidue();
 		}
 
-		var4 = readBits(6) + 1; // L: 183
-		VorbisSample_mappings = new VorbisMapping[var4]; // L: 184
+		var4 = readBits(6) + 1; // L: 167
+		VorbisSample_mappings = new VorbisMapping[var4]; // L: 168
 
-		for (var5 = 0; var5 < var4; ++var5) { // L: 185
+		for (var5 = 0; var5 < var4; ++var5) { // L: 169
 			VorbisSample_mappings[var5] = new VorbisMapping();
 		}
 
-		var5 = readBits(6) + 1; // L: 186
-		VorbisSample_blockFlags = new boolean[var5]; // L: 187
-		VorbisSample_mapping = new int[var5]; // L: 188
+		var5 = readBits(6) + 1; // L: 170
+		VorbisSample_blockFlags = new boolean[var5]; // L: 171
+		VorbisSample_mapping = new int[var5]; // L: 172
 
-		for (int var6 = 0; var6 < var5; ++var6) { // L: 189
-			VorbisSample_blockFlags[var6] = readBit() != 0; // L: 190
-			readBits(16); // L: 191
-			readBits(16); // L: 192
-			VorbisSample_mapping[var6] = readBits(8); // L: 193
+		for (int var6 = 0; var6 < var5; ++var6) { // L: 173
+			VorbisSample_blockFlags[var6] = readBit() != 0; // L: 174
+			readBits(16); // L: 175
+			readBits(16); // L: 176
+			VorbisSample_mapping[var6] = readBits(8); // L: 177
 		}
 
-	} // L: 195
+	} // L: 179
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;)Z"
+		descriptor = "(Lku;)Z"
 	)
-	static boolean method1027(AbstractArchive var0) {
-		if (!field342) { // L: 397
-			byte[] var1 = var0.takeFile(0, 0); // L: 398
-			if (var1 == null) { // L: 399
+	static boolean method1033(AbstractArchive var0) {
+		if (!field388) { // L: 381
+			byte[] var1 = var0.takeFile(0, 0); // L: 382
+			if (var1 == null) { // L: 383
 				return false;
 			}
 
-			method1025(var1); // L: 400
-			field342 = true; // L: 401
+			method1031(var1); // L: 384
+			field388 = true; // L: 385
 		}
 
-		return true; // L: 403
+		return true; // L: 387
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;II)Laf;"
+		descriptor = "(Lku;II)Lae;"
 	)
 	@Export("readMusicSample")
 	static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) {
-		if (!method1027(var0)) { // L: 407
-			var0.tryLoadFile(var1, var2); // L: 408
-			return null; // L: 409
+		if (!method1033(var0)) { // L: 391
+			var0.tryLoadFile(var1, var2); // L: 392
+			return null; // L: 393
 		} else {
-			byte[] var3 = var0.takeFile(var1, var2); // L: 411
-			return var3 == null ? null : new VorbisSample(var3); // L: 412
+			byte[] var3 = var0.takeFile(var1, var2); // L: 395
+			return var3 == null ? null : new VorbisSample(var3); // L: 396
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java
index fe19efc1c1..48fe9b4a24 100644
--- a/runescape-client/src/main/java/WallDecoration.java
+++ b/runescape-client/src/main/java/WallDecoration.java
@@ -1,80 +1,76 @@
+import java.security.SecureRandom;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hn")
+@ObfuscatedName("hp")
 @Implements("WallDecoration")
 public final class WallDecoration {
-	@ObfuscatedName("he")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1033840405
-	)
-	static int field2630;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 1965737053
+		intValue = -2023059781
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 2050472171
+		intValue = 2111603765
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1125986265
+		intValue = -1656810997
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1018369897
+		intValue = -1965519891
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 928141821
+		intValue = 278377977
 	)
 	@Export("orientation2")
 	int orientation2;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1446275315
+		intValue = 1314236601
 	)
 	@Export("xOffset")
 	int xOffset;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1672015371
+		intValue = -1594233985
 	)
 	@Export("yOffset")
 	int yOffset;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lhj;"
+		descriptor = "Lgt;"
 	)
 	@Export("renderable1")
 	public Renderable renderable1;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lhj;"
+		descriptor = "Lgt;"
 	)
 	@Export("renderable2")
 	public Renderable renderable2;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		longValue = 8832099420400585997L
+		longValue = 6911018160892972427L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 462629417
+		intValue = 1066794937
 	)
 	@Export("flags")
 	int flags;
@@ -84,215 +80,14 @@ public final class WallDecoration {
 		this.flags = 0; // L: 14
 	} // L: 16
 
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(CLkz;I)I",
-		garbageValue = "-503554425"
-	)
-	@Export("lowercaseChar")
-	static int lowercaseChar(char var0, Language var1) {
-		int var2 = var0 << 4; // L: 104
-		if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105
-			var0 = Character.toLowerCase(var0); // L: 106
-			var2 = (var0 << 4) + 1; // L: 107
-		}
-
-		if (var0 == 241 && var1 == Language.Language_ES) { // L: 109
-			var2 = 1762;
-		}
-
-		return var2; // L: 110
-	}
-
-	@ObfuscatedName("hk")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "32"
-	)
-	@Export("updateItemPile")
-	static final void updateItemPile(int var0, int var1) {
-		NodeDeque var2 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var0][var1]; // L: 7726
-		if (var2 == null) { // L: 7727
-			GameBuild.scene.removeGroundItemPile(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0, var1); // L: 7728
-		} else {
-			long var3 = -99999999L; // L: 7731
-			TileItem var5 = null; // L: 7732
-
-			TileItem var6;
-			for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7733 7734 7742
-				ItemComposition var7 = TaskHandler.ItemDefinition_get(var6.id); // L: 7735
-				long var11 = (long)var7.price; // L: 7736
-				if (var7.isStackable == 1) { // L: 7737
-					var11 *= (long)(var6.quantity + 1);
-				}
-
-				if (var11 > var3) { // L: 7738
-					var3 = var11; // L: 7739
-					var5 = var6; // L: 7740
-				}
-			}
-
-			if (var5 == null) { // L: 7744
-				GameBuild.scene.removeGroundItemPile(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0, var1); // L: 7745
-			} else {
-				var2.addLast(var5); // L: 7748
-				TileItem var13 = null; // L: 7749
-				TileItem var8 = null; // L: 7750
-
-				for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7751 7752 7757
-					if (var6.id != var5.id) { // L: 7753
-						if (var13 == null) { // L: 7754
-							var13 = var6;
-						}
-
-						if (var13.id != var6.id && var8 == null) { // L: 7755
-							var8 = var6;
-						}
-					}
-				}
-
-				long var9 = PacketBuffer.calculateTag(var0, var1, 3, false, 0); // L: 7759
-				GameBuild.scene.newGroundItemPile(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0, var1, class392.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, GrandExchangeOfferTotalQuantityComparator.Client_plane), var5, var9, var13, var8); // L: 7760
-			}
-		}
-	} // L: 7729 7746 7761
-
-	@ObfuscatedName("kb")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;IIII)V",
-		garbageValue = "-827944855"
+		descriptor = "(B)Ljava/security/SecureRandom;",
+		garbageValue = "-121"
 	)
-	@Export("drawMinimap")
-	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
-		class14.playPcmPlayers(); // L: 11628
-		SpriteMask var4 = var0.getSpriteMask(false); // L: 11629
-		if (var4 != null) { // L: 11630
-			Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11631
-			if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11632
-				int var5 = Client.camAngleY & 2047; // L: 11633
-				int var6 = HealthBarDefinition.localPlayer.x / 32 + 48; // L: 11634
-				int var7 = 464 - HealthBarDefinition.localPlayer.y / 32; // L: 11635
-				class10.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11636
-
-				int var8;
-				int var10;
-				int var16;
-				for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11637
-					var16 = Client.mapIconXs[var8] * 4 + 2 - HealthBarDefinition.localPlayer.x / 32; // L: 11638
-					var10 = Client.mapIconYs[var8] * 4 + 2 - HealthBarDefinition.localPlayer.y / 32; // L: 11639
-					WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11640
-				}
-
-				int var11;
-				int var12;
-				for (var8 = 0; var8 < 104; ++var8) { // L: 11642
-					for (var16 = 0; var16 < 104; ++var16) { // L: 11643
-						NodeDeque var14 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var8][var16]; // L: 11644
-						if (var14 != null) { // L: 11645
-							var11 = var8 * 4 + 2 - HealthBarDefinition.localPlayer.x / 32; // L: 11646
-							var12 = var16 * 4 + 2 - HealthBarDefinition.localPlayer.y / 32; // L: 11647
-							WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var11, var12, class115.mapDotSprites[0], var4); // L: 11648
-						}
-					}
-				}
-
-				for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11652
-					NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11653
-					if (var9 != null && var9.isVisible()) { // L: 11654
-						NPCComposition var18 = var9.definition; // L: 11655
-						if (var18 != null && var18.transforms != null) { // L: 11656
-							var18 = var18.transform();
-						}
-
-						if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11657
-							var11 = var9.x / 32 - HealthBarDefinition.localPlayer.x / 32; // L: 11658
-							var12 = var9.y / 32 - HealthBarDefinition.localPlayer.y / 32; // L: 11659
-							WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var11, var12, class115.mapDotSprites[1], var4); // L: 11660
-						}
-					}
-				}
-
-				var8 = Players.Players_count; // L: 11664
-				int[] var17 = Players.Players_indices; // L: 11665
-
-				for (var10 = 0; var10 < var8; ++var10) { // L: 11666
-					Player var15 = Client.players[var17[var10]]; // L: 11667
-					if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != HealthBarDefinition.localPlayer) { // L: 11668
-						var12 = var15.x / 32 - HealthBarDefinition.localPlayer.x / 32; // L: 11669
-						int var13 = var15.y / 32 - HealthBarDefinition.localPlayer.y / 32; // L: 11670
-						if (var15.isFriend()) { // L: 11671
-							WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[3], var4);
-						} else if (HealthBarDefinition.localPlayer.team != 0 && var15.team != 0 && var15.team == HealthBarDefinition.localPlayer.team) { // L: 11672
-							WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[4], var4);
-						} else if (var15.isFriendsChatMember()) { // L: 11673
-							WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[5], var4);
-						} else if (var15.isClanMember()) { // L: 11674
-							WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[6], var4);
-						} else {
-							WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var12, var13, class115.mapDotSprites[2], var4); // L: 11675
-						}
-					}
-				}
-
-				if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11678
-					if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11679
-						NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11680
-						if (var19 != null) { // L: 11681
-							var11 = var19.x / 32 - HealthBarDefinition.localPlayer.x / 32; // L: 11682
-							var12 = var19.y / 32 - HealthBarDefinition.localPlayer.y / 32; // L: 11683
-							class383.worldToMinimap(var1, var2, var11, var12, WorldMapIcon_0.mapMarkerSprites[1], var4); // L: 11684
-						}
-					}
-
-					if (Client.hintArrowType == 2) { // L: 11687
-						var10 = Client.hintArrowX * 4 - class19.baseX * 4 + 2 - HealthBarDefinition.localPlayer.x / 32; // L: 11688
-						var11 = Client.hintArrowY * 4 - DefaultsGroup.baseY * 4 + 2 - HealthBarDefinition.localPlayer.y / 32; // L: 11689
-						class383.worldToMinimap(var1, var2, var10, var11, WorldMapIcon_0.mapMarkerSprites[1], var4); // L: 11690
-					}
-
-					if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11692
-						Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11693
-						if (var20 != null) { // L: 11694
-							var11 = var20.x / 32 - HealthBarDefinition.localPlayer.x / 32; // L: 11695
-							var12 = var20.y / 32 - HealthBarDefinition.localPlayer.y / 32; // L: 11696
-							class383.worldToMinimap(var1, var2, var11, var12, WorldMapIcon_0.mapMarkerSprites[1], var4); // L: 11697
-						}
-					}
-				}
-
-				if (Client.destinationX != 0) { // L: 11701
-					var10 = Client.destinationX * 4 + 2 - HealthBarDefinition.localPlayer.x / 32; // L: 11702
-					var11 = Client.destinationY * 4 + 2 - HealthBarDefinition.localPlayer.y / 32; // L: 11703
-					WorldMapDecoration.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapIcon_0.mapMarkerSprites[0], var4); // L: 11704
-				}
-
-				if (!HealthBarDefinition.localPlayer.isHidden) { // L: 11706
-					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: 11708
-			}
-
-			Client.field553[var3] = true; // L: 11709
-		}
-	} // L: 11710
-
-	@ObfuscatedName("lt")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-916195379"
-	)
-	static String method4643(String var0) {
-		PlayerType[] var1 = VarbitComposition.PlayerType_values(); // L: 12028
-
-		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12029
-			PlayerType var3 = var1[var2]; // L: 12030
-			if (var3.modIcon != -1 && var0.startsWith(SpriteMask.method4998(var3.modIcon))) { // L: 12032 12033
-				var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 12034
-				break;
-			}
-		}
-
-		return var0; // L: 12041
+	static SecureRandom method4340() {
+		SecureRandom var0 = new SecureRandom(); // L: 39
+		var0.nextInt(); // L: 40
+		return var0; // L: 41
 	}
 }
diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java
index 6256e66ed9..010f0818c5 100644
--- a/runescape-client/src/main/java/Widget.java
+++ b/runescape-client/src/main/java/Widget.java
@@ -4,694 +4,696 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jf")
+@ObfuscatedName("jm")
 @Implements("Widget")
 public class Widget extends Node {
-	@ObfuscatedName("b")
+	@ObfuscatedName("w")
+	@Export("Widget_loadedInterfaces")
+	static boolean[] Widget_loadedInterfaces;
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("Widget_modelsArchive")
 	static AbstractArchive Widget_modelsArchive;
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "Lig;"
-	)
-	@Export("Widget_cachedSprites")
-	static EvictingDualNodeHashTable Widget_cachedSprites;
-	@ObfuscatedName("t")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("Widget_cachedModels")
 	static EvictingDualNodeHashTable Widget_cachedModels;
-	@ObfuscatedName("l")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("Widget_cachedFonts")
 	static EvictingDualNodeHashTable Widget_cachedFonts;
-	@ObfuscatedName("u")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
 	@Export("Widget_cachedSpriteMasks")
 	static EvictingDualNodeHashTable Widget_cachedSpriteMasks;
-	@ObfuscatedName("n")
-	public static boolean field3049;
-	@ObfuscatedName("z")
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Liq;"
+	)
+	static EvictingDualNodeHashTable field3222;
+	@ObfuscatedName("a")
+	public static boolean field3223;
+	@ObfuscatedName("u")
 	@Export("isIf3")
 	public boolean isIf3;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -830177389
+		intValue = 2075239563
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 855382617
+		intValue = -1765912961
 	)
 	@Export("childIndex")
 	public int childIndex;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -918896741
+		intValue = -662656213
 	)
 	@Export("type")
 	public int type;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1801435393
+		intValue = -2103555439
 	)
 	@Export("buttonType")
 	public int buttonType;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1660525629
+		intValue = -421542377
 	)
 	@Export("contentType")
 	public int contentType;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 284180189
+		intValue = 1776788083
 	)
 	@Export("xAlignment")
 	public int xAlignment;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -107040825
+		intValue = 755518345
 	)
 	@Export("yAlignment")
 	public int yAlignment;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -2054031979
+		intValue = 1656675739
 	)
 	@Export("widthAlignment")
 	public int widthAlignment;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = -1765529153
+		intValue = 1261392773
 	)
 	@Export("heightAlignment")
 	public int heightAlignment;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = -716032615
+		intValue = -1808070299
 	)
 	@Export("rawX")
 	public int rawX;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -84019821
+		intValue = 1911563275
 	)
 	@Export("rawY")
 	public int rawY;
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -966786115
+		intValue = 1569538763
 	)
 	@Export("rawWidth")
 	public int rawWidth;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = -727779257
+		intValue = 556685443
 	)
 	@Export("rawHeight")
 	public int rawHeight;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = -836435373
+		intValue = 1962054505
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = 470259933
+		intValue = 1127629965
 	)
 	@Export("y")
 	public int y;
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -1492995549
+		intValue = 137530349
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 1623576255
+		intValue = 147077041
 	)
 	@Export("height")
 	public int height;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 1759853159
+		intValue = 130394051
 	)
-	public int field3068;
+	public int field3242;
 	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = -9428879
+		intValue = 341333975
 	)
-	public int field3069;
-	@ObfuscatedName("ak")
+	public int field3243;
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 528333103
+		intValue = -1186103625
 	)
 	@Export("parentId")
 	public int parentId;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("af")
 	@Export("isHidden")
 	public boolean isHidden;
 	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = 168917907
+		intValue = 665368309
 	)
 	@Export("scrollX")
 	public int scrollX;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 1094545789
+		intValue = 1369672271
 	)
 	@Export("scrollY")
 	public int scrollY;
-	@ObfuscatedName("an")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = 1040080419
+		intValue = -362959503
 	)
 	@Export("scrollWidth")
 	public int scrollWidth;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -1297742855
+		intValue = -390853847
 	)
 	@Export("scrollHeight")
 	public int scrollHeight;
-	@ObfuscatedName("av")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = -1557539219
+		intValue = -830468905
 	)
 	@Export("color")
 	public int color;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = 37220023
+		intValue = -744334253
 	)
 	@Export("color2")
 	public int color2;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = 1939141949
+		intValue = 147049371
 	)
 	@Export("mouseOverColor")
 	public int mouseOverColor;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -664309699
+		intValue = -1415992785
 	)
 	@Export("mouseOverColor2")
 	public int mouseOverColor2;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aw")
 	@Export("fill")
 	public boolean fill;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "Lom;"
+		descriptor = "Lpg;"
 	)
 	@Export("fillMode")
 	public FillMode fillMode;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = -1200768777
+		intValue = 193150235
 	)
 	@Export("transparencyTop")
 	public int transparencyTop;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = 1147011099
+		intValue = -749359679
 	)
 	@Export("transparencyBot")
 	public int transparencyBot;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = 1035105757
+		intValue = 19573505
 	)
 	@Export("lineWid")
 	public int lineWid;
-	@ObfuscatedName("bg")
-	public boolean field3085;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bp")
+	public boolean field3359;
+	@ObfuscatedName("bd")
 	@ObfuscatedGetter(
-		intValue = 338387711
+		intValue = 949557953
 	)
 	@Export("spriteId2")
 	public int spriteId2;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = -1784284609
+		intValue = 728672183
 	)
 	@Export("spriteId")
 	public int spriteId;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = 1886200049
+		intValue = -1593709613
 	)
 	@Export("spriteAngle")
 	public int spriteAngle;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bg")
 	@Export("spriteTiling")
 	public boolean spriteTiling;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = 460210347
+		intValue = 904416977
 	)
 	@Export("outline")
 	public int outline;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = -940365255
+		intValue = 878706021
 	)
 	@Export("spriteShadow")
 	public int spriteShadow;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bm")
 	@Export("spriteFlipV")
 	public boolean spriteFlipV;
 	@ObfuscatedName("bw")
 	@Export("spriteFlipH")
 	public boolean spriteFlipH;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = 1682155053
+		intValue = -1789185725
 	)
 	@Export("modelType")
 	public int modelType;
-	@ObfuscatedName("br")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = 1325924463
+		intValue = 434114019
 	)
 	@Export("modelId")
 	public int modelId;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = -1907857883
+		intValue = 2007672513
 	)
 	@Export("modelType2")
 	int modelType2;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = -294218779
+		intValue = 961616719
 	)
 	@Export("modelId2")
 	int modelId2;
 	@ObfuscatedName("bv")
 	@ObfuscatedGetter(
-		intValue = 995334035
+		intValue = 1588019651
 	)
 	@Export("sequenceId")
 	public int sequenceId;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bb")
 	@ObfuscatedGetter(
-		intValue = 359756345
+		intValue = 583977265
 	)
 	@Export("sequenceId2")
 	public int sequenceId2;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = -1329362105
+		intValue = 459494725
 	)
 	@Export("modelOffsetX")
 	public int modelOffsetX;
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bx")
 	@ObfuscatedGetter(
-		intValue = 1310924187
+		intValue = 584596143
 	)
 	@Export("modelOffsetY")
 	public int modelOffsetY;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = 1082654603
+		intValue = -2011255181
 	)
 	@Export("modelAngleX")
 	public int modelAngleX;
-	@ObfuscatedName("bk")
+	@ObfuscatedName("bh")
 	@ObfuscatedGetter(
-		intValue = 2109691849
+		intValue = -192481701
 	)
 	@Export("modelAngleY")
 	public int modelAngleY;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = -383796933
+		intValue = 1120643849
 	)
 	@Export("modelAngleZ")
 	public int modelAngleZ;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = -588937837
+		intValue = 1128501563
 	)
 	@Export("modelZoom")
 	public int modelZoom;
-	@ObfuscatedName("be")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = 368452663
+		intValue = 1248935109
 	)
-	public int field3106;
-	@ObfuscatedName("bb")
+	public int field3280;
+	@ObfuscatedName("bk")
 	@ObfuscatedGetter(
-		intValue = 168328461
+		intValue = 1790940755
 	)
-	public int field3165;
-	@ObfuscatedName("by")
+	public int field3260;
+	@ObfuscatedName("bo")
 	@Export("modelOrthog")
 	public boolean modelOrthog;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("bf")
 	@Export("modelTransparency")
 	public boolean modelTransparency;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("be")
 	@ObfuscatedGetter(
-		intValue = 57057327
+		intValue = -1120157659
 	)
 	@Export("itemQuantityMode")
 	public int itemQuantityMode;
-	@ObfuscatedName("ca")
+	@ObfuscatedName("ce")
 	@ObfuscatedGetter(
-		intValue = 928434151
+		intValue = 1677313687
 	)
 	@Export("fontId")
 	public int fontId;
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cl")
 	@Export("text")
 	public String text;
-	@ObfuscatedName("ck")
+	@ObfuscatedName("cp")
 	@Export("text2")
 	public String text2;
-	@ObfuscatedName("ci")
+	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		intValue = 150906213
+		intValue = -1468399469
 	)
 	@Export("textLineHeight")
 	public int textLineHeight;
-	@ObfuscatedName("cx")
+	@ObfuscatedName("ck")
 	@ObfuscatedGetter(
-		intValue = 1685073913
+		intValue = 1376772263
 	)
 	@Export("textXAlignment")
 	public int textXAlignment;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cg")
 	@ObfuscatedGetter(
-		intValue = -556962931
+		intValue = -1684285413
 	)
 	@Export("textYAlignment")
 	public int textYAlignment;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cy")
 	@Export("textShadowed")
 	public boolean textShadowed;
-	@ObfuscatedName("cd")
+	@ObfuscatedName("cn")
 	@ObfuscatedGetter(
-		intValue = -1531986129
+		intValue = -2093941643
 	)
 	@Export("paddingX")
 	public int paddingX;
-	@ObfuscatedName("cj")
+	@ObfuscatedName("cv")
 	@ObfuscatedGetter(
-		intValue = 176722309
+		intValue = -792170613
 	)
 	@Export("paddingY")
 	public int paddingY;
-	@ObfuscatedName("cl")
+	@ObfuscatedName("co")
 	@Export("inventoryXOffsets")
 	public int[] inventoryXOffsets;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cc")
 	@Export("inventoryYOffsets")
 	public int[] inventoryYOffsets;
-	@ObfuscatedName("ce")
+	@ObfuscatedName("cs")
 	@Export("inventorySprites")
 	public int[] inventorySprites;
-	@ObfuscatedName("cp")
+	@ObfuscatedName("cr")
 	@Export("itemActions")
 	public String[] itemActions;
-	@ObfuscatedName("cg")
+	@ObfuscatedName("cb")
 	@ObfuscatedGetter(
-		intValue = -1837183897
+		intValue = 485964777
 	)
 	@Export("flags")
 	public int flags;
+	@ObfuscatedName("cj")
+	public boolean field3299;
+	@ObfuscatedName("ca")
+	public byte[][] field3300;
+	@ObfuscatedName("cz")
+	public byte[][] field3301;
 	@ObfuscatedName("cw")
-	public boolean field3125;
-	@ObfuscatedName("cr")
-	public byte[][] field3180;
+	public int[] field3302;
+	@ObfuscatedName("ct")
+	public int[] field3303;
 	@ObfuscatedName("cu")
-	public byte[][] field3105;
-	@ObfuscatedName("cc")
-	public int[] field3128;
-	@ObfuscatedName("ch")
-	public int[] field3129;
-	@ObfuscatedName("co")
 	@Export("dataText")
 	public String dataText;
-	@ObfuscatedName("cy")
+	@ObfuscatedName("cx")
 	@Export("actions")
 	public String[] actions;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("cm")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+		descriptor = "Ljm;"
 	)
 	@Export("parent")
 	public Widget parent;
-	@ObfuscatedName("dq")
+	@ObfuscatedName("dm")
 	@ObfuscatedGetter(
-		intValue = -1233976297
+		intValue = -2013881261
 	)
 	@Export("dragZoneSize")
 	public int dragZoneSize;
-	@ObfuscatedName("df")
+	@ObfuscatedName("dr")
 	@ObfuscatedGetter(
-		intValue = 1376334067
+		intValue = -2058089895
 	)
 	@Export("dragThreshold")
 	public int dragThreshold;
-	@ObfuscatedName("da")
+	@ObfuscatedName("ds")
 	@Export("isScrollBar")
 	public boolean isScrollBar;
-	@ObfuscatedName("dw")
+	@ObfuscatedName("dv")
 	@Export("spellActionName")
 	public String spellActionName;
-	@ObfuscatedName("dn")
+	@ObfuscatedName("do")
 	@Export("hasListener")
 	public boolean hasListener;
-	@ObfuscatedName("dc")
+	@ObfuscatedName("dt")
 	@Export("onLoad")
 	public Object[] onLoad;
-	@ObfuscatedName("dh")
+	@ObfuscatedName("dy")
 	@Export("onClick")
 	public Object[] onClick;
-	@ObfuscatedName("du")
+	@ObfuscatedName("dk")
 	@Export("onClickRepeat")
 	public Object[] onClickRepeat;
-	@ObfuscatedName("db")
+	@ObfuscatedName("de")
 	@Export("onRelease")
 	public Object[] onRelease;
-	@ObfuscatedName("dp")
+	@ObfuscatedName("df")
 	@Export("onHold")
 	public Object[] onHold;
-	@ObfuscatedName("dj")
+	@ObfuscatedName("dh")
 	@Export("onMouseOver")
 	public Object[] onMouseOver;
-	@ObfuscatedName("dt")
+	@ObfuscatedName("dn")
 	@Export("onMouseRepeat")
 	public Object[] onMouseRepeat;
-	@ObfuscatedName("dy")
+	@ObfuscatedName("dx")
 	@Export("onMouseLeave")
 	public Object[] onMouseLeave;
-	@ObfuscatedName("ds")
+	@ObfuscatedName("dp")
 	@Export("onDrag")
 	public Object[] onDrag;
-	@ObfuscatedName("de")
+	@ObfuscatedName("dc")
 	@Export("onDragComplete")
 	public Object[] onDragComplete;
-	@ObfuscatedName("dg")
+	@ObfuscatedName("dq")
 	@Export("onTargetEnter")
 	public Object[] onTargetEnter;
-	@ObfuscatedName("di")
+	@ObfuscatedName("db")
 	@Export("onTargetLeave")
 	public Object[] onTargetLeave;
-	@ObfuscatedName("do")
+	@ObfuscatedName("dj")
 	@Export("onVarTransmit")
 	public Object[] onVarTransmit;
-	@ObfuscatedName("dr")
+	@ObfuscatedName("dd")
 	@Export("varTransmitTriggers")
 	public int[] varTransmitTriggers;
-	@ObfuscatedName("dz")
+	@ObfuscatedName("du")
 	@Export("onInvTransmit")
 	public Object[] onInvTransmit;
-	@ObfuscatedName("dx")
+	@ObfuscatedName("dl")
 	@Export("invTransmitTriggers")
 	public int[] invTransmitTriggers;
-	@ObfuscatedName("dd")
+	@ObfuscatedName("dw")
 	@Export("onStatTransmit")
 	public Object[] onStatTransmit;
-	@ObfuscatedName("dl")
+	@ObfuscatedName("dg")
 	@Export("statTransmitTriggers")
 	public int[] statTransmitTriggers;
-	@ObfuscatedName("dm")
+	@ObfuscatedName("di")
 	@Export("onTimer")
 	public Object[] onTimer;
-	@ObfuscatedName("dk")
+	@ObfuscatedName("dz")
 	@Export("onOp")
 	public Object[] onOp;
-	@ObfuscatedName("dv")
+	@ObfuscatedName("da")
 	@Export("onScroll")
 	public Object[] onScroll;
-	@ObfuscatedName("ed")
+	@ObfuscatedName("eu")
 	@Export("onChatTransmit")
 	public Object[] onChatTransmit;
-	@ObfuscatedName("ej")
+	@ObfuscatedName("et")
 	@Export("onKey")
 	public Object[] onKey;
-	@ObfuscatedName("eu")
-	public Object[] field3161;
-	@ObfuscatedName("eh")
-	public Object[] field3162;
-	@ObfuscatedName("ec")
+	@ObfuscatedName("eg")
+	public Object[] field3335;
+	@ObfuscatedName("ek")
+	public Object[] field3336;
+	@ObfuscatedName("ef")
 	@Export("onFriendTransmit")
 	public Object[] onFriendTransmit;
-	@ObfuscatedName("ek")
+	@ObfuscatedName("ev")
 	@Export("onClanTransmit")
 	public Object[] onClanTransmit;
-	@ObfuscatedName("ea")
-	public Object[] field3056;
-	@ObfuscatedName("em")
-	public Object[] field3166;
 	@ObfuscatedName("ep")
+	public Object[] field3217;
+	@ObfuscatedName("ej")
+	public Object[] field3340;
+	@ObfuscatedName("er")
 	@Export("onMiscTransmit")
 	public Object[] onMiscTransmit;
-	@ObfuscatedName("el")
+	@ObfuscatedName("em")
 	@Export("onDialogAbort")
 	public Object[] onDialogAbort;
-	@ObfuscatedName("et")
+	@ObfuscatedName("el")
 	@Export("onSubChange")
 	public Object[] onSubChange;
-	@ObfuscatedName("ex")
+	@ObfuscatedName("eo")
 	@Export("onResize")
 	public Object[] onResize;
-	@ObfuscatedName("ew")
+	@ObfuscatedName("ee")
 	@Export("onStockTransmit")
 	public Object[] onStockTransmit;
-	@ObfuscatedName("er")
-	public Object[] field3172;
-	@ObfuscatedName("eg")
+	@ObfuscatedName("en")
+	public Object[] field3294;
+	@ObfuscatedName("ez")
 	@Export("cs1Instructions")
 	public int[][] cs1Instructions;
-	@ObfuscatedName("ez")
+	@ObfuscatedName("eh")
 	@Export("cs1Comparisons")
 	public int[] cs1Comparisons;
-	@ObfuscatedName("eb")
+	@ObfuscatedName("ei")
 	@Export("cs1ComparisonValues")
 	public int[] cs1ComparisonValues;
-	@ObfuscatedName("eo")
+	@ObfuscatedName("ed")
 	@ObfuscatedGetter(
-		intValue = -712270533
+		intValue = -1965658387
 	)
 	@Export("mouseOverRedirect")
 	public int mouseOverRedirect;
-	@ObfuscatedName("ev")
+	@ObfuscatedName("ea")
 	@Export("spellName")
 	public String spellName;
-	@ObfuscatedName("ee")
+	@ObfuscatedName("ex")
 	@Export("buttonText")
 	public String buttonText;
-	@ObfuscatedName("ey")
+	@ObfuscatedName("ec")
 	@Export("itemIds")
 	public int[] itemIds;
-	@ObfuscatedName("ei")
+	@ObfuscatedName("es")
 	@Export("itemQuantities")
 	public int[] itemQuantities;
-	@ObfuscatedName("ef")
+	@ObfuscatedName("eb")
 	@ObfuscatedGetter(
-		intValue = -1000336005
+		intValue = -757750871
 	)
 	@Export("itemId")
 	public int itemId;
-	@ObfuscatedName("en")
+	@ObfuscatedName("ey")
 	@ObfuscatedGetter(
-		intValue = -119048843
+		intValue = -462414583
 	)
 	@Export("itemQuantity")
 	public int itemQuantity;
 	@ObfuscatedName("eq")
 	@ObfuscatedGetter(
-		intValue = 1683480099
+		intValue = -1348132735
 	)
 	@Export("modelFrame")
 	public int modelFrame;
-	@ObfuscatedName("es")
+	@ObfuscatedName("ew")
 	@ObfuscatedGetter(
-		intValue = -1549295787
+		intValue = -676166249
 	)
 	@Export("modelFrameCycle")
 	public int modelFrameCycle;
-	@ObfuscatedName("fd")
+	@ObfuscatedName("ff")
 	@ObfuscatedSignature(
-		descriptor = "[Ljf;"
+		descriptor = "[Ljm;"
 	)
 	@Export("children")
 	public Widget[] children;
-	@ObfuscatedName("fa")
+	@ObfuscatedName("ft")
 	@Export("containsMouse")
 	public boolean containsMouse;
-	@ObfuscatedName("fi")
+	@ObfuscatedName("fk")
 	@Export("isClicked")
 	public boolean isClicked;
-	@ObfuscatedName("fj")
+	@ObfuscatedName("fv")
 	@ObfuscatedGetter(
-		intValue = 500124989
+		intValue = 1631841167
 	)
-	public int field3188;
-	@ObfuscatedName("fw")
+	public int field3341;
+	@ObfuscatedName("fe")
 	@ObfuscatedGetter(
-		intValue = -898435809
+		intValue = -1237599647
 	)
-	public int field3189;
-	@ObfuscatedName("fg")
+	public int field3363;
+	@ObfuscatedName("fu")
 	@ObfuscatedGetter(
-		intValue = -242702175
+		intValue = 1972995307
 	)
-	public int field3073;
-	@ObfuscatedName("fh")
+	public int field3364;
+	@ObfuscatedName("fb")
 	@ObfuscatedGetter(
-		intValue = -592278881
+		intValue = 1004662139
 	)
-	public int field3191;
-	@ObfuscatedName("fp")
+	public int field3365;
+	@ObfuscatedName("fj")
 	@ObfuscatedGetter(
-		intValue = -1719884029
+		intValue = -1959664983
 	)
 	@Export("rootIndex")
 	public int rootIndex;
-	@ObfuscatedName("fy")
+	@ObfuscatedName("fg")
 	@ObfuscatedGetter(
-		intValue = 11938569
+		intValue = 1623310513
 	)
 	@Export("cycle")
 	public int cycle;
-	@ObfuscatedName("fn")
-	public int[] field3194;
-	@ObfuscatedName("ft")
+	@ObfuscatedName("fh")
+	public int[] field3368;
+	@ObfuscatedName("fd")
 	@Export("noClickThrough")
 	public boolean noClickThrough;
-	@ObfuscatedName("fl")
+	@ObfuscatedName("fq")
 	@Export("noScrollThrough")
 	public boolean noScrollThrough;
-	@ObfuscatedName("fe")
+	@ObfuscatedName("fz")
 	@Export("prioritizeMenuEntry")
 	public boolean prioritizeMenuEntry;
 
 	static {
-		Widget_cachedSprites = new EvictingDualNodeHashTable(200); // L: 31
-		Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 32
-		Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 33
-		Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 34
-		field3049 = false; // L: 35
+		Widget_cachedModels = new EvictingDualNodeHashTable(200); // L: 31
+		Widget_cachedFonts = new EvictingDualNodeHashTable(50); // L: 32
+		Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(20); // L: 33
+		field3222 = new EvictingDualNodeHashTable(8); // L: 34
+		field3223 = false; // L: 35
 	}
 
 	public Widget() {
@@ -712,8 +714,8 @@ public Widget() {
 		this.y = 0; // L: 51
 		this.width = 0; // L: 52
 		this.height = 0; // L: 53
-		this.field3068 = 1; // L: 54
-		this.field3069 = 1; // L: 55
+		this.field3242 = 1; // L: 54
+		this.field3243 = 1; // L: 55
 		this.parentId = -1; // L: 56
 		this.isHidden = false; // L: 57
 		this.scrollX = 0; // L: 58
@@ -729,7 +731,7 @@ public Widget() {
 		this.transparencyTop = 0; // L: 68
 		this.transparencyBot = 0; // L: 69
 		this.lineWid = 1; // L: 70
-		this.field3085 = false; // L: 71
+		this.field3359 = false; // L: 71
 		this.spriteId2 = -1; // L: 72
 		this.spriteId = -1; // L: 73
 		this.spriteAngle = 0; // L: 74
@@ -748,8 +750,8 @@ public Widget() {
 		this.modelAngleY = 0; // L: 89
 		this.modelAngleZ = 0; // L: 90
 		this.modelZoom = 100; // L: 91
-		this.field3106 = 0; // L: 92
-		this.field3165 = 0; // L: 93
+		this.field3280 = 0; // L: 92
+		this.field3260 = 0; // L: 93
 		this.modelOrthog = false; // L: 94
 		this.modelTransparency = false; // L: 95
 		this.itemQuantityMode = 2; // L: 96
@@ -763,7 +765,7 @@ public Widget() {
 		this.paddingX = 0; // L: 104
 		this.paddingY = 0; // L: 105
 		this.flags = 0; // L: 110
-		this.field3125 = false; // L: 111
+		this.field3299 = false; // L: 111
 		this.dataText = ""; // L: 120
 		this.parent = null; // L: 122
 		this.dragZoneSize = 0; // L: 123
@@ -780,609 +782,609 @@ public Widget() {
 		this.modelFrameCycle = 0; // L: 174
 		this.containsMouse = false; // L: 176
 		this.isClicked = false; // L: 177
-		this.field3188 = -1; // L: 178
-		this.field3189 = 0; // L: 179
-		this.field3073 = 0; // L: 180
-		this.field3191 = 0; // L: 181
+		this.field3341 = -1; // L: 178
+		this.field3363 = 0; // L: 179
+		this.field3364 = 0; // L: 180
+		this.field3365 = 0; // L: 181
 		this.rootIndex = -1; // L: 182
 		this.cycle = -1; // L: 183
 		this.noClickThrough = false; // L: 185
 		this.noScrollThrough = false; // L: 186
 		this.prioritizeMenuEntry = false; // L: 187
-	} // L: 724
+	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1471945401"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "8"
 	)
 	@Export("decodeLegacy")
 	void decodeLegacy(Buffer var1) {
-		this.isIf3 = false; // L: 240
-		this.type = var1.readUnsignedByte(); // L: 241
-		this.buttonType = var1.readUnsignedByte(); // L: 242
-		this.contentType = var1.readUnsignedShort(); // L: 243
-		this.rawX = var1.readShort(); // L: 244
-		this.rawY = var1.readShort(); // L: 245
-		this.rawWidth = var1.readUnsignedShort(); // L: 246
-		this.rawHeight = var1.readUnsignedShort(); // L: 247
-		this.transparencyTop = var1.readUnsignedByte(); // L: 248
-		this.parentId = var1.readUnsignedShort(); // L: 249
-		if (this.parentId == 65535) { // L: 250
+		this.isIf3 = false; // L: 256
+		this.type = var1.readUnsignedByte(); // L: 257
+		this.buttonType = var1.readUnsignedByte(); // L: 258
+		this.contentType = var1.readUnsignedShort(); // L: 259
+		this.rawX = var1.readShort(); // L: 260
+		this.rawY = var1.readShort(); // L: 261
+		this.rawWidth = var1.readUnsignedShort(); // L: 262
+		this.rawHeight = var1.readUnsignedShort(); // L: 263
+		this.transparencyTop = var1.readUnsignedByte(); // L: 264
+		this.parentId = var1.readUnsignedShort(); // L: 265
+		if (this.parentId == 65535) { // L: 266
 			this.parentId = -1;
 		} else {
-			this.parentId += this.id & -65536; // L: 251
+			this.parentId += this.id & -65536; // L: 267
 		}
 
-		this.mouseOverRedirect = var1.readUnsignedShort(); // L: 252
-		if (this.mouseOverRedirect == 65535) { // L: 253
+		this.mouseOverRedirect = var1.readUnsignedShort(); // L: 268
+		if (this.mouseOverRedirect == 65535) { // L: 269
 			this.mouseOverRedirect = -1;
 		}
 
-		int var2 = var1.readUnsignedByte(); // L: 254
+		int var2 = var1.readUnsignedByte(); // L: 270
 		int var3;
-		if (var2 > 0) { // L: 255
-			this.cs1Comparisons = new int[var2]; // L: 256
-			this.cs1ComparisonValues = new int[var2]; // L: 257
+		if (var2 > 0) { // L: 271
+			this.cs1Comparisons = new int[var2]; // L: 272
+			this.cs1ComparisonValues = new int[var2]; // L: 273
 
-			for (var3 = 0; var3 < var2; ++var3) { // L: 258
-				this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 259
-				this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 260
+			for (var3 = 0; var3 < var2; ++var3) { // L: 274
+				this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 275
+				this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 276
 			}
 		}
 
-		var3 = var1.readUnsignedByte(); // L: 263
+		var3 = var1.readUnsignedByte(); // L: 279
 		int var4;
 		int var5;
 		int var6;
-		if (var3 > 0) { // L: 264
-			this.cs1Instructions = new int[var3][]; // L: 265
+		if (var3 > 0) { // L: 280
+			this.cs1Instructions = new int[var3][]; // L: 281
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 266
-				var5 = var1.readUnsignedShort(); // L: 267
-				this.cs1Instructions[var4] = new int[var5]; // L: 268
+			for (var4 = 0; var4 < var3; ++var4) { // L: 282
+				var5 = var1.readUnsignedShort(); // L: 283
+				this.cs1Instructions[var4] = new int[var5]; // L: 284
 
-				for (var6 = 0; var6 < var5; ++var6) { // L: 269
-					this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 270
-					if (this.cs1Instructions[var4][var6] == 65535) { // L: 271
+				for (var6 = 0; var6 < var5; ++var6) { // L: 285
+					this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 286
+					if (this.cs1Instructions[var4][var6] == 65535) { // L: 287
 						this.cs1Instructions[var4][var6] = -1;
 					}
 				}
 			}
 		}
 
-		if (this.type == 0) { // L: 275
-			this.scrollHeight = var1.readUnsignedShort(); // L: 276
-			this.isHidden = var1.readUnsignedByte() == 1; // L: 277
+		if (this.type == 0) { // L: 291
+			this.scrollHeight = var1.readUnsignedShort(); // L: 292
+			this.isHidden = var1.readUnsignedByte() == 1; // L: 293
 		}
 
-		if (this.type == 1) { // L: 279
-			var1.readUnsignedShort(); // L: 280
-			var1.readUnsignedByte(); // L: 281
+		if (this.type == 1) { // L: 295
+			var1.readUnsignedShort(); // L: 296
+			var1.readUnsignedByte(); // L: 297
 		}
 
-		if (this.type == 2) { // L: 283
-			this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 284
-			this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 285
-			var4 = var1.readUnsignedByte(); // L: 286
-			if (var4 == 1) { // L: 287
+		if (this.type == 2) { // L: 299
+			this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 300
+			this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 301
+			var4 = var1.readUnsignedByte(); // L: 302
+			if (var4 == 1) { // L: 303
 				this.flags |= 268435456;
 			}
 
-			var5 = var1.readUnsignedByte(); // L: 288
-			if (var5 == 1) { // L: 289
+			var5 = var1.readUnsignedByte(); // L: 304
+			if (var5 == 1) { // L: 305
 				this.flags |= 1073741824;
 			}
 
-			var6 = var1.readUnsignedByte(); // L: 290
-			if (var6 == 1) { // L: 291
+			var6 = var1.readUnsignedByte(); // L: 306
+			if (var6 == 1) { // L: 307
 				this.flags |= Integer.MIN_VALUE;
 			}
 
-			int var7 = var1.readUnsignedByte(); // L: 292
-			if (var7 == 1) { // L: 293
+			int var7 = var1.readUnsignedByte(); // L: 308
+			if (var7 == 1) { // L: 309
 				this.flags |= 536870912;
 			}
 
-			this.paddingX = var1.readUnsignedByte(); // L: 294
-			this.paddingY = var1.readUnsignedByte(); // L: 295
-			this.inventoryXOffsets = new int[20]; // L: 296
-			this.inventoryYOffsets = new int[20]; // L: 297
-			this.inventorySprites = new int[20]; // L: 298
+			this.paddingX = var1.readUnsignedByte(); // L: 310
+			this.paddingY = var1.readUnsignedByte(); // L: 311
+			this.inventoryXOffsets = new int[20]; // L: 312
+			this.inventoryYOffsets = new int[20]; // L: 313
+			this.inventorySprites = new int[20]; // L: 314
 
 			int var8;
-			for (var8 = 0; var8 < 20; ++var8) { // L: 299
-				int var11 = var1.readUnsignedByte(); // L: 300
-				if (var11 == 1) { // L: 301
-					this.inventoryXOffsets[var8] = var1.readShort(); // L: 302
-					this.inventoryYOffsets[var8] = var1.readShort(); // L: 303
-					this.inventorySprites[var8] = var1.readInt(); // L: 304
+			for (var8 = 0; var8 < 20; ++var8) { // L: 315
+				int var11 = var1.readUnsignedByte(); // L: 316
+				if (var11 == 1) { // L: 317
+					this.inventoryXOffsets[var8] = var1.readShort(); // L: 318
+					this.inventoryYOffsets[var8] = var1.readShort(); // L: 319
+					this.inventorySprites[var8] = var1.readInt(); // L: 320
 				} else {
-					this.inventorySprites[var8] = -1; // L: 306
+					this.inventorySprites[var8] = -1; // L: 322
 				}
 			}
 
-			this.itemActions = new String[5]; // L: 308
+			this.itemActions = new String[5]; // L: 324
 
-			for (var8 = 0; var8 < 5; ++var8) { // L: 309
-				String var9 = var1.readStringCp1252NullTerminated(); // L: 310
-				if (var9.length() > 0) { // L: 311
-					this.itemActions[var8] = var9; // L: 312
-					this.flags |= 1 << var8 + 23; // L: 313
+			for (var8 = 0; var8 < 5; ++var8) { // L: 325
+				String var9 = var1.readStringCp1252NullTerminated(); // L: 326
+				if (var9.length() > 0) { // L: 327
+					this.itemActions[var8] = var9; // L: 328
+					this.flags |= 1 << var8 + 23; // L: 329
 				}
 			}
 		}
 
-		if (this.type == 3) { // L: 317
-			this.fill = var1.readUnsignedByte() == 1; // L: 318
+		if (this.type == 3) { // L: 333
+			this.fill = var1.readUnsignedByte() == 1; // L: 334
 		}
 
-		if (this.type == 4 || this.type == 1) { // L: 320
-			this.textXAlignment = var1.readUnsignedByte(); // L: 321
-			this.textYAlignment = var1.readUnsignedByte(); // L: 322
-			this.textLineHeight = var1.readUnsignedByte(); // L: 323
-			this.fontId = var1.readUnsignedShort(); // L: 324
-			if (this.fontId == 65535) { // L: 325
+		if (this.type == 4 || this.type == 1) { // L: 336
+			this.textXAlignment = var1.readUnsignedByte(); // L: 337
+			this.textYAlignment = var1.readUnsignedByte(); // L: 338
+			this.textLineHeight = var1.readUnsignedByte(); // L: 339
+			this.fontId = var1.readUnsignedShort(); // L: 340
+			if (this.fontId == 65535) { // L: 341
 				this.fontId = -1;
 			}
 
-			this.textShadowed = var1.readUnsignedByte() == 1; // L: 326
+			this.textShadowed = var1.readUnsignedByte() == 1; // L: 342
 		}
 
-		if (this.type == 4) { // L: 328
-			this.text = var1.readStringCp1252NullTerminated(); // L: 329
-			this.text2 = var1.readStringCp1252NullTerminated(); // L: 330
+		if (this.type == 4) { // L: 344
+			this.text = var1.readStringCp1252NullTerminated(); // L: 345
+			this.text2 = var1.readStringCp1252NullTerminated(); // L: 346
 		}
 
-		if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 332
+		if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 348
 			this.color = var1.readInt();
 		}
 
-		if (this.type == 3 || this.type == 4) { // L: 333
-			this.color2 = var1.readInt(); // L: 334
-			this.mouseOverColor = var1.readInt(); // L: 335
-			this.mouseOverColor2 = var1.readInt(); // L: 336
+		if (this.type == 3 || this.type == 4) { // L: 349
+			this.color2 = var1.readInt(); // L: 350
+			this.mouseOverColor = var1.readInt(); // L: 351
+			this.mouseOverColor2 = var1.readInt(); // L: 352
 		}
 
-		if (this.type == 5) { // L: 338
-			this.spriteId2 = var1.readInt(); // L: 339
-			this.spriteId = var1.readInt(); // L: 340
+		if (this.type == 5) { // L: 354
+			this.spriteId2 = var1.readInt(); // L: 355
+			this.spriteId = var1.readInt(); // L: 356
 		}
 
-		if (this.type == 6) { // L: 342
-			this.modelType = 1; // L: 343
-			this.modelId = var1.readUnsignedShort(); // L: 344
-			if (this.modelId == 65535) { // L: 345
+		if (this.type == 6) { // L: 358
+			this.modelType = 1; // L: 359
+			this.modelId = var1.readUnsignedShort(); // L: 360
+			if (this.modelId == 65535) { // L: 361
 				this.modelId = -1;
 			}
 
-			this.modelType2 = 1; // L: 346
-			this.modelId2 = var1.readUnsignedShort(); // L: 347
-			if (this.modelId2 == 65535) { // L: 348
+			this.modelType2 = 1; // L: 362
+			this.modelId2 = var1.readUnsignedShort(); // L: 363
+			if (this.modelId2 == 65535) { // L: 364
 				this.modelId2 = -1;
 			}
 
-			this.sequenceId = var1.readUnsignedShort(); // L: 349
-			if (this.sequenceId == 65535) { // L: 350
+			this.sequenceId = var1.readUnsignedShort(); // L: 365
+			if (this.sequenceId == 65535) { // L: 366
 				this.sequenceId = -1;
 			}
 
-			this.sequenceId2 = var1.readUnsignedShort(); // L: 351
-			if (this.sequenceId2 == 65535) { // L: 352
+			this.sequenceId2 = var1.readUnsignedShort(); // L: 367
+			if (this.sequenceId2 == 65535) { // L: 368
 				this.sequenceId2 = -1;
 			}
 
-			this.modelZoom = var1.readUnsignedShort(); // L: 353
-			this.modelAngleX = var1.readUnsignedShort(); // L: 354
-			this.modelAngleY = var1.readUnsignedShort(); // L: 355
+			this.modelZoom = var1.readUnsignedShort(); // L: 369
+			this.modelAngleX = var1.readUnsignedShort(); // L: 370
+			this.modelAngleY = var1.readUnsignedShort(); // L: 371
 		}
 
-		if (this.type == 7) { // L: 357
-			this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 358
-			this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 359
-			this.textXAlignment = var1.readUnsignedByte(); // L: 360
-			this.fontId = var1.readUnsignedShort(); // L: 361
-			if (this.fontId == 65535) { // L: 362
+		if (this.type == 7) { // L: 373
+			this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 374
+			this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 375
+			this.textXAlignment = var1.readUnsignedByte(); // L: 376
+			this.fontId = var1.readUnsignedShort(); // L: 377
+			if (this.fontId == 65535) { // L: 378
 				this.fontId = -1;
 			}
 
-			this.textShadowed = var1.readUnsignedByte() == 1; // L: 363
-			this.color = var1.readInt(); // L: 364
-			this.paddingX = var1.readShort(); // L: 365
-			this.paddingY = var1.readShort(); // L: 366
-			var4 = var1.readUnsignedByte(); // L: 367
+			this.textShadowed = var1.readUnsignedByte() == 1; // L: 379
+			this.color = var1.readInt(); // L: 380
+			this.paddingX = var1.readShort(); // L: 381
+			this.paddingY = var1.readShort(); // L: 382
+			var4 = var1.readUnsignedByte(); // L: 383
 			if (var4 == 1) {
-				this.flags |= 1073741824; // L: 368
+				this.flags |= 1073741824; // L: 384
 			}
 
-			this.itemActions = new String[5]; // L: 369
+			this.itemActions = new String[5]; // L: 385
 
-			for (var5 = 0; var5 < 5; ++var5) { // L: 370
-				String var10 = var1.readStringCp1252NullTerminated(); // L: 371
-				if (var10.length() > 0) { // L: 372
-					this.itemActions[var5] = var10; // L: 373
-					this.flags |= 1 << var5 + 23; // L: 374
+			for (var5 = 0; var5 < 5; ++var5) { // L: 386
+				String var10 = var1.readStringCp1252NullTerminated(); // L: 387
+				if (var10.length() > 0) { // L: 388
+					this.itemActions[var5] = var10; // L: 389
+					this.flags |= 1 << var5 + 23; // L: 390
 				}
 			}
 		}
 
-		if (this.type == 8) { // L: 378
-			this.text = var1.readStringCp1252NullTerminated(); // L: 379
+		if (this.type == 8) { // L: 394
+			this.text = var1.readStringCp1252NullTerminated(); // L: 395
 		}
 
-		if (this.buttonType == 2 || this.type == 2) { // L: 381
-			this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 382
-			this.spellName = var1.readStringCp1252NullTerminated(); // L: 383
-			var4 = var1.readUnsignedShort() & 63; // L: 384
-			this.flags |= var4 << 11; // L: 385
+		if (this.buttonType == 2 || this.type == 2) { // L: 397
+			this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 398
+			this.spellName = var1.readStringCp1252NullTerminated(); // L: 399
+			var4 = var1.readUnsignedShort() & 63; // L: 400
+			this.flags |= var4 << 11; // L: 401
 		}
 
-		if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 387
-			this.buttonText = var1.readStringCp1252NullTerminated(); // L: 388
-			if (this.buttonText.length() == 0) { // L: 389
-				if (this.buttonType == 1) { // L: 390
+		if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 403
+			this.buttonText = var1.readStringCp1252NullTerminated(); // L: 404
+			if (this.buttonText.length() == 0) { // L: 405
+				if (this.buttonType == 1) { // L: 406
 					this.buttonText = "Ok";
 				}
 
-				if (this.buttonType == 4) { // L: 391
+				if (this.buttonType == 4) { // L: 407
 					this.buttonText = "Select";
 				}
 
-				if (this.buttonType == 5) { // L: 392
+				if (this.buttonType == 5) { // L: 408
 					this.buttonText = "Select";
 				}
 
-				if (this.buttonType == 6) { // L: 393
+				if (this.buttonType == 6) { // L: 409
 					this.buttonText = "Continue";
 				}
 			}
 		}
 
-		if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 396
-			this.flags |= 4194304; // L: 397
+		if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 412
+			this.flags |= 4194304; // L: 413
 		}
 
-		if (this.buttonType == 6) { // L: 399
-			this.flags |= 1; // L: 400
+		if (this.buttonType == 6) { // L: 415
+			this.flags |= 1; // L: 416
 		}
 
-	} // L: 402
+	} // L: 418
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "1242431249"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "3"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
-		var1.readUnsignedByte(); // L: 405
-		this.isIf3 = true; // L: 406
-		this.type = var1.readUnsignedByte(); // L: 407
-		this.contentType = var1.readUnsignedShort(); // L: 408
-		this.rawX = var1.readShort(); // L: 409
-		this.rawY = var1.readShort(); // L: 410
-		this.rawWidth = var1.readUnsignedShort(); // L: 411
-		if (this.type == 9) { // L: 412
+		var1.readUnsignedByte(); // L: 421
+		this.isIf3 = true; // L: 422
+		this.type = var1.readUnsignedByte(); // L: 423
+		this.contentType = var1.readUnsignedShort(); // L: 424
+		this.rawX = var1.readShort(); // L: 425
+		this.rawY = var1.readShort(); // L: 426
+		this.rawWidth = var1.readUnsignedShort(); // L: 427
+		if (this.type == 9) { // L: 428
 			this.rawHeight = var1.readShort();
 		} else {
-			this.rawHeight = var1.readUnsignedShort(); // L: 413
+			this.rawHeight = var1.readUnsignedShort(); // L: 429
 		}
 
-		this.widthAlignment = var1.readByte(); // L: 414
-		this.heightAlignment = var1.readByte(); // L: 415
-		this.xAlignment = var1.readByte(); // L: 416
-		this.yAlignment = var1.readByte(); // L: 417
-		this.parentId = var1.readUnsignedShort(); // L: 418
-		if (this.parentId == 65535) { // L: 419
+		this.widthAlignment = var1.readByte(); // L: 430
+		this.heightAlignment = var1.readByte(); // L: 431
+		this.xAlignment = var1.readByte(); // L: 432
+		this.yAlignment = var1.readByte(); // L: 433
+		this.parentId = var1.readUnsignedShort(); // L: 434
+		if (this.parentId == 65535) { // L: 435
 			this.parentId = -1;
 		} else {
-			this.parentId += this.id & -65536; // L: 420
+			this.parentId += this.id & -65536; // L: 436
 		}
 
-		this.isHidden = var1.readUnsignedByte() == 1; // L: 421
-		if (this.type == 0) { // L: 422
-			this.scrollWidth = var1.readUnsignedShort(); // L: 423
-			this.scrollHeight = var1.readUnsignedShort(); // L: 424
-			this.noClickThrough = var1.readUnsignedByte() == 1; // L: 425
+		this.isHidden = var1.readUnsignedByte() == 1; // L: 437
+		if (this.type == 0) { // L: 438
+			this.scrollWidth = var1.readUnsignedShort(); // L: 439
+			this.scrollHeight = var1.readUnsignedShort(); // L: 440
+			this.noClickThrough = var1.readUnsignedByte() == 1; // L: 441
 		}
 
-		if (this.type == 5) { // L: 427
-			this.spriteId2 = var1.readInt(); // L: 428
-			this.spriteAngle = var1.readUnsignedShort(); // L: 429
-			this.spriteTiling = var1.readUnsignedByte() == 1; // L: 430
-			this.transparencyTop = var1.readUnsignedByte(); // L: 431
-			this.outline = var1.readUnsignedByte(); // L: 432
-			this.spriteShadow = var1.readInt(); // L: 433
-			this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 434
-			this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 435
+		if (this.type == 5) { // L: 443
+			this.spriteId2 = var1.readInt(); // L: 444
+			this.spriteAngle = var1.readUnsignedShort(); // L: 445
+			this.spriteTiling = var1.readUnsignedByte() == 1; // L: 446
+			this.transparencyTop = var1.readUnsignedByte(); // L: 447
+			this.outline = var1.readUnsignedByte(); // L: 448
+			this.spriteShadow = var1.readInt(); // L: 449
+			this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 450
+			this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 451
 		}
 
-		if (this.type == 6) { // L: 437
-			this.modelType = 1; // L: 438
-			this.modelId = var1.readUnsignedShort(); // L: 439
-			if (this.modelId == 65535) { // L: 440
+		if (this.type == 6) { // L: 453
+			this.modelType = 1; // L: 454
+			this.modelId = var1.readUnsignedShort(); // L: 455
+			if (this.modelId == 65535) { // L: 456
 				this.modelId = -1;
 			}
 
-			this.modelOffsetX = var1.readShort(); // L: 441
-			this.modelOffsetY = var1.readShort(); // L: 442
-			this.modelAngleX = var1.readUnsignedShort(); // L: 443
-			this.modelAngleY = var1.readUnsignedShort(); // L: 444
-			this.modelAngleZ = var1.readUnsignedShort(); // L: 445
-			this.modelZoom = var1.readUnsignedShort(); // L: 446
-			this.sequenceId = var1.readUnsignedShort(); // L: 447
-			if (this.sequenceId == 65535) { // L: 448
+			this.modelOffsetX = var1.readShort(); // L: 457
+			this.modelOffsetY = var1.readShort(); // L: 458
+			this.modelAngleX = var1.readUnsignedShort(); // L: 459
+			this.modelAngleY = var1.readUnsignedShort(); // L: 460
+			this.modelAngleZ = var1.readUnsignedShort(); // L: 461
+			this.modelZoom = var1.readUnsignedShort(); // L: 462
+			this.sequenceId = var1.readUnsignedShort(); // L: 463
+			if (this.sequenceId == 65535) { // L: 464
 				this.sequenceId = -1;
 			}
 
-			this.modelOrthog = var1.readUnsignedByte() == 1; // L: 449
-			var1.readUnsignedShort(); // L: 450
-			if (this.widthAlignment != 0) { // L: 451
-				this.field3106 = var1.readUnsignedShort();
+			this.modelOrthog = var1.readUnsignedByte() == 1; // L: 465
+			var1.readUnsignedShort(); // L: 466
+			if (this.widthAlignment != 0) { // L: 467
+				this.field3280 = var1.readUnsignedShort();
 			}
 
-			if (this.heightAlignment != 0) { // L: 452
-				var1.readUnsignedShort(); // L: 453
+			if (this.heightAlignment != 0) { // L: 468
+				var1.readUnsignedShort(); // L: 469
 			}
 		}
 
-		if (this.type == 4) { // L: 456
-			this.fontId = var1.readUnsignedShort(); // L: 457
-			if (this.fontId == 65535) { // L: 458
+		if (this.type == 4) { // L: 472
+			this.fontId = var1.readUnsignedShort(); // L: 473
+			if (this.fontId == 65535) { // L: 474
 				this.fontId = -1;
 			}
 
-			this.text = var1.readStringCp1252NullTerminated(); // L: 459
-			this.textLineHeight = var1.readUnsignedByte(); // L: 460
-			this.textXAlignment = var1.readUnsignedByte(); // L: 461
-			this.textYAlignment = var1.readUnsignedByte(); // L: 462
-			this.textShadowed = var1.readUnsignedByte() == 1; // L: 463
-			this.color = var1.readInt(); // L: 464
+			this.text = var1.readStringCp1252NullTerminated(); // L: 475
+			this.textLineHeight = var1.readUnsignedByte(); // L: 476
+			this.textXAlignment = var1.readUnsignedByte(); // L: 477
+			this.textYAlignment = var1.readUnsignedByte(); // L: 478
+			this.textShadowed = var1.readUnsignedByte() == 1; // L: 479
+			this.color = var1.readInt(); // L: 480
 		}
 
-		if (this.type == 3) { // L: 466
-			this.color = var1.readInt(); // L: 467
-			this.fill = var1.readUnsignedByte() == 1; // L: 468
-			this.transparencyTop = var1.readUnsignedByte(); // L: 469
+		if (this.type == 3) { // L: 482
+			this.color = var1.readInt(); // L: 483
+			this.fill = var1.readUnsignedByte() == 1; // L: 484
+			this.transparencyTop = var1.readUnsignedByte(); // L: 485
 		}
 
-		if (this.type == 9) { // L: 471
-			this.lineWid = var1.readUnsignedByte(); // L: 472
-			this.color = var1.readInt(); // L: 473
-			this.field3085 = var1.readUnsignedByte() == 1; // L: 474
+		if (this.type == 9) { // L: 487
+			this.lineWid = var1.readUnsignedByte(); // L: 488
+			this.color = var1.readInt(); // L: 489
+			this.field3359 = var1.readUnsignedByte() == 1; // L: 490
 		}
 
-		this.flags = var1.readMedium(); // L: 476
-		this.dataText = var1.readStringCp1252NullTerminated(); // L: 477
-		int var2 = var1.readUnsignedByte(); // L: 478
-		if (var2 > 0) { // L: 479
-			this.actions = new String[var2]; // L: 480
+		this.flags = var1.readMedium(); // L: 492
+		this.dataText = var1.readStringCp1252NullTerminated(); // L: 493
+		int var2 = var1.readUnsignedByte(); // L: 494
+		if (var2 > 0) { // L: 495
+			this.actions = new String[var2]; // L: 496
 
-			for (int var3 = 0; var3 < var2; ++var3) { // L: 481
+			for (int var3 = 0; var3 < var2; ++var3) { // L: 497
 				this.actions[var3] = var1.readStringCp1252NullTerminated();
 			}
 		}
 
-		this.dragZoneSize = var1.readUnsignedByte(); // L: 483
-		this.dragThreshold = var1.readUnsignedByte(); // L: 484
-		this.isScrollBar = var1.readUnsignedByte() == 1; // L: 485
-		this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 486
-		this.onLoad = this.readListener(var1); // L: 487
-		this.onMouseOver = this.readListener(var1); // L: 488
-		this.onMouseLeave = this.readListener(var1); // L: 489
-		this.onTargetLeave = this.readListener(var1); // L: 490
-		this.onTargetEnter = this.readListener(var1); // L: 491
-		this.onVarTransmit = this.readListener(var1); // L: 492
-		this.onInvTransmit = this.readListener(var1); // L: 493
-		this.onStatTransmit = this.readListener(var1); // L: 494
-		this.onTimer = this.readListener(var1); // L: 495
-		this.onOp = this.readListener(var1); // L: 496
-		this.onMouseRepeat = this.readListener(var1); // L: 497
-		this.onClick = this.readListener(var1); // L: 498
-		this.onClickRepeat = this.readListener(var1); // L: 499
-		this.onRelease = this.readListener(var1); // L: 500
-		this.onHold = this.readListener(var1); // L: 501
-		this.onDrag = this.readListener(var1); // L: 502
-		this.onDragComplete = this.readListener(var1); // L: 503
-		this.onScroll = this.readListener(var1); // L: 504
-		this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 505
-		this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 506
-		this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 507
-	} // L: 508
-
-	@ObfuscatedName("e")
+		this.dragZoneSize = var1.readUnsignedByte(); // L: 499
+		this.dragThreshold = var1.readUnsignedByte(); // L: 500
+		this.isScrollBar = var1.readUnsignedByte() == 1; // L: 501
+		this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 502
+		this.onLoad = this.readListener(var1); // L: 503
+		this.onMouseOver = this.readListener(var1); // L: 504
+		this.onMouseLeave = this.readListener(var1); // L: 505
+		this.onTargetLeave = this.readListener(var1); // L: 506
+		this.onTargetEnter = this.readListener(var1); // L: 507
+		this.onVarTransmit = this.readListener(var1); // L: 508
+		this.onInvTransmit = this.readListener(var1); // L: 509
+		this.onStatTransmit = this.readListener(var1); // L: 510
+		this.onTimer = this.readListener(var1); // L: 511
+		this.onOp = this.readListener(var1); // L: 512
+		this.onMouseRepeat = this.readListener(var1); // L: 513
+		this.onClick = this.readListener(var1); // L: 514
+		this.onClickRepeat = this.readListener(var1); // L: 515
+		this.onRelease = this.readListener(var1); // L: 516
+		this.onHold = this.readListener(var1); // L: 517
+		this.onDrag = this.readListener(var1); // L: 518
+		this.onDragComplete = this.readListener(var1); // L: 519
+		this.onScroll = this.readListener(var1); // L: 520
+		this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 521
+		this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 522
+		this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 523
+	} // L: 524
+
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)[Ljava/lang/Object;",
-		garbageValue = "-866877812"
+		descriptor = "(Lpi;B)[Ljava/lang/Object;",
+		garbageValue = "-48"
 	)
 	@Export("readListener")
 	Object[] readListener(Buffer var1) {
-		int var2 = var1.readUnsignedByte(); // L: 511
-		if (var2 == 0) { // L: 512
+		int var2 = var1.readUnsignedByte(); // L: 527
+		if (var2 == 0) { // L: 528
 			return null;
 		} else {
-			Object[] var3 = new Object[var2]; // L: 513
+			Object[] var3 = new Object[var2]; // L: 529
 
-			for (int var4 = 0; var4 < var2; ++var4) { // L: 514
-				int var5 = var1.readUnsignedByte(); // L: 515
+			for (int var4 = 0; var4 < var2; ++var4) { // L: 530
+				int var5 = var1.readUnsignedByte(); // L: 531
 				if (var5 == 0) {
-					var3[var4] = new Integer(var1.readInt()); // L: 516
-				} else if (var5 == 1) { // L: 517
+					var3[var4] = new Integer(var1.readInt()); // L: 532
+				} else if (var5 == 1) { // L: 533
 					var3[var4] = var1.readStringCp1252NullTerminated();
 				}
 			}
 
-			this.hasListener = true; // L: 519
-			return var3; // L: 520
+			this.hasListener = true; // L: 535
+			return var3; // L: 536
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;B)[I",
-		garbageValue = "105"
+		descriptor = "(Lpi;I)[I",
+		garbageValue = "-1206239013"
 	)
 	@Export("readListenerTriggers")
 	int[] readListenerTriggers(Buffer var1) {
-		int var2 = var1.readUnsignedByte(); // L: 524
-		if (var2 == 0) { // L: 525
+		int var2 = var1.readUnsignedByte(); // L: 540
+		if (var2 == 0) { // L: 541
 			return null;
 		} else {
-			int[] var3 = new int[var2]; // L: 526
+			int[] var3 = new int[var2]; // L: 542
 
-			for (int var4 = 0; var4 < var2; ++var4) { // L: 527
-				var3[var4] = var1.readInt(); // L: 528
+			for (int var4 = 0; var4 < var2; ++var4) { // L: 543
+				var3[var4] = var1.readInt(); // L: 544
 			}
 
-			return var3; // L: 530
+			return var3; // L: 546
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "657208411"
+		garbageValue = "1907354945"
 	)
 	@Export("swapItems")
 	public void swapItems(int var1, int var2) {
-		int var3 = this.itemIds[var2]; // L: 534
-		this.itemIds[var2] = this.itemIds[var1]; // L: 535
-		this.itemIds[var1] = var3; // L: 536
-		var3 = this.itemQuantities[var2]; // L: 537
-		this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 538
-		this.itemQuantities[var1] = var3; // L: 539
-	} // L: 540
-
-	@ObfuscatedName("b")
+		int var3 = this.itemIds[var2]; // L: 550
+		this.itemIds[var2] = this.itemIds[var1]; // L: 551
+		this.itemIds[var1] = var3; // L: 552
+		var3 = this.itemQuantities[var2]; // L: 553
+		this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 554
+		this.itemQuantities[var1] = var3; // L: 555
+	} // L: 556
+
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)Low;",
-		garbageValue = "-58"
+		descriptor = "(ZI)Lpl;",
+		garbageValue = "-2081524052"
 	)
 	@Export("getSprite")
 	public SpritePixels getSprite(boolean var1) {
-		field3049 = false; // L: 543
+		field3223 = false; // L: 559
 		int var2;
-		if (var1) { // L: 545
+		if (var1) { // L: 561
 			var2 = this.spriteId;
 		} else {
-			var2 = this.spriteId2; // L: 546
+			var2 = this.spriteId2; // L: 562
 		}
 
-		if (var2 == -1) { // L: 547
+		if (var2 == -1) { // L: 563
 			return null;
 		} else {
-			long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.spriteShadow << 40); // L: 548
-			SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 549
-			if (var5 != null) { // L: 550
+			long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 564
+			SpritePixels var5 = (SpritePixels)Widget_cachedModels.get(var3); // L: 565
+			if (var5 != null) { // L: 566
 				return var5;
 			} else {
-				var5 = WorldMapSection0.SpriteBuffer_getSprite(WorldMapScaleHandler.Widget_spritesArchive, var2, 0); // L: 551
-				if (var5 == null) { // L: 552
-					field3049 = true; // L: 553
-					return null; // L: 554
+				var5 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0); // L: 567
+				if (var5 == null) { // L: 568
+					field3223 = true; // L: 569
+					return null; // L: 570
 				} else {
-					if (this.spriteFlipV) { // L: 556
+					if (this.spriteFlipV) { // L: 572
 						var5.flipVertically();
 					}
 
-					if (this.spriteFlipH) { // L: 557
+					if (this.spriteFlipH) { // L: 573
 						var5.flipHorizontally();
 					}
 
-					if (this.outline > 0) { // L: 558
+					if (this.outline > 0) { // L: 574
 						var5.pad(this.outline);
 					}
 
-					if (this.outline >= 1) { // L: 559
+					if (this.outline >= 1) { // L: 575
 						var5.outline(1);
 					}
 
-					if (this.outline >= 2) { // L: 560
+					if (this.outline >= 2) { // L: 576
 						var5.outline(16777215);
 					}
 
-					if (this.spriteShadow != 0) { // L: 561
+					if (this.spriteShadow != 0) { // L: 577
 						var5.shadow(this.spriteShadow);
 					}
 
-					Widget_cachedSprites.put(var5, var3); // L: 562
-					return var5; // L: 563
+					Widget_cachedModels.put(var5, var3); // L: 578
+					return var5; // L: 579
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lle;",
-		garbageValue = "96"
+		descriptor = "(I)Llx;",
+		garbageValue = "-2079109490"
 	)
 	@Export("getFont")
 	public Font getFont() {
-		field3049 = false; // L: 567
-		if (this.fontId == -1) { // L: 568
+		field3223 = false; // L: 583
+		if (this.fontId == -1) { // L: 584
 			return null;
 		} else {
-			Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 569
-			if (var1 != null) { // L: 570
+			Font var1 = (Font)Widget_cachedSpriteMasks.get((long)this.fontId); // L: 585
+			if (var1 != null) { // L: 586
 				return var1;
 			} else {
-				AbstractArchive var3 = WorldMapScaleHandler.Widget_spritesArchive; // L: 572
-				AbstractArchive var4 = class134.Widget_fontsArchive; // L: 573
-				int var5 = this.fontId; // L: 574
+				AbstractArchive var3 = GraphicsObject.Widget_spritesArchive; // L: 588
+				AbstractArchive var4 = NPC.Widget_fontsArchive; // L: 589
+				int var5 = this.fontId; // L: 590
 				Font var2;
-				if (!BuddyRankComparator.method2502(var3, var5, 0)) { // L: 576
-					var2 = null; // L: 577
+				if (!class147.method3009(var3, var5, 0)) { // L: 592
+					var2 = null; // L: 593
 				} else {
-					byte[] var7 = var4.takeFile(var5, 0); // L: 581
+					byte[] var7 = var4.takeFile(var5, 0); // L: 597
 					Font var6;
-					if (var7 == null) { // L: 583
-						var6 = null; // L: 584
+					if (var7 == null) { // L: 599
+						var6 = null; // L: 600
 					} else {
-						Font var8 = new Font(var7, class414.SpriteBuffer_xOffsets, class414.SpriteBuffer_yOffsets, UrlRequester.SpriteBuffer_spriteWidths, class414.SpriteBuffer_spriteHeights, HitSplatDefinition.SpriteBuffer_spritePalette, class295.SpriteBuffer_pixels); // L: 587
-						PacketBuffer.method6913(); // L: 588
-						var6 = var8; // L: 589
+						Font var8 = new Font(var7, class141.SpriteBuffer_xOffsets, RouteStrategy.SpriteBuffer_yOffsets, class432.SpriteBuffer_spriteWidths, class330.SpriteBuffer_spriteHeights, class432.SpriteBuffer_spritePalette, class369.SpriteBuffer_pixels); // L: 603
+						UserComparator3.method2529(); // L: 604
+						var6 = var8; // L: 605
 					}
 
-					var2 = var6; // L: 591
+					var2 = var6; // L: 607
 				}
 
-				if (var2 != null) { // L: 594
-					Widget_cachedFonts.put(var2, (long)this.fontId);
+				if (var2 != null) { // L: 610
+					Widget_cachedSpriteMasks.put(var2, (long)this.fontId);
 				} else {
-					field3049 = true; // L: 595
+					field3223 = true; // L: 611
 				}
 
-				return var2; // L: 596
+				return var2; // L: 612
 			}
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(II)Low;",
-		garbageValue = "-1869717535"
+		descriptor = "(IB)Lpl;",
+		garbageValue = "-95"
 	)
 	@Export("getInventorySprite")
 	public SpritePixels getInventorySprite(int var1) {
-		field3049 = false; // L: 600
-		if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 601
-			int var2 = this.inventorySprites[var1]; // L: 602
-			if (var2 == -1) { // L: 603
+		field3223 = false; // L: 616
+		if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 617
+			int var2 = this.inventorySprites[var1]; // L: 618
+			if (var2 == -1) { // L: 619
 				return null;
 			} else {
-				SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 604
-				if (var3 != null) { // L: 605
+				SpritePixels var3 = (SpritePixels)Widget_cachedModels.get((long)var2); // L: 620
+				if (var3 != null) { // L: 621
 					return var3;
 				} else {
-					var3 = WorldMapSection0.SpriteBuffer_getSprite(WorldMapScaleHandler.Widget_spritesArchive, var2, 0); // L: 606
-					if (var3 != null) { // L: 607
-						Widget_cachedSprites.put(var3, (long)var2);
+					var3 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0); // L: 622
+					if (var3 != null) { // L: 623
+						Widget_cachedModels.put(var3, (long)var2);
 					} else {
-						field3049 = true; // L: 608
+						field3223 = true; // L: 624
 					}
 
-					return var3; // L: 609
+					return var3; // L: 625
 				}
 			}
 		} else {
@@ -1390,165 +1392,165 @@ public SpritePixels getInventorySprite(int var1) {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Lfm;IZLit;I)Lhl;",
-		garbageValue = "811469011"
+		descriptor = "(Lgn;IZLjo;I)Lgo;",
+		garbageValue = "733986686"
 	)
 	@Export("getModel")
 	public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) {
-		field3049 = false; // L: 613
+		field3223 = false; // L: 629
 		int var5;
 		int var6;
-		if (var3) { // L: 616
-			var5 = this.modelType2; // L: 617
-			var6 = this.modelId2; // L: 618
+		if (var3) { // L: 632
+			var5 = this.modelType2; // L: 633
+			var6 = this.modelId2; // L: 634
 		} else {
-			var5 = this.modelType; // L: 621
-			var6 = this.modelId; // L: 622
+			var5 = this.modelType; // L: 637
+			var6 = this.modelId; // L: 638
 		}
 
-		if (var5 == 0) { // L: 624
+		if (var5 == 0) { // L: 640
 			return null;
-		} else if (var5 == 1 && var6 == -1) { // L: 625
+		} else if (var5 == 1 && var6 == -1) { // L: 641
 			return null;
 		} else {
-			Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 626
-			if (var7 == null) { // L: 627
+			Model var7 = (Model)Widget_cachedFonts.get((long)(var6 + (var5 << 16))); // L: 642
+			if (var7 == null) { // L: 643
 				ModelData var8;
-				if (var5 == 1) { // L: 629
-					var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); // L: 630
-					if (var8 == null) { // L: 631
-						field3049 = true; // L: 632
-						return null; // L: 633
+				if (var5 == 1) { // L: 645
+					var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); // L: 646
+					if (var8 == null) { // L: 647
+						field3223 = true; // L: 648
+						return null; // L: 649
 					}
 
-					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 635
+					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 651
 				}
 
-				if (var5 == 2) { // L: 637
-					var8 = ScriptFrame.getNpcDefinition(var6).getModelData(); // L: 638
-					if (var8 == null) { // L: 639
-						field3049 = true; // L: 640
-						return null; // L: 641
+				if (var5 == 2) { // L: 653
+					var8 = WorldMapLabelSize.getNpcDefinition(var6).getModelData(); // L: 654
+					if (var8 == null) { // L: 655
+						field3223 = true; // L: 656
+						return null; // L: 657
 					}
 
-					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 643
+					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 659
 				}
 
-				if (var5 == 3) { // L: 645
-					if (var4 == null) { // L: 646
+				if (var5 == 3) { // L: 661
+					if (var4 == null) { // L: 662
 						return null;
 					}
 
-					var8 = var4.getModelData(); // L: 647
-					if (var8 == null) { // L: 648
-						field3049 = true; // L: 649
-						return null; // L: 650
+					var8 = var4.getModelData(); // L: 663
+					if (var8 == null) { // L: 664
+						field3223 = true; // L: 665
+						return null; // L: 666
 					}
 
-					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 652
+					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 668
 				}
 
-				if (var5 == 4) { // L: 654
-					ItemComposition var9 = TaskHandler.ItemDefinition_get(var6); // L: 655
-					var8 = var9.getModelData(10); // L: 656
-					if (var8 == null) { // L: 657
-						field3049 = true; // L: 658
-						return null; // L: 659
+				if (var5 == 4) { // L: 670
+					ItemComposition var9 = UserComparator6.ItemDefinition_get(var6); // L: 671
+					var8 = var9.getModelData(10); // L: 672
+					if (var8 == null) { // L: 673
+						field3223 = true; // L: 674
+						return null; // L: 675
 					}
 
-					var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 661
+					var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 677
 				}
 
-				Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 663
+				Widget_cachedFonts.put(var7, (long)(var6 + (var5 << 16))); // L: 679
 			}
 
-			if (var1 != null) { // L: 665
-				var7 = var1.transformWidgetModel(var7, var2); // L: 666
+			if (var1 != null) { // L: 681
+				var7 = var1.transformWidgetModel(var7, var2); // L: 682
 			}
 
-			return var7; // L: 668
+			return var7; // L: 684
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)Liw;",
-		garbageValue = "-56"
+		descriptor = "(ZI)Ljr;",
+		garbageValue = "-1371777519"
 	)
 	@Export("getSpriteMask")
 	public SpriteMask getSpriteMask(boolean var1) {
-		if (this.spriteId == -1) { // L: 672
+		if (this.spriteId == -1) { // L: 688
 			var1 = false;
 		}
 
-		int var2 = var1 ? this.spriteId * -1784284609 * -1672153665 : this.spriteId2 * 1217109247 * 338387711; // L: 673
-		if (var2 == -1) { // L: 674
+		int var2 = var1 ? this.spriteId * 728672183 * 655222279 : this.spriteId2 * -1083804351 * 949557953; // L: 689
+		if (var2 == -1) { // L: 690
 			return null;
 		} else {
-			long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((long)this.spriteShadow << 40); // L: 675
-			SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 676
-			if (var5 != null) { // L: 677
+			long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 691
+			SpriteMask var5 = (SpriteMask)field3222.get(var3); // L: 692
+			if (var5 != null) { // L: 693
 				return var5;
 			} else {
-				SpritePixels var6 = this.getSprite(var1); // L: 678
-				if (var6 == null) { // L: 679
+				SpritePixels var6 = this.getSprite(var1); // L: 694
+				if (var6 == null) { // L: 695
 					return null;
 				} else {
-					SpritePixels var7 = var6.copyNormalized(); // L: 680
-					int[] var8 = new int[var7.subHeight]; // L: 681
-					int[] var9 = new int[var7.subHeight]; // L: 682
+					SpritePixels var7 = var6.copyNormalized(); // L: 696
+					int[] var8 = new int[var7.subHeight]; // L: 697
+					int[] var9 = new int[var7.subHeight]; // L: 698
 
-					for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 683
-						int var11 = 0; // L: 684
-						int var12 = var7.subWidth; // L: 685
+					for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 699
+						int var11 = 0; // L: 700
+						int var12 = var7.subWidth; // L: 701
 
 						int var13;
-						for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 686
-							if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 687
-								var11 = var13; // L: 688
+						for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 702
+							if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 703
+								var11 = var13; // L: 704
 								break;
 							}
 						}
 
-						for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 692
-							if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 693
-								var12 = var13 + 1; // L: 694
+						for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 708
+							if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 709
+								var12 = var13 + 1; // L: 710
 								break;
 							}
 						}
 
-						var8[var10] = var11; // L: 698
-						var9[var10] = var12 - var11; // L: 699
+						var8[var10] = var11; // L: 714
+						var9[var10] = var12 - var11; // L: 715
 					}
 
-					var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 701
-					Widget_cachedSpriteMasks.put(var5, var3); // L: 702
-					return var5; // L: 703
+					var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 717
+					field3222.put(var5, var3); // L: 718
+					return var5; // L: 719
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;B)V",
-		garbageValue = "35"
+		descriptor = "(ILjava/lang/String;I)V",
+		garbageValue = "340067933"
 	)
 	@Export("setAction")
 	public void setAction(int var1, String var2) {
-		if (this.actions == null || this.actions.length <= var1) { // L: 714
-			String[] var3 = new String[var1 + 1]; // L: 715
-			if (this.actions != null) { // L: 716
-				for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 717
+		if (this.actions == null || this.actions.length <= var1) { // L: 730
+			String[] var3 = new String[var1 + 1]; // L: 731
+			if (this.actions != null) { // L: 732
+				for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 733
 					var3[var4] = this.actions[var4];
 				}
 			}
 
-			this.actions = var3; // L: 719
+			this.actions = var3; // L: 735
 		}
 
-		this.actions[var1] = var2; // L: 721
-	} // L: 722
+		this.actions[var1] = var2; // L: 737
+	} // L: 738
 }
diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java
index 9ecf4e559a..4dfa858a67 100644
--- a/runescape-client/src/main/java/World.java
+++ b/runescape-client/src/main/java/World.java
@@ -3,62 +3,73 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("bw")
 @Implements("World")
 public class World {
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -219608595
+		intValue = 63855855
 	)
 	@Export("World_count")
 	static int World_count;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1277834635
+		intValue = -951276337
 	)
 	@Export("World_listCount")
 	static int World_listCount;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("World_sortOption2")
 	static int[] World_sortOption2;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("World_sortOption1")
 	static int[] World_sortOption1;
-	@ObfuscatedName("x")
+	@ObfuscatedName("k")
+	@Export("ByteArrayPool_arrays")
+	public static byte[][][] ByteArrayPool_arrays;
+	@ObfuscatedName("ai")
+	@Export("hasFocus")
+	protected static boolean hasFocus;
+	@ObfuscatedName("ip")
+	@ObfuscatedSignature(
+		descriptor = "[Lpa;"
+	)
+	@Export("modIconSprites")
+	static IndexedSprite[] modIconSprites;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 695076639
+		intValue = 402163899
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1588910771
+		intValue = 967201023
 	)
 	@Export("properties")
 	int properties;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 284961543
+		intValue = 1525969609
 	)
 	@Export("population")
 	int population;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("host")
 	String host;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("activity")
 	String activity;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1851136007
+		intValue = -102724797
 	)
 	@Export("location")
 	int location;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -942792527
+		intValue = 742286855
 	)
 	@Export("index")
 	int index;
@@ -73,151 +84,105 @@ public class World {
 	World() {
 	} // L: 27
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "62"
+		garbageValue = "16"
 	)
 	@Export("isMembersOnly")
 	boolean isMembersOnly() {
-		return (1 & this.properties) != 0; // L: 257
+		return (1 & this.properties) != 0; // L: 247
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "2012442922"
+		garbageValue = "-624791914"
 	)
-	boolean method1649() {
-		return (2 & this.properties) != 0; // L: 261
+	boolean method1696() {
+		return (2 & this.properties) != 0; // L: 251
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "71"
+		descriptor = "(I)Z",
+		garbageValue = "1709463484"
 	)
 	@Export("isPvp")
 	boolean isPvp() {
-		return (4 & this.properties) != 0; // L: 265
+		return (4 & this.properties) != 0; // L: 255
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1239609040"
+		garbageValue = "-1754892594"
 	)
-	boolean method1681() {
-		return (8 & this.properties) != 0; // L: 269
+	boolean method1676() {
+		return (8 & this.properties) != 0; // L: 259
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "40"
+		garbageValue = "-24"
 	)
 	@Export("isDeadman")
 	boolean isDeadman() {
-		return (536870912 & this.properties) != 0; // L: 273
+		return (536870912 & this.properties) != 0; // L: 263
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1502884763"
+		garbageValue = "-126940607"
 	)
 	@Export("isBeta")
 	boolean isBeta() {
-		return (33554432 & this.properties) != 0; // L: 277
+		return (33554432 & this.properties) != 0; // L: 267
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "0"
+		garbageValue = "-98"
 	)
-	boolean method1652() {
-		return (1073741824 & this.properties) != 0; // L: 281
+	boolean method1679() {
+		return (1073741824 & this.properties) != 0; // L: 271
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-654094649"
-	)
-	static int method1668(int var0, Script var1, boolean var2) {
-		int var3;
-		int var6;
-		int var9;
-		if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2062
-			class14.Interpreter_intStackSize -= 2; // L: 2063
-			var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2064
-			var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2065
-			EnumComposition var10 = FloorOverlayDefinition.getEnum(var3); // L: 2066
-			if (var10.outputType != 's') { // L: 2067
-			}
-
-			for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2068
-				if (var9 == var10.keys[var6]) { // L: 2069
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2070
-					var10 = null; // L: 2071
-					break;
-				}
+		descriptor = "(Ljm;I[B[BI)V",
+		garbageValue = "-1955457060"
+	)
+	@Export("Widget_setKey")
+	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
+		if (var0.field3300 == null) { // L: 972
+			if (var2 == null) { // L: 973
+				return; // L: 979
 			}
 
-			if (var10 != null) { // L: 2075
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var10.defaultStr;
-			}
+			var0.field3300 = new byte[11][]; // L: 974
+			var0.field3301 = new byte[11][]; // L: 975
+			var0.field3302 = new int[11]; // L: 976
+			var0.field3303 = new int[11]; // L: 977
+		}
 
-			return 1; // L: 2076
-		} else if (var0 != ScriptOpcodes.ENUM) { // L: 2078
-			if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2104
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2105
-				EnumComposition var4 = FloorOverlayDefinition.getEnum(var3); // L: 2106
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.size(); // L: 2107
-				return 1; // L: 2108
-			} else {
-				return 2; // L: 2110
-			}
+		var0.field3300[var1] = var2; // L: 981
+		if (var2 != null) {
+			var0.field3299 = true; // L: 982
 		} else {
-			class14.Interpreter_intStackSize -= 4; // L: 2079
-			var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 2080
-			var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 2081
-			int var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 2082
-			var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 2083
-			EnumComposition var7 = FloorOverlayDefinition.getEnum(var5); // L: 2084
-			if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2085
-				for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2090
-					if (var6 == var7.keys[var8]) { // L: 2091
-						if (var9 == 115) { // L: 2092
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.strVals[var8];
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2093
-						}
-
-						var7 = null; // L: 2094
-						break;
-					}
-				}
-
-				if (var7 != null) { // L: 2098
-					if (var9 == 115) { // L: 2099
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.defaultStr;
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2100
-					}
-				}
+			var0.field3299 = false; // L: 984
 
-				return 1; // L: 2102
-			} else {
-				if (var9 == 115) { // L: 2086
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = "null";
-				} else {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2087
+			for (int var4 = 0; var4 < var0.field3300.length; ++var4) { // L: 985
+				if (var0.field3300[var4] != null) { // L: 986
+					var0.field3299 = true; // L: 987
+					break;
 				}
-
-				return 1; // L: 2088
 			}
 		}
-	}
+
+		var0.field3301[var1] = var3; // L: 992
+	} // L: 993
 }
diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java
index 7eeb286484..2ff964f967 100644
--- a/runescape-client/src/main/java/WorldMap.java
+++ b/runescape-client/src/main/java/WorldMap.java
@@ -10,280 +10,280 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ng")
+@ObfuscatedName("ov")
 @Implements("WorldMap")
 public class WorldMap {
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lny;"
+		descriptor = "Lot;"
 	)
 	@Export("fontNameVerdana11")
 	static final FontName fontNameVerdana11;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lny;"
+		descriptor = "Lot;"
 	)
 	@Export("fontNameVerdana13")
 	static final FontName fontNameVerdana13;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lny;"
+		descriptor = "Lot;"
 	)
 	@Export("fontNameVerdana15")
 	static final FontName fontNameVerdana15;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("WorldMap_archive")
 	AbstractArchive WorldMap_archive;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("WorldMap_geographyArchive")
 	AbstractArchive WorldMap_geographyArchive;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("WorldMap_groundArchive")
 	AbstractArchive WorldMap_groundArchive;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lle;"
+		descriptor = "Llx;"
 	)
 	@Export("font")
 	Font font;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("fonts")
 	HashMap fonts;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "[Loe;"
+		descriptor = "[Lpa;"
 	)
 	@Export("mapSceneSprites")
 	IndexedSprite[] mapSceneSprites;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@Export("details")
 	HashMap details;
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lfb;"
+		descriptor = "Lhr;"
 	)
 	@Export("mainMapArea")
 	WorldMapArea mainMapArea;
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "Lfb;"
+		descriptor = "Lhr;"
 	)
 	@Export("currentMapArea")
 	WorldMapArea currentMapArea;
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lfb;"
+		descriptor = "Lhr;"
 	)
-	WorldMapArea field4145;
-	@ObfuscatedName("d")
+	WorldMapArea field4321;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lgv;"
+		descriptor = "Lhe;"
 	)
 	@Export("worldMapManager")
 	WorldMapManager worldMapManager;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lok;"
 	)
 	@Export("cacheLoader")
 	WorldMapArchiveLoader cacheLoader;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1290964243
+		intValue = 988816303
 	)
 	@Export("centerTileX")
 	int centerTileX;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -204913467
+		intValue = 742897399
 	)
 	@Export("centerTileY")
 	int centerTileY;
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1913333161
+		intValue = 574868181
 	)
 	@Export("worldMapTargetX")
 	int worldMapTargetX;
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1159197949
+		intValue = 67441045
 	)
 	@Export("worldMapTargetY")
 	int worldMapTargetY;
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@Export("zoom")
 	float zoom;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@Export("zoomTarget")
 	float zoomTarget;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 1080910681
+		intValue = -862108599
 	)
 	@Export("worldMapDisplayWidth")
 	int worldMapDisplayWidth;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = 64732505
+		intValue = -732997845
 	)
 	@Export("worldMapDisplayHeight")
 	int worldMapDisplayHeight;
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -1230948931
+		intValue = -216475433
 	)
 	@Export("worldMapDisplayX")
 	int worldMapDisplayX;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = -17666691
+		intValue = 1517340013
 	)
 	@Export("worldMapDisplayY")
 	int worldMapDisplayY;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = -923542465
+		intValue = -420508859
 	)
 	@Export("maxFlashCount")
 	int maxFlashCount;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -939846439
+		intValue = 621335613
 	)
 	@Export("cyclesPerFlash")
 	int cyclesPerFlash;
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@Export("perpetualFlash")
 	boolean perpetualFlash;
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@Export("flashingElements")
 	HashSet flashingElements;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = 1654296513
+		intValue = -1416499467
 	)
 	@Export("flashCount")
 	int flashCount;
 	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 1442139175
+		intValue = -836292671
 	)
 	@Export("flashCycle")
 	int flashCycle;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 1121026653
+		intValue = -1744644145
 	)
-	int field4163;
-	@ObfuscatedName("ab")
+	int field4340;
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = -1594727553
+		intValue = -1265576405
 	)
-	int field4164;
+	int field4335;
 	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = -556014013
+		intValue = -1227072721
 	)
-	int field4165;
-	@ObfuscatedName("ad")
+	int field4342;
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 2105005049
+		intValue = 1034600775
 	)
-	int field4160;
-	@ObfuscatedName("an")
+	int field4343;
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		longValue = 7665645789656802907L
+		longValue = 1846955281034182293L
 	)
-	long field4167;
-	@ObfuscatedName("ax")
+	long field4311;
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = 1780442653
+		intValue = -221870639
 	)
-	int field4169;
-	@ObfuscatedName("av")
+	int field4345;
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = -576926271
+		intValue = -381850671
 	)
-	int field4148;
-	@ObfuscatedName("ap")
-	boolean field4170;
-	@ObfuscatedName("af")
+	int field4346;
+	@ObfuscatedName("at")
+	boolean field4334;
+	@ObfuscatedName("aw")
 	@Export("enabledElements")
 	HashSet enabledElements;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ay")
 	@Export("enabledCategories")
 	HashSet enabledCategories;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ae")
 	@Export("enabledElementIds")
 	HashSet enabledElementIds;
-	@ObfuscatedName("aa")
-	HashSet field4174;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ak")
+	HashSet field4351;
+	@ObfuscatedName("ad")
 	@Export("elementsDisabled")
 	boolean elementsDisabled;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bp")
 	@ObfuscatedGetter(
-		intValue = -711279599
+		intValue = -1859070629
 	)
-	int field4135;
-	@ObfuscatedName("bx")
+	int field4353;
+	@ObfuscatedName("ba")
 	@Export("menuOpcodes")
 	final int[] menuOpcodes;
-	@ObfuscatedName("bd")
-	List field4178;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bq")
+	List field4356;
+	@ObfuscatedName("bg")
 	@Export("iconIterator")
 	Iterator iconIterator;
-	@ObfuscatedName("bf")
-	HashSet field4180;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("br")
+	HashSet field4358;
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
-		descriptor = "Lie;"
+		descriptor = "Lju;"
 	)
 	@Export("mouseCoord")
 	Coord mouseCoord;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bm")
 	@Export("showCoord")
 	public boolean showCoord;
 	@ObfuscatedName("bw")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Lpl;"
 	)
 	@Export("sprite")
 	SpritePixels sprite;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = 768918845
+		intValue = 878562977
 	)
 	@Export("cachedPixelsPerTile")
 	int cachedPixelsPerTile;
-	@ObfuscatedName("br")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = -400143741
+		intValue = 1300287889
 	)
 	@Export("minCachedTileX")
 	int minCachedTileX;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = -1959278257
+		intValue = -658949633
 	)
 	@Export("minCachedTileY")
 	int minCachedTileY;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = -636170131
+		intValue = -1815289921
 	)
-	int field4187;
+	int field4365;
 
 	static {
 		fontNameVerdana11 = FontName.FontName_verdana11; // L: 46
@@ -304,30 +304,30 @@ public WorldMap() {
 		this.flashingElements = null; // L: 71
 		this.flashCount = -1; // L: 72
 		this.flashCycle = -1; // L: 73
-		this.field4163 = -1; // L: 74
-		this.field4164 = -1; // L: 75
-		this.field4165 = -1; // L: 76
-		this.field4160 = -1; // L: 77
-		this.field4170 = true; // L: 81
+		this.field4340 = -1; // L: 74
+		this.field4335 = -1; // L: 75
+		this.field4342 = -1; // L: 76
+		this.field4343 = -1; // L: 77
+		this.field4334 = true; // L: 81
 		this.enabledElements = new HashSet(); // L: 84
 		this.enabledCategories = new HashSet(); // L: 85
 		this.enabledElementIds = new HashSet(); // L: 86
-		this.field4174 = new HashSet(); // L: 87
+		this.field4351 = new HashSet(); // L: 87
 		this.elementsDisabled = false; // L: 88
-		this.field4135 = 0; // L: 89
+		this.field4353 = 0; // L: 89
 		this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91
-		this.field4180 = new HashSet(); // L: 94
+		this.field4358 = new HashSet(); // L: 94
 		this.mouseCoord = null; // L: 95
 		this.showCoord = false; // L: 96
 		this.minCachedTileX = -1; // L: 99
 		this.minCachedTileY = -1; // L: 100
-		this.field4187 = -1; // L: 101
+		this.field4365 = -1; // L: 101
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;Lko;Lko;Lle;Ljava/util/HashMap;[Loe;B)V",
-		garbageValue = "105"
+		descriptor = "(Lku;Lku;Lku;Llx;Ljava/util/HashMap;[Lpa;I)V",
+		garbageValue = "1284621273"
 	)
 	@Export("init")
 	public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) {
@@ -341,7 +341,7 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var
 		this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112
 		this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113
 		this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114
-		int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2210.name); // L: 115
+		int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2768.name); // L: 115
 		int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116
 		this.details = new HashMap(var8.length); // L: 117
 
@@ -356,1087 +356,1087 @@ public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var
 		}
 
 		this.setCurrentMapArea(this.mainMapArea); // L: 127
-		this.field4145 = null; // L: 128
+		this.field4321 = null; // L: 128
 	} // L: 129
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1459305380"
+		garbageValue = "1522497610"
 	)
-	public void method6487() {
-		class269.method5189(); // L: 132
-	} // L: 133
+	public void method6902() {
+		WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133
+	} // L: 135
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(IIZIIIII)V",
-		garbageValue = "1654773534"
+		garbageValue = "39727185"
 	)
 	@Export("onCycle")
 	public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) {
-		if (this.cacheLoader.isLoaded()) { // L: 136
-			this.smoothZoom(); // L: 139
-			this.scrollToTarget(); // L: 140
-			if (var3) { // L: 141
-				int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 144
-				int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 145
-				List var10 = this.worldMapManager.method3807(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 146
-				HashSet var11 = new HashSet(); // L: 147
+		if (this.cacheLoader.isLoaded()) { // L: 138
+			this.smoothZoom(); // L: 141
+			this.scrollToTarget(); // L: 142
+			if (var3) { // L: 143
+				int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 146
+				int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 147
+				List var10 = this.worldMapManager.method4617(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148
+				HashSet var11 = new HashSet(); // L: 149
 
 				Iterator var12;
 				AbstractWorldMapIcon var13;
 				ScriptEvent var14;
 				WorldMapEvent var15;
-				for (var12 = var10.iterator(); var12.hasNext(); Tile.runScriptEvent(var14)) { // L: 148 161
-					var13 = (AbstractWorldMapIcon)var12.next(); // L: 149
-					var11.add(var13); // L: 151
-					var14 = new ScriptEvent(); // L: 152
-					var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 153
-					var14.setArgs(new Object[]{var15, var1, var2}); // L: 154
-					if (this.field4180.contains(var13)) { // L: 155
-						var14.setType(17); // L: 156
+				for (var12 = var10.iterator(); var12.hasNext(); class285.runScriptEvent(var14)) { // L: 150 163
+					var13 = (AbstractWorldMapIcon)var12.next(); // L: 151
+					var11.add(var13); // L: 153
+					var14 = new ScriptEvent(); // L: 154
+					var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 155
+					var14.setArgs(new Object[]{var15, var1, var2}); // L: 156
+					if (this.field4358.contains(var13)) { // L: 157
+						var14.setType(17); // L: 158
 					} else {
-						var14.setType(15); // L: 159
+						var14.setType(15); // L: 161
 					}
 				}
 
-				var12 = this.field4180.iterator(); // L: 164
+				var12 = this.field4358.iterator(); // L: 166
 
 				while (var12.hasNext()) {
-					var13 = (AbstractWorldMapIcon)var12.next(); // L: 165
-					if (!var11.contains(var13)) { // L: 167
-						var14 = new ScriptEvent(); // L: 168
-						var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 169
-						var14.setArgs(new Object[]{var15, var1, var2}); // L: 170
-						var14.setType(16); // L: 171
-						Tile.runScriptEvent(var14); // L: 172
+					var13 = (AbstractWorldMapIcon)var12.next(); // L: 167
+					if (!var11.contains(var13)) { // L: 169
+						var14 = new ScriptEvent(); // L: 170
+						var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 171
+						var14.setArgs(new Object[]{var15, var1, var2}); // L: 172
+						var14.setType(16); // L: 173
+						class285.runScriptEvent(var14); // L: 174
 					}
 				}
 
-				this.field4180 = var11; // L: 176
+				this.field4358 = var11; // L: 178
 			}
 		}
-	} // L: 137 142 177
+	} // L: 139 144 179
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(IIZZI)V",
-		garbageValue = "701868023"
+		garbageValue = "2076670007"
 	)
-	public void method6625(int var1, int var2, boolean var3, boolean var4) {
-		long var5 = class111.method2516(); // L: 180
-		this.method6490(var1, var2, var4, var5); // L: 181
-		if (this.hasTarget() || !var4 && !var3) { // L: 182
-			this.method6624(); // L: 196
+	public void method7062(int var1, int var2, boolean var3, boolean var4) {
+		long var5 = Ignored.method6459(); // L: 182
+		this.method6886(var1, var2, var4, var5); // L: 183
+		if (this.hasTarget() || !var4 && !var3) { // L: 184
+			this.method7050(); // L: 198
 		} else {
-			if (var4) { // L: 183
-				this.field4165 = var1; // L: 184
-				this.field4160 = var2; // L: 185
-				this.field4163 = this.centerTileX; // L: 186
-				this.field4164 = this.centerTileY; // L: 187
+			if (var4) { // L: 185
+				this.field4342 = var1; // L: 186
+				this.field4343 = var2; // L: 187
+				this.field4340 = this.centerTileX; // L: 188
+				this.field4335 = this.centerTileY; // L: 189
 			}
 
-			if (this.field4163 != -1) { // L: 189
-				int var7 = var1 - this.field4165; // L: 190
-				int var8 = var2 - this.field4160; // L: 191
-				this.setWorldMapPosition(this.field4163 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4164, false); // L: 192
+			if (this.field4340 != -1) { // L: 191
+				int var7 = var1 - this.field4342; // L: 192
+				int var8 = var2 - this.field4343; // L: 193
+				this.setWorldMapPosition(this.field4340 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4335, false); // L: 194
 			}
 		}
 
-		if (var4) { // L: 198
-			this.field4167 = var5; // L: 199
-			this.field4169 = var1; // L: 200
-			this.field4148 = var2; // L: 201
+		if (var4) { // L: 200
+			this.field4311 = var5; // L: 201
+			this.field4345 = var1; // L: 202
+			this.field4346 = var2; // L: 203
 		}
 
-	} // L: 203
+	} // L: 205
 
-	@ObfuscatedName("o")
-	void method6490(int var1, int var2, boolean var3, long var4) {
-		if (this.currentMapArea != null) { // L: 206
-			int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 207
-			int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 208
-			this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 209
-			if (this.mouseCoord != null && var3) { // L: 210
-				boolean var8 = Client.staffModLevel >= 2; // L: 213
-				if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 215
-					InvDefinition.method2986(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 216
+	@ObfuscatedName("t")
+	void method6886(int var1, int var2, boolean var3, long var4) {
+		if (this.currentMapArea != null) { // L: 208
+			int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 209
+			int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 210
+			this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 211
+			if (this.mouseCoord != null && var3) { // L: 212
+				boolean var8 = Client.staffModLevel >= 2; // L: 215
+				if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 217
+					BuddyRankComparator.method2547(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 218
 				} else {
-					boolean var9 = true; // L: 219
-					if (this.field4170) { // L: 220
-						int var10 = var1 - this.field4169; // L: 221
-						int var11 = var2 - this.field4148; // L: 222
-						if (var4 - this.field4167 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 223
-							var9 = false; // L: 224
+					boolean var9 = true; // L: 221
+					if (this.field4334) { // L: 222
+						int var10 = var1 - this.field4345; // L: 223
+						int var11 = var2 - this.field4346; // L: 224
+						if (var4 - this.field4311 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 225
+							var9 = false; // L: 226
 						}
 					}
 
-					if (var9) { // L: 227
-						PacketBufferNode var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2720, Client.packetWriter.isaacCipher); // L: 228
-						var12.packetBuffer.writeInt(this.mouseCoord.packed()); // L: 229
-						Client.packetWriter.addNode(var12); // L: 230
-						this.field4167 = 0L; // L: 231
+					if (var9) { // L: 229
+						PacketBufferNode var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2825, Client.packetWriter.isaacCipher); // L: 230
+						var12.packetBuffer.writeIntME(this.mouseCoord.packed()); // L: 231
+						Client.packetWriter.addNode(var12); // L: 232
+						this.field4311 = 0L; // L: 233
 					}
 				}
 			}
 		} else {
-			this.mouseCoord = null; // L: 236
+			this.mouseCoord = null; // L: 238
 		}
 
-	} // L: 237
+	} // L: 239
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "735972697"
+		garbageValue = "988730717"
 	)
 	@Export("smoothZoom")
 	void smoothZoom() {
-		if (ClanSettings.field1440 != null) { // L: 240
-			this.zoom = this.zoomTarget; // L: 241
+		if (Messages.field1273 != null) { // L: 242
+			this.zoom = this.zoomTarget; // L: 243
 		} else {
-			if (this.zoom < this.zoomTarget) { // L: 244
-				this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 245
+			if (this.zoom < this.zoomTarget) { // L: 246
+				this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 247
 			}
 
-			if (this.zoom > this.zoomTarget) { // L: 247
-				this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 248
+			if (this.zoom > this.zoomTarget) { // L: 249
+				this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 250
 			}
 
 		}
-	} // L: 242 250
+	} // L: 244 252
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1284753557"
+		garbageValue = "-1397883931"
 	)
 	@Export("scrollToTarget")
 	void scrollToTarget() {
-		if (this.hasTarget()) { // L: 253
-			int var1 = this.worldMapTargetX - this.centerTileX; // L: 256
-			int var2 = this.worldMapTargetY - this.centerTileY; // L: 257
-			if (var1 != 0) { // L: 258
-				var1 /= Math.min(8, Math.abs(var1)); // L: 259
+		if (this.hasTarget()) { // L: 255
+			int var1 = this.worldMapTargetX - this.centerTileX; // L: 258
+			int var2 = this.worldMapTargetY - this.centerTileY; // L: 259
+			if (var1 != 0) { // L: 260
+				var1 /= Math.min(8, Math.abs(var1)); // L: 261
 			}
 
-			if (var2 != 0) { // L: 261
-				var2 /= Math.min(8, Math.abs(var2)); // L: 262
+			if (var2 != 0) { // L: 263
+				var2 /= Math.min(8, Math.abs(var2)); // L: 264
 			}
 
-			this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 264
-			if (this.worldMapTargetX == this.centerTileX && this.worldMapTargetY == this.centerTileY) { // L: 265
-				this.worldMapTargetX = -1; // L: 266
-				this.worldMapTargetY = -1; // L: 267
+			this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 266
+			if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 267
+				this.worldMapTargetX = -1; // L: 268
+				this.worldMapTargetY = -1; // L: 269
 			}
 
 		}
-	} // L: 254 269
+	} // L: 256 271
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(IIZI)V",
-		garbageValue = "-1562100232"
+		garbageValue = "2028510413"
 	)
 	@Export("setWorldMapPosition")
 	final void setWorldMapPosition(int var1, int var2, boolean var3) {
-		this.centerTileX = var1; // L: 272
-		this.centerTileY = var2; // L: 273
-		class111.method2516(); // L: 274
+		this.centerTileX = var1; // L: 274
+		this.centerTileY = var2; // L: 275
+		Ignored.method6459(); // L: 276
 		if (var3) {
-			this.method6624(); // L: 275
+			this.method7050(); // L: 277
 		}
 
-	} // L: 276
+	} // L: 278
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1517942634"
+		descriptor = "(B)V",
+		garbageValue = "-69"
 	)
-	final void method6624() {
-		this.field4160 = -1; // L: 279
-		this.field4165 = -1; // L: 280
-		this.field4164 = -1; // L: 281
-		this.field4163 = -1; // L: 282
-	} // L: 283
+	final void method7050() {
+		this.field4343 = -1; // L: 281
+		this.field4342 = -1; // L: 282
+		this.field4335 = -1; // L: 283
+		this.field4340 = -1; // L: 284
+	} // L: 285
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(S)Z",
-		garbageValue = "16912"
+		descriptor = "(I)Z",
+		garbageValue = "1277786220"
 	)
 	@Export("hasTarget")
 	boolean hasTarget() {
-		return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 286
+		return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 288
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)Lfb;",
-		garbageValue = "871893458"
+		descriptor = "(IIII)Lhr;",
+		garbageValue = "1760003503"
 	)
 	@Export("mapAreaAtCoord")
 	public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) {
-		Iterator var4 = this.details.values().iterator(); // L: 290
+		Iterator var4 = this.details.values().iterator(); // L: 292
 
 		WorldMapArea var5;
 		do {
 			if (!var4.hasNext()) {
-				return null; // L: 298
+				return null; // L: 300
 			}
 
-			var5 = (WorldMapArea)var4.next(); // L: 291
-		} while(!var5.containsCoord(var1, var2, var3)); // L: 293
+			var5 = (WorldMapArea)var4.next(); // L: 293
+		} while(!var5.containsCoord(var1, var2, var3)); // L: 295
 
-		return var5; // L: 294
+		return var5; // L: 296
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIIZI)V",
-		garbageValue = "2112775381"
+		descriptor = "(IIIZB)V",
+		garbageValue = "48"
 	)
-	public void method6497(int var1, int var2, int var3, boolean var4) {
-		WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 302
-		if (var5 == null) { // L: 303
-			if (!var4) { // L: 304
-				return; // L: 307
+	public void method6870(int var1, int var2, int var3, boolean var4) {
+		WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 304
+		if (var5 == null) { // L: 305
+			if (!var4) { // L: 306
+				return; // L: 309
 			}
 
-			var5 = this.mainMapArea; // L: 305
+			var5 = this.mainMapArea; // L: 307
 		}
 
-		boolean var6 = false; // L: 309
-		if (var5 != this.field4145 || var4) { // L: 310
-			this.field4145 = var5; // L: 311
-			this.setCurrentMapArea(var5); // L: 312
-			var6 = true; // L: 313
+		boolean var6 = false; // L: 311
+		if (var5 != this.field4321 || var4) { // L: 312
+			this.field4321 = var5; // L: 313
+			this.setCurrentMapArea(var5); // L: 314
+			var6 = true; // L: 315
 		}
 
-		if (var6 || var4) { // L: 315
-			this.jump(var1, var2, var3); // L: 316
+		if (var6 || var4) { // L: 317
+			this.jump(var1, var2, var3); // L: 318
 		}
 
-	} // L: 318
+	} // L: 320
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1256555807"
+		descriptor = "(IB)V",
+		garbageValue = "-89"
 	)
 	@Export("setCurrentMapAreaId")
 	public void setCurrentMapAreaId(int var1) {
-		WorldMapArea var2 = this.getMapArea(var1); // L: 321
-		if (var2 != null) { // L: 322
-			this.setCurrentMapArea(var2); // L: 323
+		WorldMapArea var2 = this.getMapArea(var1); // L: 323
+		if (var2 != null) { // L: 324
+			this.setCurrentMapArea(var2); // L: 325
 		}
 
-	} // L: 325
+	} // L: 327
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(S)I",
-		garbageValue = "-27707"
+		descriptor = "(B)I",
+		garbageValue = "9"
 	)
 	@Export("currentMapAreaId")
 	public int currentMapAreaId() {
-		return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 328 329 331
+		return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 330 331 333
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lfb;",
-		garbageValue = "-1826730666"
+		descriptor = "(I)Lhr;",
+		garbageValue = "1700798054"
 	)
 	@Export("getCurrentMapArea")
 	public WorldMapArea getCurrentMapArea() {
-		return this.currentMapArea; // L: 335
+		return this.currentMapArea; // L: 337
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lfb;I)V",
-		garbageValue = "-1624305756"
+		descriptor = "(Lhr;B)V",
+		garbageValue = "-120"
 	)
 	@Export("setCurrentMapArea")
 	void setCurrentMapArea(WorldMapArea var1) {
-		if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 339
-			this.initializeWorldMapManager(var1); // L: 342
-			this.jump(-1, -1, -1); // L: 343
+		if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 341
+			this.initializeWorldMapManager(var1); // L: 344
+			this.jump(-1, -1, -1); // L: 345
 		}
-	} // L: 340 344
+	} // L: 342 346
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(Lfb;B)V",
-		garbageValue = "-48"
+		descriptor = "(Lhr;B)V",
+		garbageValue = "2"
 	)
 	@Export("initializeWorldMapManager")
 	void initializeWorldMapManager(WorldMapArea var1) {
-		this.currentMapArea = var1; // L: 347
-		this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 348
-		this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 349
-	} // L: 350
+		this.currentMapArea = var1; // L: 349
+		this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 350
+		this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 351
+	} // L: 352
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(Lfb;Lie;Lie;ZI)V",
-		garbageValue = "-1042330893"
+		descriptor = "(Lhr;Lju;Lju;ZI)V",
+		garbageValue = "-665404074"
 	)
-	public void method6635(WorldMapArea var1, Coord var2, Coord var3, boolean var4) {
-		if (var1 != null) { // L: 353
-			if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 356
-				this.initializeWorldMapManager(var1); // L: 357
+	public void method6876(WorldMapArea var1, Coord var2, Coord var3, boolean var4) {
+		if (var1 != null) { // L: 355
+			if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 358
+				this.initializeWorldMapManager(var1); // L: 359
 			}
 
-			if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 359
-				this.jump(var2.plane, var2.x, var2.y); // L: 363
+			if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 361
+				this.jump(var2.plane, var2.x, var2.y); // L: 365
 			} else {
-				this.jump(var3.plane, var3.x, var3.y); // L: 360
+				this.jump(var3.plane, var3.x, var3.y); // L: 362
 			}
 
 		}
-	} // L: 354 365
+	} // L: 356 367
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)V",
-		garbageValue = "115"
+		descriptor = "(IIII)V",
+		garbageValue = "471705549"
 	)
 	@Export("jump")
 	void jump(int var1, int var2, int var3) {
-		if (this.currentMapArea != null) { // L: 368
-			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 371
-			if (var4 == null) { // L: 372
-				var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 373
+		if (this.currentMapArea != null) { // L: 370
+			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 373
+			if (var4 == null) { // L: 374
+				var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 375
 			}
 
-			this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 375
-			this.worldMapTargetX = -1; // L: 376
-			this.worldMapTargetY = -1; // L: 377
-			this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 378
-			this.zoomTarget = this.zoom; // L: 379
-			this.field4178 = null; // L: 380
-			this.iconIterator = null; // L: 381
-			this.worldMapManager.clearIcons(); // L: 382
+			this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 377
+			this.worldMapTargetX = -1; // L: 378
+			this.worldMapTargetY = -1; // L: 379
+			this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 380
+			this.zoomTarget = this.zoom; // L: 381
+			this.field4356 = null; // L: 382
+			this.iconIterator = null; // L: 383
+			this.worldMapManager.clearIcons(); // L: 384
 		}
-	} // L: 369 383
+	} // L: 371 385
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIII)V",
-		garbageValue = "1715999974"
+		descriptor = "(IIIIIB)V",
+		garbageValue = "-21"
 	)
 	@Export("draw")
 	public void draw(int var1, int var2, int var3, int var4, int var5) {
-		int[] var6 = new int[4]; // L: 386
-		Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 387
-		Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 388
-		Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 389
-		int var7 = this.cacheLoader.getPercentLoaded(); // L: 390
-		if (var7 < 100) { // L: 391
-			this.drawLoading(var1, var2, var3, var4, var7); // L: 392
+		int[] var6 = new int[4]; // L: 388
+		Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 389
+		Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 390
+		Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 391
+		int var7 = this.cacheLoader.getPercentLoaded(); // L: 392
+		if (var7 < 100) { // L: 393
+			this.drawLoading(var1, var2, var3, var4, var7); // L: 394
 		} else {
-			if (!this.worldMapManager.isLoaded()) { // L: 395
-				this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 396
-				if (!this.worldMapManager.isLoaded()) { // L: 397
-					return; // L: 398
+			if (!this.worldMapManager.isLoaded()) { // L: 397
+				this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 398
+				if (!this.worldMapManager.isLoaded()) { // L: 399
+					return; // L: 400
 				}
 			}
 
-			if (this.flashingElements != null) { // L: 401
-				++this.flashCycle; // L: 402
-				if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 403
-					this.flashCycle = 0; // L: 404
-					++this.flashCount; // L: 405
+			if (this.flashingElements != null) { // L: 403
+				++this.flashCycle; // L: 404
+				if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 405
+					this.flashCycle = 0; // L: 406
+					++this.flashCount; // L: 407
 				}
 
-				if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 407
-					this.flashingElements = null; // L: 408
+				if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 409
+					this.flashingElements = null; // L: 410
 				}
 			}
 
-			int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 411
-			int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 412
-			this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 413
+			int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 413
+			int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 414
+			this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 415
 			boolean var10;
-			if (!this.elementsDisabled) { // L: 414
-				var10 = false; // L: 415
-				if (var5 - this.field4135 > 100) { // L: 416
-					this.field4135 = var5; // L: 417
-					var10 = true; // L: 418
+			if (!this.elementsDisabled) { // L: 416
+				var10 = false; // L: 417
+				if (var5 - this.field4353 > 100) { // L: 418
+					this.field4353 = var5; // L: 419
+					var10 = true; // L: 420
 				}
 
-				this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4174, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 420
+				this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4351, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 422
 			}
 
-			this.method6507(var1, var2, var3, var4, var8, var9); // L: 422
-			var10 = Client.staffModLevel >= 2; // L: 425
-			if (var10 && this.showCoord && this.mouseCoord != null) { // L: 427
+			this.method7006(var1, var2, var3, var4, var8, var9); // L: 424
+			var10 = Client.staffModLevel >= 2; // L: 427
+			if (var10 && this.showCoord && this.mouseCoord != null) { // L: 429
 				this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1);
 			}
 
-			this.worldMapDisplayWidth = var8; // L: 428
-			this.worldMapDisplayHeight = var9; // L: 429
-			this.worldMapDisplayX = var1; // L: 430
-			this.worldMapDisplayY = var2; // L: 431
-			Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 432
+			this.worldMapDisplayWidth = var8; // L: 430
+			this.worldMapDisplayHeight = var9; // L: 431
+			this.worldMapDisplayX = var1; // L: 432
+			this.worldMapDisplayY = var2; // L: 433
+			Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 434
 		}
-	} // L: 393 433
+	} // L: 395 435
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIII)Z",
-		garbageValue = "-777808522"
+		descriptor = "(IIIIIIB)Z",
+		garbageValue = "54"
 	)
-	boolean method6506(int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (this.sprite == null) { // L: 436
+	boolean method6879(int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (this.sprite == null) { // L: 438
 			return true;
-		} else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 437
-			if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 438
+		} else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 439
+			if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 440
 				return true;
-			} else if (this.field4187 != Client.field742) {
-				return true; // L: 439
-			} else if (var3 <= 0 && var4 <= 0) { // L: 440
-				return var3 + var1 < var5 || var2 + var4 < var6; // L: 441
+			} else if (this.field4365 != Client.field559) {
+				return true; // L: 441
+			} else if (var3 <= 0 && var4 <= 0) { // L: 442
+				return var3 + var1 < var5 || var2 + var4 < var6; // L: 443
 			} else {
-				return true; // L: 442
+				return true; // L: 444
 			}
 		} else {
 			return true;
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIII)V",
-		garbageValue = "1267878740"
-	)
-	void method6507(int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (ClanSettings.field1440 != null) { // L: 446
-			int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 447
-			int var8 = var3 + 512; // L: 448
-			int var9 = var4 + 512; // L: 449
-			float var10 = 1.0F; // L: 450
-			var8 = (int)((float)var8 / var10); // L: 451
-			var9 = (int)((float)var9 / var10); // L: 452
-			int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 453
-			int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 454
-			int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 455
-			int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 456
-			if (this.method6506(var8, var9, var13, var14, var3, var4)) { // L: 457
-				if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 458
-					Arrays.fill(this.sprite.pixels, 0); // L: 461
+		garbageValue = "-1766155108"
+	)
+	void method7006(int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (Messages.field1273 != null) { // L: 448
+			int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 449
+			int var8 = var3 + 512; // L: 450
+			int var9 = var4 + 512; // L: 451
+			float var10 = 1.0F; // L: 452
+			var8 = (int)((float)var8 / var10); // L: 453
+			var9 = (int)((float)var9 / var10); // L: 454
+			int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 455
+			int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 456
+			int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 457
+			int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 458
+			if (this.method6879(var8, var9, var13, var14, var3, var4)) { // L: 459
+				if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 460
+					Arrays.fill(this.sprite.pixels, 0); // L: 463
 				} else {
-					this.sprite = new SpritePixels(var8, var9); // L: 459
+					this.sprite = new SpritePixels(var8, var9); // L: 461
 				}
 
-				this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 462
-				this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 463
-				this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 464
-				ClanSettings.field1440.method5491(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 465
-				this.field4187 = Client.field742; // L: 466
-				var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 467
-				var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 468
+				this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 464
+				this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 465
+				this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 466
+				Messages.field1273.method5800(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 467
+				this.field4365 = Client.field559; // L: 468
+				var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 469
+				var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 470
 			}
 
-			Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 470
-			if (var10 == 1.0F) { // L: 471
-				this.sprite.method7425(var13, var14, 192); // L: 472
+			Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 472
+			if (var10 == 1.0F) { // L: 473
+				this.sprite.method7809(var13, var14, 192); // L: 474
 			} else {
-				this.sprite.method7407(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 475
+				this.sprite.method7776(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); // L: 477
 			}
 		}
 
-	} // L: 478
+	} // L: 480
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "-718438952"
+		garbageValue = "-748187349"
 	)
 	@Export("drawOverview")
 	public void drawOverview(int var1, int var2, int var3, int var4) {
-		if (this.cacheLoader.isLoaded()) { // L: 481
-			if (!this.worldMapManager.isLoaded()) { // L: 484
-				this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 485
-				if (!this.worldMapManager.isLoaded()) { // L: 486
-					return; // L: 487
+		if (this.cacheLoader.isLoaded()) { // L: 483
+			if (!this.worldMapManager.isLoaded()) { // L: 486
+				this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 487
+				if (!this.worldMapManager.isLoaded()) { // L: 488
+					return; // L: 489
 				}
 			}
 
-			this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 490
+			this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 492
 		}
-	} // L: 482 491
+	} // L: 484 493
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "16711680"
+		garbageValue = "802712307"
 	)
 	@Export("setZoomPercentage")
 	public void setZoomPercentage(int var1) {
-		this.zoomTarget = this.getZoomFromPercentage(var1); // L: 494
-	} // L: 495
+		this.zoomTarget = this.getZoomFromPercentage(var1); // L: 496
+	} // L: 497
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIII)V",
-		garbageValue = "130628857"
+		descriptor = "(IIIIIS)V",
+		garbageValue = "29297"
 	)
 	@Export("drawLoading")
 	void drawLoading(int var1, int var2, int var3, int var4, int var5) {
-		byte var6 = 20; // L: 498
-		int var7 = var3 / 2 + var1; // L: 499
-		int var8 = var4 / 2 + var2 - 18 - var6; // L: 500
-		Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 501
-		Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 502
-		Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 503
-		this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); // L: 504
-	} // L: 505
+		byte var6 = 20; // L: 500
+		int var7 = var3 / 2 + var1; // L: 501
+		int var8 = var4 / 2 + var2 - 18 - var6; // L: 502
+		Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 503
+		Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 504
+		Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 505
+		this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 506
+	} // L: 507
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(IB)F",
-		garbageValue = "-89"
+		descriptor = "(II)F",
+		garbageValue = "2134906459"
 	)
 	@Export("getZoomFromPercentage")
 	float getZoomFromPercentage(int var1) {
-		if (var1 == 25) { // L: 508
+		if (var1 == 25) { // L: 510
 			return 1.0F;
-		} else if (var1 == 37) { // L: 509
+		} else if (var1 == 37) { // L: 511
 			return 1.5F;
-		} else if (var1 == 50) { // L: 510
-			return 2.0F;
-		} else if (var1 == 75) { // L: 511
+		} else if (var1 == 50) {
+			return 2.0F; // L: 512
+		} else if (var1 == 75) { // L: 513
 			return 3.0F;
 		} else {
-			return var1 == 100 ? 4.0F : 8.0F; // L: 512 513
+			return var1 == 100 ? 4.0F : 8.0F; // L: 514 515
 		}
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1576630654"
+		garbageValue = "-1992180022"
 	)
 	@Export("getZoomLevel")
 	public int getZoomLevel() {
-		if ((double)this.zoomTarget == 1.0D) { // L: 517
+		if ((double)this.zoomTarget == 1.0D) { // L: 519
 			return 25;
-		} else if ((double)this.zoomTarget == 1.5D) { // L: 518
+		} else if (1.5D == (double)this.zoomTarget) { // L: 520
 			return 37;
-		} else if (2.0D == (double)this.zoomTarget) { // L: 519
+		} else if (2.0D == (double)this.zoomTarget) { // L: 521
 			return 50;
 		} else if ((double)this.zoomTarget == 3.0D) {
-			return 75; // L: 520
+			return 75; // L: 522
 		} else {
-			return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 521 522
+			return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 523 524
 		}
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "20"
+		garbageValue = "1"
 	)
 	@Export("loadCache")
 	public void loadCache() {
-		this.cacheLoader.load(); // L: 526
-	} // L: 527
+		this.cacheLoader.load(); // L: 528
+	} // L: 529
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
-		descriptor = "(S)Z",
-		garbageValue = "512"
+		descriptor = "(I)Z",
+		garbageValue = "1720124749"
 	)
 	@Export("isCacheLoaded")
 	public boolean isCacheLoaded() {
-		return this.cacheLoader.isLoaded(); // L: 530
+		return this.cacheLoader.isLoaded(); // L: 532
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lfb;",
-		garbageValue = "81"
+		descriptor = "(II)Lhr;",
+		garbageValue = "505103684"
 	)
 	@Export("getMapArea")
 	public WorldMapArea getMapArea(int var1) {
-		Iterator var2 = this.details.values().iterator(); // L: 534
+		Iterator var2 = this.details.values().iterator(); // L: 536
 
 		WorldMapArea var3;
 		do {
-			if (!var2.hasNext()) {
-				return null; // L: 542
+			if (!var2.hasNext()) { // L: 543
+				return null; // L: 544
 			}
 
-			var3 = (WorldMapArea)var2.next(); // L: 535
-		} while(var3.getId() != var1); // L: 537
+			var3 = (WorldMapArea)var2.next(); // L: 537
+		} while(var3.getId() != var1); // L: 539
 
-		return var3; // L: 538
+		return var3; // L: 540
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-1568968993"
+		garbageValue = "-808391872"
 	)
 	@Export("setWorldMapPositionTarget")
 	public void setWorldMapPositionTarget(int var1, int var2) {
-		if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 546
-			this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 549
-			this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 550
+		if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 548
+			this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 551
+			this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 552
 		}
-	} // L: 547 551
+	} // L: 549 553
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-218959360"
+		descriptor = "(IIB)V",
+		garbageValue = "-93"
 	)
 	@Export("setWorldMapPositionTargetInstant")
 	public void setWorldMapPositionTargetInstant(int var1, int var2) {
-		if (this.currentMapArea != null) { // L: 554
-			this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 557
-			this.worldMapTargetX = -1; // L: 558
-			this.worldMapTargetY = -1; // L: 559
+		if (this.currentMapArea != null) { // L: 556
+			this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 559
+			this.worldMapTargetX = -1; // L: 560
+			this.worldMapTargetY = -1; // L: 561
 		}
-	} // L: 555 560
+	} // L: 557 562
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "-607717959"
+		descriptor = "(IIIB)V",
+		garbageValue = "39"
 	)
 	@Export("jumpToSourceCoord")
 	public void jumpToSourceCoord(int var1, int var2, int var3) {
-		if (this.currentMapArea != null) { // L: 563
-			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 566
-			if (var4 != null) { // L: 567
-				this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 568
+		if (this.currentMapArea != null) { // L: 565
+			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 568
+			if (var4 != null) { // L: 569
+				this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 570
 			}
 
 		}
-	} // L: 564 570
+	} // L: 566 572
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "-1556827735"
+		descriptor = "(IIIB)V",
+		garbageValue = "0"
 	)
 	@Export("jumpToSourceCoordInstant")
 	public void jumpToSourceCoordInstant(int var1, int var2, int var3) {
-		if (this.currentMapArea != null) { // L: 573
-			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 576
-			if (var4 != null) { // L: 577
-				this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 578
+		if (this.currentMapArea != null) { // L: 575
+			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 578
+			if (var4 != null) { // L: 579
+				this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 580
 			}
 
 		}
-	} // L: 574 580
+	} // L: 576 582
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "2141740850"
+		garbageValue = "636016196"
 	)
 	@Export("getDisplayX")
 	public int getDisplayX() {
-		return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 583 584 586
+		return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 585 586 588
 	}
 
-	@ObfuscatedName("az")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "201243175"
+		garbageValue = "880174523"
 	)
 	@Export("getDisplayY")
 	public int getDisplayY() {
-		return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 590 591 593
+		return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 592 593 595
 	}
 
 	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lie;",
-		garbageValue = "-410448783"
+		descriptor = "(I)Lju;",
+		garbageValue = "-2092461394"
 	)
 	@Export("getDisplayCoord")
 	public Coord getDisplayCoord() {
-		return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 597 598 600
+		return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 599 600 602
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "4"
+		descriptor = "(I)I",
+		garbageValue = "-943773093"
 	)
 	@Export("getDisplayWith")
 	public int getDisplayWith() {
-		return this.worldMapDisplayWidth; // L: 604
+		return this.worldMapDisplayWidth; // L: 606
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "486004290"
+		descriptor = "(B)I",
+		garbageValue = "-70"
 	)
 	@Export("getDisplayHeight")
 	public int getDisplayHeight() {
-		return this.worldMapDisplayHeight; // L: 608
+		return this.worldMapDisplayHeight; // L: 610
 	}
 
 	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "-71"
+		garbageValue = "20"
 	)
 	@Export("setMaxFlashCount")
 	public void setMaxFlashCount(int var1) {
-		if (var1 >= 1) { // L: 612
-			this.maxFlashCount = var1; // L: 613
+		if (var1 >= 1) { // L: 614
+			this.maxFlashCount = var1; // L: 615
 		}
 
-	} // L: 615
+	} // L: 617
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-41"
+		descriptor = "(I)V",
+		garbageValue = "1923539935"
 	)
 	@Export("resetMaxFlashCount")
 	public void resetMaxFlashCount() {
-		this.maxFlashCount = 3; // L: 618
-	} // L: 619
+		this.maxFlashCount = 3; // L: 620
+	} // L: 621
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1121589183"
+		garbageValue = "2076930032"
 	)
 	@Export("setCyclesPerFlash")
 	public void setCyclesPerFlash(int var1) {
-		if (var1 >= 1) { // L: 622
-			this.cyclesPerFlash = var1; // L: 623
+		if (var1 >= 1) { // L: 624
+			this.cyclesPerFlash = var1; // L: 625
 		}
 
-	} // L: 625
+	} // L: 627
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1682781705"
+		garbageValue = "-1874637129"
 	)
 	@Export("resetCyclesPerFlash")
 	public void resetCyclesPerFlash() {
-		this.cyclesPerFlash = 50; // L: 628
-	} // L: 629
+		this.cyclesPerFlash = 50; // L: 630
+	} // L: 631
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
-		garbageValue = "1"
+		descriptor = "(ZI)V",
+		garbageValue = "-1694447666"
 	)
 	@Export("setPerpetualFlash")
 	public void setPerpetualFlash(boolean var1) {
-		this.perpetualFlash = var1; // L: 632
-	} // L: 633
+		this.perpetualFlash = var1; // L: 634
+	} // L: 635
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-825195864"
+		garbageValue = "1277168471"
 	)
 	@Export("flashElement")
 	public void flashElement(int var1) {
-		this.flashingElements = new HashSet(); // L: 636
-		this.flashingElements.add(var1); // L: 637
-		this.flashCount = 0; // L: 638
-		this.flashCycle = 0; // L: 639
-	} // L: 640
+		this.flashingElements = new HashSet(); // L: 638
+		this.flashingElements.add(var1); // L: 639
+		this.flashCount = 0; // L: 640
+		this.flashCycle = 0; // L: 641
+	} // L: 642
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-7"
+		descriptor = "(II)V",
+		garbageValue = "-797221037"
 	)
 	@Export("flashCategory")
 	public void flashCategory(int var1) {
-		this.flashingElements = new HashSet(); // L: 643
-		this.flashCount = 0; // L: 644
-		this.flashCycle = 0; // L: 645
+		this.flashingElements = new HashSet(); // L: 645
+		this.flashCount = 0; // L: 646
+		this.flashCycle = 0; // L: 647
 
-		for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 646
-			if (ItemComposition.WorldMapElement_get(var2) != null && ItemComposition.WorldMapElement_get(var2).category == var1) { // L: 647 650
-				this.flashingElements.add(ItemComposition.WorldMapElement_get(var2).objectId); // L: 651
+		for (int var2 = 0; var2 < class408.WorldMapElement_count; ++var2) { // L: 648
+			if (class78.WorldMapElement_get(var2) != null && class78.WorldMapElement_get(var2).category == var1) { // L: 649 652
+				this.flashingElements.add(class78.WorldMapElement_get(var2).objectId); // L: 653
 			}
 		}
 
-	} // L: 654
+	} // L: 656
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1304327247"
+		descriptor = "(B)V",
+		garbageValue = "-72"
 	)
 	@Export("stopCurrentFlashes")
 	public void stopCurrentFlashes() {
-		this.flashingElements = null; // L: 657
-	} // L: 658
+		this.flashingElements = null; // L: 659
+	} // L: 660
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "1938764609"
+		descriptor = "(ZB)V",
+		garbageValue = "-36"
 	)
 	@Export("setElementsDisabled")
 	public void setElementsDisabled(boolean var1) {
-		this.elementsDisabled = !var1; // L: 661
-	} // L: 662
+		this.elementsDisabled = !var1; // L: 663
+	} // L: 664
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "(IZB)V",
-		garbageValue = "-115"
+		descriptor = "(IZI)V",
+		garbageValue = "-1255767815"
 	)
 	@Export("disableElement")
 	public void disableElement(int var1, boolean var2) {
-		if (!var2) { // L: 665
-			this.enabledElements.add(var1); // L: 666
+		if (!var2) { // L: 667
+			this.enabledElements.add(var1); // L: 668
 		} else {
-			this.enabledElements.remove(var1); // L: 669
+			this.enabledElements.remove(var1); // L: 671
 		}
 
-		this.method6601(); // L: 671
-	} // L: 672
+		this.method6910(); // L: 673
+	} // L: 674
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
 		descriptor = "(IZB)V",
-		garbageValue = "71"
+		garbageValue = "-96"
 	)
 	@Export("setCategoryDisabled")
 	public void setCategoryDisabled(int var1, boolean var2) {
-		if (!var2) { // L: 675
-			this.enabledCategories.add(var1); // L: 676
+		if (!var2) { // L: 677
+			this.enabledCategories.add(var1); // L: 678
 		} else {
-			this.enabledCategories.remove(var1); // L: 679
+			this.enabledCategories.remove(var1); // L: 681
 		}
 
-		for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 681
-			if (ItemComposition.WorldMapElement_get(var3) != null && ItemComposition.WorldMapElement_get(var3).category == var1) { // L: 682 685
-				int var4 = ItemComposition.WorldMapElement_get(var3).objectId; // L: 686
-				if (!var2) { // L: 687
-					this.enabledElementIds.add(var4); // L: 688
+		for (int var3 = 0; var3 < class408.WorldMapElement_count; ++var3) { // L: 683
+			if (class78.WorldMapElement_get(var3) != null && class78.WorldMapElement_get(var3).category == var1) { // L: 684 687
+				int var4 = class78.WorldMapElement_get(var3).objectId; // L: 688
+				if (!var2) { // L: 689
+					this.enabledElementIds.add(var4); // L: 690
 				} else {
-					this.enabledElementIds.remove(var4); // L: 691
+					this.enabledElementIds.remove(var4); // L: 693
 				}
 			}
 		}
 
-		this.method6601(); // L: 695
-	} // L: 696
+		this.method6910(); // L: 697
+	} // L: 698
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "316140986"
+		descriptor = "(S)Z",
+		garbageValue = "23313"
 	)
 	@Export("getElementsDisabled")
 	public boolean getElementsDisabled() {
-		return !this.elementsDisabled; // L: 699
+		return !this.elementsDisabled; // L: 701
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "1533055134"
+		descriptor = "(IB)Z",
+		garbageValue = "-81"
 	)
 	@Export("isElementDisabled")
 	public boolean isElementDisabled(int var1) {
-		return !this.enabledElements.contains(var1); // L: 703
+		return !this.enabledElements.contains(var1); // L: 705
 	}
 
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bp")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "42"
+		descriptor = "(II)Z",
+		garbageValue = "-264694018"
 	)
 	@Export("isCategoryDisabled")
 	public boolean isCategoryDisabled(int var1) {
-		return !this.enabledCategories.contains(var1); // L: 707
+		return !this.enabledCategories.contains(var1); // L: 709
 	}
 
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bd")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "105"
+		descriptor = "(I)V",
+		garbageValue = "878025403"
 	)
-	void method6601() {
-		this.field4174.clear(); // L: 711
-		this.field4174.addAll(this.enabledElements); // L: 712
-		this.field4174.addAll(this.enabledElementIds); // L: 713
-	} // L: 714
+	void method6910() {
+		this.field4351.clear(); // L: 713
+		this.field4351.addAll(this.enabledElements); // L: 714
+		this.field4351.addAll(this.enabledElementIds); // L: 715
+	} // L: 716
 
-	@ObfuscatedName("bx")
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIIB)V",
-		garbageValue = "90"
+		garbageValue = "1"
 	)
 	@Export("addElementMenuOptions")
 	public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (this.cacheLoader.isLoaded()) { // L: 717
-			int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 720
-			int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 721
-			List var9 = this.worldMapManager.method3807(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 722
-			if (!var9.isEmpty()) { // L: 723
-				Iterator var10 = var9.iterator(); // L: 726
+		if (this.cacheLoader.isLoaded()) { // L: 719
+			int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 722
+			int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 723
+			List var9 = this.worldMapManager.method4617(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 724
+			if (!var9.isEmpty()) { // L: 725
+				Iterator var10 = var9.iterator();
 
 				boolean var13;
 				do {
-					if (!var10.hasNext()) { // L: 741
-						return; // L: 742
+					if (!var10.hasNext()) { // L: 728
+						return; // L: 744
 					}
 
-					AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 727
-					WorldMapElement var12 = ItemComposition.WorldMapElement_get(var11.getElement()); // L: 729
-					var13 = false; // L: 730
+					AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 729
+					WorldMapElement var12 = class78.WorldMapElement_get(var11.getElement()); // L: 731
+					var13 = false; // L: 732
 
-					for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 731
-						if (var12.menuActions[var14] != null) { // L: 732
-							EnumComposition.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 733
-							var13 = true; // L: 734
+					for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 733
+						if (var12.menuActions[var14] != null) { // L: 734
+							class11.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 735
+							var13 = true; // L: 736
 						}
 					}
-				} while(!var13); // L: 737
+				} while(!var13); // L: 739
 
 			}
 		}
-	} // L: 718 724 738
+	} // L: 720 726 740
 
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
-		descriptor = "(ILie;I)Lie;",
-		garbageValue = "-2028190733"
+		descriptor = "(ILju;I)Lju;",
+		garbageValue = "-998971600"
 	)
-	public Coord method6666(int var1, Coord var2) {
-		if (!this.cacheLoader.isLoaded()) { // L: 745
-			return null; // L: 746
-		} else if (!this.worldMapManager.isLoaded()) { // L: 748
-			return null; // L: 749
-		} else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 751
-			return null; // L: 752
+	public Coord method6988(int var1, Coord var2) {
+		if (!this.cacheLoader.isLoaded()) { // L: 747
+			return null; // L: 748
+		} else if (!this.worldMapManager.isLoaded()) { // L: 750
+			return null; // L: 751
+		} else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 753
+			return null; // L: 754
 		} else {
-			HashMap var3 = this.worldMapManager.buildIcons(); // L: 754
-			List var4 = (List)var3.get(var1); // L: 755
-			if (var4 != null && !var4.isEmpty()) { // L: 756
-				AbstractWorldMapIcon var5 = null; // L: 759
-				int var6 = -1; // L: 760
-				Iterator var7 = var4.iterator(); // L: 761
+			HashMap var3 = this.worldMapManager.buildIcons(); // L: 756
+			List var4 = (List)var3.get(var1); // L: 757
+			if (var4 != null && !var4.isEmpty()) { // L: 758
+				AbstractWorldMapIcon var5 = null; // L: 761
+				int var6 = -1; // L: 762
+				Iterator var7 = var4.iterator(); // L: 763
 
 				while (true) {
 					AbstractWorldMapIcon var8;
 					int var11;
 					do {
 						if (!var7.hasNext()) {
-							return var5.coord2; // L: 776
+							return var5.coord2; // L: 778
 						}
 
-						var8 = (AbstractWorldMapIcon)var7.next(); // L: 762
-						int var9 = var8.coord2.x - var2.x; // L: 764
-						int var10 = var8.coord2.y - var2.y; // L: 765
-						var11 = var10 * var10 + var9 * var9; // L: 766
-						if (var11 == 0) { // L: 767
-							return var8.coord2; // L: 768
+						var8 = (AbstractWorldMapIcon)var7.next(); // L: 764
+						int var9 = var8.coord2.x - var2.x; // L: 766
+						int var10 = var8.coord2.y - var2.y; // L: 767
+						var11 = var9 * var9 + var10 * var10; // L: 768
+						if (var11 == 0) { // L: 769
+							return var8.coord2; // L: 770
 						}
-					} while(var11 >= var6 && var5 != null); // L: 770
+					} while(var11 >= var6 && var5 != null); // L: 772
 
-					var5 = var8; // L: 771
-					var6 = var11; // L: 772
+					var5 = var8; // L: 773
+					var6 = var11; // L: 774
 				}
 			} else {
-				return null; // L: 757
+				return null; // L: 759
 			}
 		}
 	}
 
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bg")
 	@ObfuscatedSignature(
-		descriptor = "(IILie;Lie;B)V",
-		garbageValue = "-122"
+		descriptor = "(IILju;Lju;I)V",
+		garbageValue = "-1595615747"
 	)
 	@Export("worldMapMenuAction")
 	public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) {
-		ScriptEvent var5 = new ScriptEvent(); // L: 780
-		WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 781
-		var5.setArgs(new Object[]{var6}); // L: 782
-		switch(var1) { // L: 783
+		ScriptEvent var5 = new ScriptEvent(); // L: 782
+		WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 783
+		var5.setArgs(new Object[]{var6}); // L: 784
+		switch(var1) { // L: 785
 		case 1008:
-			var5.setType(10); // L: 786
+			var5.setType(10); // L: 788
 			break;
 		case 1009:
-			var5.setType(11); // L: 806
-			break;
+			var5.setType(11); // L: 793
+			break; // L: 794
 		case 1010:
-			var5.setType(12); // L: 801
-			break; // L: 802
+			var5.setType(12); // L: 803
+			break; // L: 804
 		case 1011:
-			var5.setType(13); // L: 796
-			break; // L: 797
+			var5.setType(13); // L: 798
+			break; // L: 799
 		case 1012:
-			var5.setType(14); // L: 791
+			var5.setType(14); // L: 808
 		}
 
-		Tile.runScriptEvent(var5); // L: 810
-	} // L: 811
+		class285.runScriptEvent(var5); // L: 812
+	} // L: 813
 
-	@ObfuscatedName("bf")
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgm;",
-		garbageValue = "1362046793"
+		descriptor = "(I)Lij;",
+		garbageValue = "-542110150"
 	)
 	@Export("iconStart")
 	public AbstractWorldMapIcon iconStart() {
-		if (!this.cacheLoader.isLoaded()) { // L: 814
-			return null; // L: 815
-		} else if (!this.worldMapManager.isLoaded()) { // L: 817
-			return null; // L: 818
+		if (!this.cacheLoader.isLoaded()) { // L: 816
+			return null; // L: 817
+		} else if (!this.worldMapManager.isLoaded()) { // L: 819
+			return null; // L: 820
 		} else {
-			HashMap var1 = this.worldMapManager.buildIcons(); // L: 820
-			this.field4178 = new LinkedList(); // L: 821
-			Iterator var2 = var1.values().iterator(); // L: 822
+			HashMap var1 = this.worldMapManager.buildIcons(); // L: 822
+			this.field4356 = new LinkedList(); // L: 823
+			Iterator var2 = var1.values().iterator(); // L: 824
 
 			while (var2.hasNext()) {
-				List var3 = (List)var2.next(); // L: 823
-				this.field4178.addAll(var3); // L: 825
+				List var3 = (List)var2.next(); // L: 825
+				this.field4356.addAll(var3); // L: 827
 			}
 
-			this.iconIterator = this.field4178.iterator(); // L: 828
-			return this.iconNext(); // L: 829
+			this.iconIterator = this.field4356.iterator(); // L: 830
+			return this.iconNext(); // L: 831
 		}
 	}
 
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgm;",
-		garbageValue = "1078265651"
+		descriptor = "(I)Lij;",
+		garbageValue = "-1822141066"
 	)
 	@Export("iconNext")
 	public AbstractWorldMapIcon iconNext() {
-		if (this.iconIterator == null) { // L: 833
-			return null; // L: 834
+		if (this.iconIterator == null) { // L: 835
+			return null; // L: 836
 		} else {
 			AbstractWorldMapIcon var1;
 			do {
-				if (!this.iconIterator.hasNext()) { // L: 836
-					return null; // L: 842
+				if (!this.iconIterator.hasNext()) { // L: 838
+					return null; // L: 844
 				}
 
-				var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 837
-			} while(var1.getElement() == -1); // L: 838
+				var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 839
+			} while(var1.getElement() == -1); // L: 840
 
-			return var1; // L: 839
+			return var1; // L: 841
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java
index 9823234f38..be61270ce8 100644
--- a/runescape-client/src/main/java/WorldMapArchiveLoader.java
+++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java
@@ -4,30 +4,30 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nc")
+@ObfuscatedName("ok")
 @Implements("WorldMapArchiveLoader")
 public class WorldMapArchiveLoader {
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("cacheName")
 	String cacheName;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("archive")
 	AbstractArchive archive;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1962849213
+		intValue = 311026893
 	)
 	@Export("percentLoaded")
 	int percentLoaded;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("loaded")
 	boolean loaded;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lko;)V"
+		descriptor = "(Lku;)V"
 	)
 	WorldMapArchiveLoader(AbstractArchive var1) {
 		this.percentLoaded = 0; // L: 13
@@ -35,10 +35,10 @@ public class WorldMapArchiveLoader {
 		this.archive = var1; // L: 17
 	} // L: 18
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "38129268"
+		garbageValue = "1540505166"
 	)
 	@Export("reset")
 	void reset(String var1) {
@@ -52,15 +52,15 @@ void reset(String var1) {
 		}
 	} // L: 22 25 31
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1778196022"
+		garbageValue = "-1685563194"
 	)
 	@Export("load")
 	int load() {
 		if (this.percentLoaded < 33) { // L: 34
-			if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2211.name, this.cacheName)) { // L: 35
+			if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2763.name, this.cacheName)) { // L: 35
 				return this.percentLoaded; // L: 36
 			}
 
@@ -68,7 +68,7 @@ int load() {
 		}
 
 		if (this.percentLoaded == 33) { // L: 40
-			if (this.archive.isValidFileName(WorldMapCacheName.field2215.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2215.name, this.cacheName)) { // L: 41 42
+			if (this.archive.isValidFileName(WorldMapCacheName.field2764.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2764.name, this.cacheName)) { // L: 41 42
 				return this.percentLoaded; // L: 43
 			}
 
@@ -76,7 +76,7 @@ int load() {
 		}
 
 		if (this.percentLoaded == 66) { // L: 48
-			if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2214.name)) { // L: 49
+			if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2766.name)) { // L: 49
 				return this.percentLoaded; // L: 50
 			}
 
@@ -87,71 +87,23 @@ int load() {
 		return this.percentLoaded; // L: 55
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "6"
+		garbageValue = "-118"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		return this.loaded; // L: 59
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "21"
+		garbageValue = "15"
 	)
 	@Export("getPercentLoaded")
 	int getPercentLoaded() {
 		return this.percentLoaded; // L: 63
 	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(Lbw;Lbw;IZB)I",
-		garbageValue = "36"
-	)
-	@Export("compareWorlds")
-	static int compareWorlds(World var0, World var1, int var2, boolean var3) {
-		if (var2 == 1) { // L: 221
-			int var4 = var0.population; // L: 222
-			int var5 = var1.population; // L: 223
-			if (!var3) { // L: 224
-				if (var4 == -1) { // L: 225
-					var4 = 2001;
-				}
-
-				if (var5 == -1) { // L: 226
-					var5 = 2001;
-				}
-			}
-
-			return var4 - var5; // L: 228
-		} else if (var2 == 2) { // L: 230
-			return var0.location - var1.location;
-		} else if (var2 == 3) { // L: 231
-			if (var0.activity.equals("-")) { // L: 232
-				if (var1.activity.equals("-")) { // L: 233
-					return 0;
-				} else {
-					return var3 ? -1 : 1; // L: 234
-				}
-			} else if (var1.activity.equals("-")) { // L: 236
-				return var3 ? 1 : -1;
-			} else {
-				return var0.activity.compareTo(var1.activity); // L: 237
-			}
-		} else if (var2 == 4) { // L: 239
-			return var0.method1681() ? (var1.method1681() ? 0 : 1) : (var1.method1681() ? -1 : 0);
-		} else if (var2 == 5) { // L: 240
-			return var0.method1649() ? (var1.method1649() ? 0 : 1) : (var1.method1649() ? -1 : 0);
-		} else if (var2 == 6) { // L: 241
-			return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
-		} else if (var2 == 7) { // L: 242
-			return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
-		} else {
-			return var0.id - var1.id; // L: 243
-		}
-	}
 }
diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java
index f30ff38ef7..97febb3b97 100644
--- a/runescape-client/src/main/java/WorldMapArea.java
+++ b/runescape-client/src/main/java/WorldMapArea.java
@@ -6,73 +6,73 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fb")
+@ObfuscatedName("hr")
 @Implements("WorldMapArea")
 public class WorldMapArea {
-	@ObfuscatedName("tr")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Ljm;"
 	)
-	@Export("masterDisk")
-	static ArchiveDisk masterDisk;
-	@ObfuscatedName("i")
+	@Export("scriptDotWidget")
+	static Widget scriptDotWidget;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -808178711
+		intValue = -125093569
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("internalName")
 	String internalName;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@Export("externalName")
 	String externalName;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 819237223
+		intValue = -2121548035
 	)
 	@Export("backGroundColor")
 	int backGroundColor;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -755296395
+		intValue = 364673189
 	)
 	@Export("zoom")
 	int zoom;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lie;"
+		descriptor = "Lju;"
 	)
 	@Export("origin")
 	Coord origin;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1548910029
+		intValue = 2036184927
 	)
 	@Export("regionLowX")
 	int regionLowX;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -79899971
+		intValue = 775934329
 	)
 	@Export("regionHighX")
 	int regionHighX;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -619522771
+		intValue = 1487689727
 	)
 	@Export("regionLowY")
 	int regionLowY;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 156762923
+		intValue = 599446323
 	)
 	@Export("regionHighY")
 	int regionHighY;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("isMain")
 	boolean isMain;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("sections")
 	LinkedList sections;
 
@@ -88,10 +88,10 @@ public WorldMapArea() {
 		this.isMain = false; // L: 19
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;IB)V",
-		garbageValue = "-41"
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "0"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -113,82 +113,81 @@ public void read(Buffer var1, int var2) {
 		this.setBounds(); // L: 36
 	} // L: 37
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)Lgx;",
-		garbageValue = "1722623204"
+		descriptor = "(Lpi;I)Liv;",
+		garbageValue = "-450745297"
 	)
 	@Export("readWorldMapSection")
 	WorldMapSection readWorldMapSection(Buffer var1) {
 		int var2 = var1.readUnsignedByte(); // L: 40
-		WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE2}; // L: 43
-		WorldMapSectionType var4 = (WorldMapSectionType)UserComparator4.findEnumerated(var3, var2); // L: 45
-		Object var5 = null; // L: 46
-		switch(var4.type) { // L: 47
+		WorldMapSectionType var3 = (WorldMapSectionType)class130.findEnumerated(WorldMapSectionType.method4754(), var2); // L: 41
+		Object var4 = null; // L: 42
+		switch(var3.type) { // L: 43
 		case 0:
-			var5 = new class184(); // L: 60
-			break;
+			var4 = new WorldMapSection1(); // L: 51
+			break; // L: 52
 		case 1:
-			var5 = new WorldMapSection1(); // L: 49
-			break;
+			var4 = new WorldMapSection2(); // L: 48
+			break; // L: 49
 		case 2:
-			var5 = new WorldMapSection2(); // L: 57
-			break; // L: 58
+			var4 = new class221(); // L: 45
+			break;
 		case 3:
-			var5 = new WorldMapSection0(); // L: 54
+			var4 = new WorldMapSection0(); // L: 54
 			break; // L: 55
 		default:
-			throw new IllegalStateException(""); // L: 52
+			throw new IllegalStateException(""); // L: 57
 		}
 
-		((WorldMapSection)var5).read(var1); // L: 63
-		return (WorldMapSection)var5; // L: 64
+		((WorldMapSection)var4).read(var1); // L: 59
+		return (WorldMapSection)var4; // L: 60
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)Z",
-		garbageValue = "-2062291574"
+		descriptor = "(IIIB)Z",
+		garbageValue = "-57"
 	)
 	@Export("containsCoord")
 	public boolean containsCoord(int var1, int var2, int var3) {
-		Iterator var4 = this.sections.iterator(); // L: 68
+		Iterator var4 = this.sections.iterator(); // L: 64
 
 		WorldMapSection var5;
 		do {
 			if (!var4.hasNext()) {
-				return false; // L: 76
+				return false; // L: 72
 			}
 
-			var5 = (WorldMapSection)var4.next(); // L: 69
-		} while(!var5.containsCoord(var1, var2, var3)); // L: 71
+			var5 = (WorldMapSection)var4.next(); // L: 65
+		} while(!var5.containsCoord(var1, var2, var3)); // L: 67
 
-		return true; // L: 72
+		return true; // L: 68
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "-25"
+		descriptor = "(III)Z",
+		garbageValue = "1522036681"
 	)
 	@Export("containsPosition")
 	public boolean containsPosition(int var1, int var2) {
-		int var3 = var1 / 64; // L: 80
-		int var4 = var2 / 64; // L: 81
-		if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 82
-			if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 83
-				Iterator var5 = this.sections.iterator(); // L: 84
+		int var3 = var1 / 64; // L: 76
+		int var4 = var2 / 64; // L: 77
+		if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78
+			if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79
+				Iterator var5 = this.sections.iterator(); // L: 80
 
 				WorldMapSection var6;
 				do {
 					if (!var5.hasNext()) {
-						return false; // L: 92
+						return false; // L: 88
 					}
 
-					var6 = (WorldMapSection)var5.next(); // L: 85
-				} while(!var6.containsPosition(var1, var2)); // L: 87
+					var6 = (WorldMapSection)var5.next(); // L: 81
+				} while(!var6.containsPosition(var1, var2)); // L: 83
 
-				return true; // L: 88
+				return true; // L: 84
 			} else {
 				return false;
 			}
@@ -197,220 +196,231 @@ public boolean containsPosition(int var1, int var2) {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(IIIB)[I",
-		garbageValue = "35"
+		garbageValue = "-117"
 	)
 	@Export("position")
 	public int[] position(int var1, int var2, int var3) {
-		Iterator var4 = this.sections.iterator(); // L: 96
+		Iterator var4 = this.sections.iterator(); // L: 92
 
 		WorldMapSection var5;
 		do {
 			if (!var4.hasNext()) {
-				return null; // L: 104
+				return null; // L: 100
 			}
 
-			var5 = (WorldMapSection)var4.next(); // L: 97
-		} while(!var5.containsCoord(var1, var2, var3)); // L: 99
+			var5 = (WorldMapSection)var4.next(); // L: 93
+		} while(!var5.containsCoord(var1, var2, var3)); // L: 95
 
-		return var5.getBorderTileLengths(var1, var2, var3); // L: 100
+		return var5.getBorderTileLengths(var1, var2, var3); // L: 96
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Lie;",
-		garbageValue = "58"
+		descriptor = "(III)Lju;",
+		garbageValue = "270584498"
 	)
 	@Export("coord")
 	public Coord coord(int var1, int var2) {
-		Iterator var3 = this.sections.iterator(); // L: 108
+		Iterator var3 = this.sections.iterator(); // L: 104
 
 		WorldMapSection var4;
 		do {
 			if (!var3.hasNext()) {
-				return null; // L: 116
+				return null; // L: 112
 			}
 
-			var4 = (WorldMapSection)var3.next(); // L: 109
-		} while(!var4.containsPosition(var1, var2)); // L: 111
+			var4 = (WorldMapSection)var3.next(); // L: 105
+		} while(!var4.containsPosition(var1, var2)); // L: 107
 
-		return var4.coord(var1, var2); // L: 112
+		return var4.coord(var1, var2); // L: 108
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1982690372"
+		descriptor = "(B)V",
+		garbageValue = "2"
 	)
 	@Export("setBounds")
 	void setBounds() {
-		Iterator var1 = this.sections.iterator(); // L: 120
+		Iterator var1 = this.sections.iterator(); // L: 116
 
 		while (var1.hasNext()) {
-			WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 121
-			var2.expandBounds(this); // L: 123
+			WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117
+			var2.expandBounds(this); // L: 119
 		}
 
-	} // L: 126
+	} // L: 122
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "2147380047"
+		garbageValue = "45773946"
 	)
 	@Export("getId")
 	public int getId() {
-		return this.id; // L: 129
+		return this.id; // L: 125
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-60"
+		descriptor = "(I)Z",
+		garbageValue = "-1507291444"
 	)
 	@Export("getIsMain")
 	public boolean getIsMain() {
-		return this.isMain; // L: 133
+		return this.isMain; // L: 129
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(B)Ljava/lang/String;",
 		garbageValue = "0"
 	)
 	@Export("getInternalName")
 	public String getInternalName() {
-		return this.internalName; // L: 137
+		return this.internalName; // L: 133
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-1017230656"
+		garbageValue = "-1430420774"
 	)
 	@Export("getExternalName")
 	public String getExternalName() {
-		return this.externalName; // L: 141
+		return this.externalName; // L: 137
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1217738287"
+		garbageValue = "716418813"
 	)
 	@Export("getBackGroundColor")
 	int getBackGroundColor() {
-		return this.backGroundColor; // L: 145
+		return this.backGroundColor; // L: 141
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-438706152"
+		garbageValue = "409615709"
 	)
 	@Export("getZoom")
 	public int getZoom() {
-		return this.zoom; // L: 149
+		return this.zoom;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-2116545091"
+		garbageValue = "1571181943"
 	)
 	@Export("getRegionLowX")
 	public int getRegionLowX() {
-		return this.regionLowX; // L: 153
+		return this.regionLowX;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-12"
+		garbageValue = "-98"
 	)
 	@Export("getRegionHighX")
 	public int getRegionHighX() {
-		return this.regionHighX; // L: 157
+		return this.regionHighX; // L: 153
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1073343926"
+		garbageValue = "1156835171"
 	)
 	@Export("getRegionLowY")
 	public int getRegionLowY() {
-		return this.regionLowY;
+		return this.regionLowY; // L: 157
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1503026192"
+		garbageValue = "-1827234611"
 	)
 	@Export("getRegionHighY")
 	public int getRegionHighY() {
-		return this.regionHighY;
+		return this.regionHighY; // L: 161
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(S)I",
-		garbageValue = "-6358"
+		descriptor = "(I)I",
+		garbageValue = "1506672644"
 	)
 	@Export("getOriginX")
 	public int getOriginX() {
-		return this.origin.x;
+		return this.origin.x; // L: 165
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "43"
+		descriptor = "(S)I",
+		garbageValue = "21523"
 	)
 	@Export("getOriginPlane")
 	public int getOriginPlane() {
-		return this.origin.plane; // L: 173
+		return this.origin.plane; // L: 169
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1994315244"
+		garbageValue = "1021397937"
 	)
 	@Export("getOriginY")
 	public int getOriginY() {
-		return this.origin.y; // L: 177
+		return this.origin.y; // L: 173
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lie;",
-		garbageValue = "90"
+		descriptor = "(I)Lju;",
+		garbageValue = "1046832377"
 	)
 	@Export("getOrigin")
 	public Coord getOrigin() {
-		return new Coord(this.origin); // L: 181
+		return new Coord(this.origin); // L: 177
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(S)Loe;",
-		garbageValue = "-22529"
+		descriptor = "(Lku;Lku;B)I",
+		garbageValue = "0"
 	)
-	static IndexedSprite method3654() {
-		IndexedSprite var0 = new IndexedSprite(); // L: 159
-		var0.width = class414.SpriteBuffer_spriteWidth; // L: 160
-		var0.height = class414.SpriteBuffer_spriteHeight; // L: 161
-		var0.xOffset = class414.SpriteBuffer_xOffsets[0]; // L: 162
-		var0.yOffset = class414.SpriteBuffer_yOffsets[0]; // L: 163
-		var0.subWidth = UrlRequester.SpriteBuffer_spriteWidths[0]; // L: 164
-		var0.subHeight = class414.SpriteBuffer_spriteHeights[0]; // L: 165
-		var0.palette = HitSplatDefinition.SpriteBuffer_spritePalette; // L: 166
-		var0.pixels = class295.SpriteBuffer_pixels[0]; // L: 167
-		PacketBuffer.method6913(); // L: 168
-		return var0; // L: 169
+	static int method4490(AbstractArchive var0, AbstractArchive var1) {
+		int var2 = 0; // L: 143
+		String[] var3 = Login.field892; // L: 145
+
+		int var4;
+		String var5;
+		for (var4 = 0; var4 < var3.length; ++var4) { // L: 146
+			var5 = var3[var4]; // L: 147
+			if (var0.tryLoadFileByNames(var5, "")) { // L: 149
+				++var2;
+			}
+		}
+
+		var3 = Login.field893; // L: 154
+
+		for (var4 = 0; var4 < var3.length; ++var4) { // L: 155
+			var5 = var3[var4]; // L: 156
+			if (var1.tryLoadFileByNames(var5, "")) { // L: 158
+				++var2;
+			}
+		}
+
+		return var2; // L: 162
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java
index 2a35e52087..07d1b95ac4 100644
--- a/runescape-client/src/main/java/WorldMapAreaData.java
+++ b/runescape-client/src/main/java/WorldMapAreaData.java
@@ -6,30 +6,32 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gj")
+@ObfuscatedName("ip")
 @Implements("WorldMapAreaData")
 public class WorldMapAreaData extends WorldMapArea {
-	@ObfuscatedName("k")
+	@ObfuscatedName("fh")
+	static String field2772;
+	@ObfuscatedName("d")
 	@Export("worldMapData0Set")
 	HashSet worldMapData0Set;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("worldMapData1Set")
 	HashSet worldMapData1Set;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("iconList")
 	List iconList;
 
 	WorldMapAreaData() {
 	} // L: 14
 
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bo")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;Lop;IZB)V",
-		garbageValue = "0"
+		descriptor = "(Lpi;Lpi;IZI)V",
+		garbageValue = "-1001525208"
 	)
 	@Export("init")
 	void init(Buffer var1, Buffer var2, int var3, boolean var4) {
-		this.read(var1, var3); // L: 17
+		this.read(var1, var3);
 		int var5 = var2.readUnsignedShort(); // L: 18
 		this.worldMapData0Set = new HashSet(var5); // L: 19
 
@@ -64,10 +66,10 @@ void init(Buffer var1, Buffer var2, int var3, boolean var4) {
 		this.initIconsList(var2, var4); // L: 42
 	} // L: 43
 
-	@ObfuscatedName("bn")
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;ZI)V",
-		garbageValue = "1978597282"
+		descriptor = "(Lpi;ZB)V",
+		garbageValue = "16"
 	)
 	@Export("initIconsList")
 	void initIconsList(Buffer var1, boolean var2) {
@@ -75,7 +77,7 @@ void initIconsList(Buffer var1, boolean var2) {
 		int var3 = var1.readUnsignedShort(); // L: 47
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 48
-			int var5 = var1.method6946(); // L: 49
+			int var5 = var1.method7400(); // L: 49
 			Coord var6 = new Coord(var1.readInt()); // L: 50
 			boolean var7 = var1.readUnsignedByte() == 1; // L: 51
 			if (var2 || !var7) { // L: 52
@@ -84,4 +86,13 @@ void initIconsList(Buffer var1, boolean var2) {
 		}
 
 	} // L: 56
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lko;",
+		garbageValue = "1226375978"
+	)
+	public static StudioGame[] method4894() {
+		return new StudioGame[]{StudioGame.oldscape, StudioGame.stellardawn, StudioGame.game4, StudioGame.game5, StudioGame.runescape, StudioGame.game3}; // L: 17
+	}
 }
diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java
index 715b025267..fb5b0f2fc3 100644
--- a/runescape-client/src/main/java/WorldMapCacheName.java
+++ b/runescape-client/src/main/java/WorldMapCacheName.java
@@ -3,58 +3,84 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gu")
+@ObfuscatedName("id")
 @Implements("WorldMapCacheName")
 public class WorldMapCacheName {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lgu;"
+		descriptor = "Lid;"
 	)
-	public static final WorldMapCacheName field2210;
-	@ObfuscatedName("w")
+	public static final WorldMapCacheName field2768;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lgu;"
+		descriptor = "Lid;"
 	)
-	public static final WorldMapCacheName field2211;
-	@ObfuscatedName("s")
+	public static final WorldMapCacheName field2763;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lid;"
+	)
+	public static final WorldMapCacheName field2764;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lgu;"
+		descriptor = "Lid;"
 	)
-	public static final WorldMapCacheName field2215;
-	@ObfuscatedName("a")
+	static final WorldMapCacheName field2765;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lgu;"
+		descriptor = "Lid;"
 	)
-	static final WorldMapCacheName field2213;
-	@ObfuscatedName("o")
+	public static final WorldMapCacheName field2766;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lgu;"
+		descriptor = "Lpl;"
 	)
-	public static final WorldMapCacheName field2214;
-	@ObfuscatedName("g")
+	@Export("leftTitleSprite")
+	static SpritePixels leftTitleSprite;
+	@ObfuscatedName("s")
 	@Export("name")
 	public final String name;
 
 	static {
-		field2210 = new WorldMapCacheName("details"); // L: 4
-		field2211 = new WorldMapCacheName("compositemap"); // L: 5
-		field2215 = new WorldMapCacheName("compositetexture"); // L: 6
-		field2213 = new WorldMapCacheName("area"); // L: 7
-		field2214 = new WorldMapCacheName("labels"); // L: 8
+		field2768 = new WorldMapCacheName("details"); // L: 4
+		field2763 = new WorldMapCacheName("compositemap"); // L: 5
+		field2764 = new WorldMapCacheName("compositetexture"); // L: 6
+		field2765 = new WorldMapCacheName("area"); // L: 7
+		field2766 = new WorldMapCacheName("labels"); // L: 8
 	}
 
 	WorldMapCacheName(String var1) {
 		this.name = var1; // L: 12
-	} // L: 13
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "-875853562"
+	)
+	public static int method4865(int var0, int var1) {
+		int var2;
+		if (var1 > var0) { // L: 24
+			var2 = var0; // L: 25
+			var0 = var1; // L: 26
+			var1 = var2; // L: 27
+		}
+
+		while (var1 != 0) { // L: 29
+			var2 = var0 % var1; // L: 30
+			var0 = var1; // L: 31
+			var1 = var2; // L: 32
+		}
 
-	@ObfuscatedName("w")
+		return var0; // L: 34
+	}
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "605723533"
+		descriptor = "(III)Z",
+		garbageValue = "985293867"
 	)
-	public static void method4027() {
-		class247.midiPcmStream.clear(); // L: 31
-		class247.musicPlayerStatus = 1; // L: 32
-		class128.musicTrackArchive = null; // L: 33
-	} // L: 34
+	public static boolean method4864(int var0, int var1) {
+		return (var0 >> var1 + 1 & 1) != 0; // L: 13
+	}
 }
diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java
index a96c1baa6a..e109707383 100644
--- a/runescape-client/src/main/java/WorldMapData_0.java
+++ b/runescape-client/src/main/java/WorldMapData_0.java
@@ -3,28 +3,21 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fv")
+@ObfuscatedName("hn")
 @Implements("WorldMapData_0")
 public class WorldMapData_0 extends AbstractWorldMapData {
-	@ObfuscatedName("mu")
-	@ObfuscatedSignature(
-		descriptor = "Ljf;"
-	)
-	@Export("mousedOverWidgetIf1")
-	static Widget mousedOverWidgetIf1;
-
 	WorldMapData_0() {
 	} // L: 6
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;B)V",
-		garbageValue = "-38"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "-64"
 	)
 	@Export("init")
 	void init(Buffer var1) {
 		int var2 = var1.readUnsignedByte(); // L: 9
-		if (var2 != WorldMapID.field2186.value) { // L: 10
+		if (var2 != WorldMapID.field2739.value) { // L: 10
 			throw new IllegalStateException(""); // L: 11
 		} else {
 			super.minPlane = var1.readUnsignedByte(); // L: 13
@@ -33,183 +26,71 @@ void init(Buffer var1) {
 			super.regionYLow = var1.readUnsignedShort(); // L: 16
 			super.regionX = var1.readUnsignedShort(); // L: 17
 			super.regionY = var1.readUnsignedShort(); // L: 18
-			super.groupId = var1.method6946(); // L: 19
-			super.fileId = var1.method6946(); // L: 20
+			super.groupId = var1.method7400(); // L: 19
+			super.fileId = var1.method7400();
 		}
-	} // L: 21
+	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "530647470"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "28"
 	)
 	@Export("readGeography")
 	void readGeography(Buffer var1) {
-		super.planes = Math.min(super.planes, 4); // L: 24
-		super.floorUnderlayIds = new short[1][64][64]; // L: 25
-		super.floorOverlayIds = new short[super.planes][64][64]; // L: 26
-		super.field2154 = new byte[super.planes][64][64]; // L: 27
-		super.field2145 = new byte[super.planes][64][64]; // L: 28
-		super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 29
-		int var2 = var1.readUnsignedByte(); // L: 30
-		if (var2 != class194.field2177.value) { // L: 31
-			throw new IllegalStateException(""); // L: 32
+		super.planes = Math.min(super.planes, 4); // L: 25
+		super.floorUnderlayIds = new short[1][64][64]; // L: 26
+		super.floorOverlayIds = new short[super.planes][64][64]; // L: 27
+		super.field2699 = new byte[super.planes][64][64];
+		super.field2706 = new byte[super.planes][64][64]; // L: 29
+		super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 30
+		int var2 = var1.readUnsignedByte(); // L: 31
+		if (var2 != class231.field2736.value) { // L: 32
+			throw new IllegalStateException(""); // L: 33
 		} else {
-			int var3 = var1.readUnsignedByte(); // L: 34
-			int var4 = var1.readUnsignedByte(); // L: 35
-			if (var3 == super.regionX && var4 == super.regionY) { // L: 36
-				for (int var5 = 0; var5 < 64; ++var5) { // L: 39
-					for (int var6 = 0; var6 < 64; ++var6) { // L: 40
-						this.readTile(var5, var6, var1); // L: 41
+			int var3 = var1.readUnsignedByte(); // L: 35
+			int var4 = var1.readUnsignedByte(); // L: 36
+			if (var3 == super.regionX && var4 == super.regionY) { // L: 37
+				for (int var5 = 0; var5 < 64; ++var5) { // L: 40
+					for (int var6 = 0; var6 < 64; ++var6) { // L: 41
+						this.readTile(var5, var6, var1); // L: 42
 					}
 				}
 
 			} else {
-				throw new IllegalStateException(""); // L: 37
+				throw new IllegalStateException(""); // L: 38
 			}
 		}
-	} // L: 44
+	} // L: 45
+
+	public int hashCode() {
+		return super.regionX | super.regionY << 8; // L: 58
+	}
 
 	public boolean equals(Object var1) {
-		if (!(var1 instanceof WorldMapData_0)) { // L: 47
-			return false; // L: 48
+		if (!(var1 instanceof WorldMapData_0)) { // L: 49
+			return false; // L: 50
 		} else {
-			WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50
-			return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 51
+			WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 52
+			return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 53
 		}
 	}
 
-	public int hashCode() {
-		return super.regionX | super.regionY << 8; // L: 55
-	}
-
-	@ObfuscatedName("o")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Loj;II)Z",
-		garbageValue = "-2145762606"
+		descriptor = "(II)Lpc;",
+		garbageValue = "-1557280299"
 	)
-	@Export("updateExternalPlayer")
-	static boolean updateExternalPlayer(PacketBuffer var0, int var1) {
-		int var2 = var0.readBits(2); // L: 539
-		int var3;
-		int var4;
-		int var7;
-		int var8;
-		int var9;
-		int var10;
-		if (var2 == 0) { // L: 540
-			if (var0.readBits(1) != 0) { // L: 541
-				updateExternalPlayer(var0, var1);
-			}
-
-			var3 = var0.readBits(13); // L: 542
-			var4 = var0.readBits(13); // L: 543
-			boolean var12 = var0.readBits(1) == 1; // L: 544
-			if (var12) { // L: 545
-				Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
-			}
-
-			if (Client.players[var1] != null) { // L: 546
-				throw new RuntimeException(); // L: 547
-			} else {
-				Player var11 = Client.players[var1] = new Player(); // L: 549
-				var11.index = var1; // L: 550
-				if (Players.field1242[var1] != null) { // L: 551
-					var11.read(Players.field1242[var1]);
-				}
-
-				var11.orientation = Players.Players_orientations[var1]; // L: 552
-				var11.targetIndex = Players.Players_targetIndices[var1]; // L: 553
-				var7 = Players.Players_regions[var1]; // L: 554
-				var8 = var7 >> 28; // L: 555
-				var9 = var7 >> 14 & 255; // L: 556
-				var10 = var7 & 255; // L: 557
-				var11.pathTraversed[0] = Players.field1241[var1]; // L: 558
-				var11.plane = (byte)var8; // L: 559
-				var11.resetPath((var9 << 13) + var3 - class19.baseX, (var10 << 13) + var4 - DefaultsGroup.baseY); // L: 560
-				var11.field1067 = false; // L: 561
-				return true; // L: 562
-			}
-		} else if (var2 == 1) { // L: 564
-			var3 = var0.readBits(2); // L: 565
-			var4 = Players.Players_regions[var1]; // L: 566
-			Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 567
-			return false; // L: 568
-		} else {
-			int var5;
-			int var6;
-			if (var2 == 2) { // L: 570
-				var3 = var0.readBits(5); // L: 571
-				var4 = var3 >> 3; // L: 572
-				var5 = var3 & 7; // L: 573
-				var6 = Players.Players_regions[var1]; // L: 574
-				var7 = (var6 >> 28) + var4 & 3; // L: 575
-				var8 = var6 >> 14 & 255; // L: 576
-				var9 = var6 & 255; // L: 577
-				if (var5 == 0) { // L: 578
-					--var8; // L: 579
-					--var9; // L: 580
-				}
+	public static PrivateChatMode method4353(int var0) {
+		PrivateChatMode[] var1 = FloorUnderlayDefinition.method3381(); // L: 20
 
-				if (var5 == 1) { // L: 582
-					--var9;
-				}
-
-				if (var5 == 2) { // L: 583
-					++var8; // L: 584
-					--var9; // L: 585
-				}
-
-				if (var5 == 3) { // L: 587
-					--var8;
-				}
-
-				if (var5 == 4) { // L: 588
-					++var8;
-				}
-
-				if (var5 == 5) { // L: 589
-					--var8; // L: 590
-					++var9; // L: 591
-				}
-
-				if (var5 == 6) { // L: 593
-					++var9;
-				}
-
-				if (var5 == 7) { // L: 594
-					++var8; // L: 595
-					++var9; // L: 596
-				}
-
-				Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 598
-				return false; // L: 599
-			} else {
-				var3 = var0.readBits(18); // L: 601
-				var4 = var3 >> 16; // L: 602
-				var5 = var3 >> 8 & 255; // L: 603
-				var6 = var3 & 255; // L: 604
-				var7 = Players.Players_regions[var1]; // L: 605
-				var8 = (var7 >> 28) + var4 & 3; // L: 606
-				var9 = var5 + (var7 >> 14) & 255; // L: 607
-				var10 = var6 + var7 & 255; // L: 608
-				Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 609
-				return false; // L: 610
+		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21
+			PrivateChatMode var3 = var1[var2]; // L: 22
+			if (var0 == var3.field4597) {
+				return var3; // L: 24
 			}
 		}
-	}
 
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-1849354153"
-	)
-	static int method3530(int var0) {
-		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 70
-		if (var1 == null) { // L: 71
-			return -1;
-		} else {
-			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 72 73
-		}
+		return null; // L: 28
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java
index 575a610388..ec73c333fd 100644
--- a/runescape-client/src/main/java/WorldMapData_1.java
+++ b/runescape-client/src/main/java/WorldMapData_1.java
@@ -1,36 +1,44 @@
-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("gi")
+@ObfuscatedName("hu")
 @Implements("WorldMapData_1")
 public class WorldMapData_1 extends AbstractWorldMapData {
-	@ObfuscatedName("i")
+	@ObfuscatedName("aw")
+	@ObfuscatedSignature(
+		descriptor = "Lme;"
+	)
+	static Bounds field2652;
+	@ObfuscatedName("gt")
+	@ObfuscatedSignature(
+		descriptor = "Lcq;"
+	)
+	@Export("urlRequester")
+	static UrlRequester urlRequester;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 2132883567
+		intValue = -2038326589
 	)
 	@Export("chunkXLow")
 	int chunkXLow;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1424345203
+		intValue = 45783071
 	)
 	@Export("chunkYLow")
 	int chunkYLow;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -737589469
+		intValue = 1904366233
 	)
 	@Export("chunkX")
 	int chunkX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1977093803
+		intValue = -584157989
 	)
 	@Export("chunkY")
 	int chunkY;
@@ -38,15 +46,15 @@ public class WorldMapData_1 extends AbstractWorldMapData {
 	WorldMapData_1() {
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "133240278"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "4"
 	)
 	@Export("init")
 	void init(Buffer var1) {
 		int var2 = var1.readUnsignedByte(); // L: 14
-		if (var2 != WorldMapID.field2184.value) { // L: 15
+		if (var2 != WorldMapID.field2741.value) { // L: 15
 			throw new IllegalStateException(""); // L: 16
 		} else {
 			super.minPlane = var1.readUnsignedByte(); // L: 18
@@ -59,191 +67,99 @@ void init(Buffer var1) {
 			super.regionY = var1.readUnsignedShort(); // L: 25
 			this.chunkX = var1.readUnsignedByte(); // L: 26
 			this.chunkY = var1.readUnsignedByte(); // L: 27
-			super.groupId = var1.method6946(); // L: 28
-			super.fileId = var1.method6946(); // L: 29
+			super.groupId = var1.method7400(); // L: 28
+			super.fileId = var1.method7400(); // L: 29
 		}
 	} // L: 30
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "530647470"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "28"
 	)
 	@Export("readGeography")
 	void readGeography(Buffer var1) {
-		super.planes = Math.min(super.planes, 4); // L: 33
-		super.floorUnderlayIds = new short[1][64][64]; // L: 34
-		super.floorOverlayIds = new short[super.planes][64][64]; // L: 35
-		super.field2154 = new byte[super.planes][64][64]; // L: 36
-		super.field2145 = new byte[super.planes][64][64]; // L: 37
-		super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 38
-		int var2 = var1.readUnsignedByte(); // L: 39
-		if (var2 != class194.field2178.value) { // L: 40
-			throw new IllegalStateException(""); // L: 41
+		super.planes = Math.min(super.planes, 4); // L: 34
+		super.floorUnderlayIds = new short[1][64][64]; // L: 35
+		super.floorOverlayIds = new short[super.planes][64][64]; // L: 36
+		super.field2699 = new byte[super.planes][64][64]; // L: 37
+		super.field2706 = new byte[super.planes][64][64]; // L: 38
+		super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 39
+		int var2 = var1.readUnsignedByte(); // L: 40
+		if (var2 != class231.field2735.value) { // L: 41
+			throw new IllegalStateException(""); // L: 42
 		} else {
-			int var3 = var1.readUnsignedByte(); // L: 43
-			int var4 = var1.readUnsignedByte(); // L: 44
-			int var5 = var1.readUnsignedByte(); // L: 45
-			int var6 = var1.readUnsignedByte(); // L: 46
-			if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 47
-				for (int var7 = 0; var7 < 8; ++var7) { // L: 50
-					for (int var8 = 0; var8 < 8; ++var8) { // L: 51
-						this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 52
+			int var3 = var1.readUnsignedByte(); // L: 44
+			int var4 = var1.readUnsignedByte(); // L: 45
+			int var5 = var1.readUnsignedByte(); // L: 46
+			int var6 = var1.readUnsignedByte(); // L: 47
+			if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 48
+				for (int var7 = 0; var7 < 8; ++var7) { // L: 51
+					for (int var8 = 0; var8 < 8; ++var8) { // L: 52
+						this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 53
 					}
 				}
 
 			} else {
-				throw new IllegalStateException(""); // L: 48
+				throw new IllegalStateException(""); // L: 49
 			}
 		}
-	} // L: 55
+	} // L: 56
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "8"
+		descriptor = "(I)I",
+		garbageValue = "-298089645"
 	)
 	@Export("getChunkXLow")
 	int getChunkXLow() {
-		return this.chunkXLow; // L: 73
+		return this.chunkXLow; // L: 76
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "179463257"
+		descriptor = "(B)I",
+		garbageValue = "94"
 	)
 	@Export("getChunkYLow")
 	int getChunkYLow() {
-		return this.chunkYLow; // L: 77
+		return this.chunkYLow; // L: 80
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1932347732"
+		descriptor = "(B)I",
+		garbageValue = "-66"
 	)
 	@Export("getChunkX")
 	int getChunkX() {
-		return this.chunkX; // L: 81
+		return this.chunkX; // L: 84
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-728228144"
+		garbageValue = "737518377"
 	)
 	@Export("getChunkY")
 	int getChunkY() {
-		return this.chunkY; // L: 85
+		return this.chunkY; // L: 88
 	}
 
 	public boolean equals(Object var1) {
-		if (!(var1 instanceof WorldMapData_1)) { // L: 58
-			return false; // L: 59
+		if (!(var1 instanceof WorldMapData_1)) { // L: 60
+			return false; // L: 61
 		} else {
-			WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61
-			if (super.regionX == var2.regionX && var2.regionY == super.regionY) { // L: 62
-				return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; // L: 65
+			WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 63
+			if (var2.regionX == super.regionX && super.regionY == var2.regionY) { // L: 64
+				return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; // L: 67
 			} else {
-				return false; // L: 63
+				return false; // L: 65
 			}
 		}
 	}
 
 	public int hashCode() {
-		return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69
+		return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 72
 	}
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1064426552"
-	)
-	static void method3844() {
-		try {
-			File var0 = new File(TriBool.userHomeDirectory, "random.dat"); // L: 248
-			int var2;
-			if (var0.exists()) { // L: 249
-				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 250
-			} else {
-				label38:
-				for (int var1 = 0; var1 < AbstractRasterProvider.cacheSubPaths.length; ++var1) { // L: 253
-					for (var2 = 0; var2 < NPC.cacheParentPaths.length; ++var2) { // L: 254
-						File var3 = new File(NPC.cacheParentPaths[var2] + AbstractRasterProvider.cacheSubPaths[var1] + File.separatorChar + "random.dat"); // L: 255
-						if (var3.exists()) { // L: 256
-							JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 257
-							break label38; // L: 258
-						}
-					}
-				}
-			}
-
-			if (JagexCache.JagexCache_randomDat == null) { // L: 263
-				RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 264
-				var2 = var4.read(); // L: 265
-				var4.seek(0L); // L: 266
-				var4.write(var2); // L: 267
-				var4.seek(0L); // L: 268
-				var4.close(); // L: 269
-				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 270
-			}
-		} catch (IOException var5) { // L: 273
-		}
-
-	} // L: 274
-
-	@ObfuscatedName("fd")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1129195954"
-	)
-	@Export("updateGameState")
-	static void updateGameState(int var0) {
-		if (var0 != Client.gameState) { // L: 1671
-			if (Client.gameState == 0) { // L: 1672
-				ArchiveLoader.client.method508();
-			}
-
-			if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1673
-				UserComparator6.method2503(0); // L: 1674
-				Client.field496 = 0; // L: 1675
-				Client.field685 = 0; // L: 1676
-				Client.timer.method5973(var0); // L: 1677
-				if (var0 != 20) { // L: 1678
-					WorldMapSection2.method3584(false);
-				}
-			}
-
-			if (var0 != 20 && var0 != 40 && Projectile.field915 != null) { // L: 1680 1681
-				Projectile.field915.close(); // L: 1682
-				Projectile.field915 = null; // L: 1683
-			}
-
-			if (Client.gameState == 25) { // L: 1686
-				Client.field485 = 0; // L: 1687
-				Client.field521 = 0; // L: 1688
-				Client.field522 = 1; // L: 1689
-				Client.field523 = 0; // L: 1690
-				Client.field524 = 1; // L: 1691
-			}
-
-			if (var0 != 5 && var0 != 10) { // L: 1693
-				if (var0 == 20) { // L: 1701
-					int var3 = Client.gameState == 11 ? 4 : 0; // L: 1702
-					class113.method2529(ChatChannel.archive10, GrandExchangeOfferOwnWorldComparator.archive8, true, var3); // L: 1703
-				} else if (var0 == 11) { // L: 1705
-					class113.method2529(ChatChannel.archive10, GrandExchangeOfferOwnWorldComparator.archive8, false, 4); // L: 1706
-				} else {
-					ArchiveDiskActionHandler.method5258(); // L: 1708
-				}
-			} else {
-				boolean var1 = class408.clientPreferences.field1182 >= Client.field467; // L: 1696
-				int var2 = var1 ? 0 : 12; // L: 1698
-				class113.method2529(ChatChannel.archive10, GrandExchangeOfferOwnWorldComparator.archive8, true, var2); // L: 1699
-			}
-
-			Client.gameState = var0; // L: 1709
-		}
-	} // L: 1710
 }
diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java
index 9971147b55..ccbc01f88e 100644
--- a/runescape-client/src/main/java/WorldMapDecoration.java
+++ b/runescape-client/src/main/java/WorldMapDecoration.java
@@ -4,24 +4,29 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gp")
+@ObfuscatedName("hb")
 @Implements("WorldMapDecoration")
 public class WorldMapDecoration {
-	@ObfuscatedName("i")
+	@ObfuscatedName("kr")
+	@ObfuscatedSignature(
+		descriptor = "Ljm;"
+	)
+	static Widget field2722;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1197653211
+		intValue = -534188833
 	)
 	@Export("objectDefinitionId")
 	final int objectDefinitionId;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1466372567
+		intValue = -1834904579
 	)
 	@Export("decoration")
 	final int decoration;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1276630481
+		intValue = 556880363
 	)
 	@Export("rotation")
 	final int rotation;
@@ -32,28 +37,95 @@ public class WorldMapDecoration {
 		this.rotation = var3; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("kh")
+	@ObfuscatedName("gc")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILow;Liw;B)V",
-		garbageValue = "-5"
+		descriptor = "(IIIIZI)V",
+		garbageValue = "2097152469"
 	)
-	@Export("drawSpriteOnMinimap")
-	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
-		if (var4 != null) { // L: 11738
-			int var6 = Client.camAngleY & 2047; // L: 11739
-			int var7 = var3 * var3 + var2 * var2; // L: 11740
-			if (var7 <= 6400) { // L: 11741
-				int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11742
-				int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11743
-				int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11744
-				int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11745
-				if (var7 > 2500) {
-					var4.method7410(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 11746
-				} else {
-					var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11747
+	@Export("setViewportShape")
+	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+		if (var2 < 1) { // L: 5366
+			var2 = 1;
+		}
+
+		if (var3 < 1) { // L: 5367
+			var3 = 1;
+		}
+
+		int var5 = var3 - 334; // L: 5368
+		int var6;
+		if (var5 < 0) { // L: 5370
+			var6 = Client.field690;
+		} else if (var5 >= 100) { // L: 5371
+			var6 = Client.field707;
+		} else {
+			var6 = (Client.field707 - Client.field690) * var5 / 100 + Client.field690; // L: 5372
+		}
+
+		int var7 = var3 * var6 * 512 / (var2 * 334); // L: 5373
+		int var8;
+		int var9;
+		short var17;
+		if (var7 < Client.field736) { // L: 5374
+			var17 = Client.field736; // L: 5375
+			var6 = var17 * var2 * 334 / (var3 * 512); // L: 5376
+			if (var6 > Client.field735) { // L: 5377
+				var6 = Client.field735; // L: 5378
+				var8 = var3 * var6 * 512 / (var17 * 334); // L: 5379
+				var9 = (var2 - var8) / 2; // L: 5380
+				if (var4) { // L: 5381
+					Rasterizer2D.Rasterizer2D_resetClip(); // L: 5382
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 5383
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 5384
 				}
 
+				var0 += var9; // L: 5386
+				var2 -= var9 * 2; // L: 5387
+			}
+		} else if (var7 > Client.field737) { // L: 5390
+			var17 = Client.field737; // L: 5391
+			var6 = var17 * var2 * 334 / (var3 * 512); // L: 5392
+			if (var6 < Client.field619) { // L: 5393
+				var6 = Client.field619; // L: 5394
+				var8 = var17 * var2 * 334 / (var6 * 512); // L: 5395
+				var9 = (var3 - var8) / 2; // L: 5396
+				if (var4) { // L: 5397
+					Rasterizer2D.Rasterizer2D_resetClip(); // L: 5398
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 5399
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 5400
+				}
+
+				var1 += var9; // L: 5402
+				var3 -= var9 * 2; // L: 5403
 			}
 		}
-	} // L: 11748
+
+		Client.viewportZoom = var3 * var6 / 334; // L: 5406
+		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 5407
+			int[] var16 = new int[9]; // L: 5409
+
+			for (var9 = 0; var9 < var16.length; ++var9) { // L: 5410
+				int var10 = var9 * 32 + 15 + 128; // L: 5411
+				int var11 = class142.method2958(var10); // L: 5412
+				int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 5413
+				int var14 = var3 - 334; // L: 5416
+				if (var14 < 0) { // L: 5417
+					var14 = 0;
+				} else if (var14 > 100) { // L: 5418
+					var14 = 100;
+				}
+
+				int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; // L: 5419
+				int var13 = var15 * var11 / 256; // L: 5420
+				var16[var9] = var13 * var12 >> 16; // L: 5423
+			}
+
+			Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); // L: 5425
+		}
+
+		Client.viewportOffsetX = var0; // L: 5428
+		Client.viewportOffsetY = var1; // L: 5429
+		Client.viewportWidth = var2; // L: 5430
+		Client.viewportHeight = var3; // L: 5431
+	} // L: 5432
 }
diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java
index 7e471853aa..2a469a0c8a 100644
--- a/runescape-client/src/main/java/WorldMapDecorationType.java
+++ b/runescape-client/src/main/java/WorldMapDecorationType.java
@@ -4,128 +4,134 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jv")
+@ObfuscatedName("jy")
 @Implements("WorldMapDecorationType")
 public enum WorldMapDecorationType implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3238(0, 0),
-	@ObfuscatedName("w")
+	field3391(0, 0),
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3223(1, 0),
-	@ObfuscatedName("s")
+	field3404(1, 0),
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3224(2, 0),
-	@ObfuscatedName("a")
+	field3384(2, 0),
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3230(3, 0),
-	@ObfuscatedName("o")
+	field3385(3, 0),
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3231(9, 2),
-	@ObfuscatedName("g")
+	field3406(9, 2),
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3227(4, 1),
-	@ObfuscatedName("e")
+	field3387(4, 1),
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3228(5, 1),
-	@ObfuscatedName("p")
+	field3388(5, 1),
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3240(6, 1),
-	@ObfuscatedName("j")
+	field3383(6, 1),
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3234(7, 1),
-	@ObfuscatedName("b")
+	field3390(7, 1),
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3229(8, 1),
-	@ObfuscatedName("x")
+	field3397(8, 1),
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3232(12, 2),
-	@ObfuscatedName("y")
+	field3392(12, 2),
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3225(13, 2),
-	@ObfuscatedName("k")
+	field3396(13, 2),
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3222(14, 2),
-	@ObfuscatedName("t")
+	field3394(14, 2),
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3235(15, 2),
-	@ObfuscatedName("l")
+	field3395(15, 2),
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3236(16, 2),
-	@ObfuscatedName("u")
+	field3393(16, 2),
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3237(17, 2),
-	@ObfuscatedName("n")
+	field3386(17, 2),
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3226(18, 2),
-	@ObfuscatedName("z")
+	field3398(18, 2),
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3239(19, 2),
-	@ObfuscatedName("q")
+	field3399(19, 2),
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3233(20, 2),
-	@ObfuscatedName("d")
+	field3400(20, 2),
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3241(21, 2),
-	@ObfuscatedName("r")
+	field3401(21, 2),
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3242(10, 2),
-	@ObfuscatedName("m")
+	field3402(10, 2),
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3243(11, 2),
-	@ObfuscatedName("c")
+	field3403(11, 2),
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljy;"
 	)
-	field3244(22, 3);
+	field3389(22, 3);
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("pn")
+	@ObfuscatedSignature(
+		descriptor = "Leq;"
+	)
+	@Export("mouseWheel")
+	static class154 mouseWheel;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1784539249
+		intValue = 292795951
 	)
 	@Export("id")
 	public final int id;
@@ -138,22 +144,13 @@ public enum WorldMapDecorationType implements MouseWheel {
 		this.id = var3; // L: 34
 	} // L: 35
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 38
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "15"
-	)
-	static int method5193() {
-		return ++Messages.Messages_count - 1; // L: 19
+		return this.id; // L: 39
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java
index 52b8ad74ef..54f5e962bc 100644
--- a/runescape-client/src/main/java/WorldMapElement.java
+++ b/runescape-client/src/main/java/WorldMapElement.java
@@ -4,145 +4,139 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("en")
+@ObfuscatedName("fj")
 @Implements("WorldMapElement")
 public class WorldMapElement extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("WorldMapElement_archive")
 	public static AbstractArchive WorldMapElement_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "[Len;"
+		descriptor = "[Lfj;"
 	)
 	@Export("WorldMapElement_cached")
 	public static WorldMapElement[] WorldMapElement_cached;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -1280320999
-	)
-	@Export("WorldMapElement_count")
-	public static int WorldMapElement_count;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Liq;"
 	)
-	@Export("WorldMapElement_cachedSprites")
-	public static EvictingDualNodeHashTable WorldMapElement_cachedSprites;
-	@ObfuscatedName("o")
+	@Export("PlayerAppearance_cachedModels")
+	public static EvictingDualNodeHashTable PlayerAppearance_cachedModels;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 2056696763
+		intValue = -2128430095
 	)
 	@Export("objectId")
 	public final int objectId;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -976227479
+		intValue = -1548608787
 	)
 	@Export("sprite1")
 	public int sprite1;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1158497187
+		intValue = 1438813025
 	)
 	@Export("sprite2")
 	int sprite2;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1157635857
+		intValue = -638140105
 	)
-	public int field1626;
-	@ObfuscatedName("b")
+	public int field1756;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 334109615
+		intValue = 1797672819
 	)
 	@Export("textSize")
 	public int textSize;
-	@ObfuscatedName("y")
-	public boolean field1641;
-	@ObfuscatedName("k")
-	public boolean field1629;
-	@ObfuscatedName("t")
+	@ObfuscatedName("v")
+	public boolean field1758;
+	@ObfuscatedName("d")
+	public boolean field1759;
+	@ObfuscatedName("h")
 	@Export("menuActions")
 	public String[] menuActions;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@Export("menuTargetName")
 	public String menuTargetName;
-	@ObfuscatedName("u")
-	int[] field1632;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
+	int[] field1762;
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1219303973
+		intValue = 1652119417
 	)
-	int field1633;
-	@ObfuscatedName("z")
+	int field1770;
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1453776181
+		intValue = 158634661
 	)
-	int field1634;
-	@ObfuscatedName("q")
+	int field1764;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -526173565
+		intValue = 772894737
 	)
-	int field1635;
-	@ObfuscatedName("d")
+	int field1763;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 2048716063
+		intValue = 1373703661
 	)
-	int field1621;
-	@ObfuscatedName("r")
+	int field1766;
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lfj;"
+		descriptor = "Lfc;"
 	)
 	@Export("horizontalAlignment")
 	public HorizontalAlignment horizontalAlignment;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lfg;"
+		descriptor = "Lfs;"
 	)
 	@Export("verticalAlignment")
 	public VerticalAlignment verticalAlignment;
-	@ObfuscatedName("c")
-	int[] field1636;
-	@ObfuscatedName("f")
-	byte[] field1638;
-	@ObfuscatedName("h")
+	@ObfuscatedName("x")
+	int[] field1749;
+	@ObfuscatedName("z")
+	byte[] field1769;
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1234093325
+		intValue = -783407031
 	)
 	@Export("category")
 	public int category;
 
 	static {
-		WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16
+		PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(256); // L: 16
 	}
 
 	public WorldMapElement(int var1) {
 		this.sprite1 = -1; // L: 18
 		this.sprite2 = -1; // L: 19
 		this.textSize = 0; // L: 22
-		this.field1641 = true; // L: 24
-		this.field1629 = false; // L: 25
+		this.field1758 = true; // L: 24
+		this.field1759 = false; // L: 25
 		this.menuActions = new String[5]; // L: 26
-		this.field1633 = Integer.MAX_VALUE; // L: 29
-		this.field1634 = Integer.MAX_VALUE; // L: 30
-		this.field1635 = Integer.MIN_VALUE; // L: 31
-		this.field1621 = Integer.MIN_VALUE; // L: 32
+		this.field1770 = Integer.MAX_VALUE; // L: 29
+		this.field1764 = Integer.MAX_VALUE; // L: 30
+		this.field1763 = Integer.MIN_VALUE; // L: 31
+		this.field1766 = Integer.MIN_VALUE; // L: 32
 		this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33
 		this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34
 		this.category = -1; // L: 37
 		this.objectId = var1; // L: 40
 	} // L: 41
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;S)V",
-		garbageValue = "5756"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "-20"
 	)
 	@Export("decode")
 	public void decode(Buffer var1) {
@@ -156,68 +150,68 @@ public void decode(Buffer var1) {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;IB)V",
-		garbageValue = "-64"
+		descriptor = "(Lpi;IS)V",
+		garbageValue = "2466"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) { // L: 59
-			this.sprite1 = var1.method6946();
+			this.sprite1 = var1.method7400();
 		} else if (var2 == 2) { // L: 60
-			this.sprite2 = var1.method6946();
+			this.sprite2 = var1.method7400();
 		} else if (var2 == 3) { // L: 61
 			this.name = var1.readStringCp1252NullTerminated();
 		} else if (var2 == 4) { // L: 62
-			this.field1626 = var1.readMedium();
+			this.field1756 = var1.readMedium();
 		} else if (var2 == 5) { // L: 63
 			var1.readMedium(); // L: 64
 		} else if (var2 == 6) { // L: 66
 			this.textSize = var1.readUnsignedByte();
 		} else {
-			int var6;
+			int var3;
 			if (var2 == 7) { // L: 67
-				var6 = var1.readUnsignedByte(); // L: 68
-				if ((var6 & 1) == 0) { // L: 69
-					this.field1641 = false;
+				var3 = var1.readUnsignedByte(); // L: 68
+				if ((var3 & 1) == 0) { // L: 69
+					this.field1758 = false;
 				}
 
-				if ((var6 & 2) == 2) { // L: 70
-					this.field1629 = true;
+				if ((var3 & 2) == 2) { // L: 70
+					this.field1759 = true;
 				}
 			} else if (var2 == 8) { // L: 72
 				var1.readUnsignedByte(); // L: 73
 			} else if (var2 >= 10 && var2 <= 14) { // L: 75
 				this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated();
 			} else if (var2 == 15) { // L: 76
-				var6 = var1.readUnsignedByte(); // L: 77
-				this.field1632 = new int[var6 * 2]; // L: 78
+				var3 = var1.readUnsignedByte(); // L: 77
+				this.field1762 = new int[var3 * 2]; // L: 78
 
 				int var4;
-				for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 79
-					this.field1632[var4] = var1.readShort();
+				for (var4 = 0; var4 < var3 * 2; ++var4) { // L: 79
+					this.field1762[var4] = var1.readShort();
 				}
 
 				var1.readInt(); // L: 80
 				var4 = var1.readUnsignedByte(); // L: 81
-				this.field1636 = new int[var4]; // L: 82
+				this.field1749 = new int[var4]; // L: 82
 
 				int var5;
-				for (var5 = 0; var5 < this.field1636.length; ++var5) { // L: 83
-					this.field1636[var5] = var1.readInt();
+				for (var5 = 0; var5 < this.field1749.length; ++var5) { // L: 83
+					this.field1749[var5] = var1.readInt();
 				}
 
-				this.field1638 = new byte[var6]; // L: 84
+				this.field1769 = new byte[var3]; // L: 84
 
-				for (var5 = 0; var5 < var6; ++var5) { // L: 85
-					this.field1638[var5] = var1.readByte();
+				for (var5 = 0; var5 < var3; ++var5) { // L: 85
+					this.field1769[var5] = var1.readByte();
 				}
 			} else if (var2 != 16) { // L: 87
 				if (var2 == 17) { // L: 88
 					this.menuTargetName = var1.readStringCp1252NullTerminated();
 				} else if (var2 == 18) { // L: 89
-					var1.method6946(); // L: 90
+					var1.method7400(); // L: 90
 				} else if (var2 == 19) { // L: 92
 					this.category = var1.readUnsignedShort();
 				} else if (var2 == 21) { // L: 93
@@ -232,105 +226,100 @@ void decodeNext(Buffer var1, int var2) {
 					var1.readShort(); // L: 105
 					var1.readShort(); // L: 106
 				} else if (var2 == 25) { // L: 108
-					var1.method6946(); // L: 109
+					var1.method7400(); // L: 109
 				} else if (var2 == 28) { // L: 111
 					var1.readUnsignedByte(); // L: 112
 				} else if (var2 == 29) { // L: 114
-					HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field1699, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1694}; // L: 117
-					this.horizontalAlignment = (HorizontalAlignment)UserComparator4.findEnumerated(var3, var1.readUnsignedByte()); // L: 119
-				} else if (var2 == 30) { // L: 121
-					this.verticalAlignment = (VerticalAlignment)UserComparator4.findEnumerated(class150.method2969(), var1.readUnsignedByte()); // L: 122
+					this.horizontalAlignment = (HorizontalAlignment)class130.findEnumerated(class186.method3739(), var1.readUnsignedByte()); // L: 115
+				} else if (var2 == 30) { // L: 117
+					this.verticalAlignment = (VerticalAlignment)class130.findEnumerated(MouseHandler.method651(), var1.readUnsignedByte()); // L: 118
 				}
 			}
 		}
 
-	}
+	} // L: 121
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-23"
+		descriptor = "(I)V",
+		garbageValue = "2062943344"
 	)
-	public void method3008() {
-		if (this.field1632 != null) {
-			for (int var1 = 0; var1 < this.field1632.length; var1 += 2) {
-				if (this.field1632[var1] < this.field1633) { // L: 130
-					this.field1633 = this.field1632[var1];
-				} else if (this.field1632[var1] > this.field1635) { // L: 131
-					this.field1635 = this.field1632[var1];
+	public void method3173() {
+		if (this.field1762 != null) { // L: 124
+			for (int var1 = 0; var1 < this.field1762.length; var1 += 2) { // L: 125
+				if (this.field1762[var1] < this.field1770) { // L: 126
+					this.field1770 = this.field1762[var1];
+				} else if (this.field1762[var1] > this.field1763) { // L: 127
+					this.field1763 = this.field1762[var1];
 				}
 
-				if (this.field1632[var1 + 1] < this.field1634) { // L: 132
-					this.field1634 = this.field1632[var1 + 1];
-				} else if (this.field1632[var1 + 1] > this.field1621) {
-					this.field1621 = this.field1632[var1 + 1]; // L: 133
+				if (this.field1762[var1 + 1] < this.field1764) { // L: 128
+					this.field1764 = this.field1762[var1 + 1];
+				} else if (this.field1762[var1 + 1] > this.field1766) {
+					this.field1766 = this.field1762[var1 + 1]; // L: 129
 				}
 			}
 		}
 
-	} // L: 136
+	} // L: 132
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)Low;",
-		garbageValue = "1908363794"
+		descriptor = "(ZI)Lpl;",
+		garbageValue = "690648807"
 	)
 	@Export("getSpriteBool")
 	public SpritePixels getSpriteBool(boolean var1) {
-		int var2 = this.sprite1; // L: 139
-		return this.getSprite(var2); // L: 140
+		int var2 = this.sprite1; // L: 135
+		return this.getSprite(var2); // L: 136
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(II)Low;",
-		garbageValue = "-834050600"
+		descriptor = "(II)Lpl;",
+		garbageValue = "-89662038"
 	)
 	@Export("getSprite")
 	SpritePixels getSprite(int var1) {
-		if (var1 < 0) { // L: 144
+		if (var1 < 0) { // L: 140
 			return null;
 		} else {
-			SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 145
-			if (var2 != null) { // L: 146
+			SpritePixels var2 = (SpritePixels)PlayerAppearance_cachedModels.get((long)var1); // L: 141
+			if (var2 != null) { // L: 142
 				return var2;
 			} else {
-				var2 = WorldMapSection0.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 147
-				if (var2 != null) { // L: 148
-					WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 149
+				var2 = class6.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 143
+				if (var2 != null) { // L: 144
+					PlayerAppearance_cachedModels.put(var2, (long)var1); // L: 145
 				}
 
-				return var2; // L: 151
+				return var2; // L: 147
 			}
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1251139845"
+		descriptor = "(B)I",
+		garbageValue = "-12"
 	)
 	@Export("getObjectId")
 	public int getObjectId() {
-		return this.objectId; // L: 155
+		return this.objectId; // L: 151
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("hx")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "72"
+		descriptor = "(S)V",
+		garbageValue = "5179"
 	)
-	@Export("isKeyDown")
-	public static final boolean isKeyDown() {
-		synchronized(KeyHandler.KeyHandler_instance) { // L: 124
-			if (KeyHandler.field107 == KeyHandler.field131) { // L: 125
-				return false;
-			} else {
-				class12.field55 = KeyHandler.field124[KeyHandler.field107]; // L: 126
-				class319.field3858 = KeyHandler.field112[KeyHandler.field107]; // L: 127
-				KeyHandler.field107 = KeyHandler.field107 + 1 & 127; // L: 128
-				return true; // L: 129
-			}
-		}
-	}
+	@Export("addCancelMenuEntry")
+	static void addCancelMenuEntry() {
+		UrlRequest.method2489(); // L: 8786
+		Client.menuActions[0] = "Cancel"; // L: 8787
+		Client.menuTargets[0] = ""; // L: 8788
+		Client.menuOpcodes[0] = 1006; // L: 8789
+		Client.menuShiftClick[0] = false; // L: 8790
+		Client.menuOptionsCount = 1; // L: 8791
+	} // L: 8792
 }
diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java
index a691f3b44b..3374827a74 100644
--- a/runescape-client/src/main/java/WorldMapEvent.java
+++ b/runescape-client/src/main/java/WorldMapEvent.java
@@ -3,38 +3,31 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("gw")
+@ObfuscatedName("im")
 @Implements("WorldMapEvent")
 public class WorldMapEvent {
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "[Lbw;"
-	)
-	@Export("World_worlds")
-	static World[] World_worlds;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -370976069
+		intValue = 1564837313
 	)
 	@Export("mapElement")
 	public int mapElement;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lie;"
+		descriptor = "Lju;"
 	)
 	@Export("coord1")
 	public Coord coord1;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lie;"
+		descriptor = "Lju;"
 	)
 	@Export("coord2")
 	public Coord coord2;
 
 	@ObfuscatedSignature(
-		descriptor = "(ILie;Lie;)V"
+		descriptor = "(ILju;Lju;)V"
 	)
 	public WorldMapEvent(int var1, Coord var2, Coord var3) {
 		this.mapElement = var1; // L: 11
@@ -42,142 +35,12 @@ public WorldMapEvent(int var1, Coord var2, Coord var3) {
 		this.coord2 = var3; // L: 13
 	} // L: 14
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "3"
+		descriptor = "(II)I",
+		garbageValue = "438167000"
 	)
-	static int method4105(int var0, Script var1, boolean var2) {
-		boolean var3 = true; // L: 845
-		Widget var4;
-		if (var0 >= 2000) { // L: 847
-			var0 -= 1000; // L: 848
-			var4 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 849
-			var3 = false; // L: 850
-		} else {
-			var4 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 852
-		}
-
-		int var11;
-		if (var0 == ScriptOpcodes.CC_SETOP) { // L: 853
-			var11 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] - 1; // L: 854
-			if (var11 >= 0 && var11 <= 9) { // L: 855
-				var4.setAction(var11, Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]); // L: 859
-				return 1; // L: 860
-			} else {
-				--class295.Interpreter_stringStackSize; // L: 856
-				return 1; // L: 857
-			}
-		} else {
-			int var6;
-			if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 862
-				class14.Interpreter_intStackSize -= 2; // L: 863
-				var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 864
-				var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 865
-				var4.parent = ItemContainer.getWidgetChild(var11, var6); // L: 866
-				return 1; // L: 867
-			} else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 869
-				var4.isScrollBar = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 870
-				return 1; // L: 871
-			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 873
-				var4.dragZoneSize = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 874
-				return 1; // L: 875
-			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 877
-				var4.dragThreshold = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 878
-				return 1; // L: 879
-			} else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 881
-				var4.dataText = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 882
-				return 1; // L: 883
-			} else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 885
-				var4.spellActionName = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 886
-				return 1; // L: 887
-			} else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 889
-				var4.actions = null; // L: 890
-				return 1; // L: 891
-			} else if (var0 == 1308) { // L: 893
-				var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 894
-				return 1; // L: 895
-			} else if (var0 == 1309) { // L: 897
-				--class14.Interpreter_intStackSize; // L: 898
-				return 1; // L: 899
-			} else {
-				int var7;
-				byte[] var8;
-				if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 901
-					byte var5;
-					if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 931
-						class14.Interpreter_intStackSize -= 2; // L: 932
-						var5 = 10; // L: 933
-						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]}; // L: 934
-						byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]}; // L: 935
-						Varps.Widget_setKey(var4, var5, var8, var9); // L: 936
-						return 1; // L: 937
-					} else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 939
-						class14.Interpreter_intStackSize -= 3; // L: 940
-						var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] - 1; // L: 941
-						var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 942
-						var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 943
-						if (var11 >= 0 && var11 <= 9) { // L: 944
-							Interpreter.Widget_setKeyRate(var4, var11, var6, var7); // L: 947
-							return 1; // L: 948
-						} else {
-							throw new RuntimeException(); // L: 945
-						}
-					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 950
-						var5 = 10; // L: 951
-						var6 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 952
-						var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 953
-						Interpreter.Widget_setKeyRate(var4, var5, var6, var7); // L: 954
-						return 1; // L: 955
-					} else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 957
-						--class14.Interpreter_intStackSize; // L: 958
-						var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize] - 1; // L: 959
-						if (var11 >= 0 && var11 <= 9) { // L: 960
-							class1.Widget_setKeyIgnoreHeld(var4, var11); // L: 963
-							return 1; // L: 964
-						} else {
-							throw new RuntimeException(); // L: 961
-						}
-					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 966
-						var5 = 10; // L: 967
-						class1.Widget_setKeyIgnoreHeld(var4, var5); // L: 968
-						return 1; // L: 969
-					} else {
-						return 2; // L: 971
-					}
-				} else {
-					byte[] var10 = null; // L: 902
-					var8 = null; // L: 903
-					if (var3) { // L: 904
-						class14.Interpreter_intStackSize -= 10; // L: 905
-
-						for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class14.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 907 908
-						}
-
-						if (var7 > 0) { // L: 910
-							var10 = new byte[var7 / 2]; // L: 911
-							var8 = new byte[var7 / 2]; // L: 912
-
-							for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 913
-								var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class14.Interpreter_intStackSize]; // L: 914
-								var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class14.Interpreter_intStackSize + 1]; // L: 915
-							}
-						}
-					} else {
-						class14.Interpreter_intStackSize -= 2; // L: 920
-						var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]}; // L: 921
-						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]}; // L: 922
-					}
-
-					var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] - 1; // L: 924
-					if (var7 >= 0 && var7 <= 9) { // L: 925
-						Varps.Widget_setKey(var4, var7, var10, var8); // L: 928
-						return 1; // L: 929
-					} else {
-						throw new RuntimeException(); // L: 926
-					}
-				}
-			}
-		}
+	public static int method4942(int var0) {
+		return class258.field3049[var0]; // L: 38
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java
index c5e230b01b..a07e0c9357 100644
--- a/runescape-client/src/main/java/WorldMapID.java
+++ b/runescape-client/src/main/java/WorldMapID.java
@@ -3,39 +3,170 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("gz")
+@ObfuscatedName("hk")
 @Implements("WorldMapID")
 public class WorldMapID {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lgz;"
+		descriptor = "Lhk;"
 	)
-	static final WorldMapID field2186;
-	@ObfuscatedName("w")
+	static final WorldMapID field2739;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lgz;"
+		descriptor = "Lhk;"
 	)
-	static final WorldMapID field2184;
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "[Lnw;"
-	)
-	@Export("JagexCache_idxFiles")
-	public static BufferedFile[] JagexCache_idxFiles;
-	@ObfuscatedName("s")
+	static final WorldMapID field2741;
+	@ObfuscatedName("hr")
+	@Export("xteaKeys")
+	static int[][] xteaKeys;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 418528697
+		intValue = 2061213835
 	)
 	@Export("value")
 	final int value;
 
 	static {
-		field2186 = new WorldMapID(0); // L: 4
-		field2184 = new WorldMapID(1); // L: 5
+		field2739 = new WorldMapID(0); // L: 4
+		field2741 = new WorldMapID(1); // L: 5
 	}
 
 	WorldMapID(int var1) {
 		this.value = var1; // L: 9
 	} // L: 10
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-3"
+	)
+	static void method4805() {
+		if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 339
+			Login.currentLoginField = 1; // L: 340
+		} else {
+			Login.currentLoginField = 0; // L: 343
+		}
+
+	} // L: 345
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "112852327"
+	)
+	static int method4804(int var0, Script var1, boolean var2) {
+		Widget var3;
+		if (var0 >= 2000) { // L: 1015
+			var0 -= 1000; // L: 1016
+			var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1017
+		} else {
+			var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1019
+		}
+
+		String var4 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 1020
+		int[] var5 = null; // L: 1021
+		if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1022
+			int var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1023
+			if (var6 > 0) { // L: 1024
+				for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]) { // L: 1025 1026
+				}
+			}
+
+			var4 = var4.substring(0, var4.length() - 1); // L: 1028
+		}
+
+		Object[] var8 = new Object[var4.length() + 1]; // L: 1030
+
+		int var7;
+		for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1031
+			if (var4.charAt(var7 - 1) == 's') { // L: 1032
+				var8[var7] = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize];
+			} else {
+				var8[var7] = new Integer(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1033
+			}
+		}
+
+		var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1035
+		if (var7 != -1) { // L: 1036
+			var8[0] = new Integer(var7);
+		} else {
+			var8 = null; // L: 1037
+		}
+
+		if (var0 == ScriptOpcodes.CC_SETONCLICK) {
+			var3.onClick = var8; // L: 1038
+		} else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1039
+			var3.onHold = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1040
+			var3.onRelease = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1041
+			var3.onMouseOver = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1042
+			var3.onMouseLeave = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1043
+			var3.onDrag = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1044
+			var3.onTargetLeave = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1045
+			var3.onVarTransmit = var8; // L: 1046
+			var3.varTransmitTriggers = var5; // L: 1047
+		} else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1049
+			var3.onTimer = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1050
+			var3.onOp = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1051
+			var3.onDragComplete = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1052
+			var3.onClickRepeat = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1053
+			var3.onMouseRepeat = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1054
+			var3.onInvTransmit = var8; // L: 1055
+			var3.invTransmitTriggers = var5; // L: 1056
+		} else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1058
+			var3.onStatTransmit = var8; // L: 1059
+			var3.statTransmitTriggers = var5; // L: 1060
+		} else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1062
+			var3.onTargetEnter = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1063
+			var3.onScroll = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1064
+			var3.onChatTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1065
+			var3.onKey = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1066
+			var3.onFriendTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1067
+			var3.onClanTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1068
+			var3.onMiscTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1069
+			var3.onDialogAbort = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1070
+			var3.onSubChange = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1071
+			var3.onStockTransmit = var8;
+		} else if (var0 == 1426) { // L: 1072
+			var3.field3294 = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1073
+			var3.onResize = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1074
+			var3.field3217 = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1075
+			var3.field3340 = var8;
+		} else if (var0 == 1430) {
+			var3.field3335 = var8; // L: 1076
+		} else {
+			if (var0 != 1431) { // L: 1077
+				return 2; // L: 1078
+			}
+
+			var3.field3336 = var8;
+		}
+
+		var3.hasListener = true; // L: 1079
+		return 1; // L: 1080
+	}
 }
diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java
index 97c949a7f9..72d273c5b4 100644
--- a/runescape-client/src/main/java/WorldMapIcon_0.java
+++ b/runescape-client/src/main/java/WorldMapIcon_0.java
@@ -4,145 +4,100 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gh")
+@ObfuscatedName("hf")
 @Implements("WorldMapIcon_0")
 public class WorldMapIcon_0 extends AbstractWorldMapIcon {
-	@ObfuscatedName("fa")
-	@Export("worldHost")
-	static String worldHost;
-	@ObfuscatedName("hd")
-	@ObfuscatedSignature(
-		descriptor = "[Low;"
-	)
-	@Export("mapMarkerSprites")
-	static SpritePixels[] mapMarkerSprites;
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1687504305
+		intValue = -198838733
 	)
 	@Export("element")
 	final int element;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lga;"
+		descriptor = "Lhm;"
 	)
 	@Export("label")
 	final WorldMapLabel label;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -515906735
+		intValue = 1320837941
 	)
 	@Export("subWidth")
 	final int subWidth;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 724406877
+		intValue = 1830230057
 	)
 	@Export("subHeight")
 	final int subHeight;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lie;Lie;ILga;)V"
+		descriptor = "(Lju;Lju;ILhm;)V"
 	)
 	WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) {
 		super(var1, var2); // L: 14
 		this.element = var3; // L: 15
 		this.label = var4; // L: 16
-		WorldMapElement var5 = ItemComposition.WorldMapElement_get(this.getElement()); // L: 17
+		WorldMapElement var5 = class78.WorldMapElement_get(this.getElement()); // L: 17
 		SpritePixels var6 = var5.getSpriteBool(false); // L: 18
 		if (var6 != null) { // L: 19
 			this.subWidth = var6.subWidth; // L: 20
 			this.subHeight = var6.subHeight; // L: 21
 		} else {
-			this.subWidth = 0;
-			this.subHeight = 0;
+			this.subWidth = 0; // L: 24
+			this.subHeight = 0; // L: 25
 		}
 
-	}
+	} // L: 27
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1660589105"
+		garbageValue = "-1255702565"
 	)
 	@Export("getElement")
 	public int getElement() {
-		return this.element; // L: 30
+		return this.element; // L: 31
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lga;",
-		garbageValue = "0"
+		descriptor = "(I)Lhm;",
+		garbageValue = "-577826789"
 	)
 	@Export("getLabel")
 	WorldMapLabel getLabel() {
-		return this.label; // L: 34
+		return this.label; // L: 36
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "374350712"
+		descriptor = "(S)I",
+		garbageValue = "-21504"
 	)
 	@Export("getSubWidth")
 	int getSubWidth() {
-		return this.subWidth; // L: 38
+		return this.subWidth; // L: 41
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1569056170"
+		garbageValue = "1225820190"
 	)
 	@Export("getSubHeight")
 	int getSubHeight() {
-		return this.subHeight; // L: 42
+		return this.subHeight; // L: 46
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(II)Ljk;",
-		garbageValue = "1771772075"
+		descriptor = "(CB)Z",
+		garbageValue = "94"
 	)
-	public static GameBuild method3890(int var0) {
-		GameBuild[] var1 = class245.method4742(); // L: 23
-
-		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 24
-			GameBuild var3 = var1[var2]; // L: 25
-			if (var0 == var3.buildId) { // L: 27
-				return var3;
-			}
-		}
-
-		return null; // L: 31
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-2005741653"
-	)
-	static final int method3885(int var0, int var1) {
-		if (var0 == -2) { // L: 579
-			return 12345678;
-		} else if (var0 == -1) { // L: 580
-			if (var1 < 2) {
-				var1 = 2; // L: 581
-			} else if (var1 > 126) { // L: 582
-				var1 = 126;
-			}
-
-			return var1; // L: 583
-		} else {
-			var1 = (var0 & 127) * var1 / 128; // L: 585
-			if (var1 < 2) { // L: 586
-				var1 = 2;
-			} else if (var1 > 126) { // L: 587
-				var1 = 126;
-			}
-
-			return (var0 & 65408) + var1; // L: 588
-		}
+	@Export("isAlphaNumeric")
+	public static boolean isAlphaNumeric(char var0) {
+		return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 152
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java
index 2391006f27..fccbba5f62 100644
--- a/runescape-client/src/main/java/WorldMapIcon_1.java
+++ b/runescape-client/src/main/java/WorldMapIcon_1.java
@@ -4,48 +4,48 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fr")
+@ObfuscatedName("ho")
 @Implements("WorldMapIcon_1")
 public class WorldMapIcon_1 extends AbstractWorldMapIcon {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -887698533
+		intValue = 1692545293
 	)
 	@Export("objectDefId")
 	final int objectDefId;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lfk;"
+		descriptor = "Lhw;"
 	)
 	@Export("region")
 	final WorldMapRegion region;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1970765317
+		intValue = 1380082375
 	)
 	@Export("element")
 	int element;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lga;"
+		descriptor = "Lhm;"
 	)
 	@Export("label")
 	WorldMapLabel label;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -609134761
+		intValue = -1584169743
 	)
 	@Export("subWidth")
 	int subWidth;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1799535623
+		intValue = -853528965
 	)
 	@Export("subHeight")
 	int subHeight;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lie;Lie;ILfk;)V"
+		descriptor = "(Lju;Lju;ILhw;)V"
 	)
 	WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) {
 		super(var1, var2); // L: 17
@@ -54,16 +54,16 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon {
 		this.init(); // L: 20
 	} // L: 21
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1060359040"
+		garbageValue = "1162816642"
 	)
 	@Export("init")
 	void init() {
-		this.element = KitDefinition.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24
-		this.label = this.region.createMapLabel(ItemComposition.WorldMapElement_get(this.element)); // L: 25
-		WorldMapElement var1 = ItemComposition.WorldMapElement_get(this.getElement()); // L: 26
+		this.element = class148.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24
+		this.label = this.region.createMapLabel(class78.WorldMapElement_get(this.element)); // L: 25
+		WorldMapElement var1 = class78.WorldMapElement_get(this.getElement()); // L: 26
 		SpritePixels var2 = var1.getSpriteBool(false); // L: 27
 		if (var2 != null) { // L: 28
 			this.subWidth = var2.subWidth; // L: 29
@@ -75,43 +75,64 @@ void init() {
 
 	} // L: 36
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1660589105"
+		garbageValue = "-1255702565"
 	)
 	@Export("getElement")
 	public int getElement() {
-		return this.element; // L: 39
+		return this.element; // L: 40
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lga;",
-		garbageValue = "0"
+		descriptor = "(I)Lhm;",
+		garbageValue = "-577826789"
 	)
 	@Export("getLabel")
 	WorldMapLabel getLabel() {
-		return this.label; // L: 43
+		return this.label; // L: 45
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "374350712"
+		descriptor = "(S)I",
+		garbageValue = "-21504"
 	)
 	@Export("getSubWidth")
 	int getSubWidth() {
-		return this.subWidth; // L: 47
+		return this.subWidth; // L: 50
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1569056170"
+		garbageValue = "1225820190"
 	)
 	@Export("getSubHeight")
 	int getSubHeight() {
-		return this.subHeight; // L: 51
+		return this.subHeight; // L: 55
 	}
+
+	@ObfuscatedName("iy")
+	@ObfuscatedSignature(
+		descriptor = "(Lbb;III)V",
+		garbageValue = "-77644822"
+	)
+	static final void method4385(MenuAction var0, int var1, int var2) {
+		Decimator.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); // L: 9015
+	} // L: 9016
+
+	@ObfuscatedName("lq")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1016164207"
+	)
+	@Export("Clan_leaveChat")
+	static final void Clan_leaveChat() {
+		PacketBufferNode var0 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2857, Client.packetWriter.isaacCipher); // L: 12504
+		var0.packetBuffer.writeByte(0); // L: 12505
+		Client.packetWriter.addNode(var0); // L: 12506
+	} // L: 12507
 }
diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java
index 2d00810257..998810508c 100644
--- a/runescape-client/src/main/java/WorldMapLabel.java
+++ b/runescape-client/src/main/java/WorldMapLabel.java
@@ -4,33 +4,39 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ga")
+@ObfuscatedName("hm")
 @Implements("WorldMapLabel")
 public class WorldMapLabel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lpi;"
+	)
+	@Export("NetCache_reference")
+	static Buffer NetCache_reference;
+	@ObfuscatedName("c")
 	@Export("text")
 	String text;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1596677031
+		intValue = -353724483
 	)
 	@Export("width")
 	int width;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 136381791
+		intValue = 1345453381
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lfo;"
+		descriptor = "Lhh;"
 	)
 	@Export("size")
 	WorldMapLabelSize size;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;IILfo;)V"
+		descriptor = "(Ljava/lang/String;IILhh;)V"
 	)
 	WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) {
 		this.text = var1; // L: 10
@@ -38,71 +44,4 @@ public class WorldMapLabel {
 		this.height = var3; // L: 12
 		this.size = var4; // L: 13
 	} // L: 14
-
-	@ObfuscatedName("hg")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1622810143"
-	)
-	static final void method3970() {
-		PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 8002
-		var0.importIndex(); // L: 8003
-		int var1 = var0.readBits(8); // L: 8004
-		int var2;
-		if (var1 < Client.npcCount) { // L: 8005
-			for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 8006
-				Client.field592[++Client.field591 - 1] = Client.npcIndices[var2];
-			}
-		}
-
-		if (var1 > Client.npcCount) { // L: 8008
-			throw new RuntimeException("");
-		} else {
-			Client.npcCount = 0; // L: 8009
-
-			for (var2 = 0; var2 < var1; ++var2) { // L: 8010
-				int var3 = Client.npcIndices[var2]; // L: 8011
-				NPC var4 = Client.npcs[var3]; // L: 8012
-				int var5 = var0.readBits(1); // L: 8013
-				if (var5 == 0) { // L: 8014
-					Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8015
-					var4.npcCycle = Client.cycle; // L: 8016
-				} else {
-					int var6 = var0.readBits(2); // L: 8019
-					if (var6 == 0) { // L: 8020
-						Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8021
-						var4.npcCycle = Client.cycle; // L: 8022
-						Client.field513[++Client.field512 - 1] = var3; // L: 8023
-					} else {
-						int var7;
-						int var8;
-						if (var6 == 1) { // L: 8026
-							Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8027
-							var4.npcCycle = Client.cycle; // L: 8028
-							var7 = var0.readBits(3); // L: 8029
-							var4.method2258(var7, (byte)1); // L: 8030
-							var8 = var0.readBits(1); // L: 8031
-							if (var8 == 1) { // L: 8032
-								Client.field513[++Client.field512 - 1] = var3;
-							}
-						} else if (var6 == 2) { // L: 8035
-							Client.npcIndices[++Client.npcCount - 1] = var3; // L: 8036
-							var4.npcCycle = Client.cycle; // L: 8037
-							var7 = var0.readBits(3); // L: 8038
-							var4.method2258(var7, (byte)2); // L: 8039
-							var8 = var0.readBits(3); // L: 8040
-							var4.method2258(var8, (byte)2); // L: 8041
-							int var9 = var0.readBits(1); // L: 8042
-							if (var9 == 1) {
-								Client.field513[++Client.field512 - 1] = var3; // L: 8043
-							}
-						} else if (var6 == 3) { // L: 8046
-							Client.field592[++Client.field591 - 1] = var3; // L: 8047
-						}
-					}
-				}
-			}
-
-		}
-	} // L: 8051
 }
diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java
index 675f329e6b..ce456d7380 100644
--- a/runescape-client/src/main/java/WorldMapLabelSize.java
+++ b/runescape-client/src/main/java/WorldMapLabelSize.java
@@ -3,45 +3,51 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("fo")
+@ObfuscatedName("hh")
 @Implements("WorldMapLabelSize")
 public class WorldMapLabelSize {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lfo;"
+		descriptor = "Lhh;"
 	)
 	@Export("WorldMapLabelSize_small")
 	public static final WorldMapLabelSize WorldMapLabelSize_small;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lfo;"
+		descriptor = "Lhh;"
 	)
 	@Export("WorldMapLabelSize_medium")
 	public static final WorldMapLabelSize WorldMapLabelSize_medium;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lfo;"
+		descriptor = "Lhh;"
 	)
 	@Export("WorldMapLabelSize_large")
 	public static final WorldMapLabelSize WorldMapLabelSize_large;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
+	static byte[][][] field2580;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = -1838818577
+	)
+	@Export("ItemDefinition_fileCount")
+	public static int ItemDefinition_fileCount;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -55906983
+		intValue = -606313299
 	)
-	final int field2014;
-	@ObfuscatedName("o")
+	final int field2583;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1208925503
+		intValue = -330742685
 	)
-	final int field2011;
-	@ObfuscatedName("g")
+	final int field2578;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1826409873
+		intValue = -586299201
 	)
-	final int field2016;
+	final int field2579;
 
 	static {
 		WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); // L: 7
@@ -50,393 +56,146 @@ public class WorldMapLabelSize {
 	}
 
 	WorldMapLabelSize(int var1, int var2, int var3) {
-		this.field2014 = var1; // L: 15
-		this.field2011 = var2; // L: 16
-		this.field2016 = var3; // L: 17
-	} // L: 18
+		this.field2583 = var1; // L: 19
+		this.field2578 = var2; // L: 20
+		this.field2579 = var3; // L: 21
+	} // L: 22
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(FI)Z",
-		garbageValue = "-2129729185"
+		garbageValue = "714158034"
 	)
-	boolean method3533(float var1) {
-		return var1 >= (float)this.field2016; // L: 21
+	boolean method4370(float var1) {
+		return var1 >= (float)this.field2579; // L: 25
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lfo;",
-		garbageValue = "-2058322957"
+		descriptor = "(I)[Lhh;",
+		garbageValue = "1279044140"
 	)
-	static WorldMapLabelSize method3538(int var0) {
-		WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; // L: 28
-		WorldMapLabelSize[] var2 = var1; // L: 30
-
-		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31
-			WorldMapLabelSize var4 = var2[var3]; // L: 32
-			if (var0 == var4.field2011) { // L: 34
-				return var4; // L: 35
-			}
-		}
-
-		return null; // L: 40
+	static WorldMapLabelSize[] method4357() {
+		return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; // L: 15
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)Ljava/lang/Class;",
-		garbageValue = "0"
+		descriptor = "(II)Lfi;",
+		garbageValue = "-661734359"
 	)
-	@Export("loadClassFromDescriptor")
-	static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
-		if (var0.equals("B")) { // L: 216
-			return Byte.TYPE;
-		} else if (var0.equals("I")) { // L: 217
-			return Integer.TYPE;
-		} else if (var0.equals("S")) { // L: 218
-			return Short.TYPE;
-		} else if (var0.equals("J")) { // L: 219
-			return Long.TYPE;
-		} else if (var0.equals("Z")) { // L: 220
-			return Boolean.TYPE;
-		} else if (var0.equals("F")) { // L: 221
-			return Float.TYPE;
-		} else if (var0.equals("D")) { // L: 222
-			return Double.TYPE;
-		} else if (var0.equals("C")) { // L: 223
-			return Character.TYPE;
+	@Export("getNpcDefinition")
+	public static NPCComposition getNpcDefinition(int var0) {
+		NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62
+		if (var1 != null) { // L: 63
+			return var1;
 		} else {
-			return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 224 225
-		}
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-2112381958"
-	)
-	static int method3540(int var0, Script var1, boolean var2) {
-		int var4;
-		int var9;
-		if (var0 == ScriptOpcodes.CC_CREATE) { // L: 483
-			class14.Interpreter_intStackSize -= 3; // L: 484
-			var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 485
-			var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 486
-			int var11 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 487
-			if (var4 == 0) { // L: 488
-				throw new RuntimeException(); // L: 489
-			} else {
-				Widget var6 = UserComparator9.getWidget(var9); // L: 491
-				if (var6.children == null) { // L: 492
-					var6.children = new Widget[var11 + 1];
-				}
-
-				if (var6.children.length <= var11) { // L: 493
-					Widget[] var7 = new Widget[var11 + 1]; // L: 494
-
-					for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 495
-						var7[var8] = var6.children[var8];
-					}
-
-					var6.children = var7; // L: 496
-				}
-
-				if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 498
-					throw new RuntimeException("" + (var11 - 1));
-				} else {
-					Widget var12 = new Widget(); // L: 499
-					var12.type = var4; // L: 500
-					var12.parentId = var12.id = var6.id; // L: 501
-					var12.childIndex = var11; // L: 502
-					var12.isIf3 = true; // L: 503
-					var6.children[var11] = var12; // L: 504
-					if (var2) { // L: 505
-						class120.scriptDotWidget = var12;
-					} else {
-						Frames.scriptActiveWidget = var12; // L: 506
-					}
-
-					class184.invalidateWidget(var6); // L: 507
-					return 1; // L: 508
-				}
+			byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 64
+			var1 = new NPCComposition(); // L: 65
+			var1.id = var0; // L: 66
+			if (var2 != null) { // L: 67
+				var1.decode(new Buffer(var2));
 			}
-		} else {
-			Widget var3;
-			if (var0 == ScriptOpcodes.CC_DELETE) { // L: 510
-				var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 511
-				Widget var10 = UserComparator9.getWidget(var3.id); // L: 512
-				var10.children[var3.childIndex] = null; // L: 513
-				class184.invalidateWidget(var10); // L: 514
-				return 1; // L: 515
-			} else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 517
-				var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 518
-				var3.children = null; // L: 519
-				class184.invalidateWidget(var3); // L: 520
-				return 1; // L: 521
-			} else if (var0 == 103) { // L: 523
-				class14.Interpreter_intStackSize -= 3; // L: 524
-				return 1; // L: 525
-			} else if (var0 == 104) { // L: 527
-				--class14.Interpreter_intStackSize; // L: 528
-				return 1; // L: 529
-			} else if (var0 != ScriptOpcodes.CC_FIND) { // L: 531
-				if (var0 == ScriptOpcodes.IF_FIND) { // L: 544
-					var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 545
-					if (var3 != null) { // L: 546
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 547
-						if (var2) { // L: 548
-							class120.scriptDotWidget = var3;
-						} else {
-							Frames.scriptActiveWidget = var3; // L: 549
-						}
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 551
-					}
-
-					return 1; // L: 552
-				} else if (var0 == 202) { // L: 554
-					Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] = 0; // L: 555
-					return 1; // L: 556
-				} else if (var0 == 203) { // L: 558
-					Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize + 1] = 0; // L: 559
-					return 1; // L: 560
-				} else {
-					return 2; // L: 562
-				}
-			} else {
-				class14.Interpreter_intStackSize -= 2; // L: 532
-				var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 533
-				var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 534
-				Widget var5 = ItemContainer.getWidgetChild(var9, var4); // L: 535
-				if (var5 != null && var4 != -1) { // L: 536
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 537
-					if (var2) { // L: 538
-						class120.scriptDotWidget = var5;
-					} else {
-						Frames.scriptActiveWidget = var5; // L: 539
-					}
-				} else {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 541
-				}
 
-				return 1; // L: 542
-			}
+			var1.postDecode(); // L: 68
+			NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69
+			return var1; // L: 70
 		}
 	}
 
-	@ObfuscatedName("hr")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIIII)V",
-		garbageValue = "1223728297"
+		descriptor = "(II)Lhh;",
+		garbageValue = "-1103968142"
 	)
-	@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: 7473
+	static WorldMapLabelSize method4362(int var0) {
+		WorldMapLabelSize[] var1 = method4357(); // L: 30
 
-		for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7474 7475 7480
-			if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7476
-				var9 = var10; // L: 7477
-				break;
+		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31
+			WorldMapLabelSize var3 = var1[var2]; // L: 32
+			if (var0 == var3.field2578) { // L: 34
+				return var3; // L: 35
 			}
 		}
 
-		if (var9 == null) { // L: 7482
-			var9 = new PendingSpawn(); // L: 7483
-			var9.plane = var0; // L: 7484
-			var9.type = var3; // L: 7485
-			var9.x = var1; // L: 7486
-			var9.y = var2; // L: 7487
-			class14.method180(var9); // L: 7488
-			Client.pendingSpawns.addFirst(var9); // L: 7489
-		}
-
-		var9.id = var4; // L: 7491
-		var9.field1082 = var5; // L: 7492
-		var9.orientation = var6; // L: 7493
-		var9.delay = var7; // L: 7494
-		var9.hitpoints = var8; // L: 7495
-	} // L: 7496
+		return null; // L: 40
+	}
 
-	@ObfuscatedName("it")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "([Ljf;IIIZB)V",
-		garbageValue = "124"
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "0"
 	)
-	@Export("resizeInterface")
-	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
-		for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10244
-			Widget var6 = var0[var5]; // L: 10245
-			if (var6 != null && var6.parentId == var1) { // L: 10246 10247
-				WorldMapScaleHandler.alignWidgetSize(var6, var2, var3, var4); // L: 10248
-				LoginPacket.alignWidgetPosition(var6, var2, var3); // L: 10249
-				if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10250
-					var6.scrollX = var6.scrollWidth - var6.width;
-				}
-
-				if (var6.scrollX < 0) { // L: 10251
-					var6.scrollX = 0;
-				}
-
-				if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10252
-					var6.scrollY = var6.scrollHeight - var6.height;
-				}
-
-				if (var6.scrollY < 0) { // L: 10253
-					var6.scrollY = 0;
-				}
-
-				if (var6.type == 0) { // L: 10254
-					MouseRecorder.revalidateWidgetScroll(var0, var6, var4);
-				}
+	static int method4359(int var0, Script var1, boolean var2) {
+		if (var0 == 7100) { // L: 4382
+			++IsaacCipher.Interpreter_intStackSize; // L: 4383
+			return 1; // L: 4384
+		} else if (var0 == 7101) { // L: 4386
+			class13.Interpreter_stringStackSize += 2; // L: 4387
+			return 1; // L: 4388
+		} else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4390
+			if (var0 == 7106) { // L: 4394
+				++IsaacCipher.Interpreter_intStackSize; // L: 4395
+				return 1; // L: 4396
+			} else if (var0 == 7107) { // L: 4398
+				++IsaacCipher.Interpreter_intStackSize; // L: 4399
+				return 1; // L: 4400
+			} else if (var0 == 7108) { // L: 4402
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class14.method204() ? 1 : 0; // L: 4403
+				return 1; // L: 4404
+			} else if (var0 == 7110) { // L: 4406
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4407
+				return 1; // L: 4408
+			} else if (var0 == 7120) { // L: 4410
+				--IsaacCipher.Interpreter_intStackSize; // L: 4411
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4412
+				return 1; // L: 4413
+			} else if (var0 == 7121) { // L: 4415
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 4416
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4417
+				return 1; // L: 4418
+			} else if (var0 == 7122) { // L: 4420
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 4421
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 4422
+				return 1; // L: 4423
+			} else {
+				return 2; // L: 4425
 			}
+		} else {
+			++IsaacCipher.Interpreter_intStackSize; // L: 4391
+			return 1; // L: 4392
 		}
-
-	} // L: 10256
-
-	@ObfuscatedName("jw")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Ljava/lang/String;",
-		garbageValue = "28"
-	)
-	static final String method3534(int var0) {
-		return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10344 10345
 	}
 
-	@ObfuscatedName("ko")
+	@ObfuscatedName("gq")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "98"
+		descriptor = "(I)V",
+		garbageValue = "1715943871"
 	)
-	@Export("changeGameOptions")
-	static final void changeGameOptions(int var0) {
-		ItemComposition.method3406(); // L: 11415
-		FriendLoginUpdate.method6058(); // L: 11416
-		int var1 = ArchiveLoader.VarpDefinition_get(var0).type; // L: 11417
-		if (var1 != 0) { // L: 11418
-			int var2 = Varps.Varps_main[var0]; // L: 11419
-			if (var1 == 1) { // L: 11420
-				if (var2 == 1) { // L: 11421
-					class354.method6396(0.9D);
-				}
-
-				if (var2 == 2) { // L: 11422
-					class354.method6396(0.8D);
-				}
-
-				if (var2 == 3) { // L: 11423
-					class354.method6396(0.7D);
-				}
-
-				if (var2 == 4) { // L: 11424
-					class354.method6396(0.6D);
-				}
-			}
-
-			if (var1 == 3) { // L: 11426
-				if (var2 == 0) { // L: 11427
-					class14.method178(255);
-				}
-
-				if (var2 == 1) { // L: 11428
-					class14.method178(192);
-				}
-
-				if (var2 == 2) { // L: 11429
-					class14.method178(128);
-				}
-
-				if (var2 == 3) { // L: 11430
-					class14.method178(64);
-				}
-
-				if (var2 == 4) { // L: 11431
-					class14.method178(0);
-				}
-			}
-
-			if (var1 == 4) { // L: 11433
-				if (var2 == 0) { // L: 11434
-					WorldMapSection1.updateSoundEffectVolume(127);
-				}
-
-				if (var2 == 1) { // L: 11435
-					WorldMapSection1.updateSoundEffectVolume(96);
-				}
-
-				if (var2 == 2) { // L: 11436
-					WorldMapSection1.updateSoundEffectVolume(64);
-				}
-
-				if (var2 == 3) { // L: 11437
-					WorldMapSection1.updateSoundEffectVolume(32);
-				}
-
-				if (var2 == 4) { // L: 11438
-					WorldMapSection1.updateSoundEffectVolume(0);
-				}
-			}
-
-			if (var1 == 5) { // L: 11440
-				Client.leftClickOpensMenu = var2;
-			}
-
-			if (var1 == 6) { // L: 11441
-				Client.chatEffects = var2;
-			}
-
-			if (var1 == 9) {
-				Client.field656 = var2; // L: 11442
-			}
-
-			if (var1 == 10) { // L: 11443
-				if (var2 == 0) { // L: 11444
-					ClanChannel.method2825(127);
-				}
-
-				if (var2 == 1) { // L: 11445
-					ClanChannel.method2825(96);
-				}
-
-				if (var2 == 2) { // L: 11446
-					ClanChannel.method2825(64);
-				}
-
-				if (var2 == 3) { // L: 11447
-					ClanChannel.method2825(32);
-				}
-
-				if (var2 == 4) { // L: 11448
-					ClanChannel.method2825(0);
-				}
-			}
-
-			if (var1 == 17) { // L: 11450
-				Client.followerIndex = var2 & 65535; // L: 11451
-			}
+	static void method4358() {
+		if (Varcs.worldMap != null) { // L: 4939
+			Varcs.worldMap.method6870(class20.Client_plane, (class340.localPlayer.x >> 7) + class131.baseX, (class340.localPlayer.y >> 7) + TileItem.baseY, false); // L: 4940
+			Varcs.worldMap.loadCache(); // L: 4941
+		}
 
-			if (var1 == 18) { // L: 11453
-				Client.playerAttackOption = (AttackOption)UserComparator4.findEnumerated(Login.method1950(), var2); // L: 11454
-				if (Client.playerAttackOption == null) { // L: 11455
-					Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
-				}
-			}
+	} // L: 4943
 
-			if (var1 == 19) { // L: 11457
-				if (var2 == -1) { // L: 11458
-					Client.combatTargetPlayerIndex = -1;
-				} else {
-					Client.combatTargetPlayerIndex = var2 & 2047; // L: 11459
-				}
-			}
+	@ObfuscatedName("ln")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-62"
+	)
+	static void method4373() {
+		if (Messages.field1273 != null) { // L: 12712
+			Client.field559 = Client.cycle; // L: 12713
+			Messages.field1273.method5795(); // L: 12714
 
-			if (var1 == 22) { // L: 11461
-				Client.npcAttackOption = (AttackOption)UserComparator4.findEnumerated(Login.method1950(), var2); // L: 11462
-				if (Client.npcAttackOption == null) { // L: 11463
-					Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+			for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12715
+				if (Client.players[var0] != null) { // L: 12716
+					Messages.field1273.method5806((Client.players[var0].x >> 7) + class131.baseX, (Client.players[var0].y >> 7) + TileItem.baseY); // L: 12717
 				}
 			}
-
 		}
-	} // L: 11465
+
+	} // L: 12721
 }
diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java
index 667257781b..18fe033a21 100644
--- a/runescape-client/src/main/java/WorldMapManager.java
+++ b/runescape-client/src/main/java/WorldMapManager.java
@@ -1,106 +1,101 @@
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-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("gv")
+@ObfuscatedName("he")
 @Implements("WorldMapManager")
 public final class WorldMapManager {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("loaded")
 	boolean loaded;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("loadStarted")
 	boolean loadStarted;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lgj;"
+		descriptor = "Lip;"
 	)
 	@Export("mapAreaData")
 	WorldMapAreaData mapAreaData;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Lpl;"
 	)
 	@Export("compositeTextureSprite")
 	SpritePixels compositeTextureSprite;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@Export("icons")
 	HashMap icons;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "[[Lfk;"
+		descriptor = "[[Lhw;"
 	)
 	@Export("regions")
 	WorldMapRegion[][] regions;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@Export("scaleHandlers")
 	HashMap scaleHandlers;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "[Loe;"
+		descriptor = "[Lpa;"
 	)
 	@Export("mapSceneSprites")
 	IndexedSprite[] mapSceneSprites;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("geographyArchive")
 	final AbstractArchive geographyArchive;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lku;"
 	)
 	@Export("groundArchive")
 	final AbstractArchive groundArchive;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("fonts")
 	final HashMap fonts;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1580083231
+		intValue = 656497005
 	)
 	@Export("tileX")
 	int tileX;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1005750841
+		intValue = 742928347
 	)
 	@Export("tileY")
 	int tileY;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1027044671
+		intValue = 513652849
 	)
 	@Export("tileWidth")
 	int tileWidth;
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 730187433
+		intValue = -952993593
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1922156865
+		intValue = 177187637
 	)
 	@Export("pixelsPerTile")
 	public int pixelsPerTile;
 
 	@ObfuscatedSignature(
-		descriptor = "([Loe;Ljava/util/HashMap;Lko;Lko;)V"
+		descriptor = "([Lpa;Ljava/util/HashMap;Lku;Lku;)V"
 	)
 	public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) {
 		this.loaded = false; // L: 16
@@ -113,10 +108,10 @@ public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3,
 		this.groundArchive = var4; // L: 37
 	} // L: 38
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;Ljava/lang/String;ZI)V",
-		garbageValue = "-535432557"
+		descriptor = "(Lku;Ljava/lang/String;ZI)V",
+		garbageValue = "-1533871384"
 	)
 	@Export("load")
 	public void load(AbstractArchive var1, String var2, boolean var3) {
@@ -124,17 +119,17 @@ public void load(AbstractArchive var1, String var2, boolean var3) {
 			this.loaded = false; // L: 44
 			this.loadStarted = true; // L: 45
 			System.nanoTime(); // L: 46
-			int var4 = var1.getGroupId(WorldMapCacheName.field2210.name); // L: 47
+			int var4 = var1.getGroupId(WorldMapCacheName.field2768.name); // L: 47
 			int var5 = var1.getFileId(var4, var2); // L: 48
-			Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2210.name, var2)); // L: 49
-			Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2211.name, var2)); // L: 50
+			Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2768.name, var2)); // L: 49
+			Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2763.name, var2)); // L: 50
 			System.nanoTime(); // L: 51
 			System.nanoTime(); // L: 52
 			this.mapAreaData = new WorldMapAreaData(); // L: 53
 
 			try {
 				this.mapAreaData.init(var6, var7, var5, var3); // L: 55
-			} catch (IllegalStateException var23) { // L: 57
+			} catch (IllegalStateException var19) { // L: 57
 				return; // L: 58
 			}
 
@@ -145,428 +140,324 @@ public void load(AbstractArchive var1, String var2, boolean var3) {
 			this.tileY = this.mapAreaData.getRegionLowY() * 64; // L: 64
 			this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; // L: 65
 			this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; // L: 66
-			int var17 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; // L: 67
+			int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; // L: 67
 			int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; // L: 68
 			System.nanoTime(); // L: 69
 			System.nanoTime(); // L: 70
-			InvDefinition.method2983(); // L: 71
-			this.regions = new WorldMapRegion[var17][var9]; // L: 72
+			class127.method2770(); // L: 71
+			this.regions = new WorldMapRegion[var16][var9]; // L: 72
 			Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73
 
-			int var13;
-			int var14;
 			while (var10.hasNext()) {
 				WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 74
 				int var12 = var11.regionX; // L: 76
-				var13 = var11.regionY; // L: 77
-				var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 78
+				int var13 = var11.regionY; // L: 77
+				int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 78
 				int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 79
 				this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 80
 				this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 81
 			}
 
-			for (int var18 = 0; var18 < var17; ++var18) { // L: 84
-				for (int var19 = 0; var19 < var9; ++var19) { // L: 85
-					if (this.regions[var18][var19] == null) { // L: 86
-						this.regions[var18][var19] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var18, this.mapAreaData.getRegionLowY() + var19, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 87
-						this.regions[var18][var19].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 88
+			for (int var17 = 0; var17 < var16; ++var17) { // L: 84
+				for (int var18 = 0; var18 < var9; ++var18) { // L: 85
+					if (this.regions[var17][var18] == null) { // L: 86
+						this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 87
+						this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 88
 					}
 				}
 			}
 
 			System.nanoTime(); // L: 92
 			System.nanoTime(); // L: 93
-			if (var1.isValidFileName(WorldMapCacheName.field2215.name, var2)) { // L: 94
-				byte[] var26 = var1.takeFileByNames(WorldMapCacheName.field2215.name, var2); // L: 95
-				BufferedImage var20 = null; // L: 98
-
-				SpritePixels var27;
-				label48: {
-					try {
-						var20 = ImageIO.read(new ByteArrayInputStream(var26)); // L: 100
-						var13 = var20.getWidth(); // L: 101
-						var14 = var20.getHeight(); // L: 102
-						int[] var21 = new int[var14 * var13]; // L: 103
-						PixelGrabber var16 = new PixelGrabber(var20, 0, 0, var13, var14, var21, 0, var13); // L: 104
-						var16.grabPixels(); // L: 105
-						var27 = new SpritePixels(var21, var13, var14); // L: 106
-						break label48;
-					} catch (IOException var24) { // L: 109
-					} catch (InterruptedException var25) { // L: 110
-					}
-
-					var27 = new SpritePixels(0, 0); // L: 111
-				}
-
-				this.compositeTextureSprite = var27; // L: 113
+			if (var1.isValidFileName(WorldMapCacheName.field2764.name, var2)) { // L: 94
+				byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2764.name, var2); // L: 95
+				this.compositeTextureSprite = MouseRecorder.method2161(var20); // L: 96
 			}
 
-			System.nanoTime(); // L: 115
-			var1.clearGroups(); // L: 116
-			var1.clearFiles(); // L: 117
-			this.loaded = true; // L: 118
+			System.nanoTime(); // L: 98
+			var1.clearGroups(); // L: 99
+			var1.clearFiles(); // L: 100
+			this.loaded = true; // L: 101
 		}
-	} // L: 42 119
+	} // L: 42 102
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "77"
+		descriptor = "(I)V",
+		garbageValue = "1414126757"
 	)
 	@Export("clearIcons")
 	public final void clearIcons() {
-		this.icons = null; // L: 122
-	} // L: 123
+		this.icons = null; // L: 105
+	} // L: 106
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIIIII)V",
-		garbageValue = "634870474"
+		garbageValue = "-29177073"
 	)
 	@Export("drawTiles")
 	public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 126
-		int var10 = Rasterizer2D.Rasterizer2D_width; // L: 127
-		int var11 = Rasterizer2D.Rasterizer2D_height; // L: 128
-		int[] var12 = new int[4]; // L: 129
-		Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 130
-		WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 131
-		float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 132
-		int var15 = (int)Math.ceil((double)var14); // L: 133
-		this.pixelsPerTile = var15; // L: 134
-		if (!this.scaleHandlers.containsKey(var15)) { // L: 135
-			WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 136
-			var16.init(); // L: 137
-			this.scaleHandlers.put(var15, var16); // L: 138
+		int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 109
+		int var10 = Rasterizer2D.Rasterizer2D_width; // L: 110
+		int var11 = Rasterizer2D.Rasterizer2D_height; // L: 111
+		int[] var12 = new int[4]; // L: 112
+		Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 113
+		WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 114
+		float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 115
+		int var15 = (int)Math.ceil((double)var14); // L: 116
+		this.pixelsPerTile = var15; // L: 117
+		if (!this.scaleHandlers.containsKey(var15)) { // L: 118
+			WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 119
+			var16.init(); // L: 120
+			this.scaleHandlers.put(var15, var16); // L: 121
 		}
 
-		int var23 = var13.x + var13.width - 1; // L: 140
-		int var17 = var13.height + var13.y - 1; // L: 141
+		int var23 = var13.width + var13.x - 1; // L: 123
+		int var17 = var13.height + var13.y - 1; // L: 124
 
 		int var18;
 		int var19;
-		for (var18 = var13.x; var18 <= var23; ++var18) { // L: 142
-			for (var19 = var13.y; var19 <= var17; ++var19) { // L: 143
-				this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 144
+		for (var18 = var13.x; var18 <= var23; ++var18) { // L: 125
+			for (var19 = var13.y; var19 <= var17; ++var19) { // L: 126
+				this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 127
 			}
 		}
 
-		Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 147
-		Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 148
-		var18 = (int)(64.0F * var14); // L: 149
-		var19 = this.tileX + var1; // L: 150
-		int var20 = var2 + this.tileY; // L: 151
+		Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 130
+		Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 131
+		var18 = (int)(var14 * 64.0F); // L: 132
+		var19 = this.tileX + var1; // L: 133
+		int var20 = var2 + this.tileY; // L: 134
 
-		for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 152
-			for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 153
-				this.regions[var21][var22].method3685(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 154
+		for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { // L: 135
+			for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { // L: 136
+				this.regions[var21][var22].method4492(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 137
 			}
 		}
 
-	} // L: 157
+	} // L: 140
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V",
-		garbageValue = "0"
+		descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V",
+		garbageValue = "-69482236"
 	)
 	@Export("drawElements")
 	public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) {
-		WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 160
-		float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 161
-		int var16 = (int)(64.0F * var15); // L: 162
-		int var17 = this.tileX + var1; // L: 163
-		int var18 = var2 + this.tileY; // L: 164
+		WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 143
+		float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 144
+		int var16 = (int)(var15 * 64.0F); // L: 145
+		int var17 = this.tileX + var1; // L: 146
+		int var18 = var2 + this.tileY; // L: 147
 
 		int var19;
 		int var20;
-		for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 165
-			for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 166
-				if (var13) { // L: 167
-					this.regions[var19][var20].initWorldMapIcon1s(); // L: 168
+		for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 148
+			for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 149
+				if (var13) { // L: 150
+					this.regions[var19][var20].initWorldMapIcon1s(); // L: 151
 				}
 
-				this.regions[var19][var20].method3681(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 170
+				this.regions[var19][var20].method4588(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 153
 			}
 		}
 
-		if (var10 != null && var11 > 0) { // L: 173
-			for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 174
-				for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 175
-					this.regions[var19][var20].flashElements(var10, var11, var12); // L: 176
+		if (var10 != null && var11 > 0) { // L: 156
+			for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 157
+				for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 158
+					this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159
 				}
 			}
 		}
 
-	} // L: 180
+	} // L: 163
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILjava/util/HashSet;III)V",
-		garbageValue = "1858879901"
+		descriptor = "(IIIILjava/util/HashSet;IIB)V",
+		garbageValue = "-122"
 	)
 	@Export("drawOverview")
 	public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) {
-		if (this.compositeTextureSprite != null) { // L: 183
-			this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 186
-			if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 187
-				if (this.icons == null) { // L: 190
-					this.buildIcons0(); // L: 191
+		if (this.compositeTextureSprite != null) { // L: 166
+			this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 169
+			if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 170
+				if (this.icons == null) { // L: 173
+					this.buildIcons0(); // L: 174
 				}
 
-				Iterator var8 = var5.iterator(); // L: 193
+				Iterator var8 = var5.iterator(); // L: 176
 
 				while (true) {
 					List var10;
 					do {
 						if (!var8.hasNext()) {
-							return; // L: 210
+							return; // L: 193
 						}
 
-						int var9 = (Integer)var8.next(); // L: 194
-						var10 = (List)this.icons.get(var9); // L: 196
-					} while(var10 == null); // L: 197
+						int var9 = (Integer)var8.next(); // L: 177
+						var10 = (List)this.icons.get(var9); // L: 179
+					} while(var10 == null); // L: 180
 
-					Iterator var11 = var10.iterator(); // L: 200
+					Iterator var11 = var10.iterator(); // L: 183
 
 					while (var11.hasNext()) {
-						AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 201
-						int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 203
-						int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 204
-						Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 205
+						AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 184
+						int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 186
+						int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 187
+						Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 188
 					}
 				}
 			}
 		}
-	} // L: 184 188
+	} // L: 167 171
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIIIIIII)Ljava/util/List;",
-		garbageValue = "2076457944"
+		garbageValue = "546478193"
 	)
-	public List method3807(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
-		LinkedList var11 = new LinkedList(); // L: 213
-		if (!this.loaded) { // L: 214
-			return var11; // L: 215
+	public List method4617(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
+		LinkedList var11 = new LinkedList(); // L: 196
+		if (!this.loaded) { // L: 197
+			return var11; // L: 198
 		} else {
-			WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 217
-			float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 218
-			int var14 = (int)(64.0F * var13); // L: 219
-			int var15 = this.tileX + var1; // L: 220
-			int var16 = var2 + this.tileY; // L: 221
-
-			for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { // L: 222
-				for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { // L: 223
-					List var19 = this.regions[var17][var18].method3687(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 224
-					if (!var19.isEmpty()) { // L: 225
-						var11.addAll(var19); // L: 226
+			WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 200
+			float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 201
+			int var14 = (int)(64.0F * var13); // L: 202
+			int var15 = this.tileX + var1; // L: 203
+			int var16 = var2 + this.tileY; // L: 204
+
+			for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 205
+				for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { // L: 206
+					List var19 = this.regions[var17][var18].method4522(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 207
+					if (!var19.isEmpty()) { // L: 208
+						var11.addAll(var19); // L: 209
 					}
 				}
 			}
 
-			return var11; // L: 230
+			return var11; // L: 213
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIB)Lgb;",
-		garbageValue = "47"
+		descriptor = "(IIIII)Lhs;",
+		garbageValue = "2077706460"
 	)
 	@Export("createWorldMapRectangle")
 	WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) {
-		WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 234
-		int var6 = this.tileX + var1; // L: 235
-		int var7 = var2 + this.tileY; // L: 236
-		int var8 = var3 + this.tileX; // L: 237
-		int var9 = var4 + this.tileY; // L: 238
-		int var10 = var6 / 64; // L: 239
-		int var11 = var7 / 64; // L: 240
-		int var12 = var8 / 64; // L: 241
-		int var13 = var9 / 64; // L: 242
-		var5.width = var12 - var10 + 1; // L: 243
-		var5.height = var13 - var11 + 1; // L: 244
-		var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 245
-		var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 246
-		if (var5.x < 0) { // L: 247
-			var5.width += var5.x; // L: 248
-			var5.x = 0; // L: 249
+		WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 217
+		int var6 = this.tileX + var1; // L: 218
+		int var7 = var2 + this.tileY; // L: 219
+		int var8 = var3 + this.tileX; // L: 220
+		int var9 = var4 + this.tileY; // L: 221
+		int var10 = var6 / 64; // L: 222
+		int var11 = var7 / 64; // L: 223
+		int var12 = var8 / 64; // L: 224
+		int var13 = var9 / 64; // L: 225
+		var5.width = var12 - var10 + 1; // L: 226
+		var5.height = var13 - var11 + 1; // L: 227
+		var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 228
+		var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 229
+		if (var5.x < 0) { // L: 230
+			var5.width += var5.x; // L: 231
+			var5.x = 0; // L: 232
 		}
 
-		if (var5.x > this.regions.length - var5.width) { // L: 251
-			var5.width = this.regions.length - var5.x; // L: 252
+		if (var5.x > this.regions.length - var5.width) { // L: 234
+			var5.width = this.regions.length - var5.x; // L: 235
 		}
 
-		if (var5.y < 0) { // L: 254
-			var5.height += var5.y; // L: 255
-			var5.y = 0; // L: 256
+		if (var5.y < 0) { // L: 237
+			var5.height += var5.y; // L: 238
+			var5.y = 0; // L: 239
 		}
 
-		if (var5.y > this.regions[0].length - var5.height) { // L: 258
-			var5.height = this.regions[0].length - var5.y; // L: 259
+		if (var5.y > this.regions[0].length - var5.height) { // L: 241
+			var5.height = this.regions[0].length - var5.y; // L: 242
 		}
 
-		var5.width = Math.min(var5.width, this.regions.length); // L: 261
-		var5.height = Math.min(var5.height, this.regions[0].length); // L: 262
-		return var5; // L: 263
+		var5.width = Math.min(var5.width, this.regions.length); // L: 244
+		var5.height = Math.min(var5.height, this.regions[0].length); // L: 245
+		return var5; // L: 246
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "16711935"
+		descriptor = "(B)Z",
+		garbageValue = "104"
 	)
 	@Export("isLoaded")
 	public boolean isLoaded() {
-		return this.loaded; // L: 267
+		return this.loaded; // L: 250
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(S)Ljava/util/HashMap;",
-		garbageValue = "11419"
+		descriptor = "(I)Ljava/util/HashMap;",
+		garbageValue = "-1251505644"
 	)
 	@Export("buildIcons")
 	public HashMap buildIcons() {
-		this.buildIcons0(); // L: 271
-		return this.icons; // L: 272
+		this.buildIcons0(); // L: 254
+		return this.icons; // L: 255
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "60263929"
+		garbageValue = "-1332406635"
 	)
 	@Export("buildIcons0")
 	void buildIcons0() {
-		if (this.icons == null) { // L: 276
-			this.icons = new HashMap(); // L: 277
+		if (this.icons == null) { // L: 259
+			this.icons = new HashMap(); // L: 260
 		}
 
-		this.icons.clear(); // L: 279
+		this.icons.clear(); // L: 262
 
-		for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 280
-			for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 281
-				List var3 = this.regions[var1][var2].icons(); // L: 282
-				Iterator var4 = var3.iterator(); // L: 283
+		for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 263
+			for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 264
+				List var3 = this.regions[var1][var2].icons(); // L: 265
+				Iterator var4 = var3.iterator(); // L: 266
 
 				while (var4.hasNext()) {
-					AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 284
-					if (var5.hasValidElement()) { // L: 286
-						int var6 = var5.getElement(); // L: 287
-						if (!this.icons.containsKey(var6)) { // L: 288
-							LinkedList var7 = new LinkedList(); // L: 289
-							var7.add(var5); // L: 290
-							this.icons.put(var6, var7); // L: 291
+					AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 267
+					if (var5.hasValidElement()) { // L: 269
+						int var6 = var5.getElement(); // L: 270
+						if (!this.icons.containsKey(var6)) { // L: 271
+							LinkedList var7 = new LinkedList(); // L: 272
+							var7.add(var5); // L: 273
+							this.icons.put(var6, var7); // L: 274
 						} else {
-							List var8 = (List)this.icons.get(var6); // L: 294
-							var8.add(var5); // L: 295
+							List var8 = (List)this.icons.get(var6); // L: 277
+							var8.add(var5); // L: 278
 						}
 					}
 				}
 			}
 		}
 
-	} // L: 301
+	} // L: 284
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(IIB)F",
-		garbageValue = "-7"
+		garbageValue = "-25"
 	)
 	@Export("getPixelsPerTile")
 	float getPixelsPerTile(int var1, int var2) {
-		float var3 = (float)var1 / (float)var2; // L: 304
-		if (var3 > 8.0F) { // L: 305
+		float var3 = (float)var1 / (float)var2; // L: 287
+		if (var3 > 8.0F) { // L: 288
 			return 8.0F;
-		} else if (var3 < 1.0F) { // L: 306
+		} else if (var3 < 1.0F) { // L: 289
 			return 1.0F;
 		} else {
-			int var4 = Math.round(var3); // L: 307
-			return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 308 309
+			int var4 = Math.round(var3); // L: 290
+			return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 291 292
 		}
 	}
-
-	@ObfuscatedName("go")
-	@ObfuscatedSignature(
-		descriptor = "(Lct;I)V",
-		garbageValue = "2038669517"
-	)
-	static final void method3814(Actor var0) {
-		if (var0.field1138 != 0) { // L: 4400
-			if (var0.targetIndex != -1) { // L: 4401
-				Object var1 = null; // L: 4402
-				if (var0.targetIndex < 32768) { // L: 4403
-					var1 = Client.npcs[var0.targetIndex];
-				} else if (var0.targetIndex >= 32768) { // L: 4404
-					var1 = Client.players[var0.targetIndex - 32768];
-				}
-
-				if (var1 != null) { // L: 4405
-					int var2 = var0.x - ((Actor)var1).x; // L: 4406
-					int var3 = var0.y - ((Actor)var1).y; // L: 4407
-					if (var2 != 0 || var3 != 0) { // L: 4408
-						var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047;
-					}
-				} else if (var0.false0) { // L: 4410
-					var0.targetIndex = -1; // L: 4411
-					var0.false0 = false; // L: 4412
-				}
-			}
-
-			if (var0.field1112 != -1 && (var0.pathLength == 0 || var0.field1085 > 0)) { // L: 4415
-				var0.orientation = var0.field1112; // L: 4416
-				var0.field1112 = -1; // L: 4417
-			}
-
-			int var4 = var0.orientation - var0.rotation & 2047; // L: 4419
-			if (var4 == 0 && var0.false0) { // L: 4420
-				var0.targetIndex = -1; // L: 4421
-				var0.false0 = false; // L: 4422
-			}
-
-			if (var4 != 0) { // L: 4424
-				++var0.field1137; // L: 4425
-				boolean var6;
-				if (var4 > 1024) { // L: 4426
-					var0.rotation -= var0.field1127 ? var4 : var0.field1138 * 369982221 * 1275186117; // L: 4427
-					var6 = true; // L: 4428
-					if (var4 < var0.field1138 || var4 > 2048 - var0.field1138) { // L: 4429
-						var0.rotation = var0.orientation; // L: 4430
-						var6 = false; // L: 4431
-					}
-
-					if (!var0.field1127 && var0.movementSequence == var0.idleSequence && (var0.field1137 > 25 || var6)) { // L: 4433
-						if (var0.turnLeftSequence != -1) { // L: 4434
-							var0.movementSequence = var0.turnLeftSequence;
-						} else {
-							var0.movementSequence = var0.walkSequence; // L: 4435
-						}
-					}
-				} else {
-					var0.rotation += var0.field1127 ? var4 : 369982221 * var0.field1138 * 1275186117; // L: 4439
-					var6 = true; // L: 4440
-					if (var4 < var0.field1138 || var4 > 2048 - var0.field1138) { // L: 4441
-						var0.rotation = var0.orientation; // L: 4442
-						var6 = false; // L: 4443
-					}
-
-					if (!var0.field1127 && var0.idleSequence == var0.movementSequence && (var0.field1137 > 25 || var6)) { // L: 4445
-						if (var0.turnRightSequence != -1) { // L: 4446
-							var0.movementSequence = var0.turnRightSequence;
-						} else {
-							var0.movementSequence = var0.walkSequence; // L: 4447
-						}
-					}
-				}
-
-				var0.rotation &= 2047; // L: 4451
-				var0.field1127 = false; // L: 4452
-			} else {
-				var0.field1137 = 0; // L: 4454
-			}
-
-		}
-	} // L: 4455
 }
diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java
index 61d6dfbce2..cb4883bc21 100644
--- a/runescape-client/src/main/java/WorldMapRectangle.java
+++ b/runescape-client/src/main/java/WorldMapRectangle.java
@@ -1,175 +1,288 @@
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Random;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gb")
+@ObfuscatedName("hs")
 @Implements("WorldMapRectangle")
 public final class WorldMapRectangle {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1778592037
+		intValue = -588844259
 	)
 	@Export("width")
 	int width;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1730738719
+		intValue = 671222849
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1307484671
+		intValue = 1126418901
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 2146368743
+		intValue = 1865600049
 	)
 	@Export("y")
 	int y;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lgv;"
+		descriptor = "Lhe;"
 	)
 	final WorldMapManager this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lgv;)V"
+		descriptor = "(Lhe;)V"
 	)
 	WorldMapRectangle(WorldMapManager var1) {
-		this.this$0 = var1; // L: 320
+		this.this$0 = var1; // L: 303
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IILfc;Lfq;I)Z",
-		garbageValue = "-1234525376"
+		descriptor = "(IIIB)I",
+		garbageValue = "18"
 	)
-	public static final boolean method3959(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
-		int var4 = var0; // L: 19
-		int var5 = var1; // L: 20
-		byte var6 = 64; // L: 21
-		byte var7 = 64;
-		int var8 = var0 - var6;
-		int var9 = var1 - var7;
-		class174.directions[var6][var7] = 99;
-		class174.distances[var6][var7] = 0; // L: 26
-		byte var10 = 0;
-		int var11 = 0;
-		class174.bufferX[var10] = var0;
-		byte var10001 = var10;
-		int var18 = var10 + 1;
-		class174.bufferY[var10001] = var1;
-		int[][] var12 = var3.flags; // L: 31
-
-		while (var11 != var18) { // L: 32
-			var4 = class174.bufferX[var11]; // L: 33
-			var5 = class174.bufferY[var11]; // L: 34
-			var11 = var11 + 1 & 4095; // L: 35
-			int var16 = var4 - var8; // L: 36
-			int var17 = var5 - var9; // L: 37
-			int var13 = var4 - var3.xInset; // L: 38
-			int var14 = var5 - var3.yInset; // L: 39
-			if (var2.hasArrived(2, var4, var5, var3)) { // L: 40
-				RouteStrategy.field1979 = var4; // L: 41
-				class67.field845 = var5; // L: 42
-				return true; // L: 43
-			}
+	static int method4794(int var0, int var1, int var2) {
+		if (var2 > 179) { // L: 84
+			var1 /= 2;
+		}
 
-			int var15 = class174.distances[var16][var17] + 1; // L: 45
-			if (var16 > 0 && class174.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 46 47 48 49
-				class174.bufferX[var18] = var4 - 1; // L: 50
-				class174.bufferY[var18] = var5; // L: 51
-				var18 = var18 + 1 & 4095; // L: 52
-				class174.directions[var16 - 1][var17] = 2; // L: 53
-				class174.distances[var16 - 1][var17] = var15; // L: 54
-			}
+		if (var2 > 192) { // L: 85
+			var1 /= 2;
+		}
 
-			if (var16 < 126 && class174.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 56 57 58 59
-				class174.bufferX[var18] = var4 + 1; // L: 60
-				class174.bufferY[var18] = var5; // L: 61
-				var18 = var18 + 1 & 4095; // L: 62
-				class174.directions[var16 + 1][var17] = 8; // L: 63
-				class174.distances[var16 + 1][var17] = var15; // L: 64
-			}
+		if (var2 > 217) { // L: 86
+			var1 /= 2;
+		}
 
-			if (var17 > 0 && class174.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 66 67 68 69
-				class174.bufferX[var18] = var4; // L: 70
-				class174.bufferY[var18] = var5 - 1; // L: 71
-				var18 = var18 + 1 & 4095; // L: 72
-				class174.directions[var16][var17 - 1] = 1; // L: 73
-				class174.distances[var16][var17 - 1] = var15; // L: 74
-			}
+		if (var2 > 243) { // L: 87
+			var1 /= 2;
+		}
 
-			if (var17 < 126 && class174.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 76 77 78 79
-				class174.bufferX[var18] = var4; // L: 80
-				class174.bufferY[var18] = var5 + 1; // L: 81
-				var18 = var18 + 1 & 4095; // L: 82
-				class174.directions[var16][var17 + 1] = 4; // L: 83
-				class174.distances[var16][var17 + 1] = var15; // L: 84
-			}
+		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 88
+		return var3; // L: 89
+	}
 
-			if (var16 > 0 && var17 > 0 && class174.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: 86 87 88 89 90
-				class174.bufferX[var18] = var4 - 1; // L: 91
-				class174.bufferY[var18] = var5 - 1; // L: 92
-				var18 = var18 + 1 & 4095; // L: 93
-				class174.directions[var16 - 1][var17 - 1] = 3; // L: 94
-				class174.distances[var16 - 1][var17 - 1] = var15; // L: 95
-			}
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-105"
+	)
+	static void method4793() {
+		Login.Login_username = Login.Login_username.trim(); // L: 1066
+		if (Login.Login_username.length() == 0) { // L: 1067
+			class19.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 1068
+		} else {
+			long var1;
+			try {
+				URL var3 = new URL(InterfaceParent.method2146("services", false) + "m=accountappeal/login.ws"); // L: 1075
+				URLConnection var4 = var3.openConnection(); // L: 1076
+				var4.setRequestProperty("connection", "close"); // L: 1077
+				var4.setDoInput(true); // L: 1078
+				var4.setDoOutput(true); // L: 1079
+				var4.setConnectTimeout(5000); // L: 1080
+				OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); // L: 1081
+				var5.write("data1=req"); // L: 1082
+				var5.flush(); // L: 1083
+				InputStream var6 = var4.getInputStream(); // L: 1084
+				Buffer var7 = new Buffer(new byte[1000]); // L: 1085
+
+				while (true) {
+					int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); // L: 1087
+					if (var8 == -1) { // L: 1088
+						var7.offset = 0; // L: 1095
+						long var24 = var7.readLong(); // L: 1096
+						var1 = var24; // L: 1097
+						break;
+					}
 
-			if (var16 < 126 && var17 > 0 && class174.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: 97 98 99 100 101
-				class174.bufferX[var18] = var4 + 1; // L: 102
-				class174.bufferY[var18] = var5 - 1; // L: 103
-				var18 = var18 + 1 & 4095; // L: 104
-				class174.directions[var16 + 1][var17 - 1] = 9; // L: 105
-				class174.distances[var16 + 1][var17 - 1] = var15; // L: 106
+					var7.offset += var8; // L: 1089
+					if (var7.offset >= 1000) { // L: 1090
+						var1 = 0L; // L: 1091
+						break;
+					}
+				}
+			} catch (Exception var33) { // L: 1099
+				var1 = 0L; // L: 1100
 			}
 
-			if (var16 > 0 && var17 < 126 && class174.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: 108 109 110 111 112
-				class174.bufferX[var18] = var4 - 1; // L: 113
-				class174.bufferY[var18] = var5 + 1; // L: 114
-				var18 = var18 + 1 & 4095; // L: 115
-				class174.directions[var16 - 1][var17 + 1] = 6; // L: 116
-				class174.distances[var16 - 1][var17 + 1] = var15; // L: 117
+			byte var0;
+			if (var1 == 0L) { // L: 1104
+				var0 = 5;
+			} else {
+				String var34 = Login.Login_username; // L: 1107
+				Random var35 = new Random(); // L: 1109
+				Buffer var28 = new Buffer(128); // L: 1110
+				Buffer var9 = new Buffer(128); // L: 1111
+				int[] var10 = new int[]{var35.nextInt(), var35.nextInt(), (int)(var1 >> 32), (int)var1}; // L: 1112 1113 1114 1115 1116
+				var28.writeByte(10); // L: 1117
+
+				int var11;
+				for (var11 = 0; var11 < 4; ++var11) { // L: 1118
+					var28.writeInt(var35.nextInt()); // L: 1119
+				}
+
+				var28.writeInt(var10[0]); // L: 1121
+				var28.writeInt(var10[1]); // L: 1122
+				var28.writeLong(var1); // L: 1123
+				var28.writeLong(0L); // L: 1124
+
+				for (var11 = 0; var11 < 4; ++var11) { // L: 1125
+					var28.writeInt(var35.nextInt()); // L: 1126
+				}
+
+				var28.encryptRsa(class65.field841, class65.field842); // L: 1128
+				var9.writeByte(10); // L: 1129
+
+				for (var11 = 0; var11 < 3; ++var11) { // L: 1130
+					var9.writeInt(var35.nextInt()); // L: 1131
+				}
+
+				var9.writeLong(var35.nextLong()); // L: 1133
+				var9.writeLongMedium(var35.nextLong()); // L: 1134
+				Decimator.method1082(var9); // L: 1135
+				var9.writeLong(var35.nextLong()); // L: 1136
+				var9.encryptRsa(class65.field841, class65.field842); // L: 1137
+				var11 = class116.stringCp1252NullTerminatedByteSize(var34); // L: 1138
+				if (var11 % 8 != 0) { // L: 1139
+					var11 += 8 - var11 % 8;
+				}
+
+				Buffer var12 = new Buffer(var11); // L: 1140
+				var12.writeStringCp1252NullTerminated(var34); // L: 1141
+				var12.offset = var11; // L: 1142
+				var12.xteaEncryptAll(var10); // L: 1143
+				Buffer var13 = new Buffer(var12.offset + var28.offset + var9.offset + 5); // L: 1144
+				var13.writeByte(2); // L: 1145
+				var13.writeByte(var28.offset); // L: 1146
+				var13.writeBytes(var28.array, 0, var28.offset); // L: 1147
+				var13.writeByte(var9.offset); // L: 1148
+				var13.writeBytes(var9.array, 0, var9.offset); // L: 1149
+				var13.writeShort(var12.offset); // L: 1150
+				var13.writeBytes(var12.array, 0, var12.offset); // L: 1151
+				byte[] var15 = var13.array; // L: 1153
+				String var14 = PendingSpawn.method2224(var15, 0, var15.length); // L: 1155
+				String var16 = var14; // L: 1157
+
+				byte var29;
+				try {
+					URL var17 = new URL(InterfaceParent.method2146("services", false) + "m=accountappeal/login.ws"); // L: 1159
+					URLConnection var18 = var17.openConnection(); // L: 1160
+					var18.setDoInput(true); // L: 1161
+					var18.setDoOutput(true); // L: 1162
+					var18.setConnectTimeout(5000); // L: 1163
+					OutputStreamWriter var19 = new OutputStreamWriter(var18.getOutputStream()); // L: 1164
+					var19.write("data2=" + class260.method5070(var16) + "&dest=" + class260.method5070("passwordchoice.ws")); // L: 1165
+					var19.flush(); // L: 1166
+					InputStream var20 = var18.getInputStream(); // L: 1167
+					var13 = new Buffer(new byte[1000]); // L: 1168
+
+					while (true) {
+						int var21 = var20.read(var13.array, var13.offset, 1000 - var13.offset); // L: 1170
+						if (var21 == -1) { // L: 1171
+							var19.close(); // L: 1178
+							var20.close(); // L: 1179
+							String var30 = new String(var13.array); // L: 1180
+							if (var30.startsWith("OFFLINE")) { // L: 1181
+								var29 = 4; // L: 1182
+							} else if (var30.startsWith("WRONG")) { // L: 1185
+								var29 = 7; // L: 1186
+							} else if (var30.startsWith("RELOAD")) { // L: 1189
+								var29 = 3; // L: 1190
+							} else if (var30.startsWith("Not permitted for social network accounts.")) { // L: 1193
+								var29 = 6; // L: 1194
+							} else {
+								var13.xteaDecryptAll(var10); // L: 1197
+
+								while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { // L: 1198
+									--var13.offset; // L: 1199
+								}
+
+								var30 = new String(var13.array, 0, var13.offset); // L: 1201
+								boolean var22;
+								if (var30 == null) { // L: 1204
+									var22 = false; // L: 1205
+								} else {
+									label113: {
+										try {
+											new URL(var30);
+										} catch (MalformedURLException var31) { // L: 1211
+											var22 = false; // L: 1212
+											break label113; // L: 1213
+										}
+
+										var22 = true; // L: 1215
+									}
+								}
+
+								if (var22) { // L: 1217
+									WorldMapSprite.openURL(var30, true, false); // L: 1218
+									var29 = 2; // L: 1219
+								} else {
+									var29 = 5; // L: 1221
+								}
+							}
+							break;
+						}
+
+						var13.offset += var21; // L: 1172
+						if (var13.offset >= 1000) { // L: 1173
+							var29 = 5; // L: 1174
+							break;
+						}
+					}
+				} catch (Throwable var32) { // L: 1223
+					var32.printStackTrace(); // L: 1224
+					var29 = 5; // L: 1225
+				}
+
+				var0 = var29; // L: 1228
 			}
 
-			if (var16 < 126 && var17 < 126 && class174.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: 119 120 121 122 123
-				class174.bufferX[var18] = var4 + 1; // L: 124
-				class174.bufferY[var18] = var5 + 1; // L: 125
-				var18 = var18 + 1 & 4095; // L: 126
-				class174.directions[var16 + 1][var17 + 1] = 12; // L: 127
-				class174.distances[var16 + 1][var17 + 1] = var15; // L: 128
+			switch(var0) { // L: 1230
+			case 2:
+				class19.setLoginResponseString(Strings.field3747, Strings.field3551, Strings.field3749); // L: 1232
+				PlayerType.method5521(6); // L: 1233
+				break; // L: 1234
+			case 3:
+				class19.setLoginResponseString("", "Error connecting to server.", ""); // L: 1248
+				break;
+			case 4:
+				class19.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 1236
+				break; // L: 1237
+			case 5:
+				class19.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 1242
+				break; // L: 1243
+			case 6:
+				class19.setLoginResponseString("", "Error connecting to server.", ""); // L: 1245
+				break; // L: 1246
+			case 7:
+				class19.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: 1239
 			}
-		}
 
-		RouteStrategy.field1979 = var4; // L: 131
-		class67.field845 = var5; // L: 132
-		return false; // L: 133
-	}
+		}
+	} // L: 1069 1251
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("es")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIB)I",
-		garbageValue = "62"
+		descriptor = "(I)Lov;",
+		garbageValue = "-1090496124"
 	)
-	public static int method3960(int var0, int var1, int var2, int var3, int var4, int var5) {
-		if ((var5 & 1) == 1) { // L: 22
-			int var6 = var3; // L: 23
-			var3 = var4; // L: 24
-			var4 = var6; // L: 25
-		}
-
-		var2 &= 3; // L: 27
-		if (var2 == 0) { // L: 28
-			return var1;
-		} else if (var2 == 1) { // L: 29
-			return 7 - var0 - (var3 - 1);
-		} else {
-			return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 30
-		}
+	@Export("getWorldMap")
+	static WorldMap getWorldMap() {
+		return Varcs.worldMap; // L: 656
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java
index 85a03b15ef..78c308a155 100644
--- a/runescape-client/src/main/java/WorldMapRegion.java
+++ b/runescape-client/src/main/java/WorldMapRegion.java
@@ -10,66 +10,55 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fk")
+@ObfuscatedName("hw")
 @Implements("WorldMapRegion")
 public class WorldMapRegion {
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lhd;"
+		descriptor = "Lic;"
 	)
 	@Export("WorldMapRegion_cachedSprites")
-	static DemotingHashTable WorldMapRegion_cachedSprites;
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		descriptor = "Lea;"
-	)
-	static ClanChannel field2069;
-	@ObfuscatedName("iv")
+	public static DemotingHashTable WorldMapRegion_cachedSprites;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1587771547
-	)
-	@Export("cameraYaw")
-	static int cameraYaw;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 1512933093
+		intValue = -1430773617
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1311115551
+		intValue = 1183220227
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Lfv;"
+		descriptor = "Lhn;"
 	)
 	@Export("worldMapData_0")
 	WorldMapData_0 worldMapData_0;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@Export("worldMapData1List")
 	LinkedList worldMapData1List;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -367405989
+		intValue = 590178605
 	)
 	@Export("backgroundColor")
 	int backgroundColor;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -572472021
+		intValue = -90451331
 	)
 	@Export("pixelsPerTile")
 	int pixelsPerTile;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@Export("icon0List")
 	List icon0List;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@Export("iconMap")
 	HashMap iconMap;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@Export("fonts")
 	final HashMap fonts;
 
@@ -78,107 +67,112 @@ public class WorldMapRegion {
 	}
 
 	WorldMapRegion(int var1, int var2, int var3, HashMap var4) {
-		this.regionX = var1; // L: 58
-		this.regionY = var2; // L: 59
-		this.worldMapData1List = new LinkedList(); // L: 60
-		this.icon0List = new LinkedList(); // L: 61
-		this.iconMap = new HashMap(); // L: 62
-		this.backgroundColor = var3 | -16777216; // L: 63
-		this.fonts = var4; // L: 64
-	} // L: 65
+		this.regionX = var1; // L: 52
+		this.regionY = var2; // L: 53
+		this.worldMapData1List = new LinkedList(); // L: 54
+		this.icon0List = new LinkedList(); // L: 55
+		this.iconMap = new HashMap(); // L: 56
+		this.backgroundColor = var3 | -16777216; // L: 57
+		this.fonts = var4; // L: 58
+	} // L: 59
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "-1133697443"
-	)
-	void method3685(int var1, int var2, int var3) {
-		SpritePixels var4 = FileSystem.method2909(this.regionX, this.regionY, this.pixelsPerTile); // L: 68
-		if (var4 != null) { // L: 69
-			if (var3 == this.pixelsPerTile * 64) { // L: 70
-				var4.drawAt(var1, var2); // L: 71
+		descriptor = "(IIIB)V",
+		garbageValue = "24"
+	)
+	void method4492(int var1, int var2, int var3) {
+		int var5 = this.regionX; // L: 63
+		int var6 = this.regionY; // L: 64
+		int var7 = this.pixelsPerTile; // L: 65
+		DemotingHashTable var8 = WorldMapRegion_cachedSprites; // L: 67
+		long var9 = (long)(var7 << 16 | var5 << 8 | var6); // L: 70
+		SpritePixels var4 = (SpritePixels)var8.get(var9); // L: 72
+		if (var4 != null) {
+			if (var3 == this.pixelsPerTile * 64) { // L: 76
+				var4.drawAt(var1, var2); // L: 77
 			} else {
-				var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 74
+				var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 80
 			}
 
 		}
-	} // L: 76
+	} // L: 75 82
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lfv;Ljava/util/List;S)V",
-		garbageValue = "8593"
+		descriptor = "(Lhn;Ljava/util/List;I)V",
+		garbageValue = "392577775"
 	)
 	@Export("initWorldMapData0")
 	void initWorldMapData0(WorldMapData_0 var1, List var2) {
-		this.iconMap.clear(); // L: 79
-		this.worldMapData_0 = var1; // L: 80
-		this.addAllToIconList(var2); // L: 81
-	} // L: 82
+		this.iconMap.clear(); // L: 85
+		this.worldMapData_0 = var1; // L: 86
+		this.addAllToIconList(var2); // L: 87
+	} // L: 88
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V",
-		garbageValue = "99"
+		descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V",
+		garbageValue = "-763221367"
 	)
 	@Export("initWorldMapData1")
 	void initWorldMapData1(HashSet var1, List var2) {
-		this.iconMap.clear(); // L: 85
-		Iterator var3 = var1.iterator(); // L: 86
+		this.iconMap.clear(); // L: 91
+		Iterator var3 = var1.iterator(); // L: 92
 
-		while (var3.hasNext()) { // L: 93
-			WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 87
-			if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 89
-				this.worldMapData1List.add(var4); // L: 90
+		while (var3.hasNext()) {
+			WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 93
+			if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 95
+				this.worldMapData1List.add(var4); // L: 96
 			}
 		}
 
-		this.addAllToIconList(var2); // L: 94
-	} // L: 95
+		this.addAllToIconList(var2); // L: 100
+	} // L: 101
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILgl;I)V",
-		garbageValue = "1671953569"
+		descriptor = "(IIIILhz;I)V",
+		garbageValue = "826516683"
 	)
 	@Export("getIconsForTiles")
 	void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) {
-		for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 98
-			label76:
-			for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 99
-				for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 100
-					WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 101
-					if (var9 != null && var9.length != 0) { // L: 102
-						WorldMapDecoration[] var10 = var9; // L: 106
-
-						for (int var11 = 0; var11 < var10.length; ++var11) { // L: 107
+		for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 104
+			label75:
+			for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 105
+				for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 106
+					WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 107
+					if (var9 != null && var9.length != 0) { // L: 108
+						WorldMapDecoration[] var10 = var9; // L: 112
+
+						for (int var11 = 0; var11 < var10.length; ++var11) { // L: 113
 							ObjectComposition var13;
 							boolean var14;
-							label67: {
-								WorldMapDecoration var12 = var10[var11]; // L: 108
-								var13 = KitDefinition.getObjectDefinition(var12.objectDefinitionId); // L: 110
-								if (var13.transforms != null) { // L: 113
-									int[] var15 = var13.transforms; // L: 115
-
-									for (int var16 = 0; var16 < var15.length; ++var16) { // L: 116
-										int var17 = var15[var16]; // L: 117
-										ObjectComposition var18 = KitDefinition.getObjectDefinition(var17); // L: 119
-										if (var18.mapIconId != -1) { // L: 120
-											var14 = true; // L: 121
-											break label67;
+							label66: {
+								WorldMapDecoration var12 = var10[var11]; // L: 114
+								var13 = class148.getObjectDefinition(var12.objectDefinitionId); // L: 116
+								if (var13.transforms != null) { // L: 119
+									int[] var15 = var13.transforms; // L: 121
+
+									for (int var16 = 0; var16 < var15.length; ++var16) { // L: 122
+										int var17 = var15[var16]; // L: 123
+										ObjectComposition var18 = class148.getObjectDefinition(var17); // L: 125
+										if (var18.mapIconId != -1) { // L: 126
+											var14 = true; // L: 127
+											break label66;
 										}
 									}
-								} else if (var13.mapIconId != -1) { // L: 128
-									var14 = true; // L: 129
-									break label67; // L: 130
+								} else if (var13.mapIconId != -1) { // L: 134
+									var14 = true; // L: 135
+									break label66; // L: 136
 								}
 
-								var14 = false; // L: 132
+								var14 = false; // L: 138
 							}
 
-							if (var14) { // L: 134
-								this.getIcon(var13, var8, var6, var7, var5); // L: 137
-								continue label76; // L: 138
+							if (var14) { // L: 140
+								this.getIcon(var13, var8, var6, var7, var5); // L: 143
+								continue label75; // L: 144
 							}
 						}
 					}
@@ -186,561 +180,439 @@ void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapDa
 			}
 		}
 
-	} // L: 145
+	} // L: 151
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lfe;IIILgl;I)V",
-		garbageValue = "-844362514"
+		descriptor = "(Lfm;IIILhz;I)V",
+		garbageValue = "-501099981"
 	)
 	@Export("getIcon")
 	void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) {
-		Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 148
-		Coord var7 = null; // L: 149
-		if (this.worldMapData_0 != null) { // L: 150
-			var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 151
+		Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 154
+		Coord var7 = null; // L: 155
+		if (this.worldMapData_0 != null) { // L: 156
+			var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 157
 		} else {
-			WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 154
-			var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 155
+			WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 160
+			var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 161
 		}
 
 		WorldMapElement var9;
 		Object var10;
-		if (var1.transforms != null) { // L: 158
-			var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 159
+		if (var1.transforms != null) { // L: 164
+			var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 165
 		} else {
-			var9 = ItemComposition.WorldMapElement_get(var1.mapIconId); // L: 162
-			var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 163
+			var9 = class78.WorldMapElement_get(var1.mapIconId); // L: 168
+			var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 169
 		}
 
-		var9 = ItemComposition.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 165
-		if (var9.field1641) { // L: 166
-			this.iconMap.put(new Coord(0, var3, var4), var10); // L: 167
+		var9 = class78.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 171
+		if (var9.field1758) { // L: 172
+			this.iconMap.put(new Coord(0, var3, var4), var10); // L: 173
 		}
 
-	} // L: 169
+	} // L: 175
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1929800499"
+		garbageValue = "1131881199"
 	)
 	@Export("initWorldMapIcon1s")
 	void initWorldMapIcon1s() {
-		Iterator var1 = this.iconMap.values().iterator(); // L: 172
+		Iterator var1 = this.iconMap.values().iterator(); // L: 178
 
 		while (var1.hasNext()) {
-			AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 173
-			if (var2 instanceof WorldMapIcon_1) { // L: 175
-				((WorldMapIcon_1)var2).init(); // L: 176
+			AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 179
+			if (var2 instanceof WorldMapIcon_1) { // L: 181
+				((WorldMapIcon_1)var2).init(); // L: 182
 			}
 		}
 
-	} // L: 180
+	} // L: 186
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/List;I)V",
-		garbageValue = "-402156972"
+		garbageValue = "1992457391"
 	)
 	@Export("addAllToIconList")
 	void addAllToIconList(List var1) {
-		Iterator var2 = var1.iterator(); // L: 183
+		Iterator var2 = var1.iterator(); // L: 189
 
-		while (var2.hasNext()) {
-			WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 184
-			if (ItemComposition.WorldMapElement_get(var3.element).field1641 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 186 189
-				WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3756(var3.element)); // L: 190
-				this.icon0List.add(var4); // L: 191
+		while (var2.hasNext()) { // L: 193
+			WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 190
+			if (class78.WorldMapElement_get(var3.element).field1758 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 192 195
+				WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method4551(var3.element)); // L: 196
+				this.icon0List.add(var4); // L: 197
 			}
 		}
 
-	} // L: 195
+	} // L: 201
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1891636337"
+		garbageValue = "-1724854251"
 	)
-	void method3663() {
-		if (this.worldMapData_0 != null) { // L: 198
-			this.worldMapData_0.reset(); // L: 199
+	void method4499() {
+		if (this.worldMapData_0 != null) { // L: 204
+			this.worldMapData_0.reset(); // L: 205
 		} else {
-			Iterator var1 = this.worldMapData1List.iterator(); // L: 202
+			Iterator var1 = this.worldMapData1List.iterator(); // L: 208
 
 			while (var1.hasNext()) {
-				WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 203
-				var2.reset(); // L: 205
+				WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 209
+				var2.reset(); // L: 211
 			}
 		}
 
-	} // L: 209
+	} // L: 215
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;I)Z",
-		garbageValue = "734008370"
+		descriptor = "(Lku;S)Z",
+		garbageValue = "17548"
 	)
 	@Export("loadGeography")
 	boolean loadGeography(AbstractArchive var1) {
-		this.iconMap.clear(); // L: 212
-		if (this.worldMapData_0 != null) { // L: 213
-			this.worldMapData_0.loadGeography(var1); // L: 214
-			if (this.worldMapData_0.isFullyLoaded()) { // L: 215
-				this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 216
-				return true; // L: 217
+		this.iconMap.clear(); // L: 218
+		if (this.worldMapData_0 != null) { // L: 219
+			this.worldMapData_0.loadGeography(var1); // L: 220
+			if (this.worldMapData_0.isFullyLoaded()) { // L: 221
+				this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 222
+				return true; // L: 223
 			} else {
-				return false; // L: 219
+				return false; // L: 225
 			}
 		} else {
-			boolean var2 = true; // L: 222
+			boolean var2 = true; // L: 228
 
 			Iterator var3;
 			WorldMapData_1 var4;
-			for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 223 227
-				var4 = (WorldMapData_1)var3.next(); // L: 224
-				var4.loadGeography(var1); // L: 226
+			for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 229 233
+				var4 = (WorldMapData_1)var3.next(); // L: 230
+				var4.loadGeography(var1); // L: 232
 			}
 
-			if (var2) { // L: 230
-				var3 = this.worldMapData1List.iterator(); // L: 231
+			if (var2) { // L: 236
+				var3 = this.worldMapData1List.iterator(); // L: 237
 
 				while (var3.hasNext()) {
-					var4 = (WorldMapData_1)var3.next(); // L: 232
-					this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 234
+					var4 = (WorldMapData_1)var3.next(); // L: 238
+					this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 240
 				}
 			}
 
-			return var2; // L: 238
+			return var2; // L: 244
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(ILge;[Loe;Lko;Lko;I)V",
-		garbageValue = "749682565"
+		descriptor = "(ILig;[Lpa;Lku;Lku;I)V",
+		garbageValue = "619477379"
 	)
 	@Export("drawTile")
 	void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) {
-		this.pixelsPerTile = var1; // L: 243
-		if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 244
-			if (FileSystem.method2909(this.regionX, this.regionY, var1) == null) { // L: 247
-				boolean var6 = true; // L: 250
-				var6 &= this.loadGeography(var4); // L: 251
-				int var8;
-				if (this.worldMapData_0 != null) { // L: 254
-					var8 = this.worldMapData_0.groupId; // L: 255
+		this.pixelsPerTile = var1; // L: 249
+		if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 250
+			int var7 = this.regionX; // L: 254
+			int var8 = this.regionY; // L: 255
+			DemotingHashTable var9 = WorldMapRegion_cachedSprites; // L: 257
+			long var10 = (long)(var1 << 16 | var7 << 8 | var8); // L: 260
+			SpritePixels var6 = (SpritePixels)var9.get(var10); // L: 262
+			if (var6 == null) { // L: 264
+				boolean var15 = true; // L: 267
+				var15 &= this.loadGeography(var4); // L: 268
+				int var11;
+				if (this.worldMapData_0 != null) { // L: 271
+					var11 = this.worldMapData_0.groupId; // L: 272
 				} else {
-					var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 258
+					var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 275
 				}
 
-				var6 &= var5.tryLoadGroup(var8); // L: 260
-				if (var6) { // L: 261
-					byte[] var7 = var5.takeFileFlat(var8); // L: 262
-					WorldMapSprite var9 = class115.method2554(var7); // L: 263
-					SpritePixels var10 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 264
-					var10.setRaster(); // L: 265
-					if (this.worldMapData_0 != null) { // L: 266
-						this.method3668(var2, var3, var9); // L: 267
+				var15 &= var5.tryLoadGroup(var11); // L: 277
+				if (var15) { // L: 278
+					byte[] var16 = var5.takeFileFlat(var11); // L: 279
+					WorldMapSprite var12;
+					if (var16 == null) { // L: 282
+						var12 = new WorldMapSprite(); // L: 283
 					} else {
-						this.method3752(var2, var3, var9); // L: 270
+						var12 = new WorldMapSprite(MouseRecorder.method2161(var16).pixels); // L: 286
 					}
 
-					class174.method3512(var10, this.regionX, this.regionY, this.pixelsPerTile); // L: 272
-					this.method3663(); // L: 273
+					SpritePixels var14 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 289
+					var14.setRaster(); // L: 290
+					if (this.worldMapData_0 != null) { // L: 291
+						this.method4561(var2, var3, var12); // L: 292
+					} else {
+						this.method4566(var2, var3, var12); // L: 295
+					}
+
+					ArchiveDiskAction.method5526(var14, this.regionX, this.regionY, this.pixelsPerTile); // L: 297
+					this.method4499(); // L: 298
 				}
 			}
 		}
-	} // L: 245 248 274
+	} // L: 251 265 299
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(IIILjava/util/HashSet;I)V",
-		garbageValue = "-1052443043"
+		descriptor = "(IIILjava/util/HashSet;B)V",
+		garbageValue = "-83"
 	)
-	void method3681(int var1, int var2, int var3, HashSet var4) {
-		if (var4 == null) { // L: 277
-			var4 = new HashSet(); // L: 278
+	void method4588(int var1, int var2, int var3, HashSet var4) {
+		if (var4 == null) { // L: 302
+			var4 = new HashSet(); // L: 303
 		}
 
-		this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 280
-		this.drawMapLinks(var1, var2, var4, var3); // L: 281
-	} // L: 282
+		this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 305
+		this.drawMapLinks(var1, var2, var4, var3); // L: 306
+	} // L: 307
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/HashSet;III)V",
-		garbageValue = "1956644892"
+		garbageValue = "-1818539814"
 	)
 	@Export("flashElements")
 	void flashElements(HashSet var1, int var2, int var3) {
-		Iterator var4 = this.iconMap.values().iterator(); // L: 285
-
-		while (var4.hasNext()) { // L: 295
-			AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 286
-			if (var5.hasValidElement()) { // L: 288
-				int var6 = var5.getElement(); // L: 289
-				if (var1.contains(var6)) { // L: 290
-					WorldMapElement var7 = ItemComposition.WorldMapElement_get(var6); // L: 291
-					this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 292
+		Iterator var4 = this.iconMap.values().iterator(); // L: 310
+
+		while (var4.hasNext()) {
+			AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 311
+			if (var5.hasValidElement()) { // L: 313
+				int var6 = var5.getElement(); // L: 314
+				if (var1.contains(var6)) { // L: 315
+					WorldMapElement var7 = class78.WorldMapElement_get(var6); // L: 316
+					this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 317
 				}
 			}
 		}
 
-		this.method3719(var1, var2, var3); // L: 296
-	} // L: 297
+		this.method4512(var1, var2, var3); // L: 321
+	} // L: 322
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(Lge;[Loe;Lgg;S)V",
-		garbageValue = "-21128"
+		descriptor = "(Lig;[Lpa;Lhq;I)V",
+		garbageValue = "180589965"
 	)
-	void method3668(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
+	void method4561(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
 		int var4;
 		int var5;
-		for (var4 = 0; var4 < 64; ++var4) { // L: 300
-			for (var5 = 0; var5 < 64; ++var5) { // L: 301
-				this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 302
-				this.method3672(var4, var5, this.worldMapData_0, var1); // L: 303
+		for (var4 = 0; var4 < 64; ++var4) { // L: 325
+			for (var5 = 0; var5 < 64; ++var5) { // L: 326
+				this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 327
+				this.method4507(var4, var5, this.worldMapData_0, var1); // L: 328
 			}
 		}
 
-		for (var4 = 0; var4 < 64; ++var4) { // L: 306
-			for (var5 = 0; var5 < 64; ++var5) { // L: 307
-				this.method3678(var4, var5, this.worldMapData_0, var1, var2); // L: 308
+		for (var4 = 0; var4 < 64; ++var4) { // L: 331
+			for (var5 = 0; var5 < 64; ++var5) { // L: 332
+				this.method4505(var4, var5, this.worldMapData_0, var1, var2); // L: 333
 			}
 		}
 
-	} // L: 311
+	} // L: 336
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lge;[Loe;Lgg;I)V",
-		garbageValue = "-1733942667"
+		descriptor = "(Lig;[Lpa;Lhq;I)V",
+		garbageValue = "1976683107"
 	)
-	void method3752(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
-		Iterator var4 = this.worldMapData1List.iterator(); // L: 314
+	void method4566(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
+		Iterator var4 = this.worldMapData1List.iterator(); // L: 339
 
 		WorldMapData_1 var5;
 		int var6;
 		int var7;
 		while (var4.hasNext()) {
-			var5 = (WorldMapData_1)var4.next(); // L: 315
+			var5 = (WorldMapData_1)var4.next(); // L: 340
 
-			for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 317
-				for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 318
-					this.drawTileGround(var6, var7, var5, var1, var3); // L: 319
-					this.method3672(var6, var7, var5, var1); // L: 320
+			for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 342
+				for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 343
+					this.drawTileGround(var6, var7, var5, var1, var3); // L: 344
+					this.method4507(var6, var7, var5, var1); // L: 345
 				}
 			}
 		}
 
-		var4 = this.worldMapData1List.iterator(); // L: 325
+		var4 = this.worldMapData1List.iterator(); // L: 350
 
 		while (var4.hasNext()) {
-			var5 = (WorldMapData_1)var4.next(); // L: 326
+			var5 = (WorldMapData_1)var4.next(); // L: 351
 
-			for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 328
-				for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 329
-					this.method3678(var6, var7, var5, var1, var2); // L: 330
+			for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 353
+				for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 354
+					this.method4505(var6, var7, var5, var1, var2); // L: 355
 				}
 			}
 		}
 
-	} // L: 335
+	} // L: 360
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(IILgl;Lge;[Loe;I)V",
-		garbageValue = "239188021"
+		descriptor = "(IILhz;Lig;[Lpa;I)V",
+		garbageValue = "-1372993512"
 	)
-	void method3678(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) {
-		this.method3675(var1, var2, var3); // L: 338
-		this.method3674(var1, var2, var3, var5); // L: 339
-	} // L: 340
+	void method4505(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) {
+		this.method4510(var1, var2, var3); // L: 363
+		this.method4509(var1, var2, var3, var5); // L: 364
+	} // L: 365
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(IILgl;Lge;Lgg;B)V",
-		garbageValue = "127"
+		descriptor = "(IILhz;Lig;Lhq;I)V",
+		garbageValue = "1507550490"
 	)
 	@Export("drawTileGround")
 	void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) {
-		int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 343
-		int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 344
-		if (var6 == -1 && var7 == -1) { // L: 345
-			Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 346
+		int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 368
+		int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 369
+		if (var6 == -1 && var7 == -1) { // L: 370
+			Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 371
 		}
 
-		int var8 = 16711935; // L: 348
-		int var9;
-		if (var7 != -1) { // L: 349
-			int var10 = this.backgroundColor; // L: 351
-			FloorOverlayDefinition var11 = InvDefinition.method2987(var7); // L: 353
-			if (var11 == null) { // L: 354
-				var9 = var10; // L: 355
-			} else if (var11.secondaryRgb >= 0) { // L: 358
-				var9 = var11.secondaryRgb | -16777216; // L: 359
-			} else {
-				int var12;
-				int var13;
-				byte var14;
-				int var16;
-				if (var11.texture >= 0) { // L: 361
-					var13 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture); // L: 363
-					var14 = 96; // L: 364
-					if (var13 == -2) { // L: 366
-						var12 = 12345678; // L: 367
-					} else if (var13 == -1) { // L: 370
-						if (var14 < 0) { // L: 371
-							var14 = 0; // L: 372
-						} else if (var14 > 127) { // L: 374
-							var14 = 127; // L: 375
-						}
-
-						var16 = 127 - var14; // L: 377
-						var12 = var16; // L: 378
-					} else {
-						var16 = var14 * (var13 & 127) / 128; // L: 381
-						if (var16 < 2) { // L: 382
-							var16 = 2;
-						} else if (var16 > 126) { // L: 383
-							var16 = 126;
-						}
-
-						var12 = var16 + (var13 & 65408); // L: 384
-					}
-
-					var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 387
-				} else if (var11.primaryRgb == 16711935) { // L: 389
-					var9 = var10; // L: 390
-				} else {
-					var12 = LoginScreenAnimation.method2218(var11.hue, var11.saturation, var11.lightness); // L: 393
-					var14 = 96; // L: 395
-					if (var12 == -2) { // L: 397
-						var13 = 12345678; // L: 398
-					} else if (var12 == -1) { // L: 401
-						if (var14 < 0) { // L: 402
-							var14 = 0; // L: 403
-						} else if (var14 > 127) { // L: 405
-							var14 = 127; // L: 406
-						}
-
-						var16 = 127 - var14; // L: 408
-						var13 = var16; // L: 409
-					} else {
-						var16 = var14 * (var12 & 127) / 128; // L: 412
-						if (var16 < 2) { // L: 413
-							var16 = 2;
-						} else if (var16 > 126) { // L: 414
-							var16 = 126;
-						}
-
-						var13 = var16 + (var12 & 65408); // L: 415
-					}
-
-					var9 = Rasterizer3D.Rasterizer3D_colorPalette[var13] | -16777216; // L: 418
-				}
-			}
-
-			var8 = var9; // L: 421
+		int var8 = 16711935; // L: 373
+		if (var7 != -1) { // L: 374
+			var8 = Actor.method2235(var7, this.backgroundColor); // L: 375
 		}
 
-		if (var7 > -1 && var3.field2154[0][var1][var2] == 0) { // L: 423
-			Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 424
+		if (var7 > -1 && var3.field2699[0][var1][var2] == 0) { // L: 377
+			Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 378
 		} else {
-			var9 = this.method3673(var1, var2, var3, var5); // L: 427
-			if (var7 == -1) { // L: 428
-				Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 429
+			int var9 = this.method4508(var1, var2, var3, var5); // L: 381
+			if (var7 == -1) { // L: 382
+				Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 383
 			} else {
-				var4.method4086(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2154[0][var1][var2], var3.field2145[0][var1][var2]); // L: 432
+				var4.method4907(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2699[0][var1][var2], var3.field2706[0][var1][var2]); // L: 386
 			}
 		}
-	} // L: 425 430 433
+	} // L: 379 384 387
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IILgl;Lge;B)V",
-		garbageValue = "33"
+		descriptor = "(IILhz;Lig;I)V",
+		garbageValue = "-1920100331"
 	)
-	void method3672(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) {
-		for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 436
-			int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 437
-			if (var6 > -1) { // L: 438
-				int var8 = this.backgroundColor; // L: 440
-				FloorOverlayDefinition var9 = InvDefinition.method2987(var6); // L: 442
-				int var7;
-				if (var9 == null) { // L: 443
-					var7 = var8; // L: 444
-				} else if (var9.secondaryRgb >= 0) { // L: 447
-					var7 = var9.secondaryRgb | -16777216; // L: 448
-				} else {
-					int var10;
-					int var11;
-					byte var12;
-					int var15;
-					if (var9.texture >= 0) { // L: 450
-						var11 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture); // L: 452
-						var12 = 96; // L: 453
-						if (var11 == -2) { // L: 455
-							var10 = 12345678; // L: 456
-						} else if (var11 == -1) { // L: 459
-							if (var12 < 0) { // L: 460
-								var12 = 0; // L: 461
-							} else if (var12 > 127) { // L: 463
-								var12 = 127; // L: 464
-							}
-
-							var15 = 127 - var12; // L: 466
-							var10 = var15; // L: 467
-						} else {
-							var15 = var12 * (var11 & 127) / 128; // L: 470
-							if (var15 < 2) { // L: 471
-								var15 = 2;
-							} else if (var15 > 126) { // L: 472
-								var15 = 126;
-							}
-
-							var10 = var15 + (var11 & 65408); // L: 473
-						}
-
-						var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 476
-					} else if (var9.primaryRgb == 16711935) { // L: 478
-						var7 = var8; // L: 479
-					} else {
-						var10 = LoginScreenAnimation.method2218(var9.hue, var9.saturation, var9.lightness); // L: 482
-						var12 = 96; // L: 484
-						if (var10 == -2) { // L: 486
-							var11 = 12345678; // L: 487
-						} else if (var10 == -1) { // L: 490
-							if (var12 < 0) { // L: 491
-								var12 = 0; // L: 492
-							} else if (var12 > 127) { // L: 494
-								var12 = 127; // L: 495
-							}
-
-							var15 = 127 - var12; // L: 497
-							var11 = var15; // L: 498
-						} else {
-							var15 = var12 * (var10 & 127) / 128; // L: 501
-							if (var15 < 2) { // L: 502
-								var15 = 2;
-							} else if (var15 > 126) { // L: 503
-								var15 = 126;
-							}
-
-							var11 = var15 + (var10 & 65408); // L: 504
-						}
-
-						var7 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216; // L: 507
-					}
-				}
-
-				if (var3.field2154[var5][var1][var2] == 0) { // L: 511
-					Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 512
+	void method4507(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) {
+		for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 390
+			int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 391
+			if (var6 > -1) { // L: 392
+				int var7 = Actor.method2235(var6, this.backgroundColor); // L: 393
+				if (var3.field2699[var5][var1][var2] == 0) { // L: 394
+					Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 395
 				} else {
-					var4.method4086(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2154[var5][var1][var2], var3.field2145[var5][var1][var2]); // L: 515
+					var4.method4907(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2699[var5][var1][var2], var3.field2706[var5][var1][var2]); // L: 398
 				}
 			}
 		}
 
-	} // L: 519
+	} // L: 402
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IILgl;Lgg;B)I",
-		garbageValue = "4"
+		descriptor = "(IILhz;Lhq;I)I",
+		garbageValue = "-2111432629"
 	)
-	int method3673(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) {
-		return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 522 523 525
+	int method4508(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) {
+		return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 405 406 408
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(IILgl;[Loe;B)V",
-		garbageValue = "0"
-	)
-	void method3674(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) {
-		for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 529
-			WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 530
-			if (var6 != null && var6.length != 0) { // L: 531
-				WorldMapDecoration[] var7 = var6; // L: 535
-
-				for (int var8 = 0; var8 < var7.length; ++var8) { // L: 536
-					WorldMapDecoration var9 = var7[var8]; // L: 537
-					int var11 = var9.decoration; // L: 540
-					boolean var10 = var11 >= WorldMapDecorationType.field3242.id && var11 <= WorldMapDecorationType.field3243.id; // L: 542
-					if (var10 || class123.method2614(var9.decoration)) { // L: 544
-						ObjectComposition var12 = KitDefinition.getObjectDefinition(var9.objectDefinitionId); // L: 545
-						if (var12.mapSceneId != -1) { // L: 546
-							if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { // L: 547
-								var4[var12.mapSceneId].method7362(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 551
-							} else {
-								var4[var12.mapSceneId].method7362(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 548
-							}
+		descriptor = "(IILhz;[Lpa;I)V",
+		garbageValue = "-1600468399"
+	)
+	void method4509(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) {
+		for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 412
+			WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 413
+			if (var6 != null && var6.length != 0) { // L: 414
+				WorldMapDecoration[] var7 = var6; // L: 418
+
+				for (int var8 = 0; var8 < var7.length; ++var8) { // L: 419
+					WorldMapDecoration var9 = var7[var8]; // L: 420
+					int var11 = var9.decoration; // L: 423
+					boolean var10 = var11 >= WorldMapDecorationType.field3402.id && var11 <= WorldMapDecorationType.field3403.id; // L: 425
+					if (!var10) { // L: 428
+						int var13 = var9.decoration; // L: 430
+						boolean var12 = var13 == WorldMapDecorationType.field3389.id; // L: 432
+						if (!var12) { // L: 434
+							continue;
+						}
+					}
+
+					ObjectComposition var14 = class148.getObjectDefinition(var9.objectDefinitionId); // L: 436
+					if (var14.mapSceneId != -1) { // L: 437
+						if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { // L: 438
+							var4[var14.mapSceneId].method7732(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 442
+						} else {
+							var4[var14.mapSceneId].method7732(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 439
 						}
 					}
 				}
 			}
 		}
 
-	} // L: 559
+	} // L: 450
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(IILgl;B)V",
-		garbageValue = "107"
-	)
-	void method3675(int var1, int var2, AbstractWorldMapData var3) {
-		for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 562
-			WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 563
-			if (var5 != null && var5.length != 0) { // L: 564
-				WorldMapDecoration[] var6 = var5; // L: 568
-
-				for (int var7 = 0; var7 < var6.length; ++var7) { // L: 569
-					WorldMapDecoration var8 = var6[var7]; // L: 570
-					int var10 = var8.decoration; // L: 573
-					boolean var9 = var10 >= WorldMapDecorationType.field3238.id && var10 <= WorldMapDecorationType.field3230.id || var10 == WorldMapDecorationType.field3231.id; // L: 575
-					if (var9) { // L: 577
-						ObjectComposition var11 = KitDefinition.getObjectDefinition(var8.objectDefinitionId); // L: 578
-						int var12 = var11.int1 != 0 ? -3407872 : -3355444; // L: 579
-						if (var8.decoration == WorldMapDecorationType.field3238.id) { // L: 580
-							this.method3689(var1, var2, var8.rotation, var12); // L: 581
+		descriptor = "(IILhz;I)V",
+		garbageValue = "1344943338"
+	)
+	void method4510(int var1, int var2, AbstractWorldMapData var3) {
+		for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 453
+			WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 454
+			if (var5 != null && var5.length != 0) { // L: 455
+				WorldMapDecoration[] var6 = var5; // L: 459
+
+				for (int var7 = 0; var7 < var6.length; ++var7) { // L: 460
+					WorldMapDecoration var8 = var6[var7]; // L: 461
+					if (AbstractWorldMapIcon.method4863(var8.decoration)) { // L: 463
+						ObjectComposition var9 = class148.getObjectDefinition(var8.objectDefinitionId); // L: 464
+						int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 465
+						if (var8.decoration == WorldMapDecorationType.field3391.id) { // L: 466
+							this.method4501(var1, var2, var8.rotation, var10); // L: 467
 						}
 
-						if (var8.decoration == WorldMapDecorationType.field3224.id) { // L: 583
-							this.method3689(var1, var2, var8.rotation, -3355444); // L: 584
-							this.method3689(var1, var2, var8.rotation + 1, var12); // L: 585
+						if (var8.decoration == WorldMapDecorationType.field3384.id) { // L: 469
+							this.method4501(var1, var2, var8.rotation, -3355444); // L: 470
+							this.method4501(var1, var2, var8.rotation + 1, var10); // L: 471
 						}
 
-						if (var8.decoration == WorldMapDecorationType.field3230.id) { // L: 587
-							if (var8.rotation == 0) {
-								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); // L: 588
+						if (var8.decoration == WorldMapDecorationType.field3385.id) { // L: 473
+							if (var8.rotation == 0) { // L: 474
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10);
 							}
 
-							if (var8.rotation == 1) { // L: 589
-								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12);
+							if (var8.rotation == 1) {
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 475
 							}
 
-							if (var8.rotation == 2) { // L: 590
-								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12);
+							if (var8.rotation == 2) { // L: 476
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
 							}
 
-							if (var8.rotation == 3) { // L: 591
-								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12);
+							if (var8.rotation == 3) { // L: 477
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
 							}
 						}
 
-						if (var8.decoration == WorldMapDecorationType.field3231.id) { // L: 593
-							int var13 = var8.rotation % 2; // L: 594
-							int var14;
-							if (var13 == 0) { // L: 595
-								for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 596
-									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); // L: 597
+						if (var8.decoration == WorldMapDecorationType.field3406.id) { // L: 479
+							int var11 = var8.rotation % 2; // L: 480
+							int var12;
+							if (var11 == 0) { // L: 481
+								for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 482
+									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 483
 								}
 							} else {
-								for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 601
-									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); // L: 602
+								for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 487
+									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 488
 								}
 							}
 						}
@@ -749,294 +621,294 @@ void method3675(int var1, int var2, AbstractWorldMapData var3) {
 			}
 		}
 
-	} // L: 611
+	} // L: 497
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(IILjava/util/HashSet;IB)V",
-		garbageValue = "-98"
+		descriptor = "(IILjava/util/HashSet;II)V",
+		garbageValue = "470292347"
 	)
 	@Export("drawNonLinkMapIcons")
 	void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) {
-		float var5 = (float)var4 / 64.0F; // L: 614
-		float var6 = var5 / 2.0F; // L: 615
-		Iterator var7 = this.iconMap.entrySet().iterator(); // L: 616
+		float var5 = (float)var4 / 64.0F; // L: 500
+		float var6 = var5 / 2.0F; // L: 501
+		Iterator var7 = this.iconMap.entrySet().iterator(); // L: 502
 
 		while (var7.hasNext()) {
-			Entry var8 = (Entry)var7.next(); // L: 617
-			Coord var9 = (Coord)var8.getKey(); // L: 619
-			int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); // L: 620
-			int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 621
-			AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 622
-			if (var12 != null && var12.hasValidElement()) { // L: 623
-				var12.screenX = var10; // L: 624
-				var12.screenY = var11; // L: 625
-				WorldMapElement var13 = ItemComposition.WorldMapElement_get(var12.getElement()); // L: 626
-				if (!var3.contains(var13.getObjectId())) { // L: 627
-					this.method3666(var12, var10, var11, var5); // L: 628
+			Entry var8 = (Entry)var7.next(); // L: 503
+			Coord var9 = (Coord)var8.getKey(); // L: 505
+			int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); // L: 506
+			int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 507
+			AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 508
+			if (var12 != null && var12.hasValidElement()) { // L: 509
+				var12.screenX = var10; // L: 510
+				var12.screenY = var11; // L: 511
+				WorldMapElement var13 = class78.WorldMapElement_get(var12.getElement()); // L: 512
+				if (!var3.contains(var13.getObjectId())) { // L: 513
+					this.method4569(var12, var10, var11, var5); // L: 514
 				}
 			}
 		}
 
-	} // L: 633
+	} // L: 519
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/HashSet;III)V",
-		garbageValue = "19259641"
+		garbageValue = "1160918022"
 	)
-	void method3719(HashSet var1, int var2, int var3) {
-		Iterator var4 = this.icon0List.iterator(); // L: 636
+	void method4512(HashSet var1, int var2, int var3) {
+		Iterator var4 = this.icon0List.iterator(); // L: 522
 
 		while (var4.hasNext()) {
-			AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 637
-			if (var5.hasValidElement()) { // L: 639
-				WorldMapElement var6 = ItemComposition.WorldMapElement_get(var5.getElement()); // L: 640
-				if (var6 != null && var1.contains(var6.getObjectId())) { // L: 641
-					this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 642
+			AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 523
+			if (var5.hasValidElement()) { // L: 525
+				WorldMapElement var6 = class78.WorldMapElement_get(var5.getElement()); // L: 526
+				if (var6 != null && var1.contains(var6.getObjectId())) { // L: 527
+					this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 528
 				}
 			}
 		}
 
-	} // L: 646
+	} // L: 532
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(Len;IIIII)V",
-		garbageValue = "614726264"
+		descriptor = "(Lfj;IIIII)V",
+		garbageValue = "2034829434"
 	)
 	@Export("drawBackgroundCircle")
 	void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) {
-		SpritePixels var6 = var1.getSpriteBool(false); // L: 649
-		if (var6 != null) { // L: 650
-			var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 653
-			if (var4 % var5 < var5 / 2) { // L: 654
-				Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 655
-				Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 656
+		SpritePixels var6 = var1.getSpriteBool(false); // L: 535
+		if (var6 != null) { // L: 536
+			var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 539
+			if (var4 % var5 < var5 / 2) { // L: 540
+				Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 541
+				Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 542
 			}
 
 		}
-	} // L: 651 658
+	} // L: 537 544
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lgm;IIFB)V",
-		garbageValue = "2"
+		descriptor = "(Lij;IIFB)V",
+		garbageValue = "99"
 	)
-	void method3666(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
-		WorldMapElement var5 = ItemComposition.WorldMapElement_get(var1.getElement()); // L: 661
-		this.method3680(var5, var2, var3); // L: 662
-		this.method3676(var1, var5, var2, var3, var4); // L: 663
-	} // L: 664
+	void method4569(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
+		WorldMapElement var5 = class78.WorldMapElement_get(var1.getElement()); // L: 547
+		this.method4515(var5, var2, var3); // L: 548
+		this.method4516(var1, var5, var2, var3, var4); // L: 549
+	} // L: 550
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "(Len;III)V",
-		garbageValue = "-1236346843"
+		descriptor = "(Lfj;III)V",
+		garbageValue = "980896550"
 	)
-	void method3680(WorldMapElement var1, int var2, int var3) {
-		SpritePixels var4 = var1.getSpriteBool(false); // L: 667
-		if (var4 != null) { // L: 668
-			int var5 = this.method3683(var4, var1.horizontalAlignment); // L: 669
-			int var6 = this.method3705(var4, var1.verticalAlignment); // L: 670
-			var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 671
+	void method4515(WorldMapElement var1, int var2, int var3) {
+		SpritePixels var4 = var1.getSpriteBool(false); // L: 553
+		if (var4 != null) { // L: 554
+			int var5 = this.method4518(var4, var1.horizontalAlignment); // L: 555
+			int var6 = this.method4519(var4, var1.verticalAlignment); // L: 556
+			var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 557
 		}
 
-	} // L: 673
+	} // L: 559
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "(Lgm;Len;IIFI)V",
-		garbageValue = "-1559767910"
+		descriptor = "(Lij;Lfj;IIFB)V",
+		garbageValue = "87"
 	)
-	void method3676(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
-		WorldMapLabel var6 = var1.getLabel(); // L: 676
-		if (var6 != null) { // L: 677
-			if (var6.size.method3533(var5)) { // L: 680
-				Font var7 = (Font)this.fonts.get(var6.size); // L: 683
-				var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1626, 0, 1, 0, var7.ascent / 2); // L: 684
+	void method4516(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
+		WorldMapLabel var6 = var1.getLabel(); // L: 562
+		if (var6 != null) { // L: 563
+			if (var6.size.method4370(var5)) { // L: 566
+				Font var7 = (Font)this.fonts.get(var6.size); // L: 569
+				var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1756, 0, 1, 0, var7.ascent / 2); // L: 570
 			}
 		}
-	} // L: 678 681 685
+	} // L: 564 567 571
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		descriptor = "(IILjava/util/HashSet;II)V",
-		garbageValue = "1502655393"
+		garbageValue = "707842246"
 	)
 	@Export("drawMapLinks")
 	void drawMapLinks(int var1, int var2, HashSet var3, int var4) {
-		float var5 = (float)var4 / 64.0F; // L: 688
-		Iterator var6 = this.icon0List.iterator(); // L: 689
+		float var5 = (float)var4 / 64.0F; // L: 574
+		Iterator var6 = this.icon0List.iterator(); // L: 575
 
 		while (var6.hasNext()) {
-			AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 690
-			if (var7.hasValidElement()) { // L: 692
-				int var8 = var7.coord2.x % 64; // L: 693
-				int var9 = var7.coord2.y % 64; // L: 694
-				var7.screenX = (int)((float)var1 + (float)var8 * var5); // L: 695
-				var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); // L: 696
-				if (!var3.contains(var7.getElement())) { // L: 697
-					this.method3666(var7, var7.screenX, var7.screenY, var5); // L: 700
+			AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 576
+			if (var7.hasValidElement()) { // L: 578
+				int var8 = var7.coord2.x % 64; // L: 579
+				int var9 = var7.coord2.y % 64; // L: 580
+				var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 581
+				var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); // L: 582
+				if (!var3.contains(var7.getElement())) { // L: 583
+					this.method4569(var7, var7.screenX, var7.screenY, var5); // L: 586
 				}
 			}
 		}
 
-	} // L: 703
+	} // L: 589
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		descriptor = "(Low;Lfj;B)I",
-		garbageValue = "13"
+		descriptor = "(Lpl;Lfc;I)I",
+		garbageValue = "-2104998727"
 	)
-	int method3683(SpritePixels var1, HorizontalAlignment var2) {
-		switch(var2.value) { // L: 706
+	int method4518(SpritePixels var1, HorizontalAlignment var2) {
+		switch(var2.value) { // L: 592
 		case 0:
-			return 0; // L: 709
-		case 1:
-			return -var1.subWidth / 2; // L: 717
+			return 0; // L: 595
+		case 2:
+			return -var1.subWidth / 2; // L: 603
 		default:
-			return -var1.subWidth; // L: 713
+			return -var1.subWidth; // L: 599
 		}
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "(Low;Lfg;S)I",
-		garbageValue = "26323"
+		descriptor = "(Lpl;Lfs;B)I",
+		garbageValue = "-51"
 	)
-	int method3705(SpritePixels var1, VerticalAlignment var2) {
-		switch(var2.value) { // L: 723
-		case 0:
-			return -var1.subHeight / 2; // L: 734
+	int method4519(SpritePixels var1, VerticalAlignment var2) {
+		switch(var2.value) { // L: 609
+		case 1:
+			return -var1.subHeight / 2; // L: 616
 		case 2:
-			return 0; // L: 726
+			return 0; // L: 620
 		default:
-			return -var1.subHeight; // L: 730
+			return -var1.subHeight; // L: 612
 		}
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lga;",
-		garbageValue = "-302877736"
+		descriptor = "(II)Lhm;",
+		garbageValue = "-2073836265"
 	)
-	WorldMapLabel method3756(int var1) {
-		WorldMapElement var2 = ItemComposition.WorldMapElement_get(var1); // L: 740
-		return this.createMapLabel(var2); // L: 741
+	WorldMapLabel method4551(int var1) {
+		WorldMapElement var2 = class78.WorldMapElement_get(var1); // L: 626
+		return this.createMapLabel(var2); // L: 627
 	}
 
 	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(Len;B)Lga;",
-		garbageValue = "15"
+		descriptor = "(Lfj;B)Lhm;",
+		garbageValue = "36"
 	)
 	@Export("createMapLabel")
 	WorldMapLabel createMapLabel(WorldMapElement var1) {
-		if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 745
-			WorldMapLabelSize var2 = WorldMapLabelSize.method3538(var1.textSize); // L: 748
-			if (var2 == null) { // L: 749
-				return null; // L: 750
+		if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 631
+			WorldMapLabelSize var2 = WorldMapLabelSize.method4362(var1.textSize); // L: 634
+			if (var2 == null) { // L: 635
+				return null; // L: 636
 			} else {
-				Font var3 = (Font)this.fonts.get(var2); // L: 752
-				if (var3 == null) { // L: 753
-					return null; // L: 754
+				Font var3 = (Font)this.fonts.get(var2); // L: 638
+				if (var3 == null) { // L: 639
+					return null; // L: 640
 				} else {
-					int var4 = var3.lineCount(var1.name, 1000000); // L: 756
-					String[] var5 = new String[var4]; // L: 757
-					var3.breakLines(var1.name, (int[])null, var5); // L: 758
-					int var6 = var5.length * var3.ascent / 2; // L: 759
-					int var7 = 0; // L: 760
-					String[] var8 = var5; // L: 762
-
-					for (int var9 = 0; var9 < var8.length; ++var9) { // L: 763
-						String var10 = var8[var9]; // L: 764
-						int var11 = var3.stringWidth(var10); // L: 766
-						if (var11 > var7) { // L: 767
-							var7 = var11; // L: 768
+					int var4 = var3.lineCount(var1.name, 1000000); // L: 642
+					String[] var5 = new String[var4]; // L: 643
+					var3.breakLines(var1.name, (int[])null, var5); // L: 644
+					int var6 = var5.length * var3.ascent / 2; // L: 645
+					int var7 = 0; // L: 646
+					String[] var8 = var5; // L: 648
+
+					for (int var9 = 0; var9 < var8.length; ++var9) { // L: 649
+						String var10 = var8[var9]; // L: 650
+						int var11 = var3.stringWidth(var10); // L: 652
+						if (var11 > var7) { // L: 653
+							var7 = var11; // L: 654
 						}
 					}
 
-					return new WorldMapLabel(var1.name, var7, var6, var2); // L: 773
+					return new WorldMapLabel(var1.name, var7, var6, var2); // L: 659
 				}
 			}
 		} else {
-			return null; // L: 746
+			return null; // L: 632
 		}
 	}
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIB)Ljava/util/List;",
-		garbageValue = "1"
+		garbageValue = "2"
 	)
-	List method3687(int var1, int var2, int var3, int var4, int var5) {
-		LinkedList var6 = new LinkedList(); // L: 777
-		if (var4 >= var1 && var5 >= var2) { // L: 778
-			if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 779
-				Iterator var7 = this.iconMap.values().iterator();
+	List method4522(int var1, int var2, int var3, int var4, int var5) {
+		LinkedList var6 = new LinkedList(); // L: 663
+		if (var4 >= var1 && var5 >= var2) { // L: 664
+			if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 665
+				Iterator var7 = this.iconMap.values().iterator(); // L: 666
 
 				AbstractWorldMapIcon var8;
-				while (var7.hasNext()) { // L: 780
-					var8 = (AbstractWorldMapIcon)var7.next(); // L: 781
-					if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 783
-						var6.add(var8); // L: 784
+				while (var7.hasNext()) {
+					var8 = (AbstractWorldMapIcon)var7.next(); // L: 667
+					if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 669
+						var6.add(var8); // L: 670
 					}
 				}
 
-				var7 = this.icon0List.iterator(); // L: 788
+				var7 = this.icon0List.iterator(); // L: 674
 
 				while (var7.hasNext()) {
-					var8 = (AbstractWorldMapIcon)var7.next(); // L: 789
-					if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 791
-						var6.add(var8); // L: 792
+					var8 = (AbstractWorldMapIcon)var7.next(); // L: 675
+					if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 677
+						var6.add(var8); // L: 678
 					}
 				}
 
-				return var6; // L: 796
+				return var6; // L: 682
 			} else {
-				return var6; // L: 787
+				return var6; // L: 673
 			}
 		} else {
 			return var6;
 		}
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		descriptor = "(S)Ljava/util/List;",
-		garbageValue = "-11615"
+		descriptor = "(I)Ljava/util/List;",
+		garbageValue = "1841805502"
 	)
 	@Export("icons")
 	List icons() {
-		LinkedList var1 = new LinkedList(); // L: 800
-		var1.addAll(this.icon0List); // L: 801
-		var1.addAll(this.iconMap.values()); // L: 802
-		return var1; // L: 803
+		LinkedList var1 = new LinkedList(); // L: 686
+		var1.addAll(this.icon0List); // L: 687
+		var1.addAll(this.iconMap.values()); // L: 688
+		return var1; // L: 689
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIB)V",
-		garbageValue = "-18"
+		garbageValue = "46"
 	)
-	void method3689(int var1, int var2, int var3, int var4) {
-		var3 %= 4; // L: 807
-		if (var3 == 0) { // L: 808
+	void method4501(int var1, int var2, int var3, int var4) {
+		var3 %= 4; // L: 693
+		if (var3 == 0) { // L: 694
 			Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
 		}
 
-		if (var3 == 1) { // L: 809
+		if (var3 == 1) { // L: 695
 			Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
 		}
 
-		if (var3 == 2) { // L: 810
+		if (var3 == 2) { // L: 696
 			Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
 		}
 
 		if (var3 == 3) {
-			Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 811
+			Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 697
 		}
 
-	} // L: 812
+	} // L: 698
 }
diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java
index 2ad4e580ec..79e02abc75 100644
--- a/runescape-client/src/main/java/WorldMapScaleHandler.java
+++ b/runescape-client/src/main/java/WorldMapScaleHandler.java
@@ -4,22 +4,22 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ge")
+@ObfuscatedName("ig")
 @Implements("WorldMapScaleHandler")
 public class WorldMapScaleHandler {
-	@ObfuscatedName("x")
+	@ObfuscatedName("ev")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lkz;"
 	)
-	@Export("Widget_spritesArchive")
-	static AbstractArchive Widget_spritesArchive;
-	@ObfuscatedName("i")
+	@Export("archive6")
+	static Archive archive6;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 811469011
+		intValue = 1907354945
 	)
 	@Export("pixelsPerTile")
 	int pixelsPerTile;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("tileTemplates")
 	byte[][][] tileTemplates;
 
@@ -27,46 +27,46 @@ public class WorldMapScaleHandler {
 		this.pixelsPerTile = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIII)V",
-		garbageValue = "1525676958"
+		descriptor = "(IIIIIIIIB)V",
+		garbageValue = "-14"
 	)
-	void method4086(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+	void method4907(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { // L: 14
-			var8 = this.method4084(var8, var7); // L: 15
-			var7 = this.method4065(var7);
-			Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile);
+			var8 = this.method4895(var8, var7); // L: 15
+			var7 = this.method4897(var7); // L: 16
+			Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17
 		}
-	}
+	} // L: 18
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "44"
+		descriptor = "(III)I",
+		garbageValue = "-1888183468"
 	)
-	int method4084(int var1, int var2) {
-		if (var2 == 9) {
+	int method4895(int var1, int var2) {
+		if (var2 == 9) { // L: 21
 			var1 = var1 + 1 & 3;
 		}
 
-		if (var2 == 10) {
+		if (var2 == 10) { // L: 22
 			var1 = var1 + 3 & 3;
 		}
 
-		if (var2 == 11) {
+		if (var2 == 11) { // L: 23
 			var1 = var1 + 3 & 3;
 		}
 
-		return var1;
+		return var1; // L: 24
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "332241717"
+		garbageValue = "-1710569700"
 	)
-	int method4065(int var1) {
+	int method4897(int var1) {
 		if (var1 != 9 && var1 != 10) { // L: 28
 			return var1 == 11 ? 8 : var1; // L: 29
 		} else {
@@ -74,10 +74,10 @@ int method4065(int var1) {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-139796910"
+		garbageValue = "16120985"
 	)
 	@Export("init")
 	void init() {
@@ -94,10 +94,10 @@ void init() {
 		}
 	} // L: 35 46
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "6694"
+		descriptor = "(I)V",
+		garbageValue = "705578005"
 	)
 	@Export("init0")
 	void init0() {
@@ -161,10 +161,10 @@ void init0() {
 		this.tileTemplates[0][3] = var1; // L: 84
 	} // L: 85
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "478227481"
+		garbageValue = "-2100707486"
 	)
 	@Export("init1")
 	void init1() {
@@ -232,10 +232,10 @@ void init1() {
 		this.tileTemplates[1][3] = var1; // L: 127
 	} // L: 128
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "654314335"
+		descriptor = "(B)V",
+		garbageValue = "65"
 	)
 	@Export("init2")
 	void init2() {
@@ -299,10 +299,10 @@ void init2() {
 		this.tileTemplates[2][3] = var1; // L: 166
 	} // L: 167
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "27"
+		descriptor = "(I)V",
+		garbageValue = "-1718839549"
 	)
 	@Export("init3")
 	void init3() {
@@ -366,10 +366,10 @@ void init3() {
 		this.tileTemplates[3][3] = var1; // L: 205
 	} // L: 206
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1406724170"
+		garbageValue = "766597576"
 	)
 	@Export("init4")
 	void init4() {
@@ -433,10 +433,10 @@ void init4() {
 		this.tileTemplates[4][3] = var1; // L: 244
 	} // L: 245
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1804052877"
+		garbageValue = "-236684263"
 	)
 	@Export("init5")
 	void init5() {
@@ -502,10 +502,10 @@ void init5() {
 		this.tileTemplates[5][3] = var1; // L: 285
 	} // L: 286
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "0"
+		descriptor = "(S)V",
+		garbageValue = "255"
 	)
 	@Export("init6")
 	void init6() {
@@ -571,10 +571,10 @@ void init6() {
 		this.tileTemplates[6][3] = var1; // L: 326
 	} // L: 327
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-507566900"
+		garbageValue = "-279760962"
 	)
 	@Export("init7")
 	void init7() {
@@ -639,219 +639,4 @@ void init7() {
 
 		this.tileTemplates[7][3] = var1; // L: 367
 	} // L: 368
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)J",
-		garbageValue = "-1513370360"
-	)
-	static long method4096(CharSequence var0) {
-		long var1 = 0L; // L: 16
-		int var3 = var0.length(); // L: 17
-
-		for (int var4 = 0; var4 < var3; ++var4) { // L: 18
-			var1 *= 37L; // L: 19
-			char var5 = var0.charAt(var4); // L: 20
-			if (var5 >= 'A' && var5 <= 'Z') { // L: 21
-				var1 += (long)(var5 + 1 - 65);
-			} else if (var5 >= 'a' && var5 <= 'z') { // L: 22
-				var1 += (long)(var5 + 1 - 97);
-			} else if (var5 >= '0' && var5 <= '9') { // L: 23
-				var1 += (long)(var5 + 27 - 48);
-			}
-
-			if (var1 >= 177917621779460413L) { // L: 24
-				break;
-			}
-		}
-
-		while (var1 % 37L == 0L && 0L != var1) { // L: 26
-			var1 /= 37L;
-		}
-
-		return var1; // L: 27
-	}
-
-	@ObfuscatedName("io")
-	@ObfuscatedSignature(
-		descriptor = "(Lcp;IIII)V",
-		garbageValue = "-1638178326"
-	)
-	@Export("addNpcToMenu")
-	static final void addNpcToMenu(NPC var0, int var1, int var2, int var3) {
-		NPCComposition var4 = var0.definition; // L: 9477
-		if (Client.menuOptionsCount < 400) { // L: 9478
-			if (var4.transforms != null) { // L: 9479
-				var4 = var4.transform();
-			}
-
-			if (var4 != null) { // L: 9480
-				if (var4.isInteractable) { // L: 9481
-					if (!var4.isFollower || Client.followerIndex == var1) { // L: 9482
-						String var5 = var4.name; // L: 9483
-						int var6;
-						int var9;
-						if (var4.combatLevel != 0 && var0.field1145 != 0) { // L: 9484
-							var6 = var0.field1145 != -1 ? var0.field1145 * -947188393 * 1234710119 : var4.combatLevel * -365575447 * 1462580569; // L: 9485
-							var9 = HealthBarDefinition.localPlayer.combatLevel; // L: 9488
-							int var10 = var9 - var6; // L: 9490
-							String var8;
-							if (var10 < -9) { // L: 9491
-								var8 = MouseHandler.colorStartTag(16711680); // L: 9492
-							} else if (var10 < -6) { // L: 9495
-								var8 = MouseHandler.colorStartTag(16723968); // L: 9496
-							} else if (var10 < -3) { // L: 9499
-								var8 = MouseHandler.colorStartTag(16740352); // L: 9500
-							} else if (var10 < 0) { // L: 9503
-								var8 = MouseHandler.colorStartTag(16756736); // L: 9504
-							} else if (var10 > 9) { // L: 9507
-								var8 = MouseHandler.colorStartTag(65280); // L: 9508
-							} else if (var10 > 6) { // L: 9511
-								var8 = MouseHandler.colorStartTag(4259584); // L: 9512
-							} else if (var10 > 3) { // L: 9515
-								var8 = MouseHandler.colorStartTag(8453888); // L: 9516
-							} else if (var10 > 0) { // L: 9519
-								var8 = MouseHandler.colorStartTag(12648192); // L: 9520
-							} else {
-								var8 = MouseHandler.colorStartTag(16776960); // L: 9523
-							}
-
-							var5 = var5 + var8 + " " + " (" + "level-" + var6 + ")"; // L: 9525
-						}
-
-						if (var4.isFollower && Client.followerOpsLowPriority) { // L: 9527
-							EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9528
-						}
-
-						if (Client.isItemSelected == 1) { // L: 9531
-							EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(16776960) + var5, 7, var1, var2, var3); // L: 9532
-						} else if (Client.isSpellSelected) { // L: 9535
-							if ((class116.selectedSpellFlags & 2) == 2) { // L: 9536
-								EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(16776960) + var5, 8, var1, var2, var3); // L: 9537
-							}
-						} else {
-							var6 = var4.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9542
-							String[] var7 = var4.actions; // L: 9543
-							int var11;
-							if (var7 != null) { // L: 9544
-								for (var11 = 4; var11 >= 0; --var11) { // L: 9545
-									if (var7[var11] != null && !var7[var11].equalsIgnoreCase("Attack")) { // L: 9546
-										var9 = 0; // L: 9547
-										if (var11 == 0) { // L: 9548
-											var9 = var6 + 9;
-										}
-
-										if (var11 == 1) { // L: 9549
-											var9 = var6 + 10;
-										}
-
-										if (var11 == 2) { // L: 9550
-											var9 = var6 + 11;
-										}
-
-										if (var11 == 3) { // L: 9551
-											var9 = var6 + 12;
-										}
-
-										if (var11 == 4) { // L: 9552
-											var9 = var6 + 13;
-										}
-
-										EnumComposition.insertMenuItemNoShift(var7[var11], MouseHandler.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9553
-									}
-								}
-							}
-
-							if (var7 != null) { // L: 9558
-								for (var11 = 4; var11 >= 0; --var11) { // L: 9559
-									if (var7[var11] != null && var7[var11].equalsIgnoreCase("Attack")) { // L: 9560
-										short var12 = 0; // L: 9561
-										if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 9562
-											if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var4.combatLevel > HealthBarDefinition.localPlayer.combatLevel) { // L: 9563
-												var12 = 2000; // L: 9564
-											}
-
-											var9 = 0; // L: 9566
-											if (var11 == 0) { // L: 9567
-												var9 = var12 + 9;
-											}
-
-											if (var11 == 1) { // L: 9568
-												var9 = var12 + 10;
-											}
-
-											if (var11 == 2) { // L: 9569
-												var9 = var12 + 11;
-											}
-
-											if (var11 == 3) { // L: 9570
-												var9 = var12 + 12;
-											}
-
-											if (var11 == 4) { // L: 9571
-												var9 = var12 + 13;
-											}
-
-											EnumComposition.insertMenuItemNoShift(var7[var11], MouseHandler.colorStartTag(16776960) + var5, var9, var1, var2, var3); // L: 9572
-										}
-									}
-								}
-							}
-
-							if (!var4.isFollower || !Client.followerOpsLowPriority) { // L: 9577
-								EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(16776960) + var5, 1003, var1, var2, var3); // L: 9578
-							}
-						}
-
-					}
-				}
-			}
-		}
-	} // L: 9582
-
-	@ObfuscatedName("jx")
-	@ObfuscatedSignature(
-		descriptor = "(Ljf;IIZB)V",
-		garbageValue = "-94"
-	)
-	@Export("alignWidgetSize")
-	static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
-		int var4 = var0.width; // L: 10259
-		int var5 = var0.height; // L: 10260
-		if (var0.widthAlignment == 0) { // L: 10261
-			var0.width = var0.rawWidth;
-		} else if (var0.widthAlignment == 1) { // L: 10262
-			var0.width = var1 - var0.rawWidth;
-		} else if (var0.widthAlignment == 2) { // L: 10263
-			var0.width = var0.rawWidth * var1 >> 14;
-		}
-
-		if (var0.heightAlignment == 0) { // L: 10264
-			var0.height = var0.rawHeight;
-		} else if (var0.heightAlignment == 1) { // L: 10265
-			var0.height = var2 - var0.rawHeight;
-		} else if (var0.heightAlignment == 2) {
-			var0.height = var2 * var0.rawHeight >> 14; // L: 10266
-		}
-
-		if (var0.widthAlignment == 4) { // L: 10267
-			var0.width = var0.field3068 * var0.height / var0.field3069;
-		}
-
-		if (var0.heightAlignment == 4) { // L: 10268
-			var0.height = var0.width * var0.field3069 / var0.field3068;
-		}
-
-		if (var0.contentType == 1337) { // L: 10269
-			Client.viewportWidget = var0;
-		}
-
-		if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10270
-			ScriptEvent var6 = new ScriptEvent(); // L: 10271
-			var6.widget = var0; // L: 10272
-			var6.args = var0.onResize; // L: 10273
-			Client.scriptEvents.addFirst(var6); // L: 10274
-		}
-
-	} // L: 10276
 }
diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java
index 0b2b8d7cf3..0114050cf9 100644
--- a/runescape-client/src/main/java/WorldMapSection.java
+++ b/runescape-client/src/main/java/WorldMapSection.java
@@ -3,53 +3,53 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gx")
+@ObfuscatedName("iv")
 @Implements("WorldMapSection")
 public interface WorldMapSection {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lfb;I)V",
-		garbageValue = "-1844012640"
+		descriptor = "(Lhr;I)V",
+		garbageValue = "2069930856"
 	)
 	@Export("expandBounds")
 	void expandBounds(WorldMapArea var1);
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)Z",
-		garbageValue = "-1501827396"
+		descriptor = "(IIIB)Z",
+		garbageValue = "81"
 	)
 	@Export("containsCoord")
 	boolean containsCoord(int var1, int var2, int var3);
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "-356013678"
+		garbageValue = "42159517"
 	)
 	@Export("containsPosition")
 	boolean containsPosition(int var1, int var2);
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)[I",
-		garbageValue = "-79"
+		descriptor = "(IIII)[I",
+		garbageValue = "22240711"
 	)
 	@Export("getBorderTileLengths")
 	int[] getBorderTileLengths(int var1, int var2, int var3);
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lie;",
-		garbageValue = "494177498"
+		descriptor = "(IIS)Lju;",
+		garbageValue = "5000"
 	)
 	@Export("coord")
 	Coord coord(int var1, int var2);
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-682362313"
+		descriptor = "(Lpi;S)V",
+		garbageValue = "-15299"
 	)
 	@Export("read")
 	void read(Buffer var1);
diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java
index c92538aa7a..9a14df83d3 100644
--- a/runescape-client/src/main/java/WorldMapSection0.java
+++ b/runescape-client/src/main/java/WorldMapSection0.java
@@ -4,90 +4,90 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gn")
+@ObfuscatedName("ha")
 @Implements("WorldMapSection0")
 public class WorldMapSection0 implements WorldMapSection {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 272991891
+		intValue = -1379468797
 	)
 	@Export("oldZ")
 	int oldZ;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 754094051
+		intValue = 1978034363
 	)
 	@Export("newZ")
 	int newZ;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -644010773
+		intValue = -1418706877
 	)
 	@Export("oldX")
 	int oldX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1805234219
+		intValue = -455262703
 	)
 	@Export("oldY")
 	int oldY;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1829364501
+		intValue = -1189566559
 	)
 	@Export("newX")
 	int newX;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 2048396349
+		intValue = -1025005161
 	)
 	@Export("newY")
 	int newY;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1973016615
+		intValue = -2060231737
 	)
 	@Export("oldChunkXLow")
 	int oldChunkXLow;
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1669534475
+		intValue = -1972325381
 	)
 	@Export("oldChunkYLow")
 	int oldChunkYLow;
-	@ObfuscatedName("j")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1580023959
+		intValue = -402429253
 	)
 	@Export("oldChunkXHigh")
 	int oldChunkXHigh;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1163870055
+		intValue = 2143866963
 	)
 	@Export("oldChunkYHigh")
 	int oldChunkYHigh;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1236846997
+		intValue = -1182995105
 	)
 	@Export("newChunkXLow")
 	int newChunkXLow;
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 808496867
+		intValue = -1073244035
 	)
 	@Export("newChunkYLow")
 	int newChunkYLow;
-	@ObfuscatedName("k")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1728394355
+		intValue = -1074307305
 	)
 	@Export("newChunkXHigh")
 	int newChunkXHigh;
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -981337131
+		intValue = 726894699
 	)
 	@Export("newChunkYHigh")
 	int newChunkYHigh;
@@ -95,140 +95,188 @@ public class WorldMapSection0 implements WorldMapSection {
 	WorldMapSection0() {
 	} // L: 22
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lfb;I)V",
-		garbageValue = "-1844012640"
+		descriptor = "(Lhr;I)V",
+		garbageValue = "2069930856"
 	)
 	@Export("expandBounds")
 	public void expandBounds(WorldMapArea var1) {
-		if (var1.regionLowX > this.newX) { // L: 25
+		if (var1.regionLowX > this.newX) { // L: 26
 			var1.regionLowX = this.newX;
 		}
 
 		if (var1.regionHighX < this.newX) {
-			var1.regionHighX = this.newX;
+			var1.regionHighX = this.newX; // L: 27
 		}
 
-		if (var1.regionLowY > this.newY) {
+		if (var1.regionLowY > this.newY) { // L: 28
 			var1.regionLowY = this.newY;
 		}
 
-		if (var1.regionHighY < this.newY) {
+		if (var1.regionHighY < this.newY) { // L: 29
 			var1.regionHighY = this.newY;
 		}
 
-	} // L: 29
+	} // L: 30
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)Z",
-		garbageValue = "-1501827396"
+		descriptor = "(IIIB)Z",
+		garbageValue = "81"
 	)
 	@Export("containsCoord")
 	public boolean containsCoord(int var1, int var2, int var3) {
-		if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // L: 32
-			return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 35
+		if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // L: 34
+			return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 37
 		} else {
-			return false; // L: 33
+			return false; // L: 35
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "-356013678"
+		garbageValue = "42159517"
 	)
 	@Export("containsPosition")
 	public boolean containsPosition(int var1, int var2) {
-		return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 39
+		return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 42
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)[I",
-		garbageValue = "-79"
+		descriptor = "(IIII)[I",
+		garbageValue = "22240711"
 	)
 	@Export("getBorderTileLengths")
 	public int[] getBorderTileLengths(int var1, int var2, int var3) {
-		if (!this.containsCoord(var1, var2, var3)) { // L: 43
-			return null; // L: 44
+		if (!this.containsCoord(var1, var2, var3)) { // L: 47
+			return null; // L: 48
 		} else {
-			int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48
-			return var4; // L: 49
+			int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 50 51 52
+			return var4; // L: 53
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lie;",
-		garbageValue = "494177498"
+		descriptor = "(IIS)Lju;",
+		garbageValue = "5000"
 	)
 	@Export("coord")
 	public Coord coord(int var1, int var2) {
-		if (!this.containsPosition(var1, var2)) {
-			return null;
+		if (!this.containsPosition(var1, var2)) { // L: 58
+			return null; // L: 59
 		} else {
-			int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56
-			int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57
-			return new Coord(this.oldZ, var3, var4); // L: 58
+			int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 61
+			int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 62
+			return new Coord(this.oldZ, var3, var4); // L: 63
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-682362313"
+		descriptor = "(Lpi;S)V",
+		garbageValue = "-15299"
 	)
 	@Export("read")
 	public void read(Buffer var1) {
-		this.oldZ = var1.readUnsignedByte(); // L: 62
-		this.newZ = var1.readUnsignedByte(); // L: 63
-		this.oldX = var1.readUnsignedShort(); // L: 64
-		this.oldChunkXLow = var1.readUnsignedByte(); // L: 65
-		this.oldChunkXHigh = var1.readUnsignedByte(); // L: 66
-		this.oldY = var1.readUnsignedShort(); // L: 67
-		this.oldChunkYLow = var1.readUnsignedByte(); // L: 68
-		this.oldChunkYHigh = var1.readUnsignedByte(); // L: 69
-		this.newX = var1.readUnsignedShort(); // L: 70
-		this.newChunkXLow = var1.readUnsignedByte(); // L: 71
-		this.newChunkXHigh = var1.readUnsignedByte(); // L: 72
-		this.newY = var1.readUnsignedShort(); // L: 73
-		this.newChunkYLow = var1.readUnsignedByte(); // L: 74
-		this.newChunkYHigh = var1.readUnsignedByte(); // L: 75
-		this.postRead(); // L: 76
-	} // L: 77
-
-	@ObfuscatedName("e")
+		this.oldZ = var1.readUnsignedByte(); // L: 68
+		this.newZ = var1.readUnsignedByte(); // L: 69
+		this.oldX = var1.readUnsignedShort(); // L: 70
+		this.oldChunkXLow = var1.readUnsignedByte(); // L: 71
+		this.oldChunkXHigh = var1.readUnsignedByte(); // L: 72
+		this.oldY = var1.readUnsignedShort(); // L: 73
+		this.oldChunkYLow = var1.readUnsignedByte(); // L: 74
+		this.oldChunkYHigh = var1.readUnsignedByte(); // L: 75
+		this.newX = var1.readUnsignedShort(); // L: 76
+		this.newChunkXLow = var1.readUnsignedByte(); // L: 77
+		this.newChunkXHigh = var1.readUnsignedByte(); // L: 78
+		this.newY = var1.readUnsignedShort(); // L: 79
+		this.newChunkYLow = var1.readUnsignedByte(); // L: 80
+		this.newChunkYHigh = var1.readUnsignedByte(); // L: 81
+		this.postRead(); // L: 82
+	} // L: 83
+
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1539376631"
+		garbageValue = "-109463717"
 	)
 	@Export("postRead")
 	void postRead() {
-	} // L: 79
+	} // L: 85
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "714098050"
+		descriptor = "([BI)V",
+		garbageValue = "-27466891"
 	)
-	public static void method3917(int var0) {
-		if (class247.musicPlayerStatus != 0) { // L: 26
-			class247.musicTrackVolume = var0;
-		} else {
-			class247.midiPcmStream.setPcmStreamVolume(var0); // L: 27
+	@Export("SpriteBuffer_decode")
+	static void SpriteBuffer_decode(byte[] var0) {
+		Buffer var1 = new Buffer(var0); // L: 102
+		var1.offset = var0.length - 2; // L: 103
+		class440.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 104
+		class141.SpriteBuffer_xOffsets = new int[class440.SpriteBuffer_spriteCount]; // L: 105
+		RouteStrategy.SpriteBuffer_yOffsets = new int[class440.SpriteBuffer_spriteCount]; // L: 106
+		class432.SpriteBuffer_spriteWidths = new int[class440.SpriteBuffer_spriteCount]; // L: 107
+		class330.SpriteBuffer_spriteHeights = new int[class440.SpriteBuffer_spriteCount]; // L: 108
+		class369.SpriteBuffer_pixels = new byte[class440.SpriteBuffer_spriteCount][]; // L: 109
+		var1.offset = var0.length - 7 - class440.SpriteBuffer_spriteCount * 8; // L: 110
+		class432.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 111
+		class432.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 112
+		int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 113
+
+		int var3;
+		for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 114
+			class141.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
 		}
 
-	} // L: 28
+		for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 115
+			RouteStrategy.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
+		}
 
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;III)Low;",
-		garbageValue = "-1166598704"
-	)
-	@Export("SpriteBuffer_getSprite")
-	public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
-		return !BuddyRankComparator.method2502(var0, var1, var2) ? null : ItemLayer.method4107(); // L: 53 54
-	}
+		for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 116
+			class432.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 117
+			class330.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort();
+		}
+
+		var1.offset = var0.length - 7 - class440.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 118
+		class432.SpriteBuffer_spritePalette = new int[var2]; // L: 119
+
+		for (var3 = 1; var3 < var2; ++var3) { // L: 120
+			class432.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 121
+			if (class432.SpriteBuffer_spritePalette[var3] == 0) { // L: 122
+				class432.SpriteBuffer_spritePalette[var3] = 1;
+			}
+		}
+
+		var1.offset = 0; // L: 124
+
+		for (var3 = 0; var3 < class440.SpriteBuffer_spriteCount; ++var3) { // L: 125
+			int var4 = class432.SpriteBuffer_spriteWidths[var3]; // L: 126
+			int var5 = class330.SpriteBuffer_spriteHeights[var3]; // L: 127
+			int var6 = var5 * var4; // L: 128
+			byte[] var7 = new byte[var6]; // L: 129
+			class369.SpriteBuffer_pixels[var3] = var7; // L: 130
+			int var8 = var1.readUnsignedByte(); // L: 131
+			int var9;
+			if (var8 == 0) { // L: 132
+				for (var9 = 0; var9 < var6; ++var9) { // L: 133
+					var7[var9] = var1.readByte();
+				}
+			} else if (var8 == 1) { // L: 135
+				for (var9 = 0; var9 < var4; ++var9) { // L: 136
+					for (int var10 = 0; var10 < var5; ++var10) { // L: 137
+						var7[var9 + var4 * var10] = var1.readByte(); // L: 138
+					}
+				}
+			}
+		}
+
+	} // L: 143
 }
diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java
index a1af073e68..fd2cb7c010 100644
--- a/runescape-client/src/main/java/WorldMapSection1.java
+++ b/runescape-client/src/main/java/WorldMapSection1.java
@@ -1,54 +1,51 @@
+import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("gf")
+@ObfuscatedName("it")
 @Implements("WorldMapSection1")
 public class WorldMapSection1 implements WorldMapSection {
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "[[Ljf;"
+	@ObfuscatedName("su")
+	@ObfuscatedGetter(
+		intValue = 635212315
 	)
-	@Export("Widget_interfaceComponents")
-	public static Widget[][] Widget_interfaceComponents;
-	@ObfuscatedName("ff")
-	static String field2203;
-	@ObfuscatedName("i")
+	static int field2755;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 627592207
+		intValue = 703119
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1419661361
+		intValue = 151084345
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1032024163
+		intValue = -1603380561
 	)
 	@Export("regionStartX")
 	int regionStartX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1425416297
+		intValue = -945911483
 	)
 	@Export("regionStartY")
 	int regionStartY;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -605929777
+		intValue = -1790058655
 	)
 	@Export("regionEndX")
 	int regionEndX;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1140960947
+		intValue = 1326239363
 	)
 	@Export("regionEndY")
 	int regionEndY;
@@ -56,180 +53,132 @@ public class WorldMapSection1 implements WorldMapSection {
 	WorldMapSection1() {
 	} // L: 14
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lfb;I)V",
-		garbageValue = "-1844012640"
+		descriptor = "(Lhr;I)V",
+		garbageValue = "2069930856"
 	)
 	@Export("expandBounds")
 	public void expandBounds(WorldMapArea var1) {
-		if (var1.regionLowX > this.regionEndX) { // L: 17
+		if (var1.regionLowX > this.regionEndX) { // L: 18
 			var1.regionLowX = this.regionEndX;
 		}
 
 		if (var1.regionHighX < this.regionEndX) {
-			var1.regionHighX = this.regionEndX; // L: 18
+			var1.regionHighX = this.regionEndX; // L: 19
 		}
 
-		if (var1.regionLowY > this.regionEndY) { // L: 19
+		if (var1.regionLowY > this.regionEndY) { // L: 20
 			var1.regionLowY = this.regionEndY;
 		}
 
-		if (var1.regionHighY < this.regionEndY) { // L: 20
+		if (var1.regionHighY < this.regionEndY) { // L: 21
 			var1.regionHighY = this.regionEndY;
 		}
 
-	} // L: 21
+	} // L: 22
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)Z",
-		garbageValue = "-1501827396"
+		descriptor = "(IIIB)Z",
+		garbageValue = "81"
 	)
 	@Export("containsCoord")
 	public boolean containsCoord(int var1, int var2, int var3) {
-		if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 24
-			return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 27
+		if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 26
+			return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 29
 		} else {
-			return false; // L: 25
+			return false; // L: 27
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "-356013678"
+		garbageValue = "42159517"
 	)
 	@Export("containsPosition")
 	public boolean containsPosition(int var1, int var2) {
-		return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 31
+		return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 34
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)[I",
-		garbageValue = "-79"
+		descriptor = "(IIII)[I",
+		garbageValue = "22240711"
 	)
 	@Export("getBorderTileLengths")
 	public int[] getBorderTileLengths(int var1, int var2, int var3) {
-		if (!this.containsCoord(var1, var2, var3)) { // L: 35
-			return null; // L: 36
+		if (!this.containsCoord(var1, var2, var3)) { // L: 39
+			return null; // L: 40
 		} else {
-			int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 38 39 40
-			return var4; // L: 41
+			int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 42 43 44
+			return var4; // L: 45
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lie;",
-		garbageValue = "494177498"
+		descriptor = "(IIS)Lju;",
+		garbageValue = "5000"
 	)
 	@Export("coord")
 	public Coord coord(int var1, int var2) {
-		if (!this.containsPosition(var1, var2)) { // L: 45
-			return null; // L: 46
+		if (!this.containsPosition(var1, var2)) { // L: 50
+			return null; // L: 51
 		} else {
-			int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 48
-			int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 49
-			return new Coord(this.minPlane, var3, var4); // L: 50
+			int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 53
+			int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 54
+			return new Coord(this.minPlane, var3, var4); // L: 55
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-682362313"
+		descriptor = "(Lpi;S)V",
+		garbageValue = "-15299"
 	)
 	@Export("read")
 	public void read(Buffer var1) {
-		this.minPlane = var1.readUnsignedByte(); // L: 54
-		this.planes = var1.readUnsignedByte(); // L: 55
-		this.regionStartX = var1.readUnsignedShort(); // L: 56
-		this.regionStartY = var1.readUnsignedShort(); // L: 57
-		this.regionEndX = var1.readUnsignedShort(); // L: 58
-		this.regionEndY = var1.readUnsignedShort(); // L: 59
-		this.postRead(); // L: 60
-	} // L: 61
-
-	@ObfuscatedName("e")
+		this.minPlane = var1.readUnsignedByte(); // L: 60
+		this.planes = var1.readUnsignedByte(); // L: 61
+		this.regionStartX = var1.readUnsignedShort(); // L: 62
+		this.regionStartY = var1.readUnsignedShort(); // L: 63
+		this.regionEndX = var1.readUnsignedShort(); // L: 64
+		this.regionEndY = var1.readUnsignedShort(); // L: 65
+		this.postRead(); // L: 66
+	} // L: 67
+
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "124"
+		descriptor = "(I)V",
+		garbageValue = "-2072209821"
 	)
 	@Export("postRead")
 	void postRead() {
-	} // L: 63
+	} // L: 69
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("kb")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "-4"
+		descriptor = "(I)V",
+		garbageValue = "349431240"
 	)
-	static int method3999(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1116
-		if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1117
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1118
-			return 1; // L: 1119
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1121
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1122
-			return 1; // L: 1123
-		} else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1125
-			Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.text; // L: 1126
-			return 1; // L: 1127
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1129
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1130
-			return 1; // L: 1131
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1133
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1134
-			return 1; // L: 1135
-		} else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1137
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1138
-			return 1; // L: 1139
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1141
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1142
-			return 1; // L: 1143
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1145
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1146
-			return 1; // L: 1147
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1149
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1150
-			return 1; // L: 1151
-		} else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1153
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1154
-			return 1; // L: 1155
-		} else if (var0 == 1610) { // L: 1157
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1158
-			return 1; // L: 1159
-		} else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1161
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.color; // L: 1162
-			return 1; // L: 1163
-		} else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1165
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.color2; // L: 1166
-			return 1; // L: 1167
-		} else if (var0 == 1613) { // L: 1169
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1170
-			return 1; // L: 1171
-		} else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1173
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1174
-			return 1; // L: 1175
-		} else if (var0 != 1615 && var0 != 1616) { // L: 1177
-			return 2; // L: 1181
-		} else {
-			++class14.Interpreter_intStackSize; // L: 1178
-			return 1; // L: 1179
+	static final void method4831() {
+		for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 12447
+			Player var1 = Client.players[Players.Players_indices[var0]]; // L: 12448
+			var1.clearIsFriend(); // L: 12449
 		}
-	}
 
-	@ObfuscatedName("kd")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "209576607"
-	)
-	@Export("updateSoundEffectVolume")
-	static final void updateSoundEffectVolume(int var0) {
-		var0 = Math.min(Math.max(var0, 0), 127); // L: 11403
-		class408.clientPreferences.soundEffectsVolume = var0; // L: 11404
-		Login.savePreferences(); // L: 11405
-	} // L: 11406
+		Iterator var2 = Messages.Messages_hashTable.iterator(); // L: 12452
+
+		while (var2.hasNext()) {
+			Message var3 = (Message)var2.next(); // L: 12453
+			var3.clearIsFromFriend(); // L: 12455
+		}
+
+		if (Players.friendsChat != null) { // L: 12459
+			Players.friendsChat.clearFriends(); // L: 12460
+		}
+
+	} // L: 12462
 }
diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java
index 2d4f9fbe74..b4e3f1c8f1 100644
--- a/runescape-client/src/main/java/WorldMapSection2.java
+++ b/runescape-client/src/main/java/WorldMapSection2.java
@@ -4,194 +4,201 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fx")
+@ObfuscatedName("ht")
 @Implements("WorldMapSection2")
 public class WorldMapSection2 implements WorldMapSection {
-	@ObfuscatedName("kb")
-	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+	@ObfuscatedName("fg")
+	@ObfuscatedGetter(
+		intValue = 1621572449
 	)
-	static Widget field2037;
-	@ObfuscatedName("i")
+	static int field2601;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 268471801
+		intValue = -1294492431
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -2064297275
+		intValue = 1928617505
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 120844139
+		intValue = 959776667
 	)
 	@Export("regionStartX")
 	int regionStartX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 307764911
+		intValue = 1522453015
 	)
 	@Export("regionStartY")
 	int regionStartY;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1741263817
+		intValue = 1997000163
 	)
 	@Export("regionEndX")
 	int regionEndX;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1879263737
+		intValue = 1818792557
 	)
 	@Export("regionEndY")
 	int regionEndY;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -829160943
+		intValue = -961115099
 	)
-	int field2033;
-	@ObfuscatedName("p")
+	int field2595;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 2138355431
+		intValue = -1227046003
 	)
-	int field2028;
-	@ObfuscatedName("j")
+	int field2597;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1057428701
+		intValue = 1985561305
 	)
-	int field2026;
-	@ObfuscatedName("b")
+	int field2600;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1043419133
+		intValue = 1750450639
 	)
-	int field2035;
+	int field2599;
 
 	WorldMapSection2() {
 	} // L: 18
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lfb;I)V",
-		garbageValue = "-1844012640"
+		descriptor = "(Lhr;I)V",
+		garbageValue = "2069930856"
 	)
 	@Export("expandBounds")
 	public void expandBounds(WorldMapArea var1) {
-		if (var1.regionLowX > this.field2033) { // L: 21
-			var1.regionLowX = this.field2033;
+		if (var1.regionLowX > this.field2595) { // L: 22
+			var1.regionLowX = this.field2595;
 		}
 
-		if (var1.regionHighX < this.field2026) {
-			var1.regionHighX = this.field2026; // L: 22
+		if (var1.regionHighX < this.field2600) {
+			var1.regionHighX = this.field2600; // L: 23
 		}
 
-		if (var1.regionLowY > this.field2028) { // L: 23
-			var1.regionLowY = this.field2028;
+		if (var1.regionLowY > this.field2597) { // L: 24
+			var1.regionLowY = this.field2597;
 		}
 
-		if (var1.regionHighY < this.field2035) { // L: 24
-			var1.regionHighY = this.field2035;
+		if (var1.regionHighY < this.field2599) { // L: 25
+			var1.regionHighY = this.field2599;
 		}
 
-	} // L: 25
+	} // L: 26
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)Z",
-		garbageValue = "-1501827396"
+		descriptor = "(IIIB)Z",
+		garbageValue = "81"
 	)
 	@Export("containsCoord")
 	public boolean containsCoord(int var1, int var2, int var3) {
-		if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 28
-			return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 31
+		if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 30
+			return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 33
 		} else {
-			return false; // L: 29
+			return false; // L: 31
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "-356013678"
+		garbageValue = "42159517"
 	)
 	@Export("containsPosition")
 	public boolean containsPosition(int var1, int var2) {
-		return var1 >> 6 >= this.field2033 && var1 >> 6 <= this.field2026 && var2 >> 6 >= this.field2028 && var2 >> 6 <= this.field2035; // L: 35
+		return var1 >> 6 >= this.field2595 && var1 >> 6 <= this.field2600 && var2 >> 6 >= this.field2597 && var2 >> 6 <= this.field2599; // L: 38
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)[I",
-		garbageValue = "-79"
+		descriptor = "(IIII)[I",
+		garbageValue = "22240711"
 	)
 	@Export("getBorderTileLengths")
 	public int[] getBorderTileLengths(int var1, int var2, int var3) {
-		if (!this.containsCoord(var1, var2, var3)) { // L: 39
-			return null; // L: 40
+		if (!this.containsCoord(var1, var2, var3)) { // L: 43
+			return null; // L: 44
 		} else {
-			int[] var4 = new int[]{var2 + (this.field2033 * 64 - this.regionStartX * 64), var3 + (this.field2028 * 64 - this.regionStartY * 64)}; // L: 42 43 44
-			return var4; // L: 45
+			int[] var4 = new int[]{var2 + (this.field2595 * 64 - this.regionStartX * 64), var3 + (this.field2597 * 64 - this.regionStartY * 64)}; // L: 46 47 48
+			return var4; // L: 49
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lie;",
-		garbageValue = "494177498"
+		descriptor = "(IIS)Lju;",
+		garbageValue = "5000"
 	)
 	@Export("coord")
 	public Coord coord(int var1, int var2) {
-		if (!this.containsPosition(var1, var2)) { // L: 49
-			return null; // L: 50
+		if (!this.containsPosition(var1, var2)) { // L: 54
+			return null; // L: 55
 		} else {
-			int var3 = this.regionStartX * 64 - this.field2033 * 64 + var1; // L: 52
-			int var4 = var2 + (this.regionStartY * 64 - this.field2028 * 64); // L: 53
-			return new Coord(this.minPlane, var3, var4); // L: 54
+			int var3 = this.regionStartX * 64 - this.field2595 * 64 + var1; // L: 57
+			int var4 = var2 + (this.regionStartY * 64 - this.field2597 * 64); // L: 58
+			return new Coord(this.minPlane, var3, var4); // L: 59
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-682362313"
+		descriptor = "(Lpi;S)V",
+		garbageValue = "-15299"
 	)
 	@Export("read")
 	public void read(Buffer var1) {
-		this.minPlane = var1.readUnsignedByte(); // L: 58
-		this.planes = var1.readUnsignedByte(); // L: 59
-		this.regionStartX = var1.readUnsignedShort(); // L: 60
-		this.regionStartY = var1.readUnsignedShort(); // L: 61
-		this.regionEndX = var1.readUnsignedShort(); // L: 62
-		this.regionEndY = var1.readUnsignedShort(); // L: 63
-		this.field2033 = var1.readUnsignedShort(); // L: 64
-		this.field2028 = var1.readUnsignedShort(); // L: 65
-		this.field2026 = var1.readUnsignedShort(); // L: 66
-		this.field2035 = var1.readUnsignedShort(); // L: 67
-		this.postRead(); // L: 68
-	} // L: 69
+		this.minPlane = var1.readUnsignedByte(); // L: 64
+		this.planes = var1.readUnsignedByte(); // L: 65
+		this.regionStartX = var1.readUnsignedShort(); // L: 66
+		this.regionStartY = var1.readUnsignedShort(); // L: 67
+		this.regionEndX = var1.readUnsignedShort(); // L: 68
+		this.regionEndY = var1.readUnsignedShort(); // L: 69
+		this.field2595 = var1.readUnsignedShort(); // L: 70
+		this.field2597 = var1.readUnsignedShort(); // L: 71
+		this.field2600 = var1.readUnsignedShort(); // L: 72
+		this.field2599 = var1.readUnsignedShort(); // L: 73
+		this.postRead(); // L: 74
+	} // L: 75
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1513297237"
+		garbageValue = "426265039"
 	)
 	@Export("postRead")
 	void postRead() {
-	} // L: 71
+	} // L: 77
 
-	@ObfuscatedName("fq")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
-		garbageValue = "14"
+		descriptor = "(III)I",
+		garbageValue = "-494413761"
 	)
-	static final void method3584(boolean var0) {
-		if (var0) { // L: 3286
-			Client.field693 = Login.field875 ? class112.field1345 : class112.field1347; // L: 3287
-		} else {
-			Client.field693 = class408.clientPreferences.parameters.containsKey(ClanChannel.method2824(Login.Login_username)) ? class112.field1350 : class112.field1346; // L: 3290
-		}
+	public static int method4414(int var0, int var1) {
+		return (var0 << 8) + var1; // L: 13
+	}
 
-	} // L: 3292
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(S)V",
+		garbageValue = "12387"
+	)
+	public static void method4417() {
+		Widget.Widget_cachedModels.clear(); // L: 723
+		Widget.Widget_cachedFonts.clear(); // L: 724
+		Widget.Widget_cachedSpriteMasks.clear(); // L: 725
+		Widget.field3222.clear(); // L: 726
+	} // L: 727
 }
diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java
index 83a3a513c6..cae81fb115 100644
--- a/runescape-client/src/main/java/WorldMapSectionType.java
+++ b/runescape-client/src/main/java/WorldMapSectionType.java
@@ -3,90 +3,89 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("gc")
+@ObfuscatedName("hv")
 @Implements("WorldMapSectionType")
 public enum WorldMapSectionType implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lgc;"
+		descriptor = "Lhv;"
 	)
 	@Export("WORLDMAPSECTIONTYPE0")
-	WORLDMAPSECTIONTYPE0(2, (byte)0),
-	@ObfuscatedName("w")
+	WORLDMAPSECTIONTYPE0(1, (byte)0),
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lgc;"
+		descriptor = "Lhv;"
 	)
 	@Export("WORLDMAPSECTIONTYPE1")
-	WORLDMAPSECTIONTYPE1(1, (byte)1),
-	@ObfuscatedName("s")
+	WORLDMAPSECTIONTYPE1(0, (byte)1),
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lgc;"
+		descriptor = "Lhv;"
 	)
 	@Export("WORLDMAPSECTIONTYPE2")
 	WORLDMAPSECTIONTYPE2(3, (byte)2),
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lgc;"
+		descriptor = "Lhv;"
 	)
 	@Export("WORLDMAPSECTIONTYPE3")
-	WORLDMAPSECTIONTYPE3(0, (byte)3);
+	WORLDMAPSECTIONTYPE3(2, (byte)3);
 
-	@ObfuscatedName("au")
-	@Export("hasFocus")
-	protected static boolean hasFocus;
-	@ObfuscatedName("ir")
-	@ObfuscatedGetter(
-		intValue = 1073689221
-	)
-	@Export("cameraX")
-	static int cameraX;
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -637994723
+		intValue = -1872417907
 	)
 	@Export("type")
 	final int type;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("id")
 	final byte id;
 
 	WorldMapSectionType(int var3, byte var4) {
-		this.type = var3; // L: 17
-		this.id = var4; // L: 18
-	} // L: 19
+		this.type = var3; // L: 21
+		this.id = var4; // L: 22
+	} // L: 23
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 22
+		return this.id; // L: 27
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "1484599212"
+		descriptor = "(I)[Lhv;",
+		garbageValue = "-719396809"
 	)
-	static int method3920(int var0, int var1) {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28
-		if (var2 == null) { // L: 29
-			return 0;
-		} else if (var1 == -1) { // L: 30
-			return 0;
-		} else {
-			int var3 = 0; // L: 31
+	static WorldMapSectionType[] method4754() {
+		return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE3, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE0}; // L: 17
+	}
 
-			for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32
-				if (var2.ids[var4] == var1) {
-					var3 += var2.quantities[var4]; // L: 33
-				}
+	@ObfuscatedName("ac")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZS)I",
+		garbageValue = "4095"
+	)
+	static int method4756(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.LOGOUT) { // L: 3611
+			Client.logoutTimer = 250; // L: 3612
+			return 1; // L: 3613
+		} else if (var0 != 5631 && var0 != 5633) { // L: 3615
+			if (var0 == 5632) { // L: 3619
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 26; // L: 3620
+				return 1; // L: 3621
+			} else {
+				return 2; // L: 3623
 			}
-
-			return var3; // L: 35
+		} else {
+			class13.Interpreter_stringStackSize -= 2; // L: 3616
+			return 1; // L: 3617
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java
index 652978ebe8..af0f8218c5 100644
--- a/runescape-client/src/main/java/WorldMapSprite.java
+++ b/runescape-client/src/main/java/WorldMapSprite.java
@@ -1,12 +1,21 @@
+import java.awt.Desktop;
+import java.awt.Desktop.Action;
+import java.net.URI;
 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("gg")
+@ObfuscatedName("hq")
 @Implements("WorldMapSprite")
 public final class WorldMapSprite {
-	@ObfuscatedName("w")
+	@ObfuscatedName("ut")
+	@ObfuscatedGetter(
+		longValue = 3393919401906433013L
+	)
+	static long field2727;
+	@ObfuscatedName("b")
 	@Export("tileColors")
 	final int[] tileColors;
 
@@ -18,13 +27,42 @@ public final class WorldMapSprite {
 		this.tileColors = var1; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "1338701397"
+		garbageValue = "-1161754740"
 	)
 	@Export("getTileColor")
 	final int getTileColor(int var1, int var2) {
-		return this.tileColors[var1 + var2 * 64]; // L: 41
+		return this.tileColors[var1 + var2 * 64]; // L: 19
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;ZZI)V",
+		garbageValue = "230861091"
+	)
+	@Export("openURL")
+	public static void openURL(String var0, boolean var1, boolean var2) {
+		if (var1) { // L: 23
+			if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 24
+				try {
+					Desktop.getDesktop().browse(new URI(var0)); // L: 26
+					return; // L: 53
+				} catch (Exception var4) { // L: 29
+				}
+			}
+
+			if (class29.field177.startsWith("win")) { // L: 31
+				NPC.method2314(var0, 0, "openjs"); // L: 34
+			} else if (class29.field177.startsWith("mac")) { // L: 39
+				NPC.method2314(var0, 1, "openjs"); // L: 40
+			} else {
+				NPC.method2314(var0, 2, "openjs"); // L: 44
+			}
+		} else {
+			NPC.method2314(var0, 3, "openjs"); // L: 49
+		}
+
 	}
 }
diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java
index 4be2802422..d89247aed0 100644
--- a/runescape-client/src/main/java/Wrapper.java
+++ b/runescape-client/src/main/java/Wrapper.java
@@ -2,10 +2,10 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("in")
+@ObfuscatedName("ie")
 @Implements("Wrapper")
 public abstract class Wrapper extends DualNode {
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("size")
 	final int size;
 
@@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode {
 		this.size = var1; // L: 9
 	} // L: 10
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@Export("get")
 	abstract Object get();
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@Export("isSoft")
 	abstract boolean isSoft();
 }
diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java
index 11ede2a875..cfe476555c 100644
--- a/runescape-client/src/main/java/class0.java
+++ b/runescape-client/src/main/java/class0.java
@@ -1,30 +1,33 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("i")
+@ObfuscatedName("c")
 public class class0 implements class3 {
-	@ObfuscatedName("i")
+	class0() {
+	} // L: 8
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)Lop;"
+		descriptor = "(Lpi;)Lpi;"
 	)
-	public Buffer vmethod18(Buffer var1) {
-		Buffer var2 = new Buffer(100); // L: 9
-		this.method7(var1, var2); // L: 10
-		return var2; // L: 11
+	public Buffer vmethod15(Buffer var1) {
+		Buffer var2 = new Buffer(100); // L: 12
+		this.method2(var1, var2); // L: 13
+		return var2; // L: 14
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;Lop;)V"
+		descriptor = "(Lpi;Lpi;)V"
 	)
-	void method7(Buffer var1, Buffer var2) {
-		class8 var3 = new class8(var1); // L: 15
-		class5 var4 = new class5(var3); // L: 16
+	void method2(Buffer var1, Buffer var2) {
+		class8 var3 = new class8(var1); // L: 18
+		class5 var4 = new class5(var3); // L: 19
 
 		long var5;
-		for (var5 = 0L; !var4.method22(var3.method64(), var3.method60(), var5); ++var5) { // L: 17 18 19
+		for (var5 = 0L; !var4.method32(var3.method78(), var3.method76(), var5); ++var5) { // L: 20 21 22
 		}
 
-		var2.writeLong(var5); // L: 21
-	} // L: 22
+		var2.writeLong(var5); // L: 24
+	} // L: 25
 }
diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java
index f8dfa7f311..5937bdfc03 100644
--- a/runescape-client/src/main/java/class1.java
+++ b/runescape-client/src/main/java/class1.java
@@ -1,312 +1,117 @@
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Random;
 import java.util.concurrent.Callable;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("w")
+@ObfuscatedName("b")
 public class class1 implements Callable {
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -1698122621
-	)
-	@Export("gameCyclesToDo")
-	protected static int gameCyclesToDo;
 	@ObfuscatedName("k")
-	@Export("Tiles_hueMultiplier")
-	static int[] Tiles_hueMultiplier;
-	@ObfuscatedName("ej")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Lei;"
+	)
+	static ClanChannel field0;
+	@ObfuscatedName("bz")
+	static String field3;
+	@ObfuscatedName("ee")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
 	)
-	@Export("archive2")
-	static Archive archive2;
-	@ObfuscatedName("i")
+	@Export("archive13")
+	static Archive archive13;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lop;"
+		descriptor = "Lpi;"
 	)
-	final Buffer field3;
-	@ObfuscatedName("w")
+	final Buffer field2;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "La;"
+		descriptor = "Lm;"
 	)
 	final class3 field1;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lp;"
+		descriptor = "Lw;"
 	)
 	final class7 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lp;Lop;La;)V"
+		descriptor = "(Lw;Lpi;Lm;)V"
 	)
 	class1(class7 var1, Buffer var2, class3 var3) {
 		this.this$0 = var1; // L: 47
-		this.field3 = var2; // L: 48
+		this.field2 = var2; // L: 48
 		this.field1 = var3; // L: 49
 	} // L: 50
 
 	public Object call() {
-		return this.field1.vmethod18(this.field3); // L: 53
+		return this.field1.vmethod15(this.field2); // L: 54
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(JLjava/lang/String;I)I",
-		garbageValue = "284961543"
+		descriptor = "(B)V",
+		garbageValue = "42"
 	)
-	static final int method15(long var0, String var2) {
-		Random var3 = new Random(); // L: 65
-		Buffer var4 = new Buffer(128); // L: 66
-		Buffer var5 = new Buffer(128); // L: 67
-		int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 68 69 70 71 72
-		var4.writeByte(10); // L: 73
-
-		int var7;
-		for (var7 = 0; var7 < 4; ++var7) { // L: 74
-			var4.writeInt(var3.nextInt()); // L: 75
-		}
-
-		var4.writeInt(var6[0]); // L: 77
-		var4.writeInt(var6[1]); // L: 78
-		var4.writeLong(var0); // L: 79
-		var4.writeLong(0L); // L: 80
-
-		for (var7 = 0; var7 < 4; ++var7) { // L: 81
-			var4.writeInt(var3.nextInt()); // L: 82
-		}
-
-		var4.encryptRsa(class65.field822, class65.field823); // L: 84
-		var5.writeByte(10); // L: 85
+	public static void method8() {
+		VarbitComposition.VarbitDefinition_cached.clear(); // L: 43
+	} // L: 44
 
-		for (var7 = 0; var7 < 3; ++var7) { // L: 86
-			var5.writeInt(var3.nextInt()); // L: 87
-		}
-
-		var5.writeLong(var3.nextLong()); // L: 89
-		var5.writeLongMedium(var3.nextLong()); // L: 90
-		if (Client.randomDatData != null) { // L: 92
-			var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 93
-		} else {
-			byte[] var23 = ObjectSound.method1771(); // L: 96
-			var5.writeBytes(var23, 0, var23.length); // L: 97
+	@ObfuscatedName("gw")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)V",
+		garbageValue = "2135260751"
+	)
+	static final void method12(int var0, int var1, int var2) {
+		if (UserComparator7.cameraX < var0) { // L: 4548
+			UserComparator7.cameraX = (var0 - UserComparator7.cameraX) * ItemComposition.field2012 / 1000 + UserComparator7.cameraX + Renderable.field2358; // L: 4549
+			if (UserComparator7.cameraX > var0) { // L: 4550
+				UserComparator7.cameraX = var0;
+			}
 		}
 
-		var5.writeLong(var3.nextLong()); // L: 99
-		var5.encryptRsa(class65.field822, class65.field823); // L: 100
-		var7 = Client.stringCp1252NullTerminatedByteSize(var2); // L: 101
-		if (var7 % 8 != 0) { // L: 102
-			var7 += 8 - var7 % 8;
+		if (UserComparator7.cameraX > var0) { // L: 4552
+			UserComparator7.cameraX -= (UserComparator7.cameraX - var0) * ItemComposition.field2012 / 1000 + Renderable.field2358; // L: 4553
+			if (UserComparator7.cameraX < var0) { // L: 4554
+				UserComparator7.cameraX = var0;
+			}
 		}
 
-		Buffer var8 = new Buffer(var7); // L: 103
-		var8.writeStringCp1252NullTerminated(var2); // L: 104
-		var8.offset = var7; // L: 105
-		var8.xteaEncryptAll(var6); // L: 106
-		Buffer var9 = new Buffer(var5.offset + var4.offset + var8.offset + 5); // L: 107
-		var9.writeByte(2); // L: 108
-		var9.writeByte(var4.offset); // L: 109
-		var9.writeBytes(var4.array, 0, var4.offset); // L: 110
-		var9.writeByte(var5.offset); // L: 111
-		var9.writeBytes(var5.array, 0, var5.offset); // L: 112
-		var9.writeShort(var8.offset); // L: 113
-		var9.writeBytes(var8.array, 0, var8.offset); // L: 114
-		String var10 = class114.method2545(var9.array); // L: 115
-
-		try {
-			URL var11 = new URL(HealthBar.method2246("services", false) + "m=accountappeal/login.ws"); // L: 117
-			URLConnection var12 = var11.openConnection(); // L: 118
-			var12.setDoInput(true); // L: 119
-			var12.setDoOutput(true); // L: 120
-			var12.setConnectTimeout(5000); // L: 121
-			OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream()); // L: 122
-			String var15 = "data2=" + class355.method6403(var10) + "&dest="; // L: 124
-			int var17 = "passwordchoice.ws".length(); // L: 127
-			StringBuilder var18 = new StringBuilder(var17); // L: 128
-
-			for (int var19 = 0; var19 < var17; ++var19) { // L: 129
-				char var20 = "passwordchoice.ws".charAt(var19); // L: 130
-				if ((var20 < 'a' || var20 > 'z') && (var20 < 'A' || var20 > 'Z') && (var20 < '0' || var20 > '9') && var20 != '.' && var20 != '-' && var20 != '*' && var20 != '_') { // L: 131
-					if (var20 == ' ') { // L: 132
-						var18.append('+');
-					} else {
-						byte var21 = AbstractSocket.charToByteCp1252(var20); // L: 134
-						var18.append('%'); // L: 135
-						int var22 = var21 >> 4 & 15; // L: 136
-						if (var22 >= 10) { // L: 137
-							var18.append((char)(var22 + 55));
-						} else {
-							var18.append((char)(var22 + 48)); // L: 138
-						}
-
-						var22 = var21 & 15; // L: 139
-						if (var22 >= 10) { // L: 140
-							var18.append((char)(var22 + 55));
-						} else {
-							var18.append((char)(var22 + 48)); // L: 141
-						}
-					}
-				} else {
-					var18.append(var20);
-				}
+		if (AbstractByteArrayCopier.cameraY < var1) { // L: 4556
+			AbstractByteArrayCopier.cameraY = (var1 - AbstractByteArrayCopier.cameraY) * ItemComposition.field2012 / 1000 + AbstractByteArrayCopier.cameraY + Renderable.field2358; // L: 4557
+			if (AbstractByteArrayCopier.cameraY > var1) { // L: 4558
+				AbstractByteArrayCopier.cameraY = var1;
 			}
-
-			String var16 = var18.toString(); // L: 144
-			var13.write(var15 + var16); // L: 146
-			var13.flush(); // L: 147
-			InputStream var24 = var12.getInputStream(); // L: 148
-			var9 = new Buffer(new byte[1000]); // L: 149
-
-			do {
-				int var25 = var24.read(var9.array, var9.offset, 1000 - var9.offset); // L: 151
-				if (var25 == -1) { // L: 152
-					var13.close(); // L: 158
-					var24.close(); // L: 159
-					String var27 = new String(var9.array); // L: 160
-					if (var27.startsWith("OFFLINE")) { // L: 161
-						return 4; // L: 162
-					} else if (var27.startsWith("WRONG")) { // L: 164
-						return 7; // L: 165
-					} else if (var27.startsWith("RELOAD")) { // L: 167
-						return 3; // L: 168
-					} else if (var27.startsWith("Not permitted for social network accounts.")) { // L: 170
-						return 6; // L: 171
-					} else {
-						var9.xteaDecryptAll(var6); // L: 173
-
-						while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 174
-							--var9.offset; // L: 175
-						}
-
-						var27 = new String(var9.array, 0, var9.offset); // L: 177
-						if (Occluder.method4484(var27)) { // L: 178
-							class91.openURL(var27, true, false); // L: 179
-							return 2; // L: 180
-						} else {
-							return 5; // L: 182
-						}
-					}
-				}
-
-				var9.offset += var25; // L: 153
-			} while(var9.offset < 1000); // L: 154
-
-			return 5; // L: 155
-		} catch (Throwable var26) { // L: 184
-			var26.printStackTrace(); // L: 185
-			return 5; // L: 186
 		}
-	}
 
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "207642979"
-	)
-	@Export("Login_promptCredentials")
-	static void Login_promptCredentials(boolean var0) {
-		Login.Login_response1 = ""; // L: 861
-		Login.Login_response2 = "Enter your username/email & password."; // L: 862
-		Login.Login_response3 = ""; // L: 863
-		class275.method5201(2); // L: 864
-		if (var0) { // L: 865
-			Login.Login_password = "";
+		if (AbstractByteArrayCopier.cameraY > var1) { // L: 4560
+			AbstractByteArrayCopier.cameraY -= (AbstractByteArrayCopier.cameraY - var1) * ItemComposition.field2012 / 1000 + Renderable.field2358; // L: 4561
+			if (AbstractByteArrayCopier.cameraY < var1) { // L: 4562
+				AbstractByteArrayCopier.cameraY = var1;
+			}
 		}
 
-		if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 867
-			if (class408.clientPreferences.rememberedUsername != null) { // L: 868
-				Login.Login_username = class408.clientPreferences.rememberedUsername; // L: 869
-				Client.Login_isUsernameRemembered = true; // L: 870
-			} else {
-				Client.Login_isUsernameRemembered = false; // L: 872
+		if (UserComparator10.cameraZ < var2) { // L: 4564
+			UserComparator10.cameraZ = (var2 - UserComparator10.cameraZ) * ItemComposition.field2012 / 1000 + UserComparator10.cameraZ + Renderable.field2358; // L: 4565
+			if (UserComparator10.cameraZ > var2) { // L: 4566
+				UserComparator10.cameraZ = var2;
 			}
 		}
 
-		ParamComposition.method3216(); // L: 874
-	} // L: 875
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "-2113911304"
-	)
-	@Export("setLoginResponseString")
-	static void setLoginResponseString(String var0, String var1, String var2) {
-		Login.Login_response1 = var0; // L: 1507
-		Login.Login_response2 = var1; // L: 1508
-		Login.Login_response3 = var2; // L: 1509
-	} // L: 1510
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "(Ljf;II)V",
-		garbageValue = "217206746"
-	)
-	@Export("Widget_setKeyIgnoreHeld")
-	static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) {
-		if (var0.field3180 == null) { // L: 1007
-			throw new RuntimeException(); // L: 1008
-		} else {
-			if (var0.field3194 == null) { // L: 1010
-				var0.field3194 = new int[var0.field3180.length]; // L: 1011
+		if (UserComparator10.cameraZ > var2) { // L: 4568
+			UserComparator10.cameraZ -= (UserComparator10.cameraZ - var2) * ItemComposition.field2012 / 1000 + Renderable.field2358; // L: 4569
+			if (UserComparator10.cameraZ < var2) { // L: 4570
+				UserComparator10.cameraZ = var2;
 			}
-
-			var0.field3194[var1] = Integer.MAX_VALUE; // L: 1013
 		}
-	} // L: 1014
 
-	@ObfuscatedName("fx")
+	} // L: 4572
+
+	@ObfuscatedName("jg")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;III)V",
-		garbageValue = "-989741563"
+		descriptor = "(II)Ljava/lang/String;",
+		garbageValue = "-1424242195"
 	)
-	@Export("checkIfMinimapClicked")
-	static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
-		if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 4115
-			if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 4116
-				SpriteMask var3 = var0.getSpriteMask(true); // L: 4117
-				if (var3 == null) { // L: 4118
-					return;
-				}
-
-				int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 4119
-				int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 4120
-				if (var3.contains(var4, var5)) { // L: 4121
-					var4 -= var3.width / 2; // L: 4122
-					var5 -= var3.height / 2; // L: 4123
-					int var6 = Client.camAngleY & 2047; // L: 4124
-					int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 4125
-					int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 4126
-					int var9 = var4 * var8 + var7 * var5 >> 11; // L: 4127
-					int var10 = var5 * var8 - var7 * var4 >> 11; // L: 4128
-					int var11 = var9 + HealthBarDefinition.localPlayer.x >> 7; // L: 4129
-					int var12 = HealthBarDefinition.localPlayer.y - var10 >> 7; // L: 4130
-					PacketBufferNode var13 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2749, Client.packetWriter.isaacCipher); // L: 4132
-					var13.packetBuffer.writeByte(18); // L: 4133
-					var13.packetBuffer.method6962(var11 + class19.baseX); // L: 4134
-					var13.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 4135
-					var13.packetBuffer.method7003(var12 + DefaultsGroup.baseY); // L: 4136
-					var13.packetBuffer.writeByte(var4); // L: 4137
-					var13.packetBuffer.writeByte(var5); // L: 4138
-					var13.packetBuffer.writeShort(Client.camAngleY); // L: 4139
-					var13.packetBuffer.writeByte(57); // L: 4140
-					var13.packetBuffer.writeByte(0); // L: 4141
-					var13.packetBuffer.writeByte(0); // L: 4142
-					var13.packetBuffer.writeByte(89); // L: 4143
-					var13.packetBuffer.writeShort(HealthBarDefinition.localPlayer.x); // L: 4144
-					var13.packetBuffer.writeShort(HealthBarDefinition.localPlayer.y); // L: 4145
-					var13.packetBuffer.writeByte(63); // L: 4146
-					Client.packetWriter.addNode(var13); // L: 4147
-					Client.destinationX = var11; // L: 4148
-					Client.destinationY = var12; // L: 4149
-				}
-			}
-
-		}
-	} // L: 4152
+	static final String method11(int var0) {
+		return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 11040 11041
+	}
 }
diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java
index 523c1f23c3..072a6e3920 100644
--- a/runescape-client/src/main/java/class10.java
+++ b/runescape-client/src/main/java/class10.java
@@ -16,77 +16,81 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("x")
+@ObfuscatedName("o")
 public class class10 {
-	@ObfuscatedName("rz")
-	@ObfuscatedSignature(
-		descriptor = "Low;"
+	@ObfuscatedName("aq")
+	static String field58;
+	@ObfuscatedName("fb")
+	@ObfuscatedGetter(
+		intValue = 892937659
 	)
-	@Export("sceneMinimapSprite")
-	static SpritePixels sceneMinimapSprite;
-	@ObfuscatedName("i")
-	HttpsURLConnection field46;
-	@ObfuscatedName("w")
-	final Map field40;
-	@ObfuscatedName("s")
+	static int field59;
+	@ObfuscatedName("ht")
+	@Export("regionLandArchiveIds")
+	static int[] regionLandArchiveIds;
+	@ObfuscatedName("c")
+	HttpsURLConnection field53;
+	@ObfuscatedName("b")
+	final Map field48;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lmg;"
+		descriptor = "Lni;"
 	)
-	class360 field41;
-	@ObfuscatedName("a")
-	Map field42;
-	@ObfuscatedName("o")
+	class377 field50;
+	@ObfuscatedName("m")
+	Map field49;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lb;"
+		descriptor = "Lr;"
 	)
-	final class9 field43;
-	@ObfuscatedName("g")
-	boolean field44;
-	@ObfuscatedName("e")
-	boolean field45;
-	@ObfuscatedName("p")
+	final class9 field52;
+	@ObfuscatedName("s")
+	boolean field51;
+	@ObfuscatedName("j")
+	boolean field57;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 592251103
+		intValue = 755208065
 	)
-	int field47;
+	int field55;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/net/URL;Lb;)V"
+		descriptor = "(Ljava/net/URL;Lr;)V"
 	)
 	public class10(URL var1, class9 var2) throws IOException {
-		this.field44 = false; // L: 20
-		this.field45 = false; // L: 21
-		this.field47 = 300000; // L: 22
-		if (!var2.method76()) {
-			throw new UnsupportedEncodingException("Unsupported request method used " + var2.method78()); // L: 25
+		this.field51 = false; // L: 20
+		this.field57 = false; // L: 21
+		this.field55 = 300000; // L: 22
+		if (!var2.method85()) {
+			throw new UnsupportedEncodingException("Unsupported request method used " + var2.method100()); // L: 25
 		} else {
-			this.field46 = (HttpsURLConnection)var1.openConnection(); // L: 26
-			this.field46.setSSLSocketFactory(new class15()); // L: 27
-			this.field43 = var2; // L: 28
-			this.field40 = new HashMap(); // L: 29
-			this.field42 = new HashMap(); // L: 30
+			this.field53 = (HttpsURLConnection)var1.openConnection(); // L: 26
+			this.field53.setSSLSocketFactory(new class15()); // L: 27
+			this.field52 = var2; // L: 28
+			this.field48 = new HashMap(); // L: 29
+			this.field49 = new HashMap();
 		}
-	} // L: 31
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "1308010097"
+		garbageValue = "-659899332"
 	)
-	public void method86(String var1, String var2) {
-		if (!this.field44) { // L: 34
-			this.field40.put(var1, var2); // L: 35
+	public void method121(String var1, String var2) {
+		if (!this.field51) {
+			this.field48.put(var1, var2);
 		}
 	} // L: 36
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-1722889443"
+		garbageValue = "1718208734"
 	)
-	String method87() {
-		ArrayList var1 = new ArrayList(this.field42.entrySet()); // L: 39
-		Collections.sort(var1, new class18(this)); // L: 40
+	String method109() {
+		ArrayList var1 = new ArrayList(this.field49.entrySet());
+		Collections.sort(var1, new class18(this));
 		StringBuilder var2 = new StringBuilder(); // L: 53
 		Iterator var3 = var1.iterator(); // L: 54
 
@@ -96,7 +100,7 @@ String method87() {
 				var2.append(",");
 			}
 
-			var2.append(((class359)var4.getKey()).method6418()); // L: 58
+			var2.append(((class376)var4.getKey()).method6793()); // L: 58
 			float var5 = (Float)var4.getValue(); // L: 59
 			if (var5 < 1.0F) { // L: 60
 				String var6 = Float.toString(var5).substring(0, 4); // L: 61
@@ -107,78 +111,78 @@ String method87() {
 		return var2.toString(); // L: 66
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-268892273"
-	)
-	void method88() throws ProtocolException {
-		if (!this.field44) { // L: 70
-			this.field46.setRequestMethod(this.field43.method78()); // L: 71
-			if (!this.field42.isEmpty()) { // L: 72
-				this.field40.put("Accept", this.method87());
+		descriptor = "(B)V",
+		garbageValue = "8"
+	)
+	void method104() throws ProtocolException {
+		if (!this.field51) { // L: 70
+			this.field53.setRequestMethod(this.field52.method100()); // L: 71
+			if (!this.field49.isEmpty()) { // L: 72
+				this.field48.put("Accept", this.method109());
 			}
 
-			Iterator var1 = this.field40.entrySet().iterator(); // L: 73
+			Iterator var1 = this.field48.entrySet().iterator(); // L: 73
 
 			while (var1.hasNext()) {
 				Entry var2 = (Entry)var1.next(); // L: 74
-				this.field46.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76
+				this.field53.setRequestProperty((String)var2.getKey(), (String)var2.getValue()); // L: 76
 			}
 
-			if (this.field43.method70() && this.field41 != null) { // L: 79
-				this.field46.setDoOutput(true); // L: 80
+			if (this.field52.method86() && this.field50 != null) { // L: 79
+				this.field53.setDoOutput(true); // L: 80
 				ByteArrayOutputStream var13 = new ByteArrayOutputStream(); // L: 81
 
 				try {
-					var13.write(this.field41.method6423(1606591795)); // L: 83
-					var13.writeTo(this.field46.getOutputStream()); // L: 84
+					var13.write(this.field50.method6796(-1647266432)); // L: 83
+					var13.writeTo(this.field53.getOutputStream()); // L: 84
 				} catch (IOException var11) { // L: 86
 					var11.printStackTrace(); // L: 87
 				} finally {
 					if (var13 != null) { // L: 90
 						try {
 							var13.close(); // L: 92
-						} catch (IOException var10) { // L: 94
-							var10.printStackTrace(); // L: 95
+						} catch (IOException var10) {
+							var10.printStackTrace();
 						}
 					}
 
 				}
 			}
 
-			this.field46.setConnectTimeout(this.field47); // L: 100
-			this.field46.setInstanceFollowRedirects(this.field45); // L: 101
-			this.field44 = true; // L: 102
+			this.field53.setConnectTimeout(this.field55);
+			this.field53.setInstanceFollowRedirects(this.field57);
+			this.field51 = true;
 		}
-	} // L: 103
+	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "315003479"
+		garbageValue = "-378004067"
 	)
-	boolean method89() throws IOException, SocketTimeoutException {
-		if (!this.field44) { // L: 106
-			this.method88();
+	boolean method105() throws IOException, SocketTimeoutException {
+		if (!this.field51) { // L: 106
+			this.method104();
 		}
 
-		this.field46.connect(); // L: 107
-		return this.field46.getResponseCode() == -1; // L: 108
+		this.field53.connect(); // L: 107
+		return this.field53.getResponseCode() == -1;
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lm;",
-		garbageValue = "-347704447"
+		descriptor = "(I)Lq;",
+		garbageValue = "-2098724409"
 	)
-	class21 method100() {
+	class21 method106() {
 		try {
-			if (!this.field44 || this.field46.getResponseCode() == -1) { // L: 114
+			if (!this.field51 || this.field53.getResponseCode() == -1) { // L: 114
 				return new class21("No REST response has been received yet.");
 			}
 		} catch (IOException var10) { // L: 116
-			this.field46.disconnect(); // L: 117
+			this.field53.disconnect(); // L: 117
 			return new class21("Error decoding REST response code: " + var10.getMessage()); // L: 118
 		}
 
@@ -186,26 +190,140 @@ class21 method100() {
 
 		class21 var3;
 		try {
-			var1 = new class21(this.field46); // L: 122
+			var1 = new class21(this.field53); // L: 122
 			return var1; // L: 130
-		} catch (IOException var8) { // L: 124
-			var3 = new class21("Error decoding REST response: " + var8.getMessage()); // L: 125
+		} catch (IOException var8) {
+			var3 = new class21("Error decoding REST response: " + var8.getMessage());
 		} finally {
-			this.field46.disconnect();
+			this.field53.disconnect(); // L: 128
 		}
 
-		return var3; // L: 128
+		return var3;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "0"
-	)
-	static void method104() {
-		Login.worldSelectOpen = false; // L: 1614
-		RouteStrategy.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1615
-		class139.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1616
-		class16.logoSprite.drawAt(Login.xPadding + 382 - class16.logoSprite.subWidth / 2, 18); // L: 1617
-	} // L: 1618
+		descriptor = "(ILmy;Lkz;B)V",
+		garbageValue = "16"
+	)
+	static void method122(int var0, ArchiveDisk var1, Archive var2) {
+		byte[] var3 = null; // L: 30
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 31
+			for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 32
+				if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) { // L: 33
+					var3 = var5.data; // L: 34
+					break; // L: 35
+				}
+			}
+		}
+
+		if (var3 != null) { // L: 39
+			var2.load(var1, var0, var3, true); // L: 40
+		} else {
+			byte[] var4 = var1.read(var0); // L: 43
+			var2.load(var1, var0, var4, true); // L: 44
+		}
+	} // L: 41 45
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "([BIIII[Lgf;I)V",
+		garbageValue = "1276924993"
+	)
+	static final void method119(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
+		int var7;
+		int var8;
+		for (int var6 = 0; var6 < 4; ++var6) { // L: 93
+			for (var7 = 0; var7 < 64; ++var7) { // L: 94
+				for (var8 = 0; var8 < 64; ++var8) { // L: 95
+					if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96
+						int[] var10000 = var5[var6].flags[var7 + var1];
+						var10000[var8 + var2] &= -16777217;
+					}
+				}
+			}
+		}
+
+		Buffer var10 = new Buffer(var0); // L: 100
+
+		for (var7 = 0; var7 < 4; ++var7) { // L: 101
+			for (var8 = 0; var8 < 64; ++var8) { // L: 102
+				for (int var9 = 0; var9 < 64; ++var9) { // L: 103
+					ScriptFrame.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104
+				}
+			}
+		}
+
+	} // L: 108
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "1542275516"
+	)
+	static final void method123(String var0) {
+		PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2895, Client.packetWriter.isaacCipher); // L: 123
+		var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); // L: 124
+		var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 125
+		Client.packetWriter.addNode(var1); // L: 126
+	} // L: 127
+
+	@ObfuscatedName("am")
+	@ObfuscatedSignature(
+		descriptor = "(Lai;I)V",
+		garbageValue = "372010078"
+	)
+	@Export("PcmStream_disable")
+	static final void PcmStream_disable(PcmStream var0) {
+		var0.active = false; // L: 263
+		if (var0.sound != null) { // L: 264
+			var0.sound.position = 0;
+		}
+
+		for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
+			PcmStream_disable(var1); // L: 265
+		}
+
+	} // L: 266
+
+	@ObfuscatedName("iv")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "708882827"
+	)
+	static final void method124(int var0, int var1, int var2, int var3) {
+		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 8861
+			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: 8862
+				Client.field504[var4] = true;
+			}
+		}
+
+	} // L: 8864
+
+	@ObfuscatedName("kh")
+	@ObfuscatedSignature(
+		descriptor = "(Lcl;ZI)V",
+		garbageValue = "-1418873427"
+	)
+	@Export("closeInterface")
+	static final void closeInterface(InterfaceParent var0, boolean var1) {
+		int var2 = var0.group; // L: 12284
+		int var3 = (int)var0.key; // L: 12285
+		var0.remove(); // L: 12286
+		if (var1) { // L: 12287
+			class273.method5333(var2);
+		}
+
+		TextureProvider.method4185(var2); // L: 12288
+		Widget var4 = ChatChannel.getWidget(var3); // L: 12289
+		if (var4 != null) { // L: 12290
+			SecureRandomCallable.invalidateWidget(var4);
+		}
+
+		FileSystem.method3084(); // L: 12291
+		if (Client.rootInterface != -1) { // L: 12292
+			Message.runIntfCloseListeners(Client.rootInterface, 1);
+		}
+
+	} // L: 12293
 }
diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java
index 1928c84553..b4a4459365 100644
--- a/runescape-client/src/main/java/class11.java
+++ b/runescape-client/src/main/java/class11.java
@@ -6,76 +6,102 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 import org.bouncycastle.crypto.tls.Certificate;
 import org.bouncycastle.crypto.tls.CertificateRequest;
 import org.bouncycastle.crypto.tls.TlsAuthentication;
 import org.bouncycastle.crypto.tls.TlsCredentials;
 
-@ObfuscatedName("y")
+@ObfuscatedName("v")
 class class11 implements TlsAuthentication {
-	@ObfuscatedName("ec")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "Law;"
 	)
-	@Export("archive5")
-	static Archive archive5;
+	@Export("pcmPlayerProvider")
+	static class47 pcmPlayerProvider;
+	@ObfuscatedName("be")
+	@ObfuscatedSignature(
+		descriptor = "Lpa;"
+	)
+	@Export("worldSelectLeftSprite")
+	static IndexedSprite worldSelectLeftSprite;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lt;"
+		descriptor = "Lh;"
 	)
 	final class13 this$2;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lt;)V"
+		descriptor = "(Lh;)V"
 	)
 	class11(class13 var1) {
-		this.this$2 = var1; // L: 248
-	}
-
-	public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException {
-		return null; // L: 270
+		this.this$2 = var1; // L: 305
 	}
 
 	public void notifyServerCertificate(Certificate var1) throws IOException {
 		try {
-			CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 251
-			LinkedList var3 = new LinkedList(); // L: 252
-			org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 254
+			CertificateFactory var2 = CertificateFactory.getInstance("X.509"); // L: 309
+			LinkedList var3 = new LinkedList(); // L: 310
+			org.bouncycastle.asn1.x509.Certificate[] var4 = var1.getCertificateList(); // L: 312
 
-			for (int var5 = 0; var5 < var4.length; ++var5) { // L: 255
-				org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 256
-				var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 258
+			for (int var5 = 0; var5 < var4.length; ++var5) { // L: 313
+				org.bouncycastle.asn1.x509.Certificate var6 = var4[var5]; // L: 314
+				var3.add(var2.generateCertificate(new ByteArrayInputStream(var6.getEncoded()))); // L: 316
 			}
 
-			this.this$2.this$1.field53 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 262
-		} catch (CertificateException var7) { // L: 264
-			throw new IOException(var7); // L: 265
+			this.this$2.this$1.field67 = (java.security.cert.Certificate[])((java.security.cert.Certificate[])var3.toArray(new java.security.cert.Certificate[0])); // L: 320
+		} catch (CertificateException var7) { // L: 322
+			throw new IOException(var7); // L: 323
 		}
-	} // L: 267
+	} // L: 325
+
+	public TlsCredentials getClientCredentials(CertificateRequest var1) throws IOException {
+		return null; // L: 329
+	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(IZIZI)V",
-		garbageValue = "-1739783749"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-1179058549"
 	)
-	@Export("sortWorldList")
-	static void sortWorldList(int var0, boolean var1, int var2, boolean var3) {
-		if (WorldMapEvent.World_worlds != null) { // L: 171
-			FriendSystem.doWorldSorting(0, WorldMapEvent.World_worlds.length - 1, var0, var1, var2, var3); // L: 172
-		}
+	static int method125(int var0, Script var1, boolean var2) {
+		Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1388
+		if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1389
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class404.Widget_unpackTargetMask(class363.getWidgetFlags(var3)); // L: 1390
+			return 1; // L: 1391
+		} else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1393
+			if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1400
+				if (var3.dataText == null) { // L: 1401
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = "";
+				} else {
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1402
+				}
 
-	} // L: 174
+				return 1; // L: 1403
+			} else {
+				return 2; // L: 1405
+			}
+		} else {
+			int var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1394
+			--var4; // L: 1395
+			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1396
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1397
+			} else {
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = "";
+			}
+
+			return 1; // L: 1398
+		}
+	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("iu")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;II)V",
-		garbageValue = "-233699552"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V",
+		garbageValue = "-380667098"
 	)
-	static final void method107(String var0, int var1) {
-		PacketBufferNode var2 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2746, Client.packetWriter.isaacCipher); // L: 242
-		var2.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 243
-		var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 244
-		var2.packetBuffer.writeByte(var1); // L: 245
-		Client.packetWriter.addNode(var2); // L: 246
-	} // L: 247
+	@Export("insertMenuItemNoShift")
+	public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
+		class21.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 10041
+	} // L: 10042
 }
diff --git a/runescape-client/src/main/java/class110.java b/runescape-client/src/main/java/class110.java
index 1b7d74c9ff..f1258914b7 100644
--- a/runescape-client/src/main/java/class110.java
+++ b/runescape-client/src/main/java/class110.java
@@ -1,5 +1,5 @@
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("dh")
+@ObfuscatedName("dy")
 public interface class110 {
 }
diff --git a/runescape-client/src/main/java/class111.java b/runescape-client/src/main/java/class111.java
index 4b9ae38c49..38ea5cd7eb 100644
--- a/runescape-client/src/main/java/class111.java
+++ b/runescape-client/src/main/java/class111.java
@@ -1,193 +1,57 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("du")
-public class class111 implements class110 {
-	@ObfuscatedName("ez")
+@ObfuscatedName("dk")
+public class class111 {
+	@ObfuscatedName("n")
+	static int[] field1348;
+	@ObfuscatedName("id")
 	@ObfuscatedSignature(
-		descriptor = "Lkd;"
+		descriptor = "[Lpl;"
 	)
-	@Export("archive19")
-	static Archive archive19;
-	@ObfuscatedName("ey")
-	@ObfuscatedSignature(
-		descriptor = "Lms;"
-	)
-	@Export("spriteIds")
-	static GraphicsDefaults spriteIds;
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(I)J",
-		garbageValue = "-721238808"
+	@Export("mapDotSprites")
+	static SpritePixels[] mapDotSprites;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1184619433
 	)
-	public static final synchronized long method2516() {
-		long var0 = System.currentTimeMillis(); // L: 14
-		if (var0 < class397.field4289) { // L: 15
-			class397.field4288 += class397.field4289 - var0; // L: 16
-		}
-
-		class397.field4289 = var0; // L: 18
-		return var0 + class397.field4288; // L: 19
-	}
-
+	int field1359;
+	@ObfuscatedName("b")
+	float field1349;
 	@ObfuscatedName("p")
+	float field1350;
+	@ObfuscatedName("m")
+	float field1351;
+	@ObfuscatedName("t")
+	float field1352;
+	@ObfuscatedName("s")
+	float field1357;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "1420142897"
+		descriptor = "Ldk;"
 	)
-	public static boolean method2514(int var0) {
-		return (var0 >> 31 & 1) != 0; // L: 37
-	}
+	class111 field1354;
+
+	class111() {
+		this.field1350 = Float.MAX_VALUE; // L: 8
+		this.field1351 = Float.MAX_VALUE; // L: 9
+		this.field1352 = Float.MAX_VALUE; // L: 10
+		this.field1357 = Float.MAX_VALUE; // L: 11
+	} // L: 14
 
-	@ObfuscatedName("hq")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIII)V",
-		garbageValue = "-600085887"
+		descriptor = "(Lpi;II)V",
+		garbageValue = "-972356321"
 	)
-	@Export("drawObject")
-	static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
-		long var5 = GameBuild.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5896
-		int var7;
-		int var8;
-		int var9;
-		int var10;
-		int var12;
-		int var13;
-		if (0L != var5) { // L: 5897
-			var7 = GameBuild.scene.getObjectFlags(var0, var1, var2, var5); // L: 5898
-			var8 = var7 >> 6 & 3; // L: 5899
-			var9 = var7 & 31; // L: 5900
-			var10 = var3; // L: 5901
-			if (ItemLayer.method4106(var5)) { // L: 5902
-				var10 = var4;
-			}
-
-			int[] var11 = class10.sceneMinimapSprite.pixels; // L: 5903
-			var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5904
-			var13 = class21.Entity_unpackID(var5); // L: 5905
-			ObjectComposition var14 = KitDefinition.getObjectDefinition(var13); // L: 5906
-			if (var14.mapSceneId != -1) { // L: 5907
-				IndexedSprite var15 = TriBool.mapSceneSprites[var14.mapSceneId]; // L: 5908
-				if (var15 != null) { // L: 5909
-					int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5910
-					int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5911
-					var15.drawAt(var1 * 4 + var16 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); // L: 5912
-				}
-			} else {
-				if (var9 == 0 || var9 == 2) { // L: 5916
-					if (var8 == 0) { // L: 5917
-						var11[var12] = var10; // L: 5918
-						var11[var12 + 512] = var10; // L: 5919
-						var11[var12 + 1024] = var10; // L: 5920
-						var11[var12 + 1536] = var10; // L: 5921
-					} else if (var8 == 1) { // L: 5923
-						var11[var12] = var10; // L: 5924
-						var11[var12 + 1] = var10; // L: 5925
-						var11[var12 + 2] = var10; // L: 5926
-						var11[var12 + 3] = var10; // L: 5927
-					} else if (var8 == 2) { // L: 5929
-						var11[var12 + 3] = var10; // L: 5930
-						var11[var12 + 512 + 3] = var10; // L: 5931
-						var11[var12 + 1024 + 3] = var10; // L: 5932
-						var11[var12 + 1536 + 3] = var10; // L: 5933
-					} else if (var8 == 3) { // L: 5935
-						var11[var12 + 1536] = var10; // L: 5936
-						var11[var12 + 1536 + 1] = var10; // L: 5937
-						var11[var12 + 1536 + 2] = var10; // L: 5938
-						var11[var12 + 1536 + 3] = var10; // L: 5939
-					}
-				}
-
-				if (var9 == 3) { // L: 5942
-					if (var8 == 0) { // L: 5943
-						var11[var12] = var10;
-					} else if (var8 == 1) { // L: 5944
-						var11[var12 + 3] = var10;
-					} else if (var8 == 2) { // L: 5945
-						var11[var12 + 1536 + 3] = var10;
-					} else if (var8 == 3) { // L: 5946
-						var11[var12 + 1536] = var10;
-					}
-				}
-
-				if (var9 == 2) { // L: 5948
-					if (var8 == 3) { // L: 5949
-						var11[var12] = var10; // L: 5950
-						var11[var12 + 512] = var10; // L: 5951
-						var11[var12 + 1024] = var10; // L: 5952
-						var11[var12 + 1536] = var10; // L: 5953
-					} else if (var8 == 0) { // L: 5955
-						var11[var12] = var10; // L: 5956
-						var11[var12 + 1] = var10; // L: 5957
-						var11[var12 + 2] = var10; // L: 5958
-						var11[var12 + 3] = var10; // L: 5959
-					} else if (var8 == 1) { // L: 5961
-						var11[var12 + 3] = var10; // L: 5962
-						var11[var12 + 512 + 3] = var10; // L: 5963
-						var11[var12 + 1024 + 3] = var10; // L: 5964
-						var11[var12 + 1536 + 3] = var10; // L: 5965
-					} else if (var8 == 2) { // L: 5967
-						var11[var12 + 1536] = var10; // L: 5968
-						var11[var12 + 1536 + 1] = var10; // L: 5969
-						var11[var12 + 1536 + 2] = var10; // L: 5970
-						var11[var12 + 1536 + 3] = var10; // L: 5971
-					}
-				}
-			}
-		}
-
-		var5 = GameBuild.scene.getGameObjectTag(var0, var1, var2); // L: 5976
-		if (var5 != 0L) { // L: 5977
-			var7 = GameBuild.scene.getObjectFlags(var0, var1, var2, var5); // L: 5978
-			var8 = var7 >> 6 & 3; // L: 5979
-			var9 = var7 & 31; // L: 5980
-			var10 = class21.Entity_unpackID(var5); // L: 5981
-			ObjectComposition var24 = KitDefinition.getObjectDefinition(var10); // L: 5982
-			int var19;
-			if (var24.mapSceneId != -1) { // L: 5983
-				IndexedSprite var20 = TriBool.mapSceneSprites[var24.mapSceneId]; // L: 5984
-				if (var20 != null) { // L: 5985
-					var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 5986
-					var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 5987
-					var20.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 5988
-				}
-			} else if (var9 == 9) { // L: 5991
-				var12 = 15658734; // L: 5992
-				if (ItemLayer.method4106(var5)) { // L: 5993
-					var12 = 15597568;
-				}
-
-				int[] var18 = class10.sceneMinimapSprite.pixels; // L: 5994
-				var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5995
-				if (var8 != 0 && var8 != 2) { // L: 5996
-					var18[var19] = var12; // L: 6003
-					var18[var19 + 1 + 512] = var12; // L: 6004
-					var18[var19 + 1024 + 2] = var12; // L: 6005
-					var18[var19 + 1536 + 3] = var12; // L: 6006
-				} else {
-					var18[var19 + 1536] = var12; // L: 5997
-					var18[var19 + 1 + 1024] = var12; // L: 5998
-					var18[var19 + 512 + 2] = var12; // L: 5999
-					var18[var19 + 3] = var12; // L: 6000
-				}
-			}
-		}
-
-		var5 = GameBuild.scene.getFloorDecorationTag(var0, var1, var2); // L: 6010
-		if (var5 != 0L) { // L: 6011
-			var7 = class21.Entity_unpackID(var5); // L: 6012
-			ObjectComposition var21 = KitDefinition.getObjectDefinition(var7); // L: 6013
-			if (var21.mapSceneId != -1) { // L: 6014
-				IndexedSprite var22 = TriBool.mapSceneSprites[var21.mapSceneId]; // L: 6015
-				if (var22 != null) { // L: 6016
-					var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 6017
-					int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 6018
-					var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); // L: 6019
-				}
-			}
-		}
-
-	} // L: 6023
+	void method2558(Buffer var1, int var2) {
+		this.field1359 = var1.readShort(); // L: 17
+		this.field1349 = var1.method7369(); // L: 18
+		this.field1350 = var1.method7369(); // L: 19
+		this.field1351 = var1.method7369(); // L: 20
+		this.field1352 = var1.method7369(); // L: 21
+		this.field1357 = var1.method7369(); // L: 22
+	} // L: 23
 }
diff --git a/runescape-client/src/main/java/class112.java b/runescape-client/src/main/java/class112.java
index 92fc8d3d43..d564531442 100644
--- a/runescape-client/src/main/java/class112.java
+++ b/runescape-client/src/main/java/class112.java
@@ -1,113 +1,231 @@
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("db")
-public enum class112 implements MouseWheel {
-	@ObfuscatedName("i")
+@ObfuscatedName("de")
+public class class112 {
+	@ObfuscatedName("m")
+	public static final float field1361;
+	@ObfuscatedName("t")
+	public static final float field1362;
+	@ObfuscatedName("bo")
 	@ObfuscatedSignature(
-		descriptor = "Ldb;"
+		descriptor = "[Lpa;"
 	)
-	field1350(1, 0),
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Ldb;"
-	)
-	field1345(0, 1),
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Ldb;"
-	)
-	field1346(2, 2),
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Ldb;"
-	)
-	field1347(3, 3);
+	@Export("worldSelectStars")
+	static IndexedSprite[] worldSelectStars;
 
-	@ObfuscatedName("tc")
+	static {
+		field1361 = Math.ulp(1.0F); // L: 10
+		field1362 = field1361 * 2.0F; // L: 11
+	}
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lbm;"
-	)
-	@Export("friendSystem")
-	public static FriendSystem friendSystem;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = 125998715
+		descriptor = "(Lku;Lku;IZI)Ldb;",
+		garbageValue = "1707780051"
 	)
-	public final int field1344;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -2047672005
-	)
-	@Export("id")
-	final int id;
+	public static class120 method2571(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) {
+		boolean var4 = true;
+		byte[] var5 = var0.takeFile(var2 >> 16 & 65535, var2 & 65535); // L: 24
+		if (var5 == null) {
+			var4 = false;
+			return null;
+		} else {
+			int var6 = (var5[1] & 255) << 8 | var5[2] & 255;
+			byte[] var7;
+			if (var3) {
+				var7 = var1.getFile(0, var6);
+			} else {
+				var7 = var1.getFile(var6, 0); // L: 32
+			}
 
-	class112(int var3, int var4) {
-		this.field1344 = var3; // L: 16
-		this.id = var4; // L: 17
-	} // L: 18
+			if (var7 == null) { // L: 33
+				var4 = false;
+			}
 
-	@ObfuscatedName("w")
+			if (!var4) { // L: 34
+				return null;
+			} else {
+				try {
+					return new class120(var0, var1, var2, var3); // L: 36
+				} catch (Exception var9) { // L: 38
+					return null; // L: 39
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
+		garbageValue = "-1374699895"
 	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.id; // L: 21
-	}
+	public static String method2565(CharSequence[] var0, int var1, int var2) {
+		if (var2 == 0) { // L: 12
+			return "";
+		} else if (var2 == 1) { // L: 13
+			CharSequence var10 = var0[var1]; // L: 14
+			return var10 == null ? "null" : var10.toString(); // L: 15 16
+		} else {
+			int var3 = var2 + var1; // L: 18
+			int var4 = 0; // L: 19
 
-	@ObfuscatedName("i")
-	static double method2517(double var0) {
-		return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9
+			for (int var5 = var1; var5 < var3; ++var5) { // L: 20
+				CharSequence var9 = var0[var5]; // L: 21
+				if (var9 == null) { // L: 22
+					var4 += 4;
+				} else {
+					var4 += var9.length(); // L: 23
+				}
+			}
+
+			StringBuilder var8 = new StringBuilder(var4); // L: 25
+
+			for (int var6 = var1; var6 < var3; ++var6) { // L: 26
+				CharSequence var7 = var0[var6]; // L: 27
+				if (var7 == null) { // L: 28
+					var8.append("null");
+				} else {
+					var8.append(var7); // L: 29
+				}
+			}
+
+			return var8.toString(); // L: 31
+		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lew;III)Lak;",
-		garbageValue = "430440132"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "1143513856"
 	)
-	public static final PcmPlayer method2522(TaskHandler var0, int var1, int var2) {
-		if (var1 >= 0 && var1 < 2) { // L: 46
-			if (var2 < 256) { // L: 47
-				var2 = 256;
-			}
+	static int method2560(int var0, Script var1, boolean var2) {
+		if (var0 < 1000) { // L: 429
+			return class273.method5332(var0, var1, var2);
+		} else if (var0 < 1100) { // L: 430
+			return class279.method5405(var0, var1, var2);
+		} else if (var0 < 1200) { // L: 431
+			return class143.method2959(var0, var1, var2);
+		} else if (var0 < 1300) { // L: 432
+			return Canvas.method404(var0, var1, var2);
+		} else if (var0 < 1400) { // L: 433
+			return class120.method2724(var0, var1, var2);
+		} else if (var0 < 1500) { // L: 434
+			return WorldMapID.method4804(var0, var1, var2);
+		} else if (var0 < 1600) { // L: 435
+			return NetFileRequest.method5588(var0, var1, var2);
+		} else if (var0 < 1700) { // L: 436
+			return BufferedSink.method6551(var0, var1, var2);
+		} else if (var0 < 1800) { // L: 437
+			return class6.method56(var0, var1, var2);
+		} else if (var0 < 1900) { // L: 438
+			return class148.method3019(var0, var1, var2);
+		} else if (var0 < 2000) { // L: 439
+			return Strings.method5510(var0, var1, var2);
+		} else if (var0 < 2100) { // L: 440
+			return class279.method5405(var0, var1, var2);
+		} else if (var0 < 2200) { // L: 441
+			return class143.method2959(var0, var1, var2);
+		} else if (var0 < 2300) { // L: 442
+			return Canvas.method404(var0, var1, var2);
+		} else if (var0 < 2400) { // L: 443
+			return class120.method2724(var0, var1, var2);
+		} else if (var0 < 2500) { // L: 444
+			return WorldMapID.method4804(var0, var1, var2);
+		} else if (var0 < 2600) { // L: 445
+			return class4.method20(var0, var1, var2);
+		} else if (var0 < 2700) { // L: 446
+			return UrlRequester.method2486(var0, var1, var2);
+		} else if (var0 < 2800) { // L: 447
+			return Projectile.method2010(var0, var1, var2);
+		} else if (var0 < 2900) { // L: 448
+			return class11.method125(var0, var1, var2);
+		} else if (var0 < 3000) { // L: 449
+			return Strings.method5510(var0, var1, var2);
+		} else if (var0 < 3200) { // L: 450
+			return ArchiveLoader.method2122(var0, var1, var2);
+		} else if (var0 < 3300) { // L: 451
+			return ParamComposition.method3397(var0, var1, var2);
+		} else if (var0 < 3400) { // L: 452
+			return class12.method190(var0, var1, var2);
+		} else if (var0 < 3500) { // L: 453
+			return ReflectionCheck.method663(var0, var1, var2);
+		} else if (var0 < 3600) { // L: 454
+			return class13.method201(var0, var1, var2);
+		} else if (var0 < 3700) { // L: 455
+			return SequenceDefinition.method3640(var0, var1, var2);
+		} else if (var0 < 3800) { // L: 456
+			return class167.method3269(var0, var1, var2);
+		} else if (var0 < 3900) { // L: 457
+			return class332.method6184(var0, var1, var2);
+		} else if (var0 < 4000) { // L: 458
+			return class28.method443(var0, var1, var2);
+		} else if (var0 < 4100) {
+			return class341.method6258(var0, var1, var2); // L: 459
+		} else if (var0 < 4200) { // L: 460
+			return StudioGame.method5500(var0, var1, var2);
+		} else if (var0 < 4300) { // L: 461
+			return TriBool.method6472(var0, var1, var2);
+		} else if (var0 < 5100) { // L: 462
+			return class167.method3270(var0, var1, var2);
+		} else if (var0 < 5400) { // L: 463
+			return class134.method2824(var0, var1, var2);
+		} else if (var0 < 5600) { // L: 464
+			return class141.method2950(var0, var1, var2);
+		} else if (var0 < 5700) { // L: 465
+			return WorldMapSectionType.method4756(var0, var1, var2);
+		} else if (var0 < 6300) { // L: 466
+			return Canvas.method405(var0, var1, var2);
+		} else if (var0 < 6600) { // L: 467
+			return ApproximateRouteStrategy.method1139(var0, var1, var2);
+		} else if (var0 < 6700) { // L: 468
+			return GameEngine.method581(var0, var1, var2);
+		} else if (var0 < 6800) { // L: 469
+			return GameObject.method4341(var0, var1, var2);
+		} else if (var0 < 6900) { // L: 470
+			return Client.method1667(var0, var1, var2);
+		} else if (var0 < 7000) { // L: 471
+			return class312.method5810(var0, var1, var2);
+		} else if (var0 < 7100) { // L: 472
+			return class4.method27(var0, var1, var2);
+		} else if (var0 < 7200) { // L: 473
+			return WorldMapLabelSize.method4359(var0, var1, var2);
+		} else if (var0 < 7300) { // L: 474
+			return ArchiveLoader.method2120(var0, var1, var2);
+		} else {
+			return var0 < 7500 ? KitDefinition.method3237(var0, var1, var2) : 2; // L: 475 476
+		}
+	}
 
-			try {
-				PcmPlayer var3 = ItemContainer.pcmPlayerProvider.player(); // L: 49
-				var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 50
-				var3.field264 = var2; // L: 51
-				var3.init(); // L: 52
-				var3.capacity = (var2 & -1024) + 1024; // L: 53
-				if (var3.capacity > 16384) { // L: 54
-					var3.capacity = 16384;
-				}
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "-1450996658"
+	)
+	static final void method2572(int var0, int var1, int var2, int var3) {
+		for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 79
+			for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80
+				if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81
+					SoundCache.field321[0][var5][var4] = 127; // L: 82
+					if (var0 == var5 && var5 > 0) { // L: 83
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
+					}
 
-				var3.open(var3.capacity); // L: 55
-				if (PcmPlayer.field272 > 0 && class122.soundSystem == null) { // L: 56
-					class122.soundSystem = new SoundSystem(); // L: 57
-					class381.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 58
-					class381.soundSystemExecutor.scheduleAtFixedRate(class122.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 59
-				}
+					if (var5 == var0 + var2 && var5 < 103) { // L: 84
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
+					}
 
-				if (class122.soundSystem != null) { // L: 61
-					if (class122.soundSystem.players[var1] != null) { // L: 62
-						throw new IllegalArgumentException();
+					if (var4 == var1 && var4 > 0) { // L: 85
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
 					}
 
-					class122.soundSystem.players[var1] = var3; // L: 63
+					if (var4 == var3 + var1 && var4 < 103) { // L: 86
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
+					}
 				}
-
-				return var3; // L: 65
-			} catch (Throwable var4) { // L: 67
-				return new PcmPlayer(); // L: 68
 			}
-		} else {
-			throw new IllegalArgumentException();
 		}
-	}
+
+	} // L: 90
 }
diff --git a/runescape-client/src/main/java/class113.java b/runescape-client/src/main/java/class113.java
index a0dea954a7..6fb758a1e0 100644
--- a/runescape-client/src/main/java/class113.java
+++ b/runescape-client/src/main/java/class113.java
@@ -1,372 +1,288 @@
-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.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dp")
-public class class113 extends class116 {
-	@ObfuscatedName("i")
+@ObfuscatedName("df")
+public class class113 {
+	@ObfuscatedName("uj")
+	@Export("foundItemIds")
+	static short[] foundItemIds;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1422168885
+		intValue = -1281490499
 	)
-	int field1356;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -1587001219
-	)
-	int field1353;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -1005373589
+	public final int field1377;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Ldf;"
 	)
-	int field1354;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 191673925
+	public class113 field1366;
+	@ObfuscatedName("p")
+	float[][] field1379;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "[Lno;"
 	)
-	int field1355;
-	// $FF: synthetic field
+	final class366[] field1368;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "[Lno;"
 	)
-	final class119 this$0;
-
+	class366[] field1369;
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "[Lno;"
 	)
-	class113(class119 var1) {
-		this.this$0 = var1;
-		this.field1356 = -1;
-	} // L: 163
-
-	@ObfuscatedName("i")
+	class366[] field1365;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "Lno;"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1356 = var1.readUnsignedShort();
-		this.field1353 = var1.readInt();
-		this.field1354 = var1.readUnsignedByte();
-		this.field1355 = var1.readUnsignedByte();
-	}
-
+	class366 field1371;
 	@ObfuscatedName("w")
+	boolean field1378;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "Lno;"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2663(this.field1356, this.field1353, this.field1354, this.field1355); // L: 173
-	} // L: 174
-
-	@ObfuscatedName("i")
+	class366 field1373;
+	@ObfuscatedName("r")
+	boolean field1374;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1973528524"
+		descriptor = "Lno;"
 	)
-	static void method2533() {
-		Tiles.Tiles_underlays = null; // L: 48
-		Tiles.Tiles_overlays = null; // L: 49
-		Tiles.Tiles_shapes = null; // L: 50
-		Tiles.field969 = null; // L: 51
-		Tiles.field962 = null; // L: 52
-		class54.field419 = null; // L: 53
-		DirectByteArrayCopier.field3212 = null; // L: 54
-		TileItem.Tiles_hue = null; // L: 55
-		class397.Tiles_saturation = null; // L: 56
-		Tiles.Tiles_lightness = null; // L: 57
-		class1.Tiles_hueMultiplier = null; // L: 58
-		MouseRecorder.field1039 = null; // L: 59
-	} // L: 60
+	class366 field1372;
+	@ObfuscatedName("v")
+	float[][] field1376;
+	@ObfuscatedName("d")
+	float[][] field1367;
+	@ObfuscatedName("h")
+	float[][] field1375;
 
-	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;Lko;ZII)V",
-		garbageValue = "-1234515035"
+		descriptor = "(ILpi;Z)V"
 	)
-	static void method2529(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
-		if (Login.clearLoginScreen) { // L: 148
-			if (var3 == 4) { // L: 149
-				class275.method5201(4); // L: 150
-			}
-
-		} else {
-			if (var3 == 0) { // L: 154
-				EnumComposition.method3097(var2); // L: 155
-			} else {
-				class275.method5201(var3); // L: 158
-			}
+	public class113(int var1, Buffer var2, boolean var3) {
+		this.field1371 = new class366(); // L: 13
+		this.field1378 = true; // L: 14
+		this.field1373 = new class366(); // L: 15
+		this.field1374 = true; // L: 16
+		this.field1372 = new class366(); // L: 17
+		this.field1377 = var2.readShort(); // L: 23
+		this.field1368 = new class366[var1]; // L: 24
+		this.field1369 = new class366[this.field1368.length]; // L: 25
+		this.field1365 = new class366[this.field1368.length]; // L: 26
+		this.field1379 = new float[this.field1368.length][3]; // L: 27
+
+		for (int var4 = 0; var4 < this.field1368.length; ++var4) { // L: 28
+			this.field1368[var4] = new class366(var2, var3); // L: 29
+			this.field1379[var4][0] = var2.method7369(); // L: 30
+			this.field1379[var4][1] = var2.method7369(); // L: 31
+			this.field1379[var4][2] = var2.method7369(); // L: 32
+		}
 
-			Rasterizer2D.Rasterizer2D_clear(); // L: 160
-			byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 161
-			BufferedImage var6 = null; // L: 164
+		this.method2584(); // L: 34
+	} // L: 35
 
-			SpritePixels var5;
-			int var8;
-			label66: {
-				try {
-					var6 = ImageIO.read(new ByteArrayInputStream(var4)); // L: 166
-					int var7 = var6.getWidth(); // L: 167
-					var8 = var6.getHeight(); // L: 168
-					int[] var9 = new int[var8 * var7]; // L: 169
-					PixelGrabber var10 = new PixelGrabber(var6, 0, 0, var7, var8, var9, 0, var7); // L: 170
-					var10.grabPixels(); // L: 171
-					var5 = new SpritePixels(var9, var7, var8); // L: 172
-					break label66;
-				} catch (IOException var17) { // L: 175
-				} catch (InterruptedException var18) { // L: 176
-				}
-
-				var5 = new SpritePixels(0, 0); // L: 177
-			}
-
-			RouteStrategy.leftTitleSprite = var5; // L: 179
-			class139.rightTitleSprite = RouteStrategy.leftTitleSprite.mirrorHorizontally(); // L: 180
-			int var12 = Client.worldProperties; // L: 181
-			if ((var12 & 536870912) != 0) { // L: 183
-				class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 184
-			} else if ((var12 & 1073741824) != 0) { // L: 186
-				class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 187
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "1"
+	)
+	void method2584() {
+		this.field1376 = new float[this.field1368.length][3]; // L: 38
+		this.field1367 = new float[this.field1368.length][3]; // L: 39
+		this.field1375 = new float[this.field1368.length][3]; // L: 40
+		class366 var1;
+		synchronized(class366.field4191) { // L: 43
+			if (class149.field1663 == 0) {
+				var1 = new class366();
 			} else {
-				class16.logoSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 190
+				class366.field4191[--class149.field1663].method6652(); // L: 46
+				var1 = class366.field4191[class149.field1663]; // L: 47
 			}
+		}
 
-			Login.titleboxSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 193
-			Login.titlebuttonSprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 194
-			Login.field854 = Script.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_large", ""); // L: 195
-			class29.field159 = Script.SpriteBuffer_getIndexedSpriteByName(var1, "play_now_text", ""); // L: 196
-			Script.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton_wide42,1", ""); // L: 197
-			Login.runesSprite = class393.method6882(var1, "runes", ""); // L: 198
-			VarpDefinition.title_muteSprite = class393.method6882(var1, "title_mute", ""); // L: 199
-			NetSocket.options_buttons_0Sprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 200
-			Login.field868 = Script.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 201
-			class9.options_buttons_2Sprite = Script.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 202
-			ClanMate.field3950 = Script.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 203
-			class327.field3908 = NetSocket.options_buttons_0Sprite.subWidth; // L: 204
-			UserComparator9.field1326 = NetSocket.options_buttons_0Sprite.subHeight; // L: 205
-			Login.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 206
-			if (var2) { // L: 207
-				Login.Login_username = ""; // L: 208
-				Login.Login_password = ""; // L: 209
-			}
+		class366 var2 = var1; // L: 51
+
+		for (int var5 = 0; var5 < this.field1368.length; ++var5) { // L: 52
+			class366 var4 = this.method2600(var5); // L: 53
+			var2.method6654(var4); // L: 54
+			var2.method6678(); // L: 55
+			this.field1376[var5] = var2.method6651(); // L: 56
+			this.field1367[var5][0] = var4.field4196[12]; // L: 57
+			this.field1367[var5][1] = var4.field4196[13]; // L: 58
+			this.field1367[var5][2] = var4.field4196[14]; // L: 59
+			this.field1375[var5] = var4.method6663(); // L: 60
+		}
 
-			ReflectionCheck.field429 = 0; // L: 211
-			Tiles.otp = ""; // L: 212
-			Login.field875 = true; // L: 213
-			Login.worldSelectOpen = false; // L: 214
-			if (!class408.clientPreferences.titleMusicDisabled) { // L: 215
-				Archive var11 = Messages.archive6; // L: 216
-				var8 = var11.getGroupId("scape main"); // L: 218
-				int var13 = var11.getFileId(var8, ""); // L: 219
-				class247.musicPlayerStatus = 1; // L: 221
-				class128.musicTrackArchive = var11; // L: 222
-				FillMode.musicTrackGroupId = var8; // L: 223
-				ArchiveDiskActionHandler.musicTrackFileId = var13; // L: 224
-				class247.musicTrackVolume = 255; // L: 225
-				SecureRandomCallable.musicTrackBoolean = false; // L: 226
-				class247.pcmSampleLength = 2; // L: 227
-			} else {
-				class247.musicPlayerStatus = 1; // L: 232
-				class128.musicTrackArchive = null; // L: 233
-				FillMode.musicTrackGroupId = -1; // L: 234
-				ArchiveDiskActionHandler.musicTrackFileId = -1; // L: 235
-				class247.musicTrackVolume = 0; // L: 236
-				SecureRandomCallable.musicTrackBoolean = false; // L: 237
-				class247.pcmSampleLength = 2; // L: 238
-			}
+		var2.method6656(); // L: 62
+	} // L: 63
 
-			if (NetCache.NetCache_socket != null) { // L: 241
-				try {
-					Buffer var19 = new Buffer(4); // L: 243
-					var19.writeByte(3); // L: 244
-					var19.writeMedium(0); // L: 245
-					NetCache.NetCache_socket.write(var19.array, 0, 4); // L: 246
-				} catch (IOException var16) {
-					try {
-						NetCache.NetCache_socket.close(); // L: 250
-					} catch (Exception var15) { // L: 252
-					}
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lno;",
+		garbageValue = "0"
+	)
+	class366 method2600(int var1) {
+		return this.field1368[var1]; // L: 66
+	}
 
-					++NetCache.NetCache_ioExceptions; // L: 253
-					NetCache.NetCache_socket = null; // L: 254
-				}
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(IS)Lno;",
+		garbageValue = "351"
+	)
+	class366 method2587(int var1) {
+		if (this.field1369[var1] == null) { // L: 70
+			this.field1369[var1] = new class366(this.method2600(var1)); // L: 71
+			if (this.field1366 != null) { // L: 72
+				this.field1369[var1].method6670(this.field1366.method2587(var1)); // L: 73
+			} else {
+				this.field1369[var1].method6670(class366.field4194); // L: 76
 			}
-
-			Login.clearLoginScreen = true; // L: 257
-			Login.xPadding = (GameEngine.canvasWidth - 765) / 2; // L: 258
-			Login.loginBoxX = Login.xPadding + 202; // L: 259
-			Login.loginBoxCenter = Login.loginBoxX + 180; // L: 260
-			RouteStrategy.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 261
-			class139.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 262
-			class16.logoSprite.drawAt(Login.xPadding + 382 - class16.logoSprite.subWidth / 2, 18); // L: 263
 		}
-	} // L: 152 264
 
-	@ObfuscatedName("jj")
+		return this.field1369[var1]; // L: 79
+	}
+
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;II)I",
-		garbageValue = "-1898154429"
+		descriptor = "(II)Lno;",
+		garbageValue = "1855658248"
 	)
-	static final int method2532(Widget var0, int var1) {
-		if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10368
-			try {
-				int[] var2 = var0.cs1Instructions[var1]; // L: 10370
-				int var3 = 0; // L: 10371
-				int var4 = 0; // L: 10372
-				byte var5 = 0; // L: 10373
-
-				while (true) {
-					int var6 = var2[var4++]; // L: 10375
-					int var7 = 0; // L: 10376
-					byte var8 = 0; // L: 10377
-					if (var6 == 0) { // L: 10378
-						return var3;
-					}
-
-					if (var6 == 1) { // L: 10379
-						var7 = Client.currentLevels[var2[var4++]];
-					}
-
-					if (var6 == 2) { // L: 10380
-						var7 = Client.levels[var2[var4++]];
-					}
-
-					if (var6 == 3) { // L: 10381
-						var7 = Client.experience[var2[var4++]];
-					}
-
-					int var9;
-					Widget var10;
-					int var11;
-					int var12;
-					if (var6 == 4) { // L: 10382
-						var9 = var2[var4++] << 16; // L: 10383
-						var9 += var2[var4++]; // L: 10384
-						var10 = UserComparator9.getWidget(var9); // L: 10385
-						var11 = var2[var4++]; // L: 10386
-						if (var11 != -1 && (!TaskHandler.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10387
-							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10388
-								if (var11 + 1 == var10.itemIds[var12]) { // L: 10389
-									var7 += var10.itemQuantities[var12];
-								}
-							}
-						}
-					}
-
-					if (var6 == 5) { // L: 10393
-						var7 = Varps.Varps_main[var2[var4++]];
-					}
-
-					if (var6 == 6) { // L: 10394
-						var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
-					}
-
-					if (var6 == 7) { // L: 10395
-						var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
-					}
-
-					if (var6 == 8) { // L: 10396
-						var7 = HealthBarDefinition.localPlayer.combatLevel;
-					}
-
-					if (var6 == 9) { // L: 10397
-						for (var9 = 0; var9 < 25; ++var9) { // L: 10398
-							if (Skills.Skills_enabled[var9]) { // L: 10399
-								var7 += Client.levels[var9];
-							}
-						}
-					}
-
-					if (var6 == 10) { // L: 10402
-						var9 = var2[var4++] << 16; // L: 10403
-						var9 += var2[var4++]; // L: 10404
-						var10 = UserComparator9.getWidget(var9); // L: 10405
-						var11 = var2[var4++]; // L: 10406
-						if (var11 != -1 && (!TaskHandler.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10407
-							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10408
-								if (var11 + 1 == var10.itemIds[var12]) { // L: 10409
-									var7 = 999999999; // L: 10410
-									break; // L: 10411
-								}
-							}
-						}
-					}
-
-					if (var6 == 11) { // L: 10416
-						var7 = Client.runEnergy;
-					}
-
-					if (var6 == 12) { // L: 10417
-						var7 = Client.weight;
-					}
+	class366 method2586(int var1) {
+		if (this.field1365[var1] == null) { // L: 83
+			this.field1365[var1] = new class366(this.method2587(var1)); // L: 84
+			this.field1365[var1].method6678(); // L: 85
+		}
 
-					if (var6 == 13) { // L: 10418
-						var9 = Varps.Varps_main[var2[var4++]]; // L: 10419
-						int var13 = var2[var4++]; // L: 10420
-						var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10421
-					}
+		return this.field1365[var1]; // L: 87
+	}
 
-					if (var6 == 14) { // L: 10423
-						var9 = var2[var4++]; // L: 10424
-						var7 = class119.getVarbit(var9); // L: 10425
-					}
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(Lno;I)V",
+		garbageValue = "275218241"
+	)
+	void method2576(class366 var1) {
+		this.field1371.method6654(var1); // L: 91
+		this.field1378 = true; // L: 92
+		this.field1374 = true; // L: 93
+	} // L: 94
 
-					if (var6 == 15) { // L: 10427
-						var8 = 1;
-					}
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(I)Lno;",
+		garbageValue = "-1259649016"
+	)
+	class366 method2604() {
+		return this.field1371; // L: 97
+	}
 
-					if (var6 == 16) { // L: 10428
-						var8 = 2;
-					}
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(B)Lno;",
+		garbageValue = "17"
+	)
+	class366 method2581() {
+		if (this.field1378) { // L: 101
+			this.field1373.method6654(this.method2604()); // L: 102
+			if (this.field1366 != null) { // L: 103
+				this.field1373.method6670(this.field1366.method2581()); // L: 104
+			}
 
-					if (var6 == 17) { // L: 10429
-						var8 = 3;
-					}
+			this.field1378 = false; // L: 106
+		}
 
-					if (var6 == 18) { // L: 10430
-						var7 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX;
-					}
+		return this.field1373; // L: 108
+	}
 
-					if (var6 == 19) { // L: 10431
-						var7 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY;
-					}
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lno;",
+		garbageValue = "1902946548"
+	)
+	public class366 method2582(int var1) {
+		if (this.field1374) { // L: 112
+			this.field1372.method6654(this.method2586(var1)); // L: 113
+			this.field1372.method6670(this.method2581()); // L: 114
+			this.field1374 = false; // L: 115
+		}
 
-					if (var6 == 20) { // L: 10432
-						var7 = var2[var4++];
-					}
+		return this.field1372; // L: 117
+	}
 
-					if (var8 == 0) { // L: 10433
-						if (var5 == 0) { // L: 10434
-							var3 += var7;
-						}
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(II)[F",
+		garbageValue = "-849855317"
+	)
+	float[] method2583(int var1) {
+		return this.field1376[var1]; // L: 121
+	}
 
-						if (var5 == 1) { // L: 10435
-							var3 -= var7;
-						}
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(IB)[F",
+		garbageValue = "-117"
+	)
+	float[] method2577(int var1) {
+		return this.field1367[var1]; // L: 125
+	}
 
-						if (var5 == 2 && var7 != 0) { // L: 10436
-							var3 /= var7;
-						}
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(II)[F",
+		garbageValue = "-177348293"
+	)
+	float[] method2585(int var1) {
+		return this.field1375[var1]; // L: 129
+	}
 
-						if (var5 == 3) { // L: 10437
-							var3 *= var7;
-						}
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1994620885"
+	)
+	public static int method2616() {
+		return ViewportMouse.ViewportMouse_entityCount; // L: 44
+	}
 
-						var5 = 0; // L: 10438
-					} else {
-						var5 = var8; // L: 10440
-					}
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;IB)V",
+		garbageValue = "13"
+	)
+	static final void method2618(String var0, int var1) {
+		PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2878, Client.packetWriter.isaacCipher); // L: 228
+		var2.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 229
+		var2.packetBuffer.method7343(var1); // L: 230
+		var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 231
+		Client.packetWriter.addNode(var2); // L: 232
+	} // L: 233
+
+	@ObfuscatedName("la")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)V",
+		garbageValue = "0"
+	)
+	static final void method2617(int var0, int var1) {
+		if (Client.currentClanChannels[var0] != null) { // L: 12525
+			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2990()) { // L: 12526
+				ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12527
+				if (var2.rank == -1) { // L: 12528
+					PacketWriter var3 = Client.packetWriter; // L: 12529
+					PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2888, var3.isaacCipher); // L: 12530
+					var4.packetBuffer.writeByte(3 + class116.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 12531
+					var4.packetBuffer.writeByte(var0); // L: 12532
+					var4.packetBuffer.writeShort(var1); // L: 12533
+					var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 12534
+					var3.addNode(var4); // L: 12535
 				}
-			} catch (Exception var14) { // L: 10443
-				return -1; // L: 10444
 			}
-		} else {
-			return -2;
 		}
-	}
+	} // L: 12536
 }
diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java
index 045067099a..87503d3d3b 100644
--- a/runescape-client/src/main/java/class114.java
+++ b/runescape-client/src/main/java/class114.java
@@ -1,498 +1,82 @@
+import java.awt.FontMetrics;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("dj")
-public class class114 extends class116 {
-	@ObfuscatedName("af")
+@ObfuscatedName("dh")
+public enum class114 implements MouseWheel {
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lmo;"
+		descriptor = "Ldh;"
 	)
-	static Bounds field1359;
-	@ObfuscatedName("dx")
+	field1390(0, 0),
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lev;"
+		descriptor = "Ldh;"
 	)
-	@Export("js5SocketTask")
-	static Task js5SocketTask;
-	@ObfuscatedName("hv")
+	field1383(1, 1),
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Low;"
+		descriptor = "Ldh;"
 	)
-	@Export("compass")
-	static SpritePixels compass;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		longValue = -3547917971433153133L
-	)
-	long field1364;
-	@ObfuscatedName("w")
-	String field1360;
-	// $FF: synthetic field
+	field1384(2, 2),
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Ldh;"
 	)
-	final class119 this$0;
-
+	field1391(3, 3),
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "Ldh;"
 	)
-	class114(class119 var1) {
-		this.this$0 = var1;
-		this.field1364 = -1L; // L: 74
-		this.field1360 = null; // L: 75
-	} // L: 77
-
-	@ObfuscatedName("i")
+	field1386(4, 4);
+
+	@ObfuscatedName("r")
+	public static short[][] field1382;
+	@ObfuscatedName("ax")
+	@Export("loginScreenFontMetrics")
+	static FontMetrics loginScreenFontMetrics;
+	@ObfuscatedName("gl")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "Llx;"
 	)
-	void vmethod2847(Buffer var1) {
-		if (var1.readUnsignedByte() != 255) { // L: 80
-			--var1.offset; // L: 81
-			this.field1364 = var1.readLong(); // L: 82
-		}
-
-		this.field1360 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84
-	} // L: 85
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
-	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2655(this.field1364, this.field1360, 0); // L: 88
-	} // L: 89
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "([BI)Ljava/lang/String;",
-		garbageValue = "-216231156"
+	@Export("fontPlain12")
+	static Font fontPlain12;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -401638189
 	)
-	public static String method2545(byte[] var0) {
-		return class135.method2795(var0, 0, var0.length); // L: 58
-	}
-
-	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "64"
+	final int field1387;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 733610371
 	)
-	static int method2542(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3317
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3318
-			return 1; // L: 3319
-		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3321
-			class14.Interpreter_intStackSize -= 3; // L: 3322
-			Client.publicChatMode = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3323
-			ApproximateRouteStrategy.privateChatMode = FloorDecoration.method4189(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 3324
-			if (ApproximateRouteStrategy.privateChatMode == null) { // L: 3325
-				ApproximateRouteStrategy.privateChatMode = PrivateChatMode.field4425;
-			}
-
-			Client.tradeChatMode = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 3326
-			PacketBufferNode var13 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2696, Client.packetWriter.isaacCipher); // L: 3328
-			var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3329
-			var13.packetBuffer.writeByte(ApproximateRouteStrategy.privateChatMode.field4424); // L: 3330
-			var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3331
-			Client.packetWriter.addNode(var13); // L: 3332
-			return 1; // L: 3333
-		} else {
-			PacketBufferNode var6;
-			int var7;
-			String var8;
-			int var9;
-			if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3335
-				var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3336
-				class14.Interpreter_intStackSize -= 2; // L: 3337
-				var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3338
-				var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3339
-				var6 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); // L: 3341
-				var6.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3342
-				var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3343
-				var6.packetBuffer.writeByte(var7 - 1); // L: 3344
-				var6.packetBuffer.writeByte(var9); // L: 3345
-				Client.packetWriter.addNode(var6); // L: 3346
-				return 1; // L: 3347
-			} else {
-				int var3;
-				Message var5;
-				if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3349
-					class14.Interpreter_intStackSize -= 2; // L: 3350
-					var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3351
-					var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3352
-					var5 = class54.Messages_getByChannelAndID(var3, var7); // L: 3353
-					if (var5 != null) { // L: 3354
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.count; // L: 3355
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.cycle; // L: 3356
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3357
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3358
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3359
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3360
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3363
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3364
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3365
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3366
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3367
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3368
-					}
-
-					return 1; // L: 3370
-				} else {
-					Message var4;
-					if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3372
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3373
-						var4 = class122.Messages_getMessage(var3); // L: 3374
-						if (var4 != null) { // L: 3375
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.type; // L: 3376
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.cycle; // L: 3377
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3378
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3379
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3380
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3381
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3384
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3385
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3386
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3387
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3388
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3389
-						}
-
-						return 1; // L: 3391
-					} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3393
-						if (ApproximateRouteStrategy.privateChatMode == null) { // L: 3394
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1;
-						} else {
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ApproximateRouteStrategy.privateChatMode.field4424; // L: 3395
-						}
-
-						return 1; // L: 3396
-					} else {
-						PacketBufferNode var12;
-						if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3398
-							var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3399
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3400
-							var12 = class383.method6755(var7, var8, MouseHandler.clientLanguage, -1); // L: 3401
-							Client.packetWriter.addNode(var12); // L: 3402
-							return 1; // L: 3403
-						} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3405
-							class295.Interpreter_stringStackSize -= 2; // L: 3406
-							var8 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3407
-							String var11 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3408
-							var12 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2675, Client.packetWriter.isaacCipher); // L: 3410
-							var12.packetBuffer.writeShort(0); // L: 3411
-							int var10 = var12.packetBuffer.offset; // L: 3412
-							var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3413
-							class132.method2769(var12.packetBuffer, var11); // L: 3414
-							var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3415
-							Client.packetWriter.addNode(var12); // L: 3416
-							return 1; // L: 3417
-						} else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3419
-							var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3420
-							class14.Interpreter_intStackSize -= 2; // L: 3421
-							var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3422
-							var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3423
-							var6 = class383.method6755(var7, var8, MouseHandler.clientLanguage, var9); // L: 3424
-							Client.packetWriter.addNode(var6); // L: 3425
-							return 1; // L: 3426
-						} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3428
-							if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3435
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3436
-								return 1; // L: 3437
-							} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3439
-								var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3440
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ObjectSound.Messages_getHistorySize(var3); // L: 3441
-								return 1; // L: 3442
-							} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3444
-								var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3445
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ClanChannelMember.Messages_getLastChatID(var3); // L: 3446
-								return 1; // L: 3447
-							} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3449
-								var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3450
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = WorldMapData_0.method3530(var3); // L: 3451
-								return 1; // L: 3452
-							} else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3454
-								var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3455
-								class7.doCheat(var8); // L: 3456
-								return 1; // L: 3457
-							} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3459
-								Client.field692 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3460
-								return 1; // L: 3461
-							} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3463
-								Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = Client.field692; // L: 3464
-								return 1; // L: 3465
-							} else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3467
-								var8 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3468
-								System.out.println(var8); // L: 3469
-								return 1; // L: 3470
-							} else if (var0 == 5024) { // L: 3472
-								--class14.Interpreter_intStackSize; // L: 3473
-								return 1; // L: 3474
-							} else if (var0 == 5025) { // L: 3476
-								++class14.Interpreter_intStackSize; // L: 3477
-								return 1; // L: 3478
-							} else if (var0 == 5030) { // L: 3480
-								class14.Interpreter_intStackSize -= 2; // L: 3481
-								var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3482
-								var7 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3483
-								var5 = class54.Messages_getByChannelAndID(var3, var7); // L: 3484
-								if (var5 != null) { // L: 3485
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.count; // L: 3486
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.cycle; // L: 3487
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3488
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3489
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3490
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3491
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3492
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3493
-								} else {
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3496
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3497
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3498
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3499
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3500
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3501
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3502
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3503
-								}
-
-								return 1; // L: 3505
-							} else if (var0 == 5031) { // L: 3507
-								var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3508
-								var4 = class122.Messages_getMessage(var3); // L: 3509
-								if (var4 != null) { // L: 3510
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.type; // L: 3511
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.cycle; // L: 3512
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3513
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3514
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3515
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3516
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3517
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3518
-								} else {
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3521
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3522
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3523
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3524
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3525
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3526
-									Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3527
-									Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3528
-								}
+	final int field1388;
 
-								return 1; // L: 3530
-							} else {
-								return 2; // L: 3532
-							}
-						} else {
-							if (HealthBarDefinition.localPlayer != null && HealthBarDefinition.localPlayer.username != null) { // L: 3430
-								var8 = HealthBarDefinition.localPlayer.username.getName();
-							} else {
-								var8 = ""; // L: 3431
-							}
+	class114(int var3, int var4) {
+		this.field1387 = var3; // L: 129
+		this.field1388 = var4; // L: 130
+	} // L: 131
 
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var8; // L: 3432
-							return 1; // L: 3433
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("gk")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-929518083"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
-	static final void method2538() {
-		Client.field539 = 0; // L: 5600
-		int var0 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX; // L: 5601
-		int var1 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY; // L: 5602
-		if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5603
-			Client.field539 = 1;
-		}
-
-		if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5604
-			Client.field539 = 1;
-		}
-
-		if (Client.field539 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5605
-			Client.field539 = 0;
-		}
-
-	} // L: 5606
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field1388; // L: 134
+	}
 
-	@ObfuscatedName("jn")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;III)V",
-		garbageValue = "226743151"
+		descriptor = "(II)I",
+		garbageValue = "1912506868"
 	)
-	@Export("Widget_addToMenu")
-	static final void Widget_addToMenu(Widget var0, int var1, int var2) {
-		if (var0.buttonType == 1) { // L: 10471
-			EnumComposition.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10472
-		}
-
-		String var3;
-		if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10475
-			var3 = class20.Widget_getSpellActionName(var0); // L: 10476
-			if (var3 != null) { // L: 10477
-				EnumComposition.insertMenuItemNoShift(var3, MouseHandler.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10478
-			}
-		}
-
-		if (var0.buttonType == 3) { // L: 10482
-			EnumComposition.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10483
-		}
-
-		if (var0.buttonType == 4) { // L: 10486
-			EnumComposition.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10487
-		}
-
-		if (var0.buttonType == 5) { // L: 10490
-			EnumComposition.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10491
-		}
-
-		if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10494
-			EnumComposition.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10495
-		}
-
-		int var4;
-		int var13;
-		if (var0.type == 2) { // L: 10498
-			var13 = 0; // L: 10499
-
-			for (var4 = 0; var4 < var0.height; ++var4) { // L: 10500
-				for (int var15 = 0; var15 < var0.width; ++var15) { // L: 10501
-					int var6 = (var0.paddingX + 32) * var15; // L: 10502
-					int var7 = (var0.paddingY + 32) * var4; // L: 10503
-					if (var13 < 20) { // L: 10504
-						var6 += var0.inventoryXOffsets[var13]; // L: 10505
-						var7 += var0.inventoryYOffsets[var13]; // L: 10506
-					}
-
-					if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 10508
-						Client.dragItemSlotDestination = var13; // L: 10509
-						class274.hoveredItemContainer = var0; // L: 10510
-						if (var0.itemIds[var13] > 0) { // L: 10511
-							ItemComposition var8 = TaskHandler.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 10512
-							if (Client.isItemSelected == 1 && Tiles.method2045(PendingSpawn.getWidgetFlags(var0))) { // L: 10513
-								if (var0.id != MouseHandler.selectedItemWidget || var13 != ReflectionCheck.selectedItemSlot) { // L: 10514
-									EnumComposition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + MouseHandler.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 10515
-								}
-							} else if (Client.isSpellSelected && Tiles.method2045(PendingSpawn.getWidgetFlags(var0))) { // L: 10519
-								if ((class116.selectedSpellFlags & 16) == 16) { // L: 10520
-									EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + MouseHandler.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 10521
-								}
-							} else {
-								String[] var9 = var8.inventoryActions; // L: 10526
-								int var10 = -1; // L: 10527
-								if (Client.shiftClickDrop && UserComparator7.method2466()) { // L: 10528
-									var10 = var8.getShiftClickIndex(); // L: 10529
-								}
-
-								int var11;
-								if (Tiles.method2045(PendingSpawn.getWidgetFlags(var0))) { // L: 10531
-									for (var11 = 4; var11 >= 3; --var11) { // L: 10532
-										if (var11 != var10) { // L: 10533
-											ObjectComposition.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 10534
-										}
-									}
-								}
-
-								if (class111.method2514(PendingSpawn.getWidgetFlags(var0))) { // L: 10537
-									EnumComposition.insertMenuItemNoShift("Use", MouseHandler.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 10538
-								}
-
-								if (Tiles.method2045(PendingSpawn.getWidgetFlags(var0))) { // L: 10541
-									for (var11 = 2; var11 >= 0; --var11) { // L: 10542
-										if (var10 != var11) { // L: 10543
-											ObjectComposition.addWidgetItemMenuItem(var0, var8, var13, var11, false); // L: 10544
-										}
-									}
-
-									if (var10 >= 0) { // L: 10546
-										ObjectComposition.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 10547
-									}
-								}
-
-								var9 = var0.itemActions; // L: 10550
-								if (var9 != null) { // L: 10551
-									for (var11 = 4; var11 >= 0; --var11) { // L: 10552
-										if (var9[var11] != null) { // L: 10553
-											byte var12 = 0; // L: 10554
-											if (var11 == 0) { // L: 10555
-												var12 = 39;
-											}
-
-											if (var11 == 1) { // L: 10556
-												var12 = 40;
-											}
-
-											if (var11 == 2) { // L: 10557
-												var12 = 41;
-											}
-
-											if (var11 == 3) { // L: 10558
-												var12 = 42;
-											}
-
-											if (var11 == 4) { // L: 10559
-												var12 = 43;
-											}
-
-											EnumComposition.insertMenuItemNoShift(var9[var11], MouseHandler.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 10560
-										}
-									}
-								}
-
-								EnumComposition.insertMenuItemNoShift("Examine", MouseHandler.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 10565
-							}
-						}
-					}
-
-					++var13; // L: 10570
-				}
-			}
-		}
-
-		if (var0.isIf3) { // L: 10574
-			if (Client.isSpellSelected) { // L: 10575
-				if (class19.method279(PendingSpawn.getWidgetFlags(var0)) && (class116.selectedSpellFlags & 32) == 32) { // L: 10576
-					EnumComposition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10577
-				}
-			} else {
-				for (var13 = 9; var13 >= 5; --var13) { // L: 10582
-					String var14 = SoundSystem.method785(var0, var13); // L: 10583
-					if (var14 != null) { // L: 10584
-						EnumComposition.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 10585
-					}
-				}
-
-				var3 = class20.Widget_getSpellActionName(var0); // L: 10589
-				if (var3 != null) { // L: 10590
-					EnumComposition.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10591
-				}
-
-				for (var4 = 4; var4 >= 0; --var4) { // L: 10594
-					String var5 = SoundSystem.method785(var0, var4); // L: 10595
-					if (var5 != null) { // L: 10596
-						ModelData0.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10597
-					}
-				}
-
-				if (ClientPacket.method4710(PendingSpawn.getWidgetFlags(var0))) { // L: 10601
-					EnumComposition.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10602
-				}
-			}
-		}
-
-	} // L: 10607
+	public static int method2629(int var0) {
+		long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 73
+		int var1 = (int)(var2 >>> 14 & 3L); // L: 75
+		return var1; // L: 77
+	}
 }
diff --git a/runescape-client/src/main/java/class115.java b/runescape-client/src/main/java/class115.java
index 844e92db3b..5d7bf1005c 100644
--- a/runescape-client/src/main/java/class115.java
+++ b/runescape-client/src/main/java/class115.java
@@ -1,103 +1,260 @@
-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.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dt")
-public class class115 extends class116 {
-	@ObfuscatedName("rx")
+@ObfuscatedName("dn")
+public class class115 {
+	@ObfuscatedName("da")
 	@ObfuscatedSignature(
-		descriptor = "Lea;"
-	)
-	@Export("guestClanChannel")
-	static ClanChannel guestClanChannel;
-	@ObfuscatedName("al")
-	@Export("fontHelvetica13")
-	static java.awt.Font fontHelvetica13;
-	@ObfuscatedName("id")
+		descriptor = "Lkz;"
+	)
+	@Export("archive1")
+	static Archive archive1;
+	@ObfuscatedName("ep")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive7")
+	static Archive archive7;
+	@ObfuscatedName("c")
+	boolean field1397;
+	@ObfuscatedName("b")
+	boolean field1408;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Ldh;"
+	)
+	class114 field1410;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Ldh;"
+	)
+	class114 field1396;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "[Low;"
+		descriptor = "[Ldk;"
 	)
-	@Export("mapDotSprites")
-	static SpritePixels[] mapDotSprites;
-	@ObfuscatedName("i")
+	class111[] field1393;
+	@ObfuscatedName("s")
+	boolean field1398;
+	@ObfuscatedName("j")
+	float field1406;
+	@ObfuscatedName("w")
+	float field1394;
+	@ObfuscatedName("n")
+	float[] field1401;
+	@ObfuscatedName("r")
+	float[] field1402;
+	@ObfuscatedName("o")
+	boolean field1403;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1098796111
+		intValue = -1087624435
 	)
-	int field1368;
-	// $FF: synthetic field
+	int field1404;
+	@ObfuscatedName("d")
+	float[] field1405;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -544565947
+	)
+	int field1395;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = -577776791
+	)
+	int field1407;
+	@ObfuscatedName("e")
+	float field1399;
+	@ObfuscatedName("a")
+	float field1409;
+
+	class115() {
+		this.field1401 = new float[4]; // L: 16
+		this.field1402 = new float[4]; // L: 17
+		this.field1403 = true; // L: 18
+		this.field1404 = 0; // L: 19
+	} // L: 26
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "(Lpi;II)I",
+		garbageValue = "13750737"
 	)
-	final class119 this$0;
+	int method2638(Buffer var1, int var2) {
+		int var3 = var1.readUnsignedShort(); // L: 29
+		int var4 = var1.readUnsignedByte(); // L: 30
+		class121 var5 = (class121)class130.findEnumerated(class87.method2281(), var4); // L: 32
+		if (var5 == null) { // L: 33
+			var5 = class121.field1467;
+		}
+
+		this.field1410 = ScriptEvent.method2154(var1.readUnsignedByte()); // L: 35
+		this.field1396 = ScriptEvent.method2154(var1.readUnsignedByte()); // L: 36
+		this.field1397 = var1.readUnsignedByte() != 0; // L: 37
+		this.field1393 = new class111[var3]; // L: 38
+		class111 var8 = null; // L: 39
+
+		int var6;
+		for (var6 = 0; var6 < var3; ++var6) { // L: 40
+			class111 var7 = new class111(); // L: 41
+			var7.method2558(var1, var2); // L: 42
+			this.field1393[var6] = var7; // L: 43
+			if (var8 != null) { // L: 44
+				var8.field1354 = var7; // L: 45
+			}
+
+			var8 = var7; // L: 47
+		}
+
+		this.field1395 = this.field1393[0].field1359; // L: 49
+		this.field1407 = this.field1393[this.method2637() - 1].field1359; // L: 50
+		this.field1405 = new float[this.method2642() + 1]; // L: 52
+
+		for (var6 = this.method2633(); var6 <= this.method2658(); ++var6) { // L: 53
+			this.field1405[var6 - this.method2633()] = class14.method210(this, (float)var6); // L: 54
+		}
+
+		this.field1393 = null; // L: 56
+		this.field1399 = class14.method210(this, (float)(this.method2633() - 1)); // L: 58
+		this.field1409 = class14.method210(this, (float)(this.method2658() + 1)); // L: 59
+		return var3; // L: 60
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(II)F",
+		garbageValue = "1379613338"
+	)
+	public float method2632(int var1) {
+		if (var1 < this.method2633()) { // L: 65
+			return this.field1399; // L: 66
+		} else {
+			return var1 > this.method2658() ? this.field1409 : this.field1405[var1 - this.method2633()]; // L: 68 69 71
+		}
+	}
 
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "(I)I",
+		garbageValue = "648165543"
 	)
-	class115(class119 var1) {
-		this.this$0 = var1;
-		this.field1368 = -1; // L: 114
-	} // L: 116
+	int method2633() {
+		return this.field1395; // L: 76
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(I)I",
+		garbageValue = "654538685"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1368 = var1.readUnsignedShort(); // L: 119
-	} // L: 120
+	int method2658() {
+		return this.field1407; // L: 80
+	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(B)I",
+		garbageValue = "118"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2656(this.field1368); // L: 123
-	} // L: 124
+	int method2642() {
+		return this.method2658() - this.method2633(); // L: 84
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "([BB)Lgg;",
-		garbageValue = "122"
+		descriptor = "(FB)I",
+		garbageValue = "111"
 	)
-	static WorldMapSprite method2554(byte[] var0) {
-		if (var0 == null) { // L: 19
-			return new WorldMapSprite();
-		} else {
-			BufferedImage var2 = null; // L: 22
-
-			SpritePixels var1;
-			try {
-				var2 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 24
-				int var3 = var2.getWidth(); // L: 25
-				int var4 = var2.getHeight(); // L: 26
-				int[] var5 = new int[var4 * var3]; // L: 27
-				PixelGrabber var6 = new PixelGrabber(var2, 0, 0, var3, var4, var5, 0, var3); // L: 28
-				var6.grabPixels(); // L: 29
-				var1 = new SpritePixels(var5, var3, var4); // L: 30
-				return new WorldMapSprite(var1.pixels); // L: 37
-			} catch (IOException var8) { // L: 33
-			} catch (InterruptedException var9) { // L: 34
-			}
+	int method2630(float var1) {
+		if (this.field1404 < 0 || (float)this.field1393[this.field1404].field1359 > var1 || this.field1393[this.field1404].field1354 != null && (float)this.field1393[this.field1404].field1354.field1359 <= var1) { // L: 88
+			if (var1 >= (float)this.method2633() && var1 <= (float)this.method2658()) { // L: 91
+				int var2 = this.method2637(); // L: 94
+				int var3 = this.field1404; // L: 95
+				if (var2 > 0) { // L: 96
+					int var4 = 0; // L: 97
+					int var5 = var2 - 1; // L: 98
 
-			var1 = new SpritePixels(0, 0); // L: 35
-			return new WorldMapSprite(var1.pixels);
+					do {
+						int var6 = var5 + var4 >> 1; // L: 100
+						if (var1 < (float)this.field1393[var6].field1359) { // L: 101
+							if (var1 > (float)this.field1393[var6 - 1].field1359) { // L: 102
+								var3 = var6 - 1; // L: 103
+								break;
+							}
+
+							var5 = var6 - 1; // L: 107
+						} else {
+							if (var1 <= (float)this.field1393[var6].field1359) { // L: 110
+								var3 = var6; // L: 120
+								break; // L: 121
+							}
+
+							if (var1 < (float)this.field1393[var6 + 1].field1359) { // L: 111
+								var3 = var6; // L: 112
+								break; // L: 113
+							}
+
+							var4 = var6 + 1; // L: 116
+						}
+					} while(var4 <= var5); // L: 123
+				}
+
+				if (var3 != this.field1404) { // L: 125
+					this.field1404 = var3; // L: 126
+					this.field1403 = true; // L: 127
+				}
+
+				return this.field1404; // L: 129
+			} else {
+				return -1; // L: 92
+			}
+		} else {
+			return this.field1404; // L: 89
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "-473426033"
+		descriptor = "(FB)Ldk;",
+		garbageValue = "80"
 	)
-	public static String method2555(CharSequence var0) {
-		return Message.method1149('*', var0.length()); // L: 201
+	class111 method2631(float var1) {
+		int var2 = this.method2630(var1); // L: 133
+		return var2 >= 0 && var2 < this.field1393.length ? this.field1393[var2] : null; // L: 134 135 138
 	}
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "1810339438"
+	)
+	int method2637() {
+		return this.field1393 == null ? 0 : this.field1393.length; // L: 143 144
+	}
+
+	@ObfuscatedName("jv")
+	@ObfuscatedSignature(
+		descriptor = "([Ljm;Ljm;ZI)V",
+		garbageValue = "-1877017569"
+	)
+	@Export("revalidateWidgetScroll")
+	static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
+		int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -362959503 * 351761297 : var1.width * -559707675 * 137530349; // L: 10925
+		int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 991543577 * -390853847 : var1.height * 147077041 * -113659567; // L: 10926
+		class92.resizeInterface(var0, var1.id, var3, var4, var2); // L: 10927
+		if (var1.children != null) { // L: 10928
+			class92.resizeInterface(var1.children, var1.id, var3, var4, var2);
+		}
+
+		InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 10929
+		if (var5 != null) {
+			class18.method297(var5.group, var3, var4, var2); // L: 10930
+		}
+
+		if (var1.contentType == 1337) { // L: 10931
+		}
+
+	} // L: 10932
 }
diff --git a/runescape-client/src/main/java/class116.java b/runescape-client/src/main/java/class116.java
index da5357d79e..03d9b428d1 100644
--- a/runescape-client/src/main/java/class116.java
+++ b/runescape-client/src/main/java/class116.java
@@ -3,29 +3,148 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dy")
-public abstract class class116 extends Node {
-	@ObfuscatedName("ns")
+@ObfuscatedName("dx")
+public class class116 implements MouseWheel {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Ldx;"
+	)
+	static final class116 field1421;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Ldx;"
+	)
+	static final class116 field1415;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Ldx;"
+	)
+	static final class116 field1416;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Ldx;"
+	)
+	static final class116 field1423;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Ldx;"
+	)
+	static final class116 field1418;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Ldx;"
+	)
+	static final class116 field1419;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -1981923463
+	)
+	final int field1420;
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		intValue = -135847907
+	)
+	final int field1417;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 670075911
+		intValue = 249405033
 	)
-	@Export("selectedSpellFlags")
-	static int selectedSpellFlags;
+	final int field1422;
+
+	static {
+		field1421 = new class116(0, 0, (String)null, 0); // L: 14
+		field1415 = new class116(1, 1, (String)null, 9); // L: 15
+		field1416 = new class116(2, 2, (String)null, 3); // L: 16
+		field1423 = new class116(3, 3, (String)null, 6); // L: 17
+		field1418 = new class116(4, 4, (String)null, 1); // L: 18
+		field1419 = new class116(5, 5, (String)null, 3); // L: 19
+	}
 
-	class116() {
-	} // L: 68
+	class116(int var1, int var2, String var3, int var4) {
+		this.field1420 = var1; // L: 29
+		this.field1417 = var2; // L: 30
+		this.field1422 = var4; // L: 31
+	} // L: 32
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
-	abstract void vmethod2847(Buffer var1);
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field1417; // L: 40
+	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "94"
+	)
+	int method2669() {
+		return this.field1422; // L: 35
+	}
+
+	@ObfuscatedName("p")
+	public static boolean method2671(long var0) {
+		return 0L != var0 && !class12.method188(var0); // L: 56
+	}
+
+	@ObfuscatedName("ai")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)I",
+		garbageValue = "-2039612371"
+	)
+	@Export("stringCp1252NullTerminatedByteSize")
+	public static int stringCp1252NullTerminatedByteSize(String var0) {
+		return var0.length() + 1; // L: 117
+	}
+
+	@ObfuscatedName("fh")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(B)V",
+		garbageValue = "55"
 	)
-	abstract void vmethod2848(ClanSettings var1);
+	static void method2662() {
+		Client.packetWriter.clearBuffer(); // L: 3417
+		Client.packetWriter.packetBuffer.offset = 0; // L: 3418
+		Client.packetWriter.serverPacket = null; // L: 3419
+		Client.packetWriter.field1289 = null; // L: 3420
+		Client.packetWriter.field1290 = null; // L: 3421
+		Client.packetWriter.field1291 = null; // L: 3422
+		Client.packetWriter.serverPacketLength = 0; // L: 3423
+		Client.packetWriter.field1287 = 0; // L: 3424
+		Client.rebootTimer = 0; // L: 3425
+		UrlRequest.method2489(); // L: 3426
+		Client.minimapState = 0; // L: 3427
+		Client.destinationX = 0; // L: 3428
+
+		int var0;
+		for (var0 = 0; var0 < 2048; ++var0) { // L: 3429
+			Client.players[var0] = null;
+		}
+
+		class340.localPlayer = null; // L: 3430
+
+		for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 3431
+			NPC var1 = Client.npcs[var0]; // L: 3432
+			if (var1 != null) { // L: 3433
+				var1.targetIndex = -1; // L: 3434
+				var1.false0 = false; // L: 3435
+			}
+		}
+
+		ItemContainer.itemContainers = new NodeHashTable(32); // L: 3439
+		VertexNormal.updateGameState(30); // L: 3441
+
+		for (var0 = 0; var0 < 100; ++var0) { // L: 3442
+			Client.field504[var0] = true;
+		}
+
+		PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2824, Client.packetWriter.isaacCipher); // L: 3445
+		var2.packetBuffer.writeByte(class143.getWindowedMode()); // L: 3446
+		var2.packetBuffer.writeShort(class186.canvasWidth); // L: 3447
+		var2.packetBuffer.writeShort(BoundaryObject.canvasHeight); // L: 3448
+		Client.packetWriter.addNode(var2); // L: 3449
+	} // L: 3451
 }
diff --git a/runescape-client/src/main/java/class117.java b/runescape-client/src/main/java/class117.java
index d363af0e74..1c22f99a31 100644
--- a/runescape-client/src/main/java/class117.java
+++ b/runescape-client/src/main/java/class117.java
@@ -3,215 +3,186 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ds")
-public class class117 extends class116 {
-	@ObfuscatedName("i")
+@ObfuscatedName("dp")
+public class class117 implements MouseWheel {
+	@ObfuscatedName("sx")
 	@ObfuscatedGetter(
-		intValue = -1054010885
+		intValue = -1106281963
 	)
-	int field1378;
-	@ObfuscatedName("w")
-	boolean field1375;
-	// $FF: synthetic field
+	static int field1433;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Ldp;"
 	)
-	final class119 this$0;
-
+	static final class117 field1425;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "Ldp;"
 	)
-	class117(class119 var1) {
-		this.this$0 = var1;
-		this.field1378 = -1; // L: 178
-	} // L: 181
-
-	@ObfuscatedName("i")
+	static final class117 field1444;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "Ldp;"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1378 = var1.readUnsignedShort(); // L: 184
-		this.field1375 = var1.readUnsignedByte() == 1; // L: 185
-	} // L: 186
-
+	static final class117 field1430;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1427;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1428;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1429;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1442;
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "Ldp;"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2662(this.field1378, this.field1375); // L: 189
-	} // L: 190
-
-	@ObfuscatedName("x")
+	static final class117 field1431;
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1432;
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1424;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1434;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "-1364170988"
+		descriptor = "Ldp;"
 	)
-	@Export("isDigit")
-	public static boolean isDigit(char var0) {
-		return var0 >= '0' && var0 <= '9'; // L: 158
+	static final class117 field1435;
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1436;
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1437;
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1438;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1439;
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "Ldp;"
+	)
+	static final class117 field1440;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = -1755047429
+	)
+	final int field1441;
+	@ObfuscatedName("k")
+	@ObfuscatedGetter(
+		intValue = -438304939
+	)
+	final int field1426;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 614342417
+	)
+	final int field1443;
+
+	static {
+		field1425 = new class117(0, 0, (String)null, -1, -1); // L: 46
+		field1444 = new class117(1, 1, (String)null, 0, 2); // L: 47
+		field1430 = new class117(2, 2, (String)null, 1, 2); // L: 48
+		field1427 = new class117(3, 3, (String)null, 2, 2); // L: 49
+		field1428 = new class117(4, 4, (String)null, 3, 1); // L: 50
+		field1429 = new class117(5, 5, (String)null, 4, 1); // L: 51
+		field1442 = new class117(6, 6, (String)null, 5, 1); // L: 52
+		field1431 = new class117(7, 7, (String)null, 6, 3); // L: 53
+		field1432 = new class117(8, 8, (String)null, 7, 3); // L: 54
+		field1424 = new class117(9, 9, (String)null, 8, 3); // L: 55
+		field1434 = new class117(10, 10, (String)null, 0, 7); // L: 56
+		field1435 = new class117(11, 11, (String)null, 1, 7); // L: 57
+		field1436 = new class117(12, 12, (String)null, 2, 7); // L: 58
+		field1437 = new class117(13, 13, (String)null, 3, 7); // L: 59
+		field1438 = new class117(14, 14, (String)null, 4, 7); // L: 60
+		field1439 = new class117(15, 15, (String)null, 5, 7); // L: 61
+		field1440 = new class117(16, 16, (String)null, 0, 5); // L: 62
 	}
 
-	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIZI)Low;",
-		garbageValue = "-115532450"
+		descriptor = "(IILjava/lang/String;II)V",
+		garbageValue = "-1"
 	)
-	@Export("getItemSprite")
-	public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
-		if (var1 == -1) { // L: 357
-			var4 = 0;
-		} else if (var4 == 2 && var1 != 1) { // L: 358
-			var4 = 1;
-		}
+	class117(int var1, int var2, String var3, int var4, int var5) {
+		this.field1441 = var1; // L: 72
+		this.field1426 = var2; // L: 73
+		this.field1443 = var4; // L: 74
+	} // L: 75
 
-		long var6 = ((long)var3 << 42) + ((long)var4 << 40) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38); // L: 359
-		SpritePixels var8;
-		if (!var5) { // L: 361
-			var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 362
-			if (var8 != null) { // L: 363
-				return var8;
-			}
-		}
-
-		ItemComposition var9 = TaskHandler.ItemDefinition_get(var0); // L: 365
-		if (var1 > 1 && var9.countobj != null) { // L: 366
-			int var10 = -1; // L: 367
-
-			for (int var11 = 0; var11 < 10; ++var11) { // L: 368
-				if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 369
-					var10 = var9.countobj[var11];
-				}
-			}
-
-			if (var10 != -1) { // L: 371
-				var9 = TaskHandler.ItemDefinition_get(var10);
-			}
-		}
-
-		Model var21 = var9.getModel(1); // L: 373
-		if (var21 == null) { // L: 374
-			return null;
-		} else {
-			SpritePixels var22 = null; // L: 375
-			if (var9.noteTemplate != -1) { // L: 376
-				var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 377
-				if (var22 == null) { // L: 378
-					return null;
-				}
-			} else if (var9.notedId != -1) { // L: 380
-				var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 381
-				if (var22 == null) { // L: 382
-					return null;
-				}
-			} else if (var9.placeholderTemplate != -1) { // L: 384
-				var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 385
-				if (var22 == null) { // L: 386
-					return null;
-				}
-			}
-
-			int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 388
-			int var13 = Rasterizer2D.Rasterizer2D_width; // L: 389
-			int var14 = Rasterizer2D.Rasterizer2D_height; // L: 390
-			int[] var15 = new int[4]; // L: 391
-			Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 392
-			var8 = new SpritePixels(36, 32); // L: 393
-			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 394
-			Rasterizer2D.Rasterizer2D_clear(); // L: 395
-			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 396
-			Rasterizer3D.method4205(16, 16); // L: 397
-			Rasterizer3D.field2367 = false; // L: 398
-			if (var9.placeholderTemplate != -1) { // L: 399
-				var22.drawTransBgAt(0, 0);
-			}
-
-			int var16 = var9.zoom2d; // L: 400
-			if (var5) { // L: 401
-				var16 = (int)((double)var16 * 1.5D);
-			} else if (var2 == 2) { // L: 402
-				var16 = (int)((double)var16 * 1.04D);
-			}
-
-			int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 403
-			int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 404
-			var21.calculateBoundsCylinder(); // L: 405
-			var21.method4539(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 406
-			if (var9.notedId != -1) { // L: 407
-				var22.drawTransBgAt(0, 0);
-			}
-
-			if (var2 >= 1) { // L: 408
-				var8.outline(1);
-			}
-
-			if (var2 >= 2) { // L: 409
-				var8.outline(16777215);
-			}
-
-			if (var3 != 0) { // L: 410
-				var8.shadow(var3);
-			}
-
-			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 411
-			if (var9.noteTemplate != -1) { // L: 412
-				var22.drawTransBgAt(0, 0);
-			}
-
-			if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 413
-				Font var19 = SoundSystem.ItemDefinition_fontPlain11; // L: 414
-				String var20;
-				if (var1 < 100000) { // L: 417
-					var20 = "<col=ffff00>" + var1 + "</col>"; // L: 418
-				} else if (var1 < 10000000) { // L: 421
-					var20 = "<col=ffffff>" + var1 / 1000 + "K" + "</col>"; // L: 422
-				} else {
-					var20 = "<col=00ff80>" + var1 / 1000000 + "M" + "</col>"; // L: 425
-				}
-
-				var19.draw(var20, 0, 9, 16776960, 1); // L: 427
-			}
-
-			if (!var5) { // L: 429
-				ItemComposition.ItemDefinition_cachedSprites.put(var8, var6);
-			}
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "48"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field1426; // L: 78
+	}
 
-			Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 430
-			Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 431
-			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 432
-			Rasterizer3D.field2367 = true; // L: 433
-			return var8; // L: 434
-		}
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-202233185"
+	)
+	int method2674() {
+		return this.field1443; // L: 82
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "969588273"
+		descriptor = "(IB)Z",
+		garbageValue = "8"
 	)
-	static final int method2573(int var0, int var1) {
-		int var2 = var1 * 57 + var0; // L: 564
-		var2 ^= var2 << 13; // L: 565
-		int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 566
-		return var3 >> 19 & 255; // L: 567
+	public static boolean method2676(int var0) {
+		return var0 >= 0 && var0 < 112 ? KeyHandler.field130[var0] : false; // L: 246 247
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("fw")
 	@ObfuscatedSignature(
-		descriptor = "([BIII)I",
-		garbageValue = "-1335123440"
+		descriptor = "(B)V",
+		garbageValue = "0"
 	)
-	static int method2565(byte[] var0, int var1, int var2) {
-		int var3 = -1; // L: 47
+	static final void method2682() {
+		if (class121.field1470) { // L: 4383
+			for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 4385
+				Player var1 = Client.players[Players.Players_indices[var0]]; // L: 4386
+				var1.method2186(); // L: 4387
+			}
 
-		for (int var4 = var1; var4 < var2; ++var4) { // L: 48
-			var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49
+			class121.field1470 = false; // L: 4390
 		}
 
-		var3 = ~var3; // L: 51
-		return var3; // L: 52
-	}
+	} // L: 4392
 }
diff --git a/runescape-client/src/main/java/class118.java b/runescape-client/src/main/java/class118.java
new file mode 100644
index 0000000000..525a42d90c
--- /dev/null
+++ b/runescape-client/src/main/java/class118.java
@@ -0,0 +1,728 @@
+import java.io.IOException;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("dc")
+public class class118 implements class110 {
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("SequenceDefinition_skeletonsArchive")
+	public static AbstractArchive SequenceDefinition_skeletonsArchive;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1101501436"
+	)
+	static void method2686() {
+		Tiles.Tiles_minPlane = 99; // L: 48
+		Tiles.Tiles_underlays = new byte[4][104][104]; // L: 49
+		Tiles.Tiles_overlays = new byte[4][104][104]; // L: 50
+		Tiles.Tiles_shapes = new byte[4][104][104]; // L: 51
+		WorldMapLabelSize.field2580 = new byte[4][104][104]; // L: 52
+		ClanChannelMember.field1504 = new int[4][105][105]; // L: 53
+		SoundCache.field321 = new byte[4][105][105]; // L: 54
+		class194.field2280 = new int[105][105]; // L: 55
+		Tiles.Tiles_hue = new int[104]; // L: 56
+		User.Tiles_saturation = new int[104]; // L: 57
+		Tiles.Tiles_lightness = new int[104]; // L: 58
+		UserComparator5.Tiles_hueMultiplier = new int[104]; // L: 59
+		VerticalAlignment.field1874 = new int[104]; // L: 60
+	} // L: 61
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lfd;",
+		garbageValue = "21"
+	)
+	public static HealthBarDefinition method2683(int var0) {
+		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cachedSprites.get((long)var0); // L: 37
+		if (var1 != null) { // L: 38
+			return var1;
+		} else {
+			byte[] var2 = GrandExchangeOfferAgeComparator.HealthBarDefinition_archive.takeFile(33, var0); // L: 39
+			var1 = new HealthBarDefinition(); // L: 40
+			if (var2 != null) { // L: 41
+				var1.decode(new Buffer(var2));
+			}
+
+			HealthBarDefinition.HealthBarDefinition_cachedSprites.put(var1, (long)var0); // L: 42
+			return var1; // L: 43
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(IZIZI)V",
+		garbageValue = "582881016"
+	)
+	@Export("sortWorldList")
+	static void sortWorldList(int var0, boolean var1, int var2, boolean var3) {
+		if (class334.World_worlds != null) { // L: 171
+			class286.doWorldSorting(0, class334.World_worlds.length - 1, var0, var1, var2, var3); // L: 172
+		}
+
+	} // L: 174
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(B)[B",
+		garbageValue = "28"
+	)
+	public static byte[] method2684() {
+		byte[] var0 = new byte[24]; // L: 131
+
+		try {
+			JagexCache.JagexCache_randomDat.seek(0L); // L: 133
+			JagexCache.JagexCache_randomDat.readFully(var0); // L: 134
+
+			int var1;
+			for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 135 136 137
+			}
+
+			if (var1 >= 24) {
+				throw new IOException(); // L: 139
+			}
+		} catch (Exception var4) {
+			for (int var2 = 0; var2 < 24; ++var2) { // L: 142
+				var0[var2] = -1;
+			}
+		}
+
+		return var0; // L: 144
+	}
+
+	@ObfuscatedName("jl")
+	@ObfuscatedSignature(
+		descriptor = "([Ljm;IIIIIIIII)V",
+		garbageValue = "2121973055"
+	)
+	@Export("drawInterface")
+	static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+		Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10389
+		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10390
+
+		for (int var9 = 0; var9 < var0.length; ++var9) { // L: 10391
+			Widget var10 = var0[var9]; // L: 10392
+			if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 10393 10394
+				int var11;
+				if (var8 == -1) { // L: 10396
+					Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 10397
+					Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 10398
+					Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 10399
+					Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 10400
+					var11 = ++Client.rootWidgetCount - 1; // L: 10401
+				} else {
+					var11 = var8; // L: 10403
+				}
+
+				var10.rootIndex = var11; // L: 10404
+				var10.cycle = Client.cycle; // L: 10405
+				if (!var10.isIf3 || !StudioGame.isComponentHidden(var10)) { // L: 10406
+					if (var10.contentType > 0) { // L: 10407
+						AbstractWorldMapData.method4787(var10);
+					}
+
+					int var12 = var10.x + var6; // L: 10408
+					int var13 = var7 + var10.y; // L: 10409
+					int var14 = var10.transparencyTop; // L: 10410
+					int var15;
+					int var16;
+					if (var10 == Client.clickedWidget) { // L: 10411
+						if (var1 != -1412584499 && !var10.isScrollBar) { // L: 10412
+							BufferedFile.field4430 = var0; // L: 10413
+							HitSplatDefinition.field1945 = var6; // L: 10414
+							class78.field1000 = var7; // L: 10415
+							continue; // L: 10416
+						}
+
+						if (Client.isDraggingWidget && Client.field531) { // L: 10418
+							var15 = MouseHandler.MouseHandler_x; // L: 10419
+							var16 = MouseHandler.MouseHandler_y; // L: 10420
+							var15 -= Client.widgetClickX; // L: 10421
+							var16 -= Client.widgetClickY; // L: 10422
+							if (var15 < Client.field681) { // L: 10423
+								var15 = Client.field681;
+							}
+
+							if (var15 + var10.width > Client.field681 + Client.clickedWidgetParent.width) { // L: 10424
+								var15 = Client.field681 + Client.clickedWidgetParent.width - var10.width;
+							}
+
+							if (var16 < Client.field659) { // L: 10425
+								var16 = Client.field659;
+							}
+
+							if (var16 + var10.height > Client.field659 + Client.clickedWidgetParent.height) { // L: 10426
+								var16 = Client.field659 + Client.clickedWidgetParent.height - var10.height;
+							}
+
+							var12 = var15; // L: 10427
+							var13 = var16; // L: 10428
+						}
+
+						if (!var10.isScrollBar) { // L: 10430
+							var14 = 128;
+						}
+					}
+
+					int var17;
+					int var18;
+					int var19;
+					int var20;
+					int var21;
+					int var22;
+					if (var10.type == 2) { // L: 10436
+						var15 = var2; // L: 10437
+						var16 = var3; // L: 10438
+						var17 = var4; // L: 10439
+						var18 = var5; // L: 10440
+					} else if (var10.type == 9) { // L: 10442
+						var19 = var12; // L: 10443
+						var20 = var13; // L: 10444
+						var21 = var12 + var10.width; // L: 10445
+						var22 = var13 + var10.height; // L: 10446
+						if (var21 < var12) { // L: 10447
+							var19 = var21; // L: 10449
+							var21 = var12; // L: 10450
+						}
+
+						if (var22 < var13) { // L: 10452
+							var20 = var22; // L: 10454
+							var22 = var13; // L: 10455
+						}
+
+						++var21; // L: 10457
+						++var22; // L: 10458
+						var15 = var19 > var2 ? var19 : var2; // L: 10459
+						var16 = var20 > var3 ? var20 : var3; // L: 10460
+						var17 = var21 < var4 ? var21 : var4; // L: 10461
+						var18 = var22 < var5 ? var22 : var5; // L: 10462
+					} else {
+						var19 = var12 + var10.width; // L: 10465
+						var20 = var13 + var10.height; // L: 10466
+						var15 = var12 > var2 ? var12 : var2; // L: 10467
+						var16 = var13 > var3 ? var13 : var3; // L: 10468
+						var17 = var19 < var4 ? var19 : var4; // L: 10469
+						var18 = var20 < var5 ? var20 : var5; // L: 10470
+					}
+
+					if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 10472
+						if (var10.contentType != 0) { // L: 10473
+							if (var10.contentType == 1336) { // L: 10474
+								if (Client.displayFps) { // L: 10475
+									var13 += 15; // L: 10476
+									class114.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 10477
+									var13 += 15; // L: 10478
+									Runtime var42 = Runtime.getRuntime(); // L: 10479
+									var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 10480
+									var21 = 16776960; // L: 10481
+									if (var20 > 327680 && !Client.isLowDetail) { // L: 10482
+										var21 = 16711680;
+									}
+
+									class114.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 10483
+									var13 += 15; // L: 10484
+								}
+								continue;
+							}
+
+							if (var10.contentType == 1337) { // L: 10488
+								Client.viewportX = var12; // L: 10489
+								Client.viewportY = var13; // L: 10490
+								class291.drawEntities(var12, var13, var10.width, var10.height); // L: 10491
+								Client.field504[var10.rootIndex] = true; // L: 10492
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10493
+								continue; // L: 10494
+							}
+
+							if (var10.contentType == 1338) { // L: 10496
+								class148.drawMinimap(var10, var12, var13, var11); // L: 10497
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10498
+								continue; // L: 10499
+							}
+
+							if (var10.contentType == 1339) { // L: 10501
+								User.drawCompass(var10, var12, var13, var11); // L: 10502
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10503
+								continue; // L: 10504
+							}
+
+							if (var10.contentType == 1400) { // L: 10506
+								Varcs.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 10507
+							}
+
+							if (var10.contentType == 1401) { // L: 10509
+								Varcs.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 10510
+							}
+
+							if (var10.contentType == 1402) { // L: 10512
+								Client.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 10513
+							}
+						}
+
+						if (var10.type == 0) { // L: 10516
+							if (!var10.isIf3 && StudioGame.isComponentHidden(var10) && var10 != class4.mousedOverWidgetIf1) { // L: 10517
+								continue;
+							}
+
+							if (!var10.isIf3) { // L: 10518
+								if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 10519
+									var10.scrollY = var10.scrollHeight - var10.height;
+								}
+
+								if (var10.scrollY < 0) { // L: 10520
+									var10.scrollY = 0;
+								}
+							}
+
+							drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 10522
+							if (var10.children != null) { // L: 10523
+								drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+							}
+
+							InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 10524
+							if (var30 != null) { // L: 10525
+								class12.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 10526
+							}
+
+							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10528
+							Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 10529
+						}
+
+						if (Client.isResizable || Client.field687[var11] || Client.gameDrawingMode > 1) { // L: 10531
+							if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 10532 10533
+								class129.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
+							}
+
+							if (var10.type != 1) { // L: 10535
+								int var23;
+								int var24;
+								int var25;
+								int var26;
+								if (var10.type == 2) { // L: 10538
+									var19 = 0; // L: 10539
+
+									for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 10540
+										for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 10541
+											var22 = var12 + var21 * (var10.paddingX + 32); // L: 10542
+											var23 = var20 * (var10.paddingY + 32) + var13; // L: 10543
+											if (var19 < 20) { // L: 10544
+												var22 += var10.inventoryXOffsets[var19]; // L: 10545
+												var23 += var10.inventoryYOffsets[var19]; // L: 10546
+											}
+
+											if (var10.itemIds[var19] <= 0) { // L: 10548
+												if (var10.inventorySprites != null && var19 < 20) { // L: 10593
+													SpritePixels var46 = var10.getInventorySprite(var19); // L: 10594
+													if (var46 != null) { // L: 10595
+														var46.drawTransBgAt(var22, var23);
+													} else if (Widget.field3223) { // L: 10596
+														SecureRandomCallable.invalidateWidget(var10);
+													}
+												}
+											} else {
+												boolean var37 = false; // L: 10549
+												boolean var38 = false; // L: 10550
+												var26 = var10.itemIds[var19] - 1; // L: 10551
+												if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class143.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10552
+													SpritePixels var35;
+													if (Client.isItemSelected == 1 && var19 == Calendar.selectedItemSlot && var10.id == MidiPcmStream.selectedItemWidget) { // L: 10554
+														var35 = EnumComposition.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false);
+													} else {
+														var35 = EnumComposition.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 10555
+													}
+
+													if (var35 != null) { // L: 10556
+														if (var10 == class143.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 10557
+															var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 10558
+															var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 10559
+															if (var24 < 5 && var24 > -5) { // L: 10560
+																var24 = 0;
+															}
+
+															if (var25 < 5 && var25 > -5) { // L: 10561
+																var25 = 0;
+															}
+
+															if (Client.itemDragDuration < 5) { // L: 10562
+																var24 = 0; // L: 10563
+																var25 = 0; // L: 10564
+															}
+
+															var35.drawTransAt(var22 + var24, var23 + var25, 128); // L: 10566
+															if (var1 != -1) { // L: 10567
+																Widget var28 = var0[var1 & 65535]; // L: 10568
+																int var29;
+																if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 10569
+																	var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field538 / 3; // L: 10570
+																	if (var29 > Client.field538 * 10) { // L: 10571
+																		var29 = Client.field538 * 10;
+																	}
+
+																	if (var29 > var28.scrollY) { // L: 10572
+																		var29 = var28.scrollY;
+																	}
+
+																	var28.scrollY -= var29; // L: 10573
+																	Client.draggedWidgetY += var29; // L: 10574
+																	SecureRandomCallable.invalidateWidget(var28); // L: 10575
+																}
+
+																if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 10577
+																	var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field538 / 3; // L: 10578
+																	if (var29 > Client.field538 * 10) { // L: 10579
+																		var29 = Client.field538 * 10;
+																	}
+
+																	if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 10580
+																		var29 = var28.scrollHeight - var28.height - var28.scrollY;
+																	}
+
+																	var28.scrollY += var29; // L: 10581
+																	Client.draggedWidgetY -= var29; // L: 10582
+																	SecureRandomCallable.invalidateWidget(var28); // L: 10583
+																}
+															}
+														} else if (var10 == WorldMapDecoration.field2722 && var19 == Client.field599) { // L: 10587
+															var35.drawTransAt(var22, var23, 128);
+														} else {
+															var35.drawTransBgAt(var22, var23); // L: 10588
+														}
+													} else {
+														SecureRandomCallable.invalidateWidget(var10); // L: 10590
+													}
+												}
+											}
+
+											++var19; // L: 10598
+										}
+									}
+								} else if (var10.type == 3) { // L: 10603
+									if (class28.runCs1(var10)) { // L: 10605
+										var19 = var10.color2; // L: 10606
+										if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10607
+											var19 = var10.mouseOverColor2;
+										}
+									} else {
+										var19 = var10.color; // L: 10610
+										if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10611
+											var19 = var10.mouseOverColor;
+										}
+									}
+
+									if (var10.fill) { // L: 10613
+										switch(var10.fillMode.field4554) { // L: 10614
+										case 1:
+											Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 10616
+											break; // L: 10617
+										case 2:
+											Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 10623
+											break; // L: 10624
+										default:
+											if (var14 == 0) { // L: 10619
+												Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19);
+											} else {
+												Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10620
+											}
+										}
+									} else if (var14 == 0) { // L: 10628
+										Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19);
+									} else {
+										Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 10629
+									}
+								} else {
+									Font var39;
+									if (var10.type == 4) { // L: 10633
+										var39 = var10.getFont(); // L: 10634
+										if (var39 == null) { // L: 10635
+											if (Widget.field3223) { // L: 10636
+												SecureRandomCallable.invalidateWidget(var10);
+											}
+										} else {
+											String var44 = var10.text; // L: 10640
+											if (class28.runCs1(var10)) { // L: 10641
+												var20 = var10.color2; // L: 10642
+												if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 10643
+													var20 = var10.mouseOverColor2;
+												}
+
+												if (var10.text2.length() > 0) { // L: 10644
+													var44 = var10.text2;
+												}
+											} else {
+												var20 = var10.color; // L: 10647
+												if (var10 == class4.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 10648
+													var20 = var10.mouseOverColor;
+												}
+											}
+
+											if (var10.isIf3 && var10.itemId != -1) { // L: 10650
+												ItemComposition var45 = UserComparator6.ItemDefinition_get(var10.itemId); // L: 10651
+												var44 = var45.name; // L: 10652
+												if (var44 == null) { // L: 10653
+													var44 = "null";
+												}
+
+												if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 10654
+													var44 = UserComparator5.colorStartTag(16748608) + var44 + "</col>" + " " + 'x' + FriendSystem.formatItemStacks(var10.itemQuantity);
+												}
+											}
+
+											if (var10 == Client.meslayerContinueWidget) { // L: 10656
+												var44 = "Please wait..."; // L: 10657
+												var20 = var10.color; // L: 10658
+											}
+
+											if (!var10.isIf3) { // L: 10660
+												var44 = class7.method60(var44, var10);
+											}
+
+											var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 10661
+										}
+									} else if (var10.type == 5) { // L: 10664
+										SpritePixels var40;
+										if (!var10.isIf3) { // L: 10665
+											var40 = var10.getSprite(class28.runCs1(var10)); // L: 10666
+											if (var40 != null) { // L: 10667
+												var40.drawTransBgAt(var12, var13);
+											} else if (Widget.field3223) { // L: 10668
+												SecureRandomCallable.invalidateWidget(var10);
+											}
+										} else {
+											if (var10.itemId != -1) { // L: 10672
+												var40 = EnumComposition.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
+											} else {
+												var40 = var10.getSprite(false); // L: 10673
+											}
+
+											if (var40 == null) { // L: 10674
+												if (Widget.field3223) { // L: 10698
+													SecureRandomCallable.invalidateWidget(var10);
+												}
+											} else {
+												var20 = var40.width; // L: 10675
+												var21 = var40.height; // L: 10676
+												if (!var10.spriteTiling) { // L: 10677
+													var22 = var10.width * 4096 / var20; // L: 10691
+													if (var10.spriteAngle != 0) { // L: 10692
+														var40.method7781(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
+													} else if (var14 != 0) { // L: 10693
+														var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
+													} else if (var20 == var10.width && var21 == var10.height) { // L: 10694
+														var40.drawTransBgAt(var12, var13); // L: 10695
+													} else {
+														var40.drawScaledAt(var12, var13, var10.width, var10.height);
+													}
+												} else {
+													Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 10678
+													var22 = (var20 - 1 + var10.width) / var20; // L: 10679
+													var23 = (var21 - 1 + var10.height) / var21; // L: 10680
+
+													for (var24 = 0; var24 < var22; ++var24) { // L: 10681
+														for (var25 = 0; var25 < var23; ++var25) { // L: 10682
+															if (var10.spriteAngle != 0) { // L: 10683
+																var40.method7781(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096);
+															} else if (var14 != 0) { // L: 10684
+																var40.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255));
+															} else {
+																var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); // L: 10685
+															}
+														}
+													}
+
+													Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 10688
+												}
+											}
+										}
+									} else {
+										ItemComposition var33;
+										if (var10.type == 6) { // L: 10702
+											boolean var36 = class28.runCs1(var10); // L: 10703
+											if (var36) { // L: 10705
+												var20 = var10.sequenceId2;
+											} else {
+												var20 = var10.sequenceId; // L: 10706
+											}
+
+											Model var41 = null; // L: 10707
+											var22 = 0; // L: 10708
+											if (var10.itemId != -1) { // L: 10709
+												var33 = UserComparator6.ItemDefinition_get(var10.itemId); // L: 10710
+												if (var33 != null) { // L: 10711
+													var33 = var33.getCountObj(var10.itemQuantity); // L: 10712
+													var41 = var33.getModel(1); // L: 10713
+													if (var41 != null) { // L: 10714
+														var41.calculateBoundsCylinder(); // L: 10715
+														var22 = var41.height / 2; // L: 10716
+													} else {
+														SecureRandomCallable.invalidateWidget(var10); // L: 10718
+													}
+												}
+											} else if (var10.modelType == 5) { // L: 10721
+												if (var10.modelId == 0) { // L: 10722
+													var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
+												} else {
+													var41 = class340.localPlayer.getModel(); // L: 10723
+												}
+											} else if (var20 == -1) { // L: 10725
+												var41 = var10.getModel((SequenceDefinition)null, -1, var36, class340.localPlayer.appearance); // L: 10726
+												if (var41 == null && Widget.field3223) { // L: 10727
+													SecureRandomCallable.invalidateWidget(var10);
+												}
+											} else {
+												SequenceDefinition var47 = UserComparator5.SequenceDefinition_get(var20); // L: 10730
+												var41 = var10.getModel(var47, var10.modelFrame, var36, class340.localPlayer.appearance); // L: 10731
+												if (var41 == null && Widget.field3223) { // L: 10732
+													SecureRandomCallable.invalidateWidget(var10);
+												}
+											}
+
+											Rasterizer3D.method3913(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10734
+											var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10735
+											var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10736
+											if (var41 != null) { // L: 10737
+												if (!var10.isIf3) { // L: 10738
+													var41.method4241(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
+												} else {
+													var41.calculateBoundsCylinder(); // L: 10740
+													if (var10.modelOrthog) { // L: 10741
+														var41.method4211(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
+													} else {
+														var41.method4241(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10742
+													}
+												}
+											}
+
+											Rasterizer3D.Rasterizer3D_method3(); // L: 10745
+										} else {
+											if (var10.type == 7) { // L: 10748
+												var39 = var10.getFont(); // L: 10749
+												if (var39 == null) { // L: 10750
+													if (Widget.field3223) { // L: 10751
+														SecureRandomCallable.invalidateWidget(var10);
+													}
+													continue;
+												}
+
+												var20 = 0; // L: 10754
+
+												for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10755
+													for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10756
+														if (var10.itemIds[var20] > 0) { // L: 10757
+															var33 = UserComparator6.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10758
+															String var34;
+															if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10760
+																var34 = UserComparator5.colorStartTag(16748608) + var33.name + "</col>";
+															} else {
+																var34 = UserComparator5.colorStartTag(16748608) + var33.name + "</col>" + " " + 'x' + FriendSystem.formatItemStacks(var10.itemQuantities[var20]); // L: 10761
+															}
+
+															var25 = var12 + var22 * (var10.paddingX + 115); // L: 10762
+															var26 = var21 * (var10.paddingY + 12) + var13; // L: 10763
+															if (var10.textXAlignment == 0) { // L: 10764
+																var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+															} else if (var10.textXAlignment == 1) { // L: 10765
+																var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+															} else {
+																var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 10766
+															}
+														}
+
+														++var20; // L: 10768
+													}
+												}
+											}
+
+											if (var10.type == 8 && var10 == class281.field3375 && Client.field628 == Client.field714) { // L: 10772 10773
+												var19 = 0; // L: 10774
+												var20 = 0; // L: 10775
+												Font var31 = class114.fontPlain12; // L: 10776
+												String var32 = var10.text; // L: 10777
+
+												String var43;
+												for (var32 = class7.method60(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10779 10780 10792
+													var24 = var32.indexOf("<br>"); // L: 10781
+													if (var24 != -1) { // L: 10782
+														var43 = var32.substring(0, var24); // L: 10783
+														var32 = var32.substring(var24 + 4); // L: 10784
+													} else {
+														var43 = var32; // L: 10787
+														var32 = ""; // L: 10788
+													}
+
+													var25 = var31.stringWidth(var43); // L: 10790
+													if (var25 > var19) { // L: 10791
+														var19 = var25;
+													}
+												}
+
+												var19 += 6; // L: 10794
+												var20 += 7; // L: 10795
+												var24 = var12 + var10.width - 5 - var19; // L: 10796
+												var25 = var13 + var10.height + 5; // L: 10797
+												if (var24 < var12 + 5) { // L: 10798
+													var24 = var12 + 5;
+												}
+
+												if (var24 + var19 > var4) { // L: 10799
+													var24 = var4 - var19;
+												}
+
+												if (var20 + var25 > var5) { // L: 10800
+													var25 = var5 - var20;
+												}
+
+												Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10801
+												Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10802
+												var32 = var10.text; // L: 10803
+												var26 = var25 + var31.ascent + 2; // L: 10804
+
+												for (var32 = class7.method60(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10805 10806 10817
+													int var27 = var32.indexOf("<br>"); // L: 10807
+													if (var27 != -1) { // L: 10808
+														var43 = var32.substring(0, var27); // L: 10809
+														var32 = var32.substring(var27 + 4); // L: 10810
+													} else {
+														var43 = var32; // L: 10813
+														var32 = ""; // L: 10814
+													}
+
+													var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10816
+												}
+											}
+
+											if (var10.type == 9) { // L: 10821
+												if (var10.field3359) { // L: 10826
+													var19 = var12; // L: 10827
+													var20 = var13 + var10.height; // L: 10828
+													var21 = var12 + var10.width; // L: 10829
+													var22 = var13; // L: 10830
+												} else {
+													var19 = var12; // L: 10833
+													var20 = var13; // L: 10834
+													var21 = var12 + var10.width; // L: 10835
+													var22 = var13 + var10.height; // L: 10836
+												}
+
+												if (var10.lineWid == 1) { // L: 10838
+													Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10839
+												} else {
+													ScriptEvent.method2147(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10842
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+	} // L: 10847
+}
diff --git a/runescape-client/src/main/java/class119.java b/runescape-client/src/main/java/class119.java
index be62dda7a1..6cd036cab2 100644
--- a/runescape-client/src/main/java/class119.java
+++ b/runescape-client/src/main/java/class119.java
@@ -1,120 +1,48 @@
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dg")
+@ObfuscatedName("dq")
 public class class119 {
-	@ObfuscatedName("ho")
-	@Export("regionMapArchiveIds")
-	static int[] regionMapArchiveIds;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		longValue = 1922253905166501201L
-	)
-	long field1399;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -1571580783
-	)
-	int field1396;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lkf;"
-	)
-	IterableNodeDeque field1390;
-
-	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
-	)
-	public class119(Buffer var1) {
-		this.field1396 = -1; // L: 9
-		this.field1390 = new IterableNodeDeque(); // L: 10
-		this.method2578(var1);
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;B)V",
-		garbageValue = "113"
-	)
-	void method2578(Buffer var1) {
-		this.field1399 = var1.readLong(); // L: 32
-		this.field1396 = var1.readInt(); // L: 33
-
-		for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55
-			Object var3;
-			if (var2 == 3) { // L: 37
-				var3 = new class138(this);
-			} else if (var2 == 1) { // L: 38
-				var3 = new class114(this);
-			} else if (var2 == 13) { // L: 39
-				var3 = new class131(this);
-			} else if (var2 == 4) { // L: 40
-				var3 = new class123(this);
-			} else if (var2 == 6) { // L: 41
-				var3 = new class130(this);
-			} else if (var2 == 5) { // L: 42
-				var3 = new class115(this);
-			} else if (var2 == 2) { // L: 43
-				var3 = new class120(this);
-			} else if (var2 == 7) { // L: 44
-				var3 = new class113(this);
-			} else if (var2 == 14) { // L: 45
-				var3 = new class117(this);
-			} else if (var2 == 8) { // L: 46
-				var3 = new class134(this);
-			} else if (var2 == 9) { // L: 47
-				var3 = new class140(this);
-			} else if (var2 == 10) { // L: 48
-				var3 = new class126(this);
-			} else if (var2 == 11) { // L: 49
-				var3 = new class121(this);
-			} else if (var2 == 12) { // L: 50
-				var3 = new class125(this);
-			} else {
-				if (var2 != 15) { // L: 51
-					throw new RuntimeException(""); // L: 52
-				}
-
-				var3 = new class135(this);
-			}
-
-			((class116)var3).vmethod2847(var1); // L: 53
-			this.field1390.addFirst((Node)var3); // L: 54
-		}
-
-	} // L: 57
-
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;S)V",
-		garbageValue = "12513"
+		descriptor = "(II)Lfz;",
+		garbageValue = "237909291"
 	)
-	public void method2577(ClanSettings var1) {
-		if (this.field1399 == var1.field1456 && this.field1396 == var1.field1465) { // L: 60
-			for (class116 var2 = (class116)this.field1390.last(); var2 != null; var2 = (class116)this.field1390.previous()) { // L: 61
-				var2.vmethod2848(var1); // L: 62
+	@Export("getEnum")
+	public static EnumComposition getEnum(int var0) {
+		EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25
+		if (var1 != null) { // L: 26
+			return var1;
+		} else {
+			byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27
+			var1 = new EnumComposition(); // L: 28
+			if (var2 != null) { // L: 29
+				var1.decode(new Buffer(var2));
 			}
 
-			++var1.field1465; // L: 64
-		} else {
-			throw new RuntimeException("");
+			EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30
+			return var1; // L: 31
 		}
-	} // L: 65
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-1929405904"
+		descriptor = "(I)V",
+		garbageValue = "935400693"
 	)
-	@Export("getVarbit")
-	public static int getVarbit(int var0) {
-		VarbitComposition var1 = class150.method2965(var0); // L: 24
-		int var2 = var1.baseVar; // L: 25
-		int var3 = var1.startBit; // L: 26
-		int var4 = var1.endBit; // L: 27
-		int var5 = Varps.Varps_masks[var4 - var3]; // L: 28
-		return Varps.Varps_main[var2] >> var3 & var5; // L: 29
-	}
+	static void method2689() {
+		Tiles.Tiles_underlays = null; // L: 64
+		Tiles.Tiles_overlays = null; // L: 65
+		Tiles.Tiles_shapes = null; // L: 66
+		WorldMapLabelSize.field2580 = null; // L: 67
+		ClanChannelMember.field1504 = null; // L: 68
+		SoundCache.field321 = null; // L: 69
+		class194.field2280 = null; // L: 70
+		Tiles.Tiles_hue = null; // L: 71
+		User.Tiles_saturation = null; // L: 72
+		Tiles.Tiles_lightness = null; // L: 73
+		UserComparator5.Tiles_hueMultiplier = null; // L: 74
+		VerticalAlignment.field1874 = null; // L: 75
+	} // L: 76
 }
diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java
index a0691216e0..7c0db4af2c 100644
--- a/runescape-client/src/main/java/class12.java
+++ b/runescape-client/src/main/java/class12.java
@@ -6,35 +6,23 @@
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocket;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 import org.bouncycastle.crypto.tls.TlsClientProtocol;
 
-@ObfuscatedName("k")
+@ObfuscatedName("d")
 class class12 extends SSLSocket {
-	@ObfuscatedName("ba")
-	@ObfuscatedSignature(
-		descriptor = "Loe;"
-	)
-	static IndexedSprite field54;
-	@ObfuscatedName("cg")
-	@ObfuscatedGetter(
-		intValue = -1033236073
-	)
-	public static int field55;
-	@ObfuscatedName("eh")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive4")
-	static Archive archive4;
 	@ObfuscatedName("i")
-	Certificate[] field53;
+	@Export("BZip2Decompressor_block")
+	static int[] BZip2Decompressor_block;
+	@ObfuscatedName("dj")
+	static boolean field72;
+	@ObfuscatedName("c")
+	Certificate[] field67;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lu;"
+		descriptor = "Le;"
 	)
 	final class15 this$0;
 	// $FF: synthetic field
@@ -43,944 +31,299 @@ class class12 extends SSLSocket {
 	final String val$host;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lu;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V"
+		descriptor = "(Le;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;Ljava/lang/String;)V"
 	)
 	class12(class15 var1, TlsClientProtocol var2, String var3) {
-		this.this$0 = var1; // L: 83
+		this.this$0 = var1; // L: 90
 		this.val$tlsClientProtocol = var2;
 		this.val$host = var3;
 	}
 
-	public String[] getEnabledProtocols() {
-		return null; // L: 109
-	}
+	public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) {
+	} // L: 262
 
-	public InputStream getInputStream() throws IOException {
-		return this.val$tlsClientProtocol.getInputStream(); // L: 87
+	public String[] getSupportedCipherSuites() {
+		return null; // L: 248
 	}
 
-	public synchronized void close() throws IOException {
-		this.val$tlsClientProtocol.close(); // L: 95
-	} // L: 96
-
-	public void addHandshakeCompletedListener(HandshakeCompletedListener var1) {
-	} // L: 98
+	public String[] getEnabledProtocols() {
+		return null; // L: 123
+	}
 
-	public boolean getEnableSessionCreation() {
-		return false; // L: 101
+	public boolean getNeedClientAuth() {
+		return false; // L: 128
 	}
 
-	public String[] getEnabledCipherSuites() {
-		return null; // L: 105
+	public SSLSession getSession() {
+		return new class17(this); // L: 133
 	}
 
 	public String[] getSupportedProtocols() {
-		return null; // L: 205
+		return null; // L: 243
 	}
 
-	public String[] getSupportedCipherSuites() {
-		return null; // L: 209
-	}
+	public void setEnabledCipherSuites(String[] var1) {
+	} // L: 268
 
-	public void setEnableSessionCreation(boolean var1) {
-	} // L: 221
+	public boolean getWantClientAuth() {
+		return false; // L: 258
+	}
 
-	public void removeHandshakeCompletedListener(HandshakeCompletedListener var1) {
-	} // L: 220
+	public void setWantClientAuth(boolean var1) {
+	} // L: 280
 
-	public void setEnabledCipherSuites(String[] var1) {
-	} // L: 222
+	public void startHandshake() throws IOException {
+		this.val$tlsClientProtocol.connect(new class13(this)); // L: 284
+	} // L: 334
 
 	public void setNeedClientAuth(boolean var1) {
-	} // L: 224
+	} // L: 274
 
-	public void startHandshake() throws IOException {
-		this.val$tlsClientProtocol.connect(new class13(this)); // L: 229
-	} // L: 275
-
-	public SSLSession getSession() {
-		return new class17(this); // L: 117
+	public InputStream getInputStream() throws IOException {
+		return this.val$tlsClientProtocol.getInputStream(); // L: 95
 	}
 
-	public void setWantClientAuth(boolean var1) {
-	} // L: 226
-
 	public void setEnabledProtocols(String[] var1) {
-	} // L: 223
+	} // L: 271
 
-	public boolean getWantClientAuth() {
-		return false; // L: 217
+	public OutputStream getOutputStream() throws IOException {
+		return this.val$tlsClientProtocol.getOutputStream(); // L: 100
 	}
 
-	public boolean getNeedClientAuth() {
+	public boolean getEnableSessionCreation() {
 		return false; // L: 113
 	}
 
-	public void setUseClientMode(boolean var1) {
-	} // L: 225
+	public void addHandshakeCompletedListener(HandshakeCompletedListener var1) {
+	} // L: 109
 
-	public OutputStream getOutputStream() throws IOException {
-		return this.val$tlsClientProtocol.getOutputStream(); // L: 91
+	public String[] getEnabledCipherSuites() {
+		return null; // L: 118
 	}
 
+	public void setEnableSessionCreation(boolean var1) {
+	} // L: 265
+
 	public boolean getUseClientMode() {
-		return false; // L: 213
+		return false; // L: 253
 	}
 
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(Lle;Lle;Lle;I)V",
-		garbageValue = "31635471"
-	)
-	@Export("drawTitle")
-	static void drawTitle(Font var0, Font var1, Font var2) {
-		Login.xPadding = (GameEngine.canvasWidth - 765) / 2; // L: 941
-		Login.loginBoxX = Login.xPadding + 202; // L: 942
-		Login.loginBoxCenter = Login.loginBoxX + 180; // L: 943
-		byte var3;
-		int var4;
-		int var8;
-		boolean var15;
-		int var16;
-		int var25;
-		int var33;
-		int var43;
-		if (Login.worldSelectOpen) { // L: 944
-			int var47;
-			if (DirectByteArrayCopier.worldSelectBackSprites == null) { // L: 946
-				Archive var44 = GrandExchangeOfferOwnWorldComparator.archive8; // L: 948
-				var43 = var44.getGroupId("sl_back"); // L: 950
-				var47 = var44.getFileId(var43, ""); // L: 951
-				SpritePixels[] var45 = class21.method312(var44, var43, var47); // L: 952
-				DirectByteArrayCopier.worldSelectBackSprites = var45; // L: 954
-			}
-
-			if (UserComparator7.worldSelectFlagSprites == null) { // L: 956
-				UserComparator7.worldSelectFlagSprites = class393.method6882(GrandExchangeOfferOwnWorldComparator.archive8, "sl_flags", "");
-			}
-
-			if (class54.worldSelectArrows == null) { // L: 957
-				class54.worldSelectArrows = class393.method6882(GrandExchangeOfferOwnWorldComparator.archive8, "sl_arrows", "");
-			}
-
-			if (KeyHandler.worldSelectStars == null) { // L: 958
-				KeyHandler.worldSelectStars = class393.method6882(GrandExchangeOfferOwnWorldComparator.archive8, "sl_stars", "");
-			}
-
-			if (UserComparator6.worldSelectLeftSprite == null) { // L: 959
-				UserComparator6.worldSelectLeftSprite = Script.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferOwnWorldComparator.archive8, "leftarrow", "");
-			}
-
-			if (MouseRecorder.worldSelectRightSprite == null) { // L: 960
-				MouseRecorder.worldSelectRightSprite = Script.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferOwnWorldComparator.archive8, "rightarrow", "");
-			}
-
-			Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 961
-			Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 962
-			Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 963
-			var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 964
-			if (KeyHandler.worldSelectStars != null) { // L: 965
-				KeyHandler.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 966
-				var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 967
-				KeyHandler.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 968
-				var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 969
-			}
-
-			if (class54.worldSelectArrows != null) { // L: 971
-				var33 = Login.xPadding + 280; // L: 972
-				if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 973
-					class54.worldSelectArrows[2].drawAt(var33, 4);
-				} else {
-					class54.worldSelectArrows[0].drawAt(var33, 4); // L: 974
-				}
-
-				if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 975
-					class54.worldSelectArrows[3].drawAt(var33 + 15, 4);
-				} else {
-					class54.worldSelectArrows[1].drawAt(var33 + 15, 4); // L: 976
-				}
-
-				var0.draw("World", var33 + 32, 17, 16777215, -1); // L: 977
-				var4 = Login.xPadding + 390; // L: 978
-				if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 979
-					class54.worldSelectArrows[2].drawAt(var4, 4);
-				} else {
-					class54.worldSelectArrows[0].drawAt(var4, 4); // L: 980
-				}
-
-				if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 981
-					class54.worldSelectArrows[3].drawAt(var4 + 15, 4);
-				} else {
-					class54.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 982
-				}
-
-				var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 983
-				var43 = Login.xPadding + 500; // L: 984
-				if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 985
-					class54.worldSelectArrows[2].drawAt(var43, 4);
-				} else {
-					class54.worldSelectArrows[0].drawAt(var43, 4); // L: 986
-				}
-
-				if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 987
-					class54.worldSelectArrows[3].drawAt(var43 + 15, 4);
-				} else {
-					class54.worldSelectArrows[1].drawAt(var43 + 15, 4); // L: 988
-				}
-
-				var0.draw("Location", var43 + 32, 17, 16777215, -1); // L: 989
-				var47 = Login.xPadding + 610; // L: 990
-				if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 991
-					class54.worldSelectArrows[2].drawAt(var47, 4);
-				} else {
-					class54.worldSelectArrows[0].drawAt(var47, 4); // L: 992
-				}
-
-				if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 993
-					class54.worldSelectArrows[3].drawAt(var47 + 15, 4);
-				} else {
-					class54.worldSelectArrows[1].drawAt(var47 + 15, 4); // L: 994
-				}
-
-				var0.draw("Type", var47 + 32, 17, 16777215, -1); // L: 995
-			}
-
-			Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 997
-			var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 998
-			Login.hoveredWorldIndex = -1; // L: 999
-			if (DirectByteArrayCopier.worldSelectBackSprites != null) { // L: 1000
-				var3 = 88; // L: 1001
-				byte var39 = 19; // L: 1002
-				var43 = 765 / (var3 + 1) - 1; // L: 1003
-				var47 = 480 / (var39 + 1); // L: 1004
-
-				do {
-					var25 = var47; // L: 1006
-					var8 = var43; // L: 1007
-					if (var47 * (var43 - 1) >= World.World_count) { // L: 1008
-						--var43;
-					}
-
-					if (var43 * (var47 - 1) >= World.World_count) { // L: 1009
-						--var47;
-					}
-
-					if (var43 * (var47 - 1) >= World.World_count) { // L: 1010
-						--var47;
-					}
-				} while(var47 != var25 || var43 != var8); // L: 1011
-
-				var25 = (765 - var3 * var43) / (var43 + 1); // L: 1013
-				if (var25 > 5) { // L: 1014
-					var25 = 5;
-				}
+	public synchronized void close() throws IOException {
+		this.val$tlsClientProtocol.close(); // L: 105
+	} // L: 106
 
-				var8 = (480 - var39 * var47) / (var47 + 1); // L: 1015
-				if (var8 > 5) { // L: 1016
-					var8 = 5;
-				}
+	public void setUseClientMode(boolean var1) {
+	} // L: 277
 
-				int var28 = (765 - var3 * var43 - var25 * (var43 - 1)) / 2; // L: 1017
-				int var37 = (480 - var39 * var47 - var8 * (var47 - 1)) / 2; // L: 1018
-				int var38 = (var47 + World.World_count - 1) / var47; // L: 1019
-				Login.worldSelectPagesCount = var38 - var43; // L: 1020
-				if (UserComparator6.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1021
-					UserComparator6.worldSelectLeftSprite.drawAt(8, KeyHandler.canvasHeight / 2 - UserComparator6.worldSelectLeftSprite.subHeight / 2); // L: 1022
-				}
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "392889295"
+	)
+	static int method189(int var0, int var1) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14
+		if (var2 == null) { // L: 15
+			return -1;
+		} else {
+			return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17
+		}
+	}
 
-				if (MouseRecorder.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1024
-					MouseRecorder.worldSelectRightSprite.drawAt(GameEngine.canvasWidth - MouseRecorder.worldSelectRightSprite.subWidth - 8, KeyHandler.canvasHeight / 2 - MouseRecorder.worldSelectRightSprite.subHeight / 2); // L: 1025
-				}
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Loz;III)I",
+		garbageValue = "-1062038297"
+	)
+	static int method158(IterableNodeHashTable var0, int var1, int var2) {
+		if (var0 == null) { // L: 33
+			return var2;
+		} else {
+			IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34
+			return var3 == null ? var2 : var3.integer; // L: 35 36
+		}
+	}
 
-				int var29 = var37 + 23; // L: 1027
-				int var30 = var28 + Login.xPadding; // L: 1028
-				int var40 = 0; // L: 1029
-				var15 = false; // L: 1030
-				var16 = Login.worldSelectPage; // L: 1031
-
-				int var41;
-				for (var41 = var16 * var47; var41 < World.World_count && var16 - Login.worldSelectPage < var43; ++var41) { // L: 1032 1033
-					World var18 = WorldMapEvent.World_worlds[var41]; // L: 1036
-					boolean var19 = true; // L: 1037
-					String var20 = Integer.toString(var18.population); // L: 1038
-					if (var18.population == -1) { // L: 1039
-						var20 = "OFF"; // L: 1040
-						var19 = false; // L: 1041
-					} else if (var18.population > 1980) { // L: 1043
-						var20 = "FULL"; // L: 1044
-						var19 = false; // L: 1045
-					}
+	@ObfuscatedName("w")
+	static boolean method188(long var0) {
+		return (int)(var0 >>> 16 & 1L) == 1; // L: 81
+	}
 
-					int var22 = 0; // L: 1048
-					byte var21;
-					if (var18.isBeta()) { // L: 1049
-						if (var18.isMembersOnly()) { // L: 1050
-							var21 = 7;
-						} else {
-							var21 = 6; // L: 1051
-						}
-					} else if (var18.isDeadman()) { // L: 1053
-						var22 = 16711680; // L: 1054
-						if (var18.isMembersOnly()) { // L: 1055
-							var21 = 5;
-						} else {
-							var21 = 4; // L: 1056
-						}
-					} else if (var18.method1652()) { // L: 1058
-						if (var18.isMembersOnly()) { // L: 1059
-							var21 = 9;
-						} else {
-							var21 = 8; // L: 1060
-						}
-					} else if (var18.isPvp()) { // L: 1062
-						if (var18.isMembersOnly()) { // L: 1063
-							var21 = 3;
-						} else {
-							var21 = 2; // L: 1064
-						}
-					} else if (var18.isMembersOnly()) { // L: 1067
-						var21 = 1;
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "122"
+	)
+	static int method190(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1913
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.cycle; // L: 1914
+			return 1; // L: 1915
+		} else {
+			int var3;
+			int var4;
+			if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1917
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 1918
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1919
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1920
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = method189(var3, var4); // L: 1921
+				return 1; // L: 1922
+			} else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1924
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 1925
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1926
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1927
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ReflectionCheck.ItemContainer_getCount(var3, var4); // L: 1928
+				return 1; // L: 1929
+			} else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1931
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 1932
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 1933
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1934
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = MouseRecorder.method2160(var3, var4); // L: 1935
+				return 1; // L: 1936
+			} else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1938
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1939
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class78.getInvDefinition(var3).size; // L: 1940
+				return 1; // L: 1941
+			} else if (var0 == ScriptOpcodes.STAT) { // L: 1943
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1944
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1945
+				return 1; // L: 1946
+			} else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1948
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1949
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1950
+				return 1; // L: 1951
+			} else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1953
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1954
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1955
+				return 1; // L: 1956
+			} else {
+				int var5;
+				if (var0 == ScriptOpcodes.COORD) { // L: 1958
+					var3 = class20.Client_plane; // L: 1959
+					var4 = (class340.localPlayer.x >> 7) + class131.baseX; // L: 1960
+					var5 = (class340.localPlayer.y >> 7) + TileItem.baseY; // L: 1961
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1962
+					return 1; // L: 1963
+				} else if (var0 == ScriptOpcodes.COORDX) { // L: 1965
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1966
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1967
+					return 1; // L: 1968
+				} else if (var0 == ScriptOpcodes.COORDZ) { // L: 1970
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1971
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1972
+					return 1; // L: 1973
+				} else if (var0 == ScriptOpcodes.COORDY) { // L: 1975
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1976
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1977
+					return 1; // L: 1978
+				} else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1980
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1981
+					return 1; // L: 1982
+				} else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1984
+					IsaacCipher.Interpreter_intStackSize -= 2; // L: 1985
+					var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; // L: 1986
+					var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1987
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = method189(var3, var4); // L: 1988
+					return 1; // L: 1989
+				} else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1991
+					IsaacCipher.Interpreter_intStackSize -= 2; // L: 1992
+					var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; // L: 1993
+					var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 1994
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ReflectionCheck.ItemContainer_getCount(var3, var4); // L: 1995
+					return 1; // L: 1996
+				} else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1998
+					IsaacCipher.Interpreter_intStackSize -= 2; // L: 1999
+					var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] + 32768; // L: 2000
+					var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2001
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = MouseRecorder.method2160(var3, var4); // L: 2002
+					return 1; // L: 2003
+				} else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 2005
+					if (Client.staffModLevel >= 2) { // L: 2006
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.staffModLevel;
 					} else {
-						var21 = 0; // L: 1068
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2007
 					}
 
-					if (MouseHandler.MouseHandler_x >= var30 && MouseHandler.MouseHandler_y >= var29 && MouseHandler.MouseHandler_x < var3 + var30 && MouseHandler.MouseHandler_y < var29 + var39 && var19) { // L: 1070
-						Login.hoveredWorldIndex = var41; // L: 1071
-						DirectByteArrayCopier.worldSelectBackSprites[var21].drawTransOverlayAt(var30, var29, 128, 16777215); // L: 1072
-						var15 = true; // L: 1073
+					return 1; // L: 2008
+				} else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 2010
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 2011
+					return 1; // L: 2012
+				} else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 2014
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.worldId; // L: 2015
+					return 1; // L: 2016
+				} else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 2018
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 2019
+					return 1; // L: 2020
+				} else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 2022
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.weight; // L: 2023
+					return 1; // L: 2024
+				} else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 2026
+					if (Client.playerMod) { // L: 2027
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1;
 					} else {
-						DirectByteArrayCopier.worldSelectBackSprites[var21].drawAt(var30, var29); // L: 1075
-					}
-
-					if (UserComparator7.worldSelectFlagSprites != null) { // L: 1076
-						UserComparator7.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var30 + 29, var29);
-					}
-
-					var0.drawCentered(Integer.toString(var18.id), var30 + 15, var39 / 2 + var29 + 5, var22, -1); // L: 1077
-					var1.drawCentered(var20, var30 + 60, var39 / 2 + var29 + 5, 268435455, -1); // L: 1078
-					var29 = var29 + var8 + var39; // L: 1079
-					++var40; // L: 1080
-					if (var40 >= var47) {
-						var29 = var37 + 23; // L: 1081
-						var30 = var30 + var3 + var25; // L: 1082
-						var40 = 0; // L: 1083
-						++var16; // L: 1084
-					}
-				}
-
-				if (var15) { // L: 1087
-					var41 = var1.stringWidth(WorldMapEvent.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1088
-					int var31 = var1.ascent + 8; // L: 1089
-					int var42 = MouseHandler.MouseHandler_y + 25; // L: 1090
-					if (var31 + var42 > 480) { // L: 1091
-						var42 = MouseHandler.MouseHandler_y - 25 - var31; // L: 1092
-					}
-
-					Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var41 / 2, var42, var41, var31, 16777120); // L: 1094
-					Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var41 / 2, var42, var41, var31, 0); // L: 1095
-					var1.drawCentered(WorldMapEvent.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var42 + var1.ascent + 4, 0, -1); // L: 1096
-				}
-			}
-
-			Canvas.rasterProvider.drawFull(0, 0); // L: 1099
-		} else {
-			RouteStrategy.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1103
-			class139.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1104
-			class16.logoSprite.drawAt(Login.xPadding + 382 - class16.logoSprite.subWidth / 2, 18); // L: 1105
-			if (Client.gameState == 0 || Client.gameState == 5) { // L: 1106
-				var3 = 20; // L: 1107
-				var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1108
-				var4 = 253 - var3; // L: 1109
-				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1110
-				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1111
-				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1112
-				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1113
-				var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1114
-			}
-
-			String var5;
-			String var6;
-			String var7;
-			short var32;
-			short var34;
-			if (Client.gameState == 20) { // L: 1116
-				Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); // L: 1117
-				var32 = 201; // L: 1118
-				var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1119
-				var33 = var32 + 15; // L: 1120
-				var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1121
-				var33 += 15; // L: 1122
-				var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1123
-				var33 += 15; // L: 1124
-				var33 += 7; // L: 1125
-				if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1126
-					var0.draw("Login: ", Login.loginBoxX + 180 - 110, var33, 16777215, 0); // L: 1127
-					var34 = 200; // L: 1128
-					var5 = class408.clientPreferences.hideUsername ? class115.method2555(Login.Login_username) : Login.Login_username; // L: 1131
-
-					for (var6 = var5; var0.stringWidth(var6) > var34; var6 = var6.substring(0, var6.length() - 1)) { // L: 1133 1134 1135
-					}
-
-					var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var33, 16777215, 0); // L: 1137
-					var33 += 15; // L: 1138
-
-					for (var7 = class115.method2555(Login.Login_password); var0.stringWidth(var7) > var34; var7 = var7.substring(1)) { // L: 1139 1140 1141
-					}
-
-					var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1143
-					var33 += 15; // L: 1144
-				}
-			}
-
-			if (Client.gameState == 10 || Client.gameState == 11) { // L: 1147
-				Login.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1148
-				short var23;
-				if (Login.loginIndex == 0) { // L: 1149
-					var32 = 251; // L: 1150
-					var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1151
-					var33 = var32 + 30; // L: 1152
-					var4 = Login.loginBoxX + 180 - 80; // L: 1153
-					var23 = 291; // L: 1154
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1155
-					var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1156
-					var4 = Login.loginBoxX + 180 + 80; // L: 1157
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1158
-					var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1159
-				} else if (Login.loginIndex == 1) { // L: 1161
-					var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1162
-					var32 = 236; // L: 1163
-					var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1164
-					var33 = var32 + 15; // L: 1165
-					var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1166
-					var33 += 15; // L: 1167
-					var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1168
-					var33 += 15; // L: 1169
-					var4 = Login.loginBoxX + 180 - 80; // L: 1170
-					var23 = 321; // L: 1171
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1172
-					var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1173
-					var4 = Login.loginBoxX + 180 + 80; // L: 1174
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1175
-					var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1176
-				} else if (Login.loginIndex == 2) { // L: 1178
-					var32 = 201; // L: 1179
-					var0.drawCentered(Login.Login_response1, Login.loginBoxCenter, var32, 16776960, 0); // L: 1180
-					var33 = var32 + 15; // L: 1181
-					var0.drawCentered(Login.Login_response2, Login.loginBoxCenter, var33, 16776960, 0); // L: 1182
-					var33 += 15; // L: 1183
-					var0.drawCentered(Login.Login_response3, Login.loginBoxCenter, var33, 16776960, 0); // L: 1184
-					var33 += 15; // L: 1185
-					var33 += 7; // L: 1186
-					var0.draw("Login: ", Login.loginBoxCenter - 110, var33, 16777215, 0); // L: 1187
-					var34 = 200; // L: 1188
-					var5 = class408.clientPreferences.hideUsername ? class115.method2555(Login.Login_username) : Login.Login_username; // L: 1191
-
-					for (var6 = var5; var0.stringWidth(var6) > var34; var6 = var6.substring(1)) { // L: 1193 1194 1195
-					}
-
-					var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? MouseHandler.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 70, var33, 16777215, 0); // L: 1197
-					var33 += 15; // L: 1198
-
-					for (var7 = class115.method2555(Login.Login_password); var0.stringWidth(var7) > var34; var7 = var7.substring(1)) { // L: 1199 1200 1201
-					}
-
-					var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? MouseHandler.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 108, var33, 16777215, 0); // L: 1203
-					var33 += 15; // L: 1204
-					var32 = 277; // L: 1205
-					var8 = Login.loginBoxCenter + -117; // L: 1206
-					boolean var10 = Client.Login_isUsernameRemembered; // L: 1208
-					boolean var11 = Login.field873; // L: 1209
-					IndexedSprite var9 = var10 ? (var11 ? ClanMate.field3950 : class9.options_buttons_2Sprite) : (var11 ? Login.field868 : NetSocket.options_buttons_0Sprite); // L: 1211
-					var9.drawAt(var8, var32); // L: 1214
-					var8 = var8 + var9.subWidth + 5; // L: 1215
-					var1.draw("Remember username", var8, var32 + 13, 16776960, 0); // L: 1216
-					var8 = Login.loginBoxCenter + 24; // L: 1217
-					boolean var14 = class408.clientPreferences.hideUsername; // L: 1219
-					var15 = Login.field860; // L: 1220
-					IndexedSprite var13 = var14 ? (var15 ? ClanMate.field3950 : class9.options_buttons_2Sprite) : (var15 ? Login.field868 : NetSocket.options_buttons_0Sprite); // L: 1222
-					var13.drawAt(var8, var32); // L: 1225
-					var8 = var8 + var13.subWidth + 5; // L: 1226
-					var1.draw("Hide username", var8, var32 + 13, 16776960, 0); // L: 1227
-					var33 = var32 + 15; // L: 1228
-					var16 = Login.loginBoxCenter - 80; // L: 1229
-					short var17 = 321; // L: 1230
-					Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); // L: 1231
-					var0.drawCentered("Login", var16, var17 + 5, 16777215, 0); // L: 1232
-					var16 = Login.loginBoxCenter + 80; // L: 1233
-					Login.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); // L: 1234
-					var0.drawCentered("Cancel", var16, var17 + 5, 16777215, 0); // L: 1235
-					var32 = 357; // L: 1236
-					switch(Login.field865) { // L: 1237
-					case 2:
-						UserComparator6.field1340 = "Having trouble logging in?"; // L: 1242
-						break;
-					default:
-						UserComparator6.field1340 = "Can't login? Click here."; // L: 1239
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2028
 					}
 
-					class114.field1359 = new Bounds(Login.loginBoxCenter, var32, var1.stringWidth(UserComparator6.field1340), 11); // L: 1245
-					ItemContainer.field998 = new Bounds(Login.loginBoxCenter, var32, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1246
-					var1.drawCentered(UserComparator6.field1340, Login.loginBoxCenter, var32, 16777215, 0); // L: 1247
-				} else if (Login.loginIndex == 3) { // L: 1249
-					var32 = 201; // L: 1250
-					var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1251
-					var33 = var32 + 20; // L: 1252
-					var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1253
-					var33 += 15; // L: 1254
-					var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1255
-					var33 += 15; // L: 1256
-					var4 = Login.loginBoxX + 180; // L: 1257
-					var23 = 276; // L: 1258
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1259
-					var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1260
-					var4 = Login.loginBoxX + 180; // L: 1261
-					var23 = 326; // L: 1262
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1263
-					var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1264
+					return 1; // L: 2029
+				} else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 2031
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 2032
+					return 1; // L: 2033
+				} else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 2035
+					IsaacCipher.Interpreter_intStackSize -= 4; // L: 2036
+					var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2037
+					var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2038
+					var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2039
+					int var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 2040
+					var3 += var4 << 14; // L: 2041
+					var3 += var5 << 28; // L: 2042
+					var3 += var6; // L: 2043
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 2044
+					return 1; // L: 2045
+				} else if (var0 == 3326) { // L: 2047
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field483; // L: 2048
+					return 1; // L: 2049
+				} else if (var0 == 3327) { // L: 2051
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.field746; // L: 2052
+					return 1; // L: 2053
 				} else {
-					short var36;
-					if (Login.loginIndex == 4) { // L: 1266
-						var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1267
-						var32 = 236; // L: 1268
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1269
-						var33 = var32 + 15; // L: 1270
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1271
-						var33 += 15; // L: 1272
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1273
-						var33 += 15; // L: 1274
-						var0.draw("PIN: " + class115.method2555(Tiles.otp) + (Client.cycle % 40 < 20 ? MouseHandler.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var33, 16777215, 0); // L: 1275
-						var33 -= 8; // L: 1276
-						var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1277
-						var33 += 15; // L: 1278
-						var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var33, 16776960, 0); // L: 1279
-						var4 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1280
-						var43 = var33 - var0.ascent; // L: 1281
-						IndexedSprite var35;
-						if (Login.field875) { // L: 1283
-							var35 = class9.options_buttons_2Sprite; // L: 1284
-						} else {
-							var35 = NetSocket.options_buttons_0Sprite; // L: 1287
-						}
-
-						var35.drawAt(var4, var43); // L: 1289
-						var33 += 15; // L: 1290
-						var25 = Login.loginBoxX + 180 - 80; // L: 1291
-						var36 = 321; // L: 1292
-						Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1293
-						var0.drawCentered("Continue", var25, var36 + 5, 16777215, 0); // L: 1294
-						var25 = Login.loginBoxX + 180 + 80; // L: 1295
-						Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1296
-						var0.drawCentered("Cancel", var25, var36 + 5, 16777215, 0); // L: 1297
-						var1.drawCentered("<u=ff>Can't Log In?</u>", Login.loginBoxX + 180, var36 + 36, 255, 0); // L: 1298
-					} else if (Login.loginIndex == 5) { // L: 1300
-						var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1301
-						var32 = 221; // L: 1302
-						var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1303
-						var33 = var32 + 15; // L: 1304
-						var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1305
-						var33 += 15; // L: 1306
-						var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1307
-						var33 += 15; // L: 1308
-						var33 += 14; // L: 1309
-						var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var33, 16777215, 0); // L: 1310
-						var34 = 174; // L: 1311
-						var5 = class408.clientPreferences.hideUsername ? class115.method2555(Login.Login_username) : Login.Login_username; // L: 1314
-
-						for (var6 = var5; var0.stringWidth(var6) > var34; var6 = var6.substring(1)) { // L: 1316 1317 1318
-						}
-
-						var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? MouseHandler.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var33, 16777215, 0); // L: 1320
-						var33 += 15; // L: 1321
-						var25 = Login.loginBoxX + 180 - 80; // L: 1322
-						var36 = 321; // L: 1323
-						Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1324
-						var0.drawCentered("Recover", var25, var36 + 5, 16777215, 0); // L: 1325
-						var25 = Login.loginBoxX + 180 + 80; // L: 1326
-						Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1327
-						var0.drawCentered("Back", var25, var36 + 5, 16777215, 0); // L: 1328
-						var36 = 356; // L: 1329
-						var1.drawCentered("Still having trouble logging in?", Login.loginBoxCenter, var36, 268435455, 0); // L: 1330
-					} else if (Login.loginIndex == 6) { // L: 1332
-						var32 = 201; // L: 1333
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1334
-						var33 = var32 + 15; // L: 1335
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1336
-						var33 += 15; // L: 1337
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1338
-						var33 += 15; // L: 1339
-						var4 = Login.loginBoxX + 180; // L: 1340
-						var23 = 321; // L: 1341
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1342
-						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1343
-					} else if (Login.loginIndex == 7) { // L: 1345
-						var32 = 216; // L: 1346
-						var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1347
-						var33 = var32 + 15; // L: 1348
-						var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1349
-						var33 += 15; // L: 1350
-						var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1351
-						var33 += 15; // L: 1352
-						var4 = Login.loginBoxX + 180 - 80; // L: 1353
-						var23 = 321; // L: 1354
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1355
-						var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1356
-						var4 = Login.loginBoxX + 180 + 80; // L: 1357
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1358
-						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1359
-					} else if (Login.loginIndex == 8) { // L: 1361
-						var32 = 216; // L: 1362
-						var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1363
-						var33 = var32 + 15; // L: 1364
-						var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1365
-						var33 += 15; // L: 1366
-						var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var33, 16776960, 0); // L: 1367
-						var33 += 15; // L: 1368
-						var4 = Login.loginBoxX + 180 - 80; // L: 1369
-						var23 = 321; // L: 1370
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1371
-						var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1372
-						var4 = Login.loginBoxX + 180 + 80; // L: 1373
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1374
-						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1375
-					} else if (Login.loginIndex == 9) { // L: 1377
-						var32 = 221; // L: 1378
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1379
-						var33 = var32 + 25; // L: 1380
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1381
-						var33 += 25; // L: 1382
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1383
-						var4 = Login.loginBoxX + 180; // L: 1384
-						var23 = 311; // L: 1385
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1386
-						var0.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1387
-					} else if (Login.loginIndex == 10) { // L: 1389
-						var33 = Login.loginBoxX + 180; // L: 1390
-						var34 = 209; // L: 1391
-						var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var34, 16776960, 0); // L: 1392
-						var4 = var34 + 20; // L: 1393
-						Login.field854.drawAt(var33 - 109, var4); // L: 1394
-						class29.field159.drawAt(var33 - 48, var4 + 18); // L: 1395
-					} else if (Login.loginIndex == 12) { // L: 1397
-						var33 = Login.loginBoxCenter; // L: 1398
-						var34 = 216; // L: 1399
-						var2.drawCentered("Before using this app, please read and accept our", var33, var34, 16777215, 0); // L: 1400
-						var4 = var34 + 17; // L: 1401
-						var2.drawCentered("<col=ffd200>terms of use</col>, <col=ffd200>privacy policy</col>, and <col=ffd200>end user licence</col>", var33, var4, 16777215, 0); // L: 1402
-						var4 += 17; // L: 1403
-						var2.drawCentered("<col=ffd200>agreement (EULA)</col>.", var33, var4, 16777215, 0); // L: 1404
-						var4 += 17; // L: 1405
-						var2.drawCentered("By accepting, you agree to these documents.", var33, var4, 16777215, 0); // L: 1406
-						var33 = Login.loginBoxCenter - 80; // L: 1407
-						var34 = 311; // L: 1408
-						Login.titlebuttonSprite.drawAt(var33 - 73, var34 - 20); // L: 1409
-						var0.drawCentered("Accept", var33, var34 + 5, 16777215, 0); // L: 1410
-						var33 = Login.loginBoxCenter + 80; // L: 1411
-						Login.titlebuttonSprite.drawAt(var33 - 73, var34 - 20); // L: 1412
-						var0.drawCentered("Decline", var33, var34 + 5, 16777215, 0); // L: 1413
-					} else if (Login.loginIndex == 13) { // L: 1415
-						var32 = 231; // L: 1416
-						var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var32, 16777215, 0); // L: 1417
-						var33 = var32 + 20; // L: 1418
-						var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var33, 16777215, 0); // L: 1419
-						var4 = Login.loginBoxX + 180; // L: 1420
-						var32 = 311; // L: 1421
-						Login.titlebuttonSprite.drawAt(var4 - 73, var32 - 20); // L: 1422
-						var0.drawCentered("Back", var4, var32 + 5, 16777215, 0); // L: 1423
-					} else if (Login.loginIndex == 14) { // L: 1425
-						var32 = 201; // L: 1426
-						String var24 = ""; // L: 1427
-						var5 = ""; // L: 1428
-						var6 = ""; // L: 1429
-						switch(Login.field866) { // L: 1430
-						case 0:
-							var24 = "Your account has been disabled."; // L: 1445
-							var5 = Strings.field3501; // L: 1446
-							var6 = ""; // L: 1447
-							break;
-						case 1:
-							var24 = "Account locked as we suspect it has been stolen."; // L: 1438
-							var5 = Strings.field3446; // L: 1439
-							var6 = ""; // L: 1440
-							break; // L: 1441
-						default:
-							class1.Login_promptCredentials(false); // L: 1433
-						}
-
-						var0.drawCentered(var24, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1451
-						var33 = var32 + 15; // L: 1452
-						var2.drawCentered(var5, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1453
-						var33 += 15; // L: 1454
-						var2.drawCentered(var6, Login.loginBoxX + 180, var33, 16776960, 0); // L: 1455
-						var33 += 15; // L: 1456
-						var25 = Login.loginBoxX + 180; // L: 1457
-						var36 = 276; // L: 1458
-						Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1459
-						var0.drawCentered("Support Page", var25, var36 + 5, 16777215, 0); // L: 1460
-						var25 = Login.loginBoxX + 180; // L: 1461
-						var36 = 326; // L: 1462
-						Login.titlebuttonSprite.drawAt(var25 - 73, var36 - 20); // L: 1463
-						var0.drawCentered("Back", var25, var36 + 5, 16777215, 0); // L: 1464
-					} else if (Login.loginIndex == 24) { // L: 1466
-						var32 = 221; // L: 1467
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1468
-						var33 = var32 + 15; // L: 1469
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1470
-						var33 += 15; // L: 1471
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var33, 16777215, 0); // L: 1472
-						var33 += 15; // L: 1473
-						var4 = Login.loginBoxX + 180; // L: 1474
-						var23 = 301; // L: 1475
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1476
-						var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1477
-					}
+					return 2; // L: 2055
 				}
 			}
-
-			if (Client.gameState >= 10) { // L: 1480
-				int[] var26 = new int[4]; // L: 1481
-				Rasterizer2D.Rasterizer2D_getClipArray(var26); // L: 1482
-				Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, KeyHandler.canvasHeight); // L: 1483
-				Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1484
-				Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1485
-				Rasterizer2D.Rasterizer2D_setClipArray(var26); // L: 1486
-			}
-
-			VarpDefinition.title_muteSprite[class408.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1488
-			if (Client.gameState > 5 && Language.Language_EN == MouseHandler.clientLanguage) { // L: 1489
-				if (field54 != null) { // L: 1490
-					var33 = Login.xPadding + 5; // L: 1491
-					var34 = 463; // L: 1492
-					byte var46 = 100; // L: 1493
-					byte var27 = 35; // L: 1494
-					field54.drawAt(var33, var34); // L: 1495
-					var0.drawCentered("World" + " " + Client.worldId, var46 / 2 + var33, var27 / 2 + var34 - 2, 16777215, 0); // L: 1496
-					if (class21.World_request != null) { // L: 1497
-						var1.drawCentered("Loading...", var46 / 2 + var33, var27 / 2 + var34 + 12, 16777215, 0);
-					} else {
-						var1.drawCentered("Click to switch", var46 / 2 + var33, var27 / 2 + var34 + 12, 16777215, 0); // L: 1498
-					}
-				} else {
-					field54 = Script.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferOwnWorldComparator.archive8, "sl_button", ""); // L: 1501
-				}
-			}
-
 		}
-	} // L: 1101 1504
+	}
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("jp")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-2090753673"
+		descriptor = "(IIIIIIIIB)V",
+		garbageValue = "60"
 	)
-	static int method171(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3710
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = MusicPatch.loadWorlds() ? 1 : 0; // L: 3711
-			return 1; // L: 3712
-		} else {
-			World var9;
-			if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3714
-				var9 = class20.worldListStart(); // L: 3715
-				if (var9 != null) { // L: 3716
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.id; // L: 3717
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.properties; // L: 3718
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var9.activity; // L: 3719
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.location; // L: 3720
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.population; // L: 3721
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var9.host; // L: 3722
-				} else {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3725
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3726
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3727
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3728
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3729
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3730
-				}
-
-				return 1; // L: 3732
-			} else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3734
-				var9 = class91.getNextWorldListWorld(); // L: 3735
-				if (var9 != null) { // L: 3736
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.id; // L: 3737
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.properties; // L: 3738
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var9.activity; // L: 3739
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.location; // L: 3740
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var9.population; // L: 3741
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var9.host; // L: 3742
-				} else {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3745
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3746
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3747
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3748
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3749
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3750
-				}
+	@Export("drawWidgets")
+	static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+		if (class242.loadInterface(var0)) { // L: 10372
+			BufferedFile.field4430 = null; // L: 10379
+			class118.drawInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 10380
+			if (BufferedFile.field4430 != null) { // L: 10381
+				class118.drawInterface(BufferedFile.field4430, -1412584499, var1, var2, var3, var4, HitSplatDefinition.field1945, class78.field1000, var7); // L: 10382
+				BufferedFile.field4430 = null; // L: 10383
+			}
 
-				return 1; // L: 3752
+		} else {
+			if (var7 != -1) { // L: 10373
+				Client.field504[var7] = true;
 			} else {
-				int var3;
-				World var7;
-				int var8;
-				if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3754
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3755
-					var7 = null; // L: 3756
-
-					for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3757
-						if (var3 == WorldMapEvent.World_worlds[var8].id) { // L: 3758
-							var7 = WorldMapEvent.World_worlds[var8]; // L: 3759
-							break;
-						}
-					}
-
-					if (var7 != null) { // L: 3763
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.id; // L: 3764
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.properties; // L: 3765
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.activity; // L: 3766
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.location; // L: 3767
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.population; // L: 3768
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.host; // L: 3769
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3772
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3773
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3774
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3775
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3776
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3777
-					}
-
-					return 1; // L: 3779
-				} else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3781
-					class14.Interpreter_intStackSize -= 4; // L: 3782
-					var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3783
-					boolean var10 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1] == 1; // L: 3784
-					var8 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 3785
-					boolean var6 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3] == 1; // L: 3786
-					class11.sortWorldList(var3, var10, var8, var6); // L: 3787
-					return 1; // L: 3788
-				} else if (var0 != 6511) { // L: 3790
-					if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3811
-						Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 3812
-						return 1; // L: 3813
-					} else {
-						int var4;
-						ParamComposition var5;
-						if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3815
-							class14.Interpreter_intStackSize -= 2; // L: 3816
-							var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3817
-							var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3818
-							var5 = Buffer.getParamDefinition(var4); // L: 3819
-							if (var5.isString()) { // L: 3820
-								Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ScriptFrame.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3821
-							} else {
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ScriptFrame.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3824
-							}
-
-							return 1; // L: 3826
-						} else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3828
-							class14.Interpreter_intStackSize -= 2; // L: 3829
-							var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3830
-							var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3831
-							var5 = Buffer.getParamDefinition(var4); // L: 3832
-							if (var5.isString()) { // L: 3833
-								Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = KitDefinition.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3834
-							} else {
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = KitDefinition.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3837
-							}
-
-							return 1; // L: 3839
-						} else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3841
-							class14.Interpreter_intStackSize -= 2; // L: 3842
-							var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3843
-							var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3844
-							var5 = Buffer.getParamDefinition(var4); // L: 3845
-							if (var5.isString()) { // L: 3846
-								Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = TaskHandler.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3847
-							} else {
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = TaskHandler.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3850
-							}
-
-							return 1; // L: 3852
-						} else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3854
-							class14.Interpreter_intStackSize -= 2; // L: 3855
-							var3 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3856
-							var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3857
-							var5 = Buffer.getParamDefinition(var4); // L: 3858
-							if (var5.isString()) { // L: 3859
-								Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = class275.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3860
-							} else {
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class275.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3863
-							}
-
-							return 1; // L: 3865
-						} else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3867
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3868
-							return 1; // L: 3869
-						} else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3871
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3872
-							return 1; // L: 3873
-						} else if (var0 == 6520) { // L: 3875
-							return 1; // L: 3876
-						} else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3878
-							return 1; // L: 3879
-						} else if (var0 == 6522) { // L: 3881
-							--class295.Interpreter_stringStackSize; // L: 3882
-							--class14.Interpreter_intStackSize; // L: 3883
-							return 1; // L: 3884
-						} else if (var0 == 6523) { // L: 3886
-							--class295.Interpreter_stringStackSize; // L: 3887
-							--class14.Interpreter_intStackSize; // L: 3888
-							return 1; // L: 3889
-						} else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 3891
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3892
-							return 1; // L: 3893
-						} else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 3895
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 3896
-							return 1; // L: 3897
-						} else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 3899
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 3900
-							return 1; // L: 3901
-						} else if (var0 == 6527) { // L: 3903
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Client.field469; // L: 3904
-							return 1; // L: 3905
-						} else {
-							return 2; // L: 3907
-						}
-					}
-				} else {
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3791
-					if (var3 >= 0 && var3 < World.World_count) { // L: 3792
-						var7 = WorldMapEvent.World_worlds[var3]; // L: 3793
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.id; // L: 3794
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.properties; // L: 3795
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.activity; // L: 3796
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.location; // L: 3797
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var7.population; // L: 3798
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var7.host; // L: 3799
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 3802
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3803
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3804
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3805
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3806
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 3807
-					}
-
-					return 1; // L: 3809
+				for (int var8 = 0; var8 < 100; ++var8) { // L: 10375
+					Client.field504[var8] = true;
 				}
 			}
+
 		}
-	}
+	} // L: 10377 10385
 
-	@ObfuscatedName("jo")
+	@ObfuscatedName("jm")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1284893568"
+		descriptor = "(ZI)V",
+		garbageValue = "1583315903"
 	)
-	static void method170(int var0) {
-		class274.tempMenuAction = new MenuAction(); // L: 11268
-		class274.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11269
-		class274.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11270
-		class274.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11271
-		class274.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11272
-		class274.tempMenuAction.action = Client.menuActions[var0]; // L: 11273
-	} // L: 11274
+	@Export("setTapToDrop")
+	static void setTapToDrop(boolean var0) {
+		Client.tapToDrop = var0; // L: 11368
+	} // L: 11369
 }
diff --git a/runescape-client/src/main/java/class120.java b/runescape-client/src/main/java/class120.java
index 0a82d4a26c..7b858ba8f7 100644
--- a/runescape-client/src/main/java/class120.java
+++ b/runescape-client/src/main/java/class120.java
@@ -1,60 +1,459 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("di")
-public class class120 extends class116 {
-	@ObfuscatedName("y")
+@ObfuscatedName("db")
+public class class120 extends DualNode {
+	@ObfuscatedName("dz")
 	@ObfuscatedGetter(
-		intValue = -81138609
+		longValue = -7392064901863756545L
 	)
-	static int field1403;
-	@ObfuscatedName("k")
-	public static boolean field1401;
-	@ObfuscatedName("n")
+	static long field1450;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -223419425
+	)
+	int field1454;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "[[Ldn;"
+	)
+	public class115[][] field1453;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "[[Ldn;"
+	)
+	class115[][] field1451;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 637363397
+	)
+	int field1452;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = 930082989
+	)
+	int field1456;
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Ljf;"
+		descriptor = "Lgi;"
 	)
-	@Export("scriptDotWidget")
-	static Widget scriptDotWidget;
-	@ObfuscatedName("i")
+	public Skeleton field1457;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1094018377
+		intValue = -129283669
+	)
+	int field1455;
+	@ObfuscatedName("w")
+	boolean field1449;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lku;Lku;IZ)V"
+	)
+	class120(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
+		this.field1453 = null; // L: 14
+		this.field1451 = null; // L: 15
+		this.field1455 = 0; // L: 19
+		this.field1454 = var3; // L: 44
+		byte[] var5 = var1.takeFile(this.field1454 >> 16 & 65535, this.field1454 & 65535); // L: 45
+		Buffer var6 = new Buffer(var5); // L: 46
+		int var7 = var6.readUnsignedByte(); // L: 47
+		int var8 = var6.readUnsignedShort(); // L: 48
+		byte[] var9;
+		if (var4) { // L: 50
+			var9 = var2.getFile(0, var8);
+		} else {
+			var9 = var2.getFile(var8, 0); // L: 51
+		}
+
+		this.field1457 = new Skeleton(var8, var9); // L: 52
+		this.method2690(var6, var7); // L: 53
+	} // L: 54
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;IB)V",
+		garbageValue = "1"
+	)
+	void method2690(Buffer var1, int var2) {
+		this.field1452 = var1.readUnsignedShort(); // L: 57
+		this.field1456 = var1.readUnsignedShort(); // L: 58
+		this.field1455 = var1.readUnsignedByte(); // L: 59
+		int var3 = var1.readUnsignedShort(); // L: 60
+		this.field1451 = new class115[this.field1457.method3943().method3935()][]; // L: 61
+		this.field1453 = new class115[this.field1457.method3949()][]; // L: 62
+
+		for (int var4 = 0; var4 < var3; ++var4) { // L: 63
+			int var6 = var1.readUnsignedByte(); // L: 65
+			class116 var7 = (class116)class130.findEnumerated(Login.method1994(), var6); // L: 67
+			if (var7 == null) { // L: 68
+				var7 = class116.field1421;
+			}
+
+			int var8 = var1.readShortSmart(); // L: 72
+			int var10 = var1.readUnsignedByte(); // L: 74
+			class117 var11 = (class117)class130.findEnumerated(class7.method74(), var10); // L: 76
+			if (var11 == null) { // L: 77
+				var11 = class117.field1425;
+			}
+
+			class115 var12 = new class115(); // L: 81
+			var12.method2638(var1, var2); // L: 82
+			int var13 = var7.method2669(); // L: 83
+			class115[][] var14;
+			if (var7 == class116.field1415) { // L: 85
+				var14 = this.field1451; // L: 86
+			} else {
+				var14 = this.field1453; // L: 89
+			}
+
+			if (var14[var8] == null) { // L: 91
+				var14[var8] = new class115[var13]; // L: 92
+			}
+
+			var14[var8][var11.method2674()] = var12; // L: 94
+			if (var7 == class116.field1418) { // L: 95
+				this.field1449 = true; // L: 96
+			}
+		}
+
+	} // L: 99
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "44"
+	)
+	int method2704() {
+		return this.field1452; // L: 102
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-565946270"
 	)
-	int field1400;
+	int method2693() {
+		return this.field1456; // L: 106
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1439954797"
+	)
+	public int method2694() {
+		return this.field1455; // L: 110
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "528719548"
+	)
+	public int method2691() {
+		return this.method2693() - this.method2704(); // L: 114
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "8"
+	)
+	public boolean method2695() {
+		return this.field1449; // L: 118
+	}
+
 	@ObfuscatedName("w")
-	byte field1405;
-	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "(ILdf;III)V",
+		garbageValue = "-1220329535"
 	)
-	final class119 this$0;
+	public void method2700(int var1, class113 var2, int var3, int var4) {
+		class366 var5;
+		synchronized(class366.field4191) { // L: 124
+			if (class149.field1663 == 0) { // L: 125
+				var5 = new class366();
+			} else {
+				class366.field4191[--class149.field1663].method6652(); // L: 127
+				var5 = class366.field4191[class149.field1663]; // L: 128
+			}
+		}
 
+		this.method2701(var5, var3, var2, var1); // L: 133
+		this.method2699(var5, var3, var2, var1); // L: 134
+		this.method2698(var5, var3, var2, var1); // L: 135
+		var2.method2576(var5); // L: 136
+		var5.method6656(); // L: 137
+	} // L: 138
+
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "(Lno;ILdf;IB)V",
+		garbageValue = "96"
 	)
-	class120(class119 var1) {
-		this.this$0 = var1;
-		this.field1400 = -1; // L: 128
-	} // L: 131
+	void method2701(class366 var1, int var2, class113 var3, int var4) {
+		float[] var5 = var3.method2583(this.field1455); // L: 141
+		float var6 = var5[0]; // L: 142
+		float var7 = var5[1]; // L: 143
+		float var8 = var5[2]; // L: 144
+		if (this.field1451[var2] != null) { // L: 145
+			class115 var9 = this.field1451[var2][0]; // L: 146
+			class115 var10 = this.field1451[var2][1]; // L: 147
+			class115 var11 = this.field1451[var2][2]; // L: 148
+			if (var9 != null) { // L: 149
+				var6 = var9.method2632(var4);
+			}
+
+			if (var10 != null) { // L: 150
+				var7 = var10.method2632(var4);
+			}
+
+			if (var11 != null) { // L: 151
+				var8 = var11.method2632(var4);
+			}
+		}
+
+		class365 var17 = Friend.method6296(); // L: 153
+		var17.method6630(1.0F, 0.0F, 0.0F, var6); // L: 154
+		class365 var18 = Friend.method6296(); // L: 155
+		var18.method6630(0.0F, 1.0F, 0.0F, var7); // L: 156
+		class365 var19 = Friend.method6296(); // L: 157
+		var19.method6630(0.0F, 0.0F, 1.0F, var8); // L: 158
+		class365 var12 = Friend.method6296(); // L: 159
+		var12.method6628(var19); // L: 160
+		var12.method6628(var17); // L: 161
+		var12.method6628(var18); // L: 162
+		class366 var13;
+		synchronized(class366.field4191) { // L: 165
+			if (class149.field1663 == 0) { // L: 166
+				var13 = new class366();
+			} else {
+				class366.field4191[--class149.field1663].method6652(); // L: 168
+				var13 = class366.field4191[class149.field1663]; // L: 169
+			}
+		}
+
+		var13.method6711(var12); // L: 174
+		var1.method6670(var13); // L: 175
+		var17.method6646(); // L: 176
+		var18.method6646(); // L: 177
+		var19.method6646(); // L: 178
+		var12.method6646(); // L: 179
+		var13.method6656(); // L: 180
+	} // L: 181
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(Lno;ILdf;IB)V",
+		garbageValue = "1"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1400 = var1.readUnsignedShort(); // L: 134
-		this.field1405 = var1.readByte(); // L: 135
-	} // L: 136
+	void method2698(class366 var1, int var2, class113 var3, int var4) {
+		float[] var5 = var3.method2577(this.field1455); // L: 184
+		float var6 = var5[0]; // L: 185
+		float var7 = var5[1]; // L: 186
+		float var8 = var5[2]; // L: 187
+		if (this.field1451[var2] != null) { // L: 188
+			class115 var9 = this.field1451[var2][3]; // L: 189
+			class115 var10 = this.field1451[var2][4]; // L: 190
+			class115 var11 = this.field1451[var2][5]; // L: 191
+			if (var9 != null) { // L: 192
+				var6 = var9.method2632(var4);
+			}
+
+			if (var10 != null) { // L: 193
+				var7 = var10.method2632(var4);
+			}
+
+			if (var11 != null) { // L: 194
+				var8 = var11.method2632(var4);
+			}
+		}
+
+		var1.field4196[12] = var6; // L: 196
+		var1.field4196[13] = var7; // L: 197
+		var1.field4196[14] = var8; // L: 198
+	} // L: 199
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Lno;ILdf;IB)V",
+		garbageValue = "-84"
+	)
+	void method2699(class366 var1, int var2, class113 var3, int var4) {
+		float[] var5 = var3.method2585(this.field1455); // L: 202
+		float var6 = var5[0]; // L: 203
+		float var7 = var5[1]; // L: 204
+		float var8 = var5[2]; // L: 205
+		if (this.field1451[var2] != null) { // L: 206
+			class115 var9 = this.field1451[var2][6]; // L: 207
+			class115 var10 = this.field1451[var2][7]; // L: 208
+			class115 var11 = this.field1451[var2][8]; // L: 209
+			if (var9 != null) { // L: 210
+				var6 = var9.method2632(var4);
+			}
+
+			if (var10 != null) { // L: 211
+				var7 = var10.method2632(var4);
+			}
+
+			if (var11 != null) { // L: 212
+				var8 = var11.method2632(var4);
+			}
+		}
+
+		class366 var14;
+		synchronized(class366.field4191) { // L: 216
+			if (class149.field1663 == 0) { // L: 217
+				var14 = new class366();
+			} else {
+				class366.field4191[--class149.field1663].method6652(); // L: 219
+				var14 = class366.field4191[class149.field1663]; // L: 220
+			}
+		}
+
+		var14.method6667(var6, var7, var8); // L: 225
+		var1.method6670(var14); // L: 226
+		var14.method6656(); // L: 227
+	} // L: 228
 
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-2070475584"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2673(this.field1400, this.field1405); // L: 139
-	} // L: 140
+	static int method2724(int var0, Script var1, boolean var2) {
+		boolean var3 = true; // L: 842
+		Widget var4;
+		if (var0 >= 2000) { // L: 844
+			var0 -= 1000; // L: 845
+			var4 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 846
+			var3 = false; // L: 847
+		} else {
+			var4 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 849
+		}
+
+		int var11;
+		if (var0 == ScriptOpcodes.CC_SETOP) { // L: 850
+			var11 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] - 1; // L: 851
+			if (var11 >= 0 && var11 <= 9) { // L: 852
+				var4.setAction(var11, Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 856
+				return 1; // L: 857
+			} else {
+				--class13.Interpreter_stringStackSize; // L: 853
+				return 1; // L: 854
+			}
+		} else {
+			int var6;
+			if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 859
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 860
+				var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 861
+				var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 862
+				var4.parent = class126.getWidgetChild(var11, var6); // L: 863
+				return 1; // L: 864
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 866
+				var4.isScrollBar = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 867
+				return 1; // L: 868
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 870
+				var4.dragZoneSize = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 871
+				return 1; // L: 872
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 874
+				var4.dragThreshold = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 875
+				return 1; // L: 876
+			} else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 878
+				var4.dataText = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 879
+				return 1; // L: 880
+			} else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 882
+				var4.spellActionName = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 883
+				return 1; // L: 884
+			} else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 886
+				var4.actions = null; // L: 887
+				return 1; // L: 888
+			} else if (var0 == 1308) { // L: 890
+				var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 891
+				return 1; // L: 892
+			} else if (var0 == 1309) { // L: 894
+				--IsaacCipher.Interpreter_intStackSize; // L: 895
+				return 1; // L: 896
+			} else {
+				int var7;
+				byte[] var8;
+				if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 898
+					byte var5;
+					if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 928
+						IsaacCipher.Interpreter_intStackSize -= 2; // L: 929
+						var5 = 10; // L: 930
+						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]}; // L: 931
+						byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]}; // L: 932
+						World.Widget_setKey(var4, var5, var8, var9); // L: 933
+						return 1; // L: 934
+					} else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 936
+						IsaacCipher.Interpreter_intStackSize -= 3; // L: 937
+						var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] - 1; // L: 938
+						var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 939
+						var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 940
+						if (var11 >= 0 && var11 <= 9) { // L: 941
+							UserComparator3.Widget_setKeyRate(var4, var11, var6, var7); // L: 944
+							return 1; // L: 945
+						} else {
+							throw new RuntimeException(); // L: 942
+						}
+					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 947
+						var5 = 10; // L: 948
+						var6 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 949
+						var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 950
+						UserComparator3.Widget_setKeyRate(var4, var5, var6, var7); // L: 951
+						return 1; // L: 952
+					} else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 954
+						--IsaacCipher.Interpreter_intStackSize; // L: 955
+						var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] - 1; // L: 956
+						if (var11 >= 0 && var11 <= 9) { // L: 957
+							class16.Widget_setKeyIgnoreHeld(var4, var11); // L: 960
+							return 1; // L: 961
+						} else {
+							throw new RuntimeException(); // L: 958
+						}
+					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 963
+						var5 = 10; // L: 964
+						class16.Widget_setKeyIgnoreHeld(var4, var5); // L: 965
+						return 1; // L: 966
+					} else {
+						return 2; // L: 968
+					}
+				} else {
+					byte[] var10 = null; // L: 899
+					var8 = null; // L: 900
+					if (var3) { // L: 901
+						IsaacCipher.Interpreter_intStackSize -= 10; // L: 902
+
+						for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 904 905
+						}
+
+						if (var7 > 0) { // L: 907
+							var10 = new byte[var7 / 2]; // L: 908
+							var8 = new byte[var7 / 2]; // L: 909
+
+							for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 910
+								var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize]; // L: 911
+								var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + IsaacCipher.Interpreter_intStackSize + 1]; // L: 912
+							}
+						}
+					} else {
+						IsaacCipher.Interpreter_intStackSize -= 2; // L: 917
+						var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]}; // L: 918
+						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]}; // L: 919
+					}
+
+					var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] - 1; // L: 921
+					if (var7 >= 0 && var7 <= 9) { // L: 922
+						World.Widget_setKey(var4, var7, var10, var8); // L: 925
+						return 1; // L: 926
+					} else {
+						throw new RuntimeException(); // L: 923
+					}
+				}
+			}
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/class121.java b/runescape-client/src/main/java/class121.java
index b61fd96a5f..a4f4c730f0 100644
--- a/runescape-client/src/main/java/class121.java
+++ b/runescape-client/src/main/java/class121.java
@@ -3,65 +3,79 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("do")
-public class class121 extends class116 {
-	@ObfuscatedName("ij")
-	@ObfuscatedGetter(
-		intValue = -1196916291
+@ObfuscatedName("dj")
+public enum class121 implements MouseWheel {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Ldj;"
 	)
-	@Export("cameraPitch")
-	static int cameraPitch;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 1717605109
+	field1465(0, 0),
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Ldj;"
 	)
-	int field1412;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -1452092031
+	field1461(1, 1),
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Ldj;"
 	)
-	int field1408;
+	field1459(2, 2),
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Ldj;"
+	)
+	field1462(3, 3),
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Ldj;"
+	)
+	field1463(4, 4),
 	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 513208975
+	@ObfuscatedSignature(
+		descriptor = "Ldj;"
 	)
-	int field1409;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 479707565
+	field1464(5, 5),
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Ldj;"
 	)
-	int field1407;
-	// $FF: synthetic field
+	field1469(6, 6),
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Ldj;"
 	)
-	final class119 this$0;
-
+	field1466(7, 7),
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "Ldj;"
 	)
-	class121(class119 var1) {
-		this.this$0 = var1; // L: 289
-	}
+	field1467(8, 8);
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+	@ObfuscatedName("rf")
+	static boolean field1470;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 1751927131
+	)
+	final int field1460;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -85516245
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1412 = var1.readInt(); // L: 292
-		this.field1407 = var1.readInt(); // L: 293
-		this.field1408 = var1.readUnsignedByte(); // L: 294
-		this.field1409 = var1.readUnsignedByte(); // L: 295
-	} // L: 296
+	final int field1468;
 
-	@ObfuscatedName("w")
+	class121(int var3, int var4) {
+		this.field1460 = var3; // L: 105
+		this.field1468 = var4; // L: 106
+	} // L: 107
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2665(this.field1412, this.field1407, this.field1408, this.field1409); // L: 299
-	} // L: 300
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field1468; // L: 110
+	}
 }
diff --git a/runescape-client/src/main/java/class122.java b/runescape-client/src/main/java/class122.java
index eb44cb347c..3a202ea99c 100644
--- a/runescape-client/src/main/java/class122.java
+++ b/runescape-client/src/main/java/class122.java
@@ -3,125 +3,53 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dr")
-public class class122 extends class132 {
-	@ObfuscatedName("b")
+@ObfuscatedName("dd")
+public enum class122 implements MouseWheel {
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lar;"
-	)
-	@Export("soundSystem")
-	static SoundSystem soundSystem;
-	@ObfuscatedName("fp")
-	@ObfuscatedGetter(
-		intValue = 203381115
-	)
-	static int field1420;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 1422927589
-	)
-	int field1419;
-	@ObfuscatedName("w")
-	byte field1415;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1058551231
+		descriptor = "Ldd;"
 	)
-	int field1417;
-	@ObfuscatedName("a")
-	String field1414;
-	// $FF: synthetic field
+	field1476(1, 0),
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Leh;"
+		descriptor = "Ldd;"
 	)
-	final class133 this$0;
-
+	field1471(0, 1),
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Leh;)V"
+		descriptor = "Ldd;"
 	)
-	class122(class133 var1) {
-		this.this$0 = var1;
-		this.field1419 = -1; // L: 101
-	} // L: 106
-
-	@ObfuscatedName("i")
+	field1473(2, 2),
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1393452113"
+		descriptor = "Ldd;"
 	)
-	void vmethod2839(Buffer var1) {
-		this.field1419 = var1.readUnsignedShort(); // L: 109
-		this.field1415 = var1.readByte(); // L: 110
-		this.field1417 = var1.readUnsignedShort(); // L: 111
-		var1.readLong(); // L: 112
-		this.field1414 = var1.readStringCp1252NullTerminated(); // L: 113
-	} // L: 114
+	field1474(3, 3);
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lea;I)V",
-		garbageValue = "-1714930149"
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -1980268263
 	)
-	void vmethod2838(ClanChannel var1) {
-		ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1419); // L: 117
-		var2.rank = this.field1415; // L: 118
-		var2.world = this.field1417; // L: 119
-		var2.username = new Username(this.field1414); // L: 120
-	} // L: 121
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/String;[IIII)V",
-		garbageValue = "904949583"
+	public final int field1475;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -83043003
 	)
-	public static void method2599(String[] var0, int[] var1, int var2, int var3) {
-		if (var2 < var3) { // L: 47
-			int var4 = (var3 + var2) / 2; // L: 48
-			int var5 = var2; // L: 49
-			String var6 = var0[var4]; // L: 50
-			var0[var4] = var0[var3]; // L: 51
-			var0[var3] = var6; // L: 52
-			int var7 = var1[var4]; // L: 53
-			var1[var4] = var1[var3]; // L: 54
-			var1[var3] = var7; // L: 55
-
-			for (int var8 = var2; var8 < var3; ++var8) { // L: 56
-				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 57
-					String var9 = var0[var8]; // L: 58
-					var0[var8] = var0[var5]; // L: 59
-					var0[var5] = var9; // L: 60
-					int var10 = var1[var8]; // L: 61
-					var1[var8] = var1[var5]; // L: 62
-					var1[var5++] = var10; // L: 63
-				}
-			}
+	@Export("id")
+	final int id;
 
-			var0[var3] = var0[var5]; // L: 67
-			var0[var5] = var6; // L: 68
-			var1[var3] = var1[var5]; // L: 69
-			var1[var5] = var7; // L: 70
-			method2599(var0, var1, var2, var5 - 1); // L: 71
-			method2599(var0, var1, var5 + 1, var3); // L: 72
-		}
+	class122(int var3, int var4) {
+		this.field1475 = var3; // L: 16
+		this.id = var4; // L: 17
+	} // L: 18
 
-	} // L: 74
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lbf;",
-		garbageValue = "622139393"
-	)
-	@Export("Messages_getMessage")
-	static Message Messages_getMessage(int var0) {
-		return (Message)Messages.Messages_hashTable.get((long)var0); // L: 44
-	}
-
-	@ObfuscatedName("il")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "-47"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
-	static boolean method2607(int var0) {
-		return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 9312
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.id; // L: 22
 	}
 }
diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java
index 8fb04b45af..ba706ddb94 100644
--- a/runescape-client/src/main/java/class123.java
+++ b/runescape-client/src/main/java/class123.java
@@ -1,329 +1,102 @@
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("dz")
-public class class123 extends class116 {
-	@ObfuscatedName("i")
-	boolean field1424;
-	@ObfuscatedName("w")
-	byte field1422;
-	@ObfuscatedName("s")
-	byte field1423;
-	@ObfuscatedName("a")
-	byte field1421;
-	@ObfuscatedName("o")
-	byte field1425;
-	// $FF: synthetic field
-	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+@ObfuscatedName("du")
+public class class123 extends class126 {
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -601293693
 	)
-	final class119 this$0;
-
-	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+	int field1481;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -1319645239
 	)
-	class123(class119 var1) {
-		this.this$0 = var1; // L: 248
-	}
-
-	@ObfuscatedName("i")
+	int field1479;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 6552211
+	)
+	int field1480;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -223756011
+	)
+	int field1482;
+	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "Lda;"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1424 = var1.readUnsignedByte() == 1; // L: 251
-		this.field1422 = var1.readByte(); // L: 252
-		this.field1423 = var1.readByte(); // L: 253
-		this.field1421 = var1.readByte(); // L: 254
-		this.field1425 = var1.readByte(); // L: 255
-	} // L: 256
+	final class129 this$0;
 
-	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(Lda;)V"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.allowGuests = this.field1424; // L: 259
-		var1.field1444 = this.field1422; // L: 260
-		var1.field1439 = this.field1423; // L: 261
-		var1.field1446 = this.field1421; // L: 262
-		var1.field1447 = this.field1425; // L: 263
-	} // L: 264
+	class123(class129 var1) {
+		this.this$0 = var1;
+		this.field1481 = -1; // L: 158
+	} // L: 163
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-776812615"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
 	)
-	public static boolean method2614(int var0) {
-		return var0 == WorldMapDecorationType.field3244.id; // L: 42
-	}
-
-	@ObfuscatedName("w")
+	void vmethod3029(Buffer var1) {
+		this.field1481 = var1.readUnsignedShort(); // L: 166
+		this.field1479 = var1.readInt(); // L: 167
+		this.field1480 = var1.readUnsignedByte(); // L: 168
+		this.field1482 = var1.readUnsignedByte(); // L: 169
+	} // L: 170
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "1761833612"
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
 	)
-	public static void method2616(int var0, int var1) {
-		VarbitComposition var2 = class150.method2965(var0); // L: 33
-		int var3 = var2.baseVar; // L: 34
-		int var4 = var2.startBit;
-		int var5 = var2.endBit; // L: 36
-		int var6 = Varps.Varps_masks[var5 - var4]; // L: 37
-		if (var1 < 0 || var1 > var6) { // L: 38
-			var1 = 0;
-		}
-
-		var6 <<= var4; // L: 39
-		Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40
-	} // L: 41
+	void vmethod3028(ClanSettings var1) {
+		var1.method2858(this.field1481, this.field1479, this.field1480, this.field1482); // L: 173
+	} // L: 174
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "988322952"
+		descriptor = "(IIB)I",
+		garbageValue = "-84"
 	)
-	public static int method2619(int var0) {
-		return class245.field2908[var0]; // L: 35
+	public static int method2744(int var0, int var1) {
+		return (int)Math.round(Math.atan2((double)var0, (double)var1) * 2607.5945876176133D) & 16383; // L: 29
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "2087887808"
+		descriptor = "(IIII)I",
+		garbageValue = "-1895069117"
 	)
-	static int method2618(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1825
-			class14.Interpreter_intStackSize -= 3; // L: 1826
-			class128.queueSoundEffect(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]); // L: 1827
-			return 1; // L: 1828
-		} else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1830
-			ModeWhere.playSong(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1831
-			return 1; // L: 1832
-		} else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1834
-			class14.Interpreter_intStackSize -= 2; // L: 1835
-			Friend.method6057(Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]); // L: 1836
-			return 1; // L: 1837
-		} else {
-			int var3;
-			int var4;
-			if (var0 != 3209 && var0 != 3181 && var0 != 3203 && var0 != 3205 && var0 != 3207) { // L: 1839
-				if (var0 != 3210 && var0 != 3182 && var0 != 3204 && var0 != 3206 && var0 != 3208) { // L: 1875
-					return var0 == 3211 ? 1 : 2; // L: 1909 1910 1912
-				} else {
-					var3 = 0; // L: 1876
-					var4 = 0; // L: 1877
-					if (var0 == 3210) { // L: 1878
-						var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1879
-					} else if (var0 == 3182) { // L: 1881
-						var3 = 6; // L: 1882
-					} else if (var0 == 3204) { // L: 1884
-						var3 = 7; // L: 1885
-					} else if (var0 == 3206) { // L: 1887
-						var3 = 8; // L: 1888
-					} else if (var0 == 3208) { // L: 1890
-						var3 = 9; // L: 1891
-					}
-
-					if (var3 == 6) { // L: 1893
-						float var5 = 200.0F * ((float)class408.clientPreferences.brightness - 0.5F); // L: 1894
-						var4 = 100 - Math.round(var5); // L: 1895
-					} else if (var3 == 7) { // L: 1897
-						var4 = Math.round((float)class408.clientPreferences.musicVolume / 2.55F); // L: 1898
-					} else if (var3 == 8) { // L: 1900
-						var4 = Math.round((float)class408.clientPreferences.soundEffectsVolume / 1.27F); // L: 1901
-					} else if (var3 == 9) { // L: 1903
-						var4 = Math.round((float)class408.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1904
-					}
-
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var4; // L: 1906
-					return 1; // L: 1907
-				}
-			} else {
-				var3 = 0; // L: 1840
-				var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1841
-				if (var0 == 3209) { // L: 1842
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1843
-				} else if (var0 == 3181) { // L: 1845
-					var3 = 6; // L: 1846
-				} else if (var0 == 3203) { // L: 1848
-					var3 = 7; // L: 1849
-				} else if (var0 == 3205) { // L: 1851
-					var3 = 8; // L: 1852
-				} else if (var0 == 3207) { // L: 1854
-					var3 = 9; // L: 1855
-				}
-
-				if (var3 == 6) { // L: 1857
-					var4 = 100 - Math.min(Math.max(var4, 0), 100); // L: 1858
-					class354.method6396((double)(0.5F + (float)var4 / 200.0F)); // L: 1859
-				} else if (var3 == 7) { // L: 1861
-					var4 = Math.min(Math.max(var4, 0), 100); // L: 1862
-					class14.method178(Math.round(2.55F * (float)var4)); // L: 1863
-				} else if (var3 == 8) { // L: 1865
-					var4 = Math.min(Math.max(var4, 0), 100); // L: 1866
-					WorldMapSection1.updateSoundEffectVolume(Math.round((float)var4 * 1.27F)); // L: 1867
-				} else if (var3 == 9) { // L: 1869
-					var4 = Math.min(Math.max(var4, 0), 100); // L: 1870
-					ClanChannel.method2825(Math.round((float)var4 * 1.27F)); // L: 1871
-				}
-
-				return 1; // L: 1873
-			}
-		}
+	public static int method2737(int var0, int var1, int var2) {
+		int var3 = WorldMapEvent.method4942(var2 - var1 + 1);
+		var3 <<= var1;
+		return var0 & ~var3;
 	}
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "1954387020"
+		descriptor = "(IB)V",
+		garbageValue = "1"
 	)
-	static int method2608(int var0, Script var1, boolean var2) {
-		if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4277
-			if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4282
-				if (var0 == 6750) { // L: 4286
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4287
-					return 1; // L: 4288
-				} else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4290
-					if (var0 == 6754) { // L: 4294
-						int var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 4295
-						NPCComposition var4 = ScriptFrame.getNpcDefinition(var3); // L: 4296
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4297
-						return 1; // L: 4298
-					} else {
-						return 2; // L: 4300
-					}
-				} else {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4291
-					return 1; // L: 4292
-				}
-			} else {
-				--class14.Interpreter_intStackSize; // L: 4283
-				return 1; // L: 4284
-			}
-		} else {
-			class14.Interpreter_intStackSize -= 2; // L: 4278
-			--class295.Interpreter_stringStackSize; // L: 4279
-			return 1; // L: 4280
-		}
-	}
+	public static void method2746(int var0) {
+		MouseHandler.MouseHandler_idleCycles = var0; // L: 72
+	} // L: 73
 
-	@ObfuscatedName("fk")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-980124614"
+		garbageValue = "-1478303214"
 	)
-	static final void method2621() {
-		int var0 = SpotAnimationDefinition.field1761 * 128 + 64; // L: 4180
-		int var1 = BuddyRankComparator.field1333 * 128 + 64; // L: 4181
-		int var2 = class392.getTileHeight(var0, var1, GrandExchangeOfferTotalQuantityComparator.Client_plane) - Renderable.field2442; // L: 4182
-		if (WorldMapSectionType.cameraX < var0) { // L: 4183
-			WorldMapSectionType.cameraX = (var0 - WorldMapSectionType.cameraX) * Login.field888 / 1000 + WorldMapSectionType.cameraX + UserComparator8.field1305; // L: 4184
-			if (WorldMapSectionType.cameraX > var0) { // L: 4185
-				WorldMapSectionType.cameraX = var0;
-			}
-		}
-
-		if (WorldMapSectionType.cameraX > var0) { // L: 4187
-			WorldMapSectionType.cameraX -= Login.field888 * (WorldMapSectionType.cameraX - var0) / 1000 + UserComparator8.field1305; // L: 4188
-			if (WorldMapSectionType.cameraX < var0) { // L: 4189
-				WorldMapSectionType.cameraX = var0;
-			}
-		}
-
-		if (class174.cameraY < var2) { // L: 4191
-			class174.cameraY = (var2 - class174.cameraY) * Login.field888 / 1000 + class174.cameraY + UserComparator8.field1305; // L: 4192
-			if (class174.cameraY > var2) { // L: 4193
-				class174.cameraY = var2;
-			}
-		}
-
-		if (class174.cameraY > var2) { // L: 4195
-			class174.cameraY -= Login.field888 * (class174.cameraY - var2) / 1000 + UserComparator8.field1305; // L: 4196
-			if (class174.cameraY < var2) { // L: 4197
-				class174.cameraY = var2;
-			}
-		}
-
-		if (class65.cameraZ < var1) { // L: 4199
-			class65.cameraZ = (var1 - class65.cameraZ) * Login.field888 / 1000 + class65.cameraZ + UserComparator8.field1305; // L: 4200
-			if (class65.cameraZ > var1) { // L: 4201
-				class65.cameraZ = var1;
-			}
-		}
-
-		if (class65.cameraZ > var1) { // L: 4203
-			class65.cameraZ -= Login.field888 * (class65.cameraZ - var1) / 1000 + UserComparator8.field1305; // L: 4204
-			if (class65.cameraZ < var1) { // L: 4205
-				class65.cameraZ = var1;
-			}
-		}
-
-		var0 = UrlRequest.field1298 * 128 + 64; // L: 4207
-		var1 = SoundSystem.field288 * 128 + 64; // L: 4208
-		var2 = class392.getTileHeight(var0, var1, GrandExchangeOfferTotalQuantityComparator.Client_plane) - ArchiveLoader.field985; // L: 4209
-		int var3 = var0 - WorldMapSectionType.cameraX; // L: 4210
-		int var4 = var2 - class174.cameraY; // L: 4211
-		int var5 = var1 - class65.cameraZ; // L: 4212
-		int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); // L: 4213
-		int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; // L: 4214
-		int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; // L: 4215
-		if (var7 < 128) { // L: 4216
-			var7 = 128;
-		}
-
-		if (var7 > 383) { // L: 4217
-			var7 = 383;
-		}
-
-		if (class121.cameraPitch < var7) { // L: 4218
-			class121.cameraPitch = (var7 - class121.cameraPitch) * TextureProvider.field2484 / 1000 + class121.cameraPitch + class269.field3221; // L: 4219
-			if (class121.cameraPitch > var7) { // L: 4220
-				class121.cameraPitch = var7;
-			}
-		}
-
-		if (class121.cameraPitch > var7) { // L: 4222
-			class121.cameraPitch -= TextureProvider.field2484 * (class121.cameraPitch - var7) / 1000 + class269.field3221; // L: 4223
-			if (class121.cameraPitch < var7) { // L: 4224
-				class121.cameraPitch = var7;
-			}
-		}
-
-		int var9 = var8 - WorldMapRegion.cameraYaw; // L: 4226
-		if (var9 > 1024) { // L: 4227
-			var9 -= 2048;
-		}
-
-		if (var9 < -1024) { // L: 4228
-			var9 += 2048;
-		}
-
-		if (var9 > 0) { // L: 4229
-			WorldMapRegion.cameraYaw = var9 * TextureProvider.field2484 / 1000 + WorldMapRegion.cameraYaw + class269.field3221; // L: 4230
-			WorldMapRegion.cameraYaw &= 2047; // L: 4231
-		}
-
-		if (var9 < 0) { // L: 4233
-			WorldMapRegion.cameraYaw -= -var9 * TextureProvider.field2484 / 1000 + class269.field3221; // L: 4234
-			WorldMapRegion.cameraYaw &= 2047; // L: 4235
-		}
-
-		int var10 = var8 - WorldMapRegion.cameraYaw; // L: 4237
-		if (var10 > 1024) { // L: 4238
-			var10 -= 2048;
-		}
-
-		if (var10 < -1024) { // L: 4239
-			var10 += 2048;
-		}
-
-		if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { // L: 4240
-			WorldMapRegion.cameraYaw = var8;
-		}
-
-	} // L: 4241
+	static void method2745() {
+		Messages.Messages_channels.clear(); // L: 50
+		Messages.Messages_hashTable.clear(); // L: 51
+		Messages.Messages_queue.clear(); // L: 52
+		Messages.Messages_count = 0; // L: 53
+	} // L: 54
 }
diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java
index 5913693442..a3adcb55b5 100644
--- a/runescape-client/src/main/java/class124.java
+++ b/runescape-client/src/main/java/class124.java
@@ -1,49 +1,104 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dx")
-public class class124 extends class132 {
-	@ObfuscatedName("i")
+@ObfuscatedName("dl")
+public class class124 extends class126 {
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("musicTrackArchive")
+	public static AbstractArchive musicTrackArchive;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -443066263
+		longValue = 3062767969711137225L
 	)
-	int field1426;
+	long field1485;
+	@ObfuscatedName("b")
+	String field1484;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Leh;"
+		descriptor = "Lda;"
 	)
-	final class133 this$0;
+	final class129 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Leh;)V"
+		descriptor = "(Lda;)V"
 	)
-	class124(class133 var1) {
+	class124(class129 var1) {
 		this.this$0 = var1;
-		this.field1426 = -1; // L: 82
-	} // L: 84
+		this.field1485 = -1L;
+		this.field1484 = null;
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
+	)
+	void vmethod3029(Buffer var1) {
+		if (var1.readUnsignedByte() != 255) {
+			--var1.offset;
+			this.field1485 = var1.readLong();
+		}
+
+		this.field1484 = var1.readStringCp1252NullTerminatedOrNull();
+	} // L: 85
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1393452113"
-	)
-	void vmethod2839(Buffer var1) {
-		this.field1426 = var1.readUnsignedShort(); // L: 87
-		var1.readUnsignedByte(); // L: 88
-		if (var1.readUnsignedByte() != 255) { // L: 89
-			--var1.offset; // L: 90
-			var1.readLong(); // L: 91
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
+	)
+	void vmethod3028(ClanSettings var1) {
+		var1.method2850(this.field1485, this.field1484, 0); // L: 88
+	} // L: 89
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Lpj;B)I",
+		garbageValue = "3"
+	)
+	static int method2747(PacketBuffer var0) {
+		int var1 = var0.readBits(2); // L: 187
+		int var2;
+		if (var1 == 0) { // L: 189
+			var2 = 0;
+		} else if (var1 == 1) { // L: 190
+			var2 = var0.readBits(5);
+		} else if (var1 == 2) { // L: 191
+			var2 = var0.readBits(8);
+		} else {
+			var2 = var0.readBits(11); // L: 192
 		}
 
-	} // L: 93
+		return var2; // L: 193
+	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lea;I)V",
-		garbageValue = "-1714930149"
+		descriptor = "(I)Lpl;",
+		garbageValue = "970200706"
 	)
-	void vmethod2838(ClanChannel var1) {
-		var1.removeMember(this.field1426); // L: 96
-	} // L: 97
+	static SpritePixels method2754() {
+		SpritePixels var0 = new SpritePixels(); // L: 72
+		var0.width = class432.SpriteBuffer_spriteWidth; // L: 73
+		var0.height = class432.SpriteBuffer_spriteHeight; // L: 74
+		var0.xOffset = class141.SpriteBuffer_xOffsets[0]; // L: 75
+		var0.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; // L: 76
+		var0.subWidth = class432.SpriteBuffer_spriteWidths[0]; // L: 77
+		var0.subHeight = class330.SpriteBuffer_spriteHeights[0]; // L: 78
+		int var1 = var0.subWidth * var0.subHeight; // L: 79
+		byte[] var2 = class369.SpriteBuffer_pixels[0]; // L: 80
+		var0.pixels = new int[var1]; // L: 81
+
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 82
+			var0.pixels[var3] = class432.SpriteBuffer_spritePalette[var2[var3] & 255];
+		}
+
+		UserComparator3.method2529(); // L: 83
+		return var0; // L: 84
+	}
 }
diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java
index 0571961693..ab84dac08a 100644
--- a/runescape-client/src/main/java/class125.java
+++ b/runescape-client/src/main/java/class125.java
@@ -1,84 +1,78 @@
+import java.io.File;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dd")
-public class class125 extends class116 {
-	@ObfuscatedName("i")
-	String field1429;
-	// $FF: synthetic field
-	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+@ObfuscatedName("dw")
+public class class125 extends class126 {
+	@ObfuscatedName("b")
+	@Export("FileSystem_cacheDir")
+	static File FileSystem_cacheDir;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -542500645
 	)
-	final class119 this$0;
-
+	int field1493;
+	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "Lda;"
 	)
-	class125(class119 var1) {
-		this.this$0 = var1; // L: 229
-	}
+	final class129 this$0;
 
-	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(Lda;)V"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1429 = var1.readStringCp1252NullTerminated(); // L: 232
-		var1.readInt(); // L: 233
-	} // L: 234
+	class125(class129 var1) {
+		this.this$0 = var1;
+		this.field1493 = -1; // L: 114
+	} // L: 116
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.name = this.field1429; // L: 237
-	} // L: 238
+	void vmethod3029(Buffer var1) {
+		this.field1493 = var1.readUnsignedShort(); // L: 119
+	} // L: 120
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-924468253"
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
 	)
-	public static void method2637() {
-		class54.reflectionChecks = new IterableNodeDeque(); // L: 24
-	} // L: 25
+	void vmethod3028(ClanSettings var1) {
+		var1.method2862(this.field1493); // L: 123
+	} // L: 124
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("gi")
 	@ObfuscatedSignature(
-		descriptor = "(IIILfe;II)V",
-		garbageValue = "2132581539"
+		descriptor = "(Lck;IIB)V",
+		garbageValue = "-63"
 	)
-	static void method2635(int var0, int var1, int var2, ObjectComposition var3, int var4) {
-		ObjectSound var5 = new ObjectSound(); // L: 59
-		var5.plane = var0; // L: 60
-		var5.x = var1 * 128; // L: 61
-		var5.y = var2 * 128; // L: 62
-		int var6 = var3.sizeX; // L: 63
-		int var7 = var3.sizeY; // L: 64
-		if (var4 == 1 || var4 == 3) { // L: 65
-			var6 = var3.sizeY; // L: 66
-			var7 = var3.sizeX; // L: 67
-		}
-
-		var5.maxX = (var6 + var1) * 128; // L: 69
-		var5.maxY = (var7 + var2) * 128; // L: 70
-		var5.soundEffectId = var3.ambientSoundId; // L: 71
-		var5.field773 = var3.int7 * 128; // L: 72
-		var5.field767 = var3.int5; // L: 73
-		var5.field776 = var3.int6; // L: 74
-		var5.soundEffectIds = var3.soundEffectIds; // L: 75
-		if (var3.transforms != null) { // L: 76
-			var5.obj = var3; // L: 77
-			var5.set(); // L: 78
-		}
+	@Export("performPlayerAnimation")
+	static void performPlayerAnimation(Player var0, int var1, int var2) {
+		if (var0.sequence == var1 && var1 != -1) { // L: 4946
+			int var3 = UserComparator5.SequenceDefinition_get(var1).field2078; // L: 4947
+			if (var3 == 1) { // L: 4948
+				var0.sequenceFrame = 0; // L: 4949
+				var0.sequenceFrameCycle = 0; // L: 4950
+				var0.sequenceDelay = var2; // L: 4951
+				var0.field1126 = 0; // L: 4952
+			}
 
-		ObjectSound.objectSounds.addFirst(var5); // L: 80
-		if (var5.soundEffectIds != null) { // L: 81
-			var5.field779 = var5.field767 + (int)(Math.random() * (double)(var5.field776 - var5.field767));
+			if (var3 == 2) { // L: 4954
+				var0.field1126 = 0; // L: 4955
+			}
+		} else if (var1 == -1 || var0.sequence == -1 || UserComparator5.SequenceDefinition_get(var1).field2092 >= UserComparator5.SequenceDefinition_get(var0.sequence).field2092) { // L: 4958
+			var0.sequence = var1; // L: 4959
+			var0.sequenceFrame = 0; // L: 4960
+			var0.sequenceFrameCycle = 0; // L: 4961
+			var0.sequenceDelay = var2; // L: 4962
+			var0.field1126 = 0; // L: 4963
+			var0.field1098 = var0.pathLength; // L: 4964
 		}
 
-	} // L: 82
+	} // L: 4966
 }
diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java
index 4fd9b74b50..ed04816038 100644
--- a/runescape-client/src/main/java/class126.java
+++ b/runescape-client/src/main/java/class126.java
@@ -1,57 +1,57 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dl")
-public class class126 extends class116 {
-	@ObfuscatedName("i")
+@ObfuscatedName("dg")
+public abstract class class126 extends Node {
+	@ObfuscatedName("ea")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive17")
+	static Archive archive17;
+	@ObfuscatedName("fj")
 	@ObfuscatedGetter(
-		intValue = 1462518915
+		intValue = -858901471
 	)
-	int field1433;
-	@ObfuscatedName("w")
-	String field1432;
-	// $FF: synthetic field
+	static int field1497;
+	@ObfuscatedName("gh")
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Loh;"
 	)
-	final class119 this$0;
+	@Export("WorldMapElement_fonts")
+	static Fonts WorldMapElement_fonts;
 
-	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
-	)
-	class126(class119 var1) {
-		this.this$0 = var1; // L: 323
-	}
+	class126() {
+	} // L: 68
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1433 = var1.readInt(); // L: 326
-		this.field1432 = var1.readStringCp1252NullTerminated(); // L: 327
-	} // L: 328
+	abstract void vmethod3029(Buffer var1);
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2667(this.field1433, this.field1432); // L: 331
-	} // L: 332
+	abstract void vmethod3028(ClanSettings var1);
 
-	@ObfuscatedName("lh")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-19"
+		descriptor = "(III)Ljm;",
+		garbageValue = "-1928288772"
 	)
-	static void method2646() {
-		if (Client.oculusOrbState == 1) { // L: 12021
-			Client.field511 = true; // L: 12022
+	@Export("getWidgetChild")
+	public static Widget getWidgetChild(int var0, int var1) {
+		Widget var2 = ChatChannel.getWidget(var0); // L: 209
+		if (var1 == -1) { // L: 210
+			return var2;
+		} else {
+			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 211 212
 		}
-
-	} // L: 12024
+	}
 }
diff --git a/runescape-client/src/main/java/class127.java b/runescape-client/src/main/java/class127.java
new file mode 100644
index 0000000000..bd2ee7a6d2
--- /dev/null
+++ b/runescape-client/src/main/java/class127.java
@@ -0,0 +1,86 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("di")
+public class class127 extends class126 {
+	@ObfuscatedName("sd")
+	@ObfuscatedGetter(
+		intValue = -1317167519
+	)
+	static int field1498;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -646146065
+	)
+	int field1503;
+	@ObfuscatedName("b")
+	boolean field1499;
+	// $FF: synthetic field
+	@ObfuscatedSignature(
+		descriptor = "Lda;"
+	)
+	final class129 this$0;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lda;)V"
+	)
+	class127(class129 var1) {
+		this.this$0 = var1;
+		this.field1503 = -1; // L: 178
+	} // L: 181
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
+	)
+	void vmethod3029(Buffer var1) {
+		this.field1503 = var1.readUnsignedShort(); // L: 184
+		this.field1499 = var1.readUnsignedByte() == 1; // L: 185
+	} // L: 186
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
+	)
+	void vmethod3028(ClanSettings var1) {
+		var1.method2857(this.field1503, this.field1499); // L: 189
+	} // L: 190
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-39935659"
+	)
+	static void method2770() {
+		WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 48
+	} // L: 49
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "506416860"
+	)
+	@Export("savePreferences")
+	static void savePreferences() {
+		AccessFile var0 = null; // L: 100
+
+		try {
+			var0 = class231.getPreferencesFile("", class338.field4054.name, true); // L: 102
+			Buffer var1 = SecureRandomFuture.clientPreferences.toBuffer(); // L: 103
+			var0.write(var1.array, 0, var1.offset); // L: 104
+		} catch (Exception var3) { // L: 106
+		}
+
+		try {
+			if (var0 != null) { // L: 108
+				var0.closeSync(true); // L: 109
+			}
+		} catch (Exception var2) { // L: 112
+		}
+
+	} // L: 113
+}
diff --git a/runescape-client/src/main/java/class128.java b/runescape-client/src/main/java/class128.java
deleted file mode 100644
index e1006aa2dc..0000000000
--- a/runescape-client/src/main/java/class128.java
+++ /dev/null
@@ -1,166 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("dk")
-public class class128 extends class132 {
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("musicTrackArchive")
-	public static AbstractArchive musicTrackArchive;
-	@ObfuscatedName("i")
-	String field1469;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -2112736833
-	)
-	int field1467;
-	@ObfuscatedName("s")
-	byte field1468;
-	// $FF: synthetic field
-	@ObfuscatedSignature(
-		descriptor = "Leh;"
-	)
-	final class133 this$0;
-
-	@ObfuscatedSignature(
-		descriptor = "(Leh;)V"
-	)
-	class128(class133 var1) {
-		this.this$0 = var1;
-		this.field1469 = null; // L: 55
-	} // L: 59
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1393452113"
-	)
-	void vmethod2839(Buffer var1) {
-		if (var1.readUnsignedByte() != 255) { // L: 62
-			--var1.offset; // L: 63
-			var1.readLong(); // L: 64
-		}
-
-		this.field1469 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66
-		this.field1467 = var1.readUnsignedShort(); // L: 67
-		this.field1468 = var1.readByte(); // L: 68
-		var1.readLong(); // L: 69
-	} // L: 70
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lea;I)V",
-		garbageValue = "-1714930149"
-	)
-	void vmethod2838(ClanChannel var1) {
-		ClanChannelMember var2 = new ClanChannelMember(); // L: 73
-		var2.username = new Username(this.field1469); // L: 74
-		var2.world = this.field1467; // L: 75
-		var2.rank = this.field1468; // L: 76
-		var1.addMember(var2); // L: 77
-	} // L: 78
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(B)[Lia;",
-		garbageValue = "0"
-	)
-	@Export("ServerPacket_values")
-	public static ServerPacket[] ServerPacket_values() {
-		return new ServerPacket[]{ServerPacket.field2796, ServerPacket.field2874, ServerPacket.field2863, ServerPacket.field2865, ServerPacket.field2821, ServerPacket.field2797, ServerPacket.field2798, ServerPacket.field2799, ServerPacket.field2853, ServerPacket.field2801, ServerPacket.field2802, ServerPacket.field2803, ServerPacket.field2804, ServerPacket.field2805, ServerPacket.field2870, ServerPacket.field2807, ServerPacket.field2808, ServerPacket.field2809, ServerPacket.field2810, ServerPacket.field2855, ServerPacket.field2812, ServerPacket.field2813, ServerPacket.field2814, ServerPacket.field2815, ServerPacket.field2878, ServerPacket.field2817, ServerPacket.field2818, ServerPacket.field2852, ServerPacket.field2820, ServerPacket.field2831, ServerPacket.field2822, ServerPacket.field2823, ServerPacket.field2824, ServerPacket.field2825, ServerPacket.field2826, ServerPacket.field2827, ServerPacket.field2828, ServerPacket.field2829, ServerPacket.field2830, ServerPacket.field2887, ServerPacket.field2880, ServerPacket.field2833, ServerPacket.field2834, ServerPacket.field2835, ServerPacket.field2836, ServerPacket.field2837, ServerPacket.field2838, ServerPacket.field2839, ServerPacket.field2840, ServerPacket.field2841, ServerPacket.field2842, ServerPacket.field2843, ServerPacket.field2844, ServerPacket.field2845, ServerPacket.field2846, ServerPacket.field2800, ServerPacket.field2885, ServerPacket.field2849, ServerPacket.field2850, ServerPacket.field2811, ServerPacket.field2793, ServerPacket.field2847, ServerPacket.field2795, ServerPacket.field2859, ServerPacket.field2856, ServerPacket.field2857, ServerPacket.field2858, ServerPacket.field2806, ServerPacket.field2860, ServerPacket.field2861, ServerPacket.field2872, ServerPacket.field2877, ServerPacket.field2864, ServerPacket.field2851, ServerPacket.field2832, ServerPacket.field2867, ServerPacket.field2868, ServerPacket.field2869, ServerPacket.field2819, ServerPacket.field2871, ServerPacket.field2792, ServerPacket.field2873, ServerPacket.field2890, ServerPacket.field2862, ServerPacket.field2876, ServerPacket.field2875, ServerPacket.field2816, ServerPacket.field2879, ServerPacket.field2882, ServerPacket.field2881, ServerPacket.field2794, ServerPacket.field2883, ServerPacket.field2884, ServerPacket.field2886, ServerPacket.field2854, ServerPacket.field2892, ServerPacket.field2888}; // L: 106
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;Lko;Lko;Lko;B)V",
-		garbageValue = "-43"
-	)
-	public static void method2720(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) {
-		class283.Widget_archive = var0; // L: 190
-		Widget.Widget_modelsArchive = var1; // L: 191
-		WorldMapScaleHandler.Widget_spritesArchive = var2; // L: 192
-		class134.Widget_fontsArchive = var3; // L: 193
-		WorldMapSection1.Widget_interfaceComponents = new Widget[class283.Widget_archive.getGroupCount()][]; // L: 194
-		class132.Widget_loadedInterfaces = new boolean[class283.Widget_archive.getGroupCount()]; // L: 195
-	} // L: 196
-
-	@ObfuscatedName("fz")
-	@ObfuscatedSignature(
-		descriptor = "(IIIB)V",
-		garbageValue = "-63"
-	)
-	@Export("queueSoundEffect")
-	static void queueSoundEffect(int var0, int var1, int var2) {
-		if (class408.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 4067
-			Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 4068
-			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 4069
-			Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 4070
-			Client.soundEffects[Client.soundEffectCount] = null; // L: 4071
-			Client.soundLocations[Client.soundEffectCount] = 0; // L: 4072
-			++Client.soundEffectCount; // L: 4073
-		}
-
-	} // L: 4075
-
-	@ObfuscatedName("jt")
-	@ObfuscatedSignature(
-		descriptor = "(Ljf;I)Z",
-		garbageValue = "-636935524"
-	)
-	@Export("runCs1")
-	static final boolean runCs1(Widget var0) {
-		if (var0.cs1Comparisons == null) { // L: 10349
-			return false;
-		} else {
-			for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10350
-				int var2 = class113.method2532(var0, var1); // L: 10351
-				int var3 = var0.cs1ComparisonValues[var1]; // L: 10352
-				if (var0.cs1Comparisons[var1] == 2) { // L: 10353
-					if (var2 >= var3) { // L: 10354
-						return false;
-					}
-				} else if (var0.cs1Comparisons[var1] == 3) { // L: 10356
-					if (var2 <= var3) { // L: 10357
-						return false;
-					}
-				} else if (var0.cs1Comparisons[var1] == 4) { // L: 10359
-					if (var3 == var2) { // L: 10360
-						return false;
-					}
-				} else if (var3 != var2) { // L: 10362
-					return false;
-				}
-			}
-
-			return true; // L: 10364
-		}
-	}
-
-	@ObfuscatedName("ll")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1742538155"
-	)
-	static void method2728(String var0) {
-		UserComparator3.field1316 = var0; // L: 11938
-
-		try {
-			String var1 = ArchiveLoader.client.getParameter(Integer.toString(18)); // L: 11940
-			String var2 = ArchiveLoader.client.getParameter(Integer.toString(13)); // L: 11941
-			String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11942
-			if (var0.length() == 0) { // L: 11943
-				var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
-			} else {
-				var3 = var3 + "; Expires=" + HorizontalAlignment.method3113(class111.method2516() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 11944
-			}
-
-			class27.method393(ArchiveLoader.client, "document.cookie=\"" + var3 + "\""); // L: 11945
-		} catch (Throwable var4) { // L: 11947
-		}
-
-	} // L: 11948
-}
diff --git a/runescape-client/src/main/java/class129.java b/runescape-client/src/main/java/class129.java
index 5f55738dc4..f524cfc4ce 100644
--- a/runescape-client/src/main/java/class129.java
+++ b/runescape-client/src/main/java/class129.java
@@ -3,158 +3,143 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dv")
-public class class129 extends class132 {
-	@ObfuscatedName("j")
+@ObfuscatedName("da")
+public class class129 {
+	@ObfuscatedName("fe")
 	@ObfuscatedGetter(
-		intValue = 901521841
+		intValue = -1804512365
 	)
-	@Export("ItemDefinition_fileCount")
-	public static int ItemDefinition_fileCount;
-	@ObfuscatedName("i")
+	@Export("currentPort")
+	static int currentPort;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1147127109
+		longValue = 6548803859152250067L
 	)
-	int field1480;
-	@ObfuscatedName("w")
-	byte field1477;
-	@ObfuscatedName("s")
+	long field1513;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1543465901
+		intValue = -2135269879
 	)
-	int field1475;
-	@ObfuscatedName("a")
-	String field1476;
-	// $FF: synthetic field
+	int field1511;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Leh;"
+		descriptor = "Llr;"
 	)
-	final class133 this$0;
+	IterableNodeDeque field1512;
 
 	@ObfuscatedSignature(
-		descriptor = "(Leh;)V"
+		descriptor = "(Lpi;)V"
 	)
-	class129(class133 var1) {
-		this.this$0 = var1;
-		this.field1480 = -1; // L: 125
-	} // L: 130
+	public class129(Buffer var1) {
+		this.field1511 = -1; // L: 9
+		this.field1512 = new IterableNodeDeque(); // L: 10
+		this.method2780(var1); // L: 28
+	} // L: 29
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1393452113"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "-65"
 	)
-	void vmethod2839(Buffer var1) {
-		var1.readUnsignedByte(); // L: 133
-		this.field1480 = var1.readUnsignedShort(); // L: 134
-		this.field1477 = var1.readByte(); // L: 135
-		this.field1475 = var1.readUnsignedShort(); // L: 136
-		var1.readLong(); // L: 137
-		this.field1476 = var1.readStringCp1252NullTerminated(); // L: 138
-		var1.readUnsignedByte(); // L: 139
-	} // L: 140
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lea;I)V",
-		garbageValue = "-1714930149"
-	)
-	void vmethod2838(ClanChannel var1) {
-		ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1480); // L: 143
-		var2.rank = this.field1477; // L: 144
-		var2.world = this.field1475; // L: 145
-		var2.username = new Username(this.field1476); // L: 146
-	} // L: 147
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;B)Z",
-		garbageValue = "-28"
-	)
-	@Export("isNumber")
-	public static boolean isNumber(CharSequence var0) {
-		boolean var2 = false; // L: 37
-		boolean var3 = false; // L: 38
-		int var4 = 0; // L: 39
-		int var5 = var0.length(); // L: 40
-		int var6 = 0;
-
-		boolean var1;
-		while (true) {
-			if (var6 >= var5) {
-				var1 = var3; // L: 70
-				break;
-			}
-
-			label85: {
-				char var7 = var0.charAt(var6); // L: 42
-				if (var6 == 0) { // L: 43
-					if (var7 == '-') { // L: 44
-						var2 = true; // L: 45
-						break label85;
-					}
-
-					if (var7 == '+') { // L: 48
-						break label85;
-					}
-				}
-
-				int var9;
-				if (var7 >= '0' && var7 <= '9') { // L: 50
-					var9 = var7 - '0';
-				} else if (var7 >= 'A' && var7 <= 'Z') { // L: 51
-					var9 = var7 - '7';
-				} else {
-					if (var7 < 'a' || var7 > 'z') { // L: 52
-						var1 = false; // L: 54
-						break;
-					}
-
-					var9 = var7 - 'W';
+	void method2780(Buffer var1) {
+		this.field1513 = var1.readLong(); // L: 32
+		this.field1511 = var1.readInt(); // L: 33
+
+		for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55
+			Object var3;
+			if (var2 == 3) { // L: 37
+				var3 = new class148(this);
+			} else if (var2 == 1) { // L: 38
+				var3 = new class124(this);
+			} else if (var2 == 13) { // L: 39
+				var3 = new class141(this);
+			} else if (var2 == 4) { // L: 40
+				var3 = new class133(this);
+			} else if (var2 == 6) { // L: 41
+				var3 = new class140(this);
+			} else if (var2 == 5) { // L: 42
+				var3 = new class125(this);
+			} else if (var2 == 2) { // L: 43
+				var3 = new class130(this);
+			} else if (var2 == 7) { // L: 44
+				var3 = new class123(this);
+			} else if (var2 == 14) { // L: 45
+				var3 = new class127(this);
+			} else if (var2 == 8) { // L: 46
+				var3 = new class144(this);
+			} else if (var2 == 9) { // L: 47
+				var3 = new class150(this);
+			} else if (var2 == 10) {
+				var3 = new class136(this); // L: 48
+			} else if (var2 == 11) { // L: 49
+				var3 = new class131(this);
+			} else if (var2 == 12) { // L: 50
+				var3 = new class135(this);
+			} else {
+				if (var2 != 15) { // L: 51
+					throw new RuntimeException(""); // L: 52
 				}
 
-				if (var9 >= 10) { // L: 57
-					var1 = false; // L: 58
-					break; // L: 59
-				}
+				var3 = new class145(this);
+			}
 
-				if (var2) { // L: 61
-					var9 = -var9;
-				}
+			((class126)var3).vmethod3029(var1); // L: 53
+			this.field1512.addFirst((Node)var3); // L: 54
+		}
 
-				int var8 = var4 * 10 + var9; // L: 62
-				if (var4 != var8 / 10) { // L: 63
-					var1 = false; // L: 64
-					break; // L: 65
-				}
+	} // L: 57
 
-				var4 = var8; // L: 67
-				var3 = true; // L: 68
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lej;I)V",
+		garbageValue = "1939011884"
+	)
+	public void method2781(ClanSettings var1) {
+		if (this.field1513 == var1.field1562 && this.field1511 == var1.field1563) { // L: 60
+			for (class126 var2 = (class126)this.field1512.last(); var2 != null; var2 = (class126)this.field1512.previous()) { // L: 61
+				var2.vmethod3028(var1); // L: 62
 			}
 
-			++var6; // L: 41
+			++var1.field1563; // L: 64
+		} else {
+			throw new RuntimeException("");
 		}
+	} // L: 65
 
-		return var1; // L: 72
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lix;",
+		garbageValue = "828857412"
+	)
+	@Export("ServerPacket_values")
+	public static ServerPacket[] ServerPacket_values() {
+		return new ServerPacket[]{ServerPacket.field3013, ServerPacket.field2931, ServerPacket.field2983, ServerPacket.field2933, ServerPacket.field2934, ServerPacket.field2930, ServerPacket.field2936, ServerPacket.field2937, ServerPacket.field3000, ServerPacket.field3003, ServerPacket.field2940, ServerPacket.field2941, ServerPacket.field2942, ServerPacket.field3006, ServerPacket.field2944, ServerPacket.field2945, ServerPacket.field2946, ServerPacket.field3008, ServerPacket.field2948, ServerPacket.field2949, ServerPacket.field2950, ServerPacket.field2951, ServerPacket.field2961, ServerPacket.field2982, ServerPacket.field2954, ServerPacket.field2955, ServerPacket.field2956, ServerPacket.field2978, ServerPacket.field2958, ServerPacket.field2959, ServerPacket.field3029, ServerPacket.field2938, ServerPacket.field2962, ServerPacket.field2963, ServerPacket.field2964, ServerPacket.field2965, ServerPacket.field3014, ServerPacket.field2986, ServerPacket.field2968, ServerPacket.field3005, ServerPacket.field2997, ServerPacket.field2971, ServerPacket.field2972, ServerPacket.field2932, ServerPacket.field2974, ServerPacket.field2975, ServerPacket.field2976, ServerPacket.field2987, ServerPacket.field2947, ServerPacket.field2979, ServerPacket.field2980, ServerPacket.field2981, ServerPacket.field2957, ServerPacket.field2939, ServerPacket.field2984, ServerPacket.field2985, ServerPacket.field3016, ServerPacket.field3017, ServerPacket.field2943, ServerPacket.field2989, ServerPacket.field2990, ServerPacket.field2991, ServerPacket.field2992, ServerPacket.field2993, ServerPacket.field2994, ServerPacket.field2995, ServerPacket.field2996, ServerPacket.field2952, ServerPacket.field2998, ServerPacket.field2999, ServerPacket.field2953, ServerPacket.field3001, ServerPacket.field3002, ServerPacket.field2960, ServerPacket.field3004, ServerPacket.field2966, ServerPacket.field2988, ServerPacket.field3007, ServerPacket.field2967, ServerPacket.field3009, ServerPacket.field3010, ServerPacket.field3011, ServerPacket.field3012, ServerPacket.field2969, ServerPacket.field2970, ServerPacket.field3015, ServerPacket.field2935, ServerPacket.field3025, ServerPacket.field3018, ServerPacket.field3019, ServerPacket.field3020, ServerPacket.field3021, ServerPacket.field3022, ServerPacket.field3023, ServerPacket.field3024, ServerPacket.field2973, ServerPacket.field3026, ServerPacket.field3027}; // L: 107
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("jr")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "1332153952"
+		descriptor = "(IIIIII)V",
+		garbageValue = "604899148"
 	)
-	static int method2738(int var0, Script var1, boolean var2) {
-		if (var0 != 3700 && var0 != 3701) { // L: 2489
-			if (var0 == 3702) { // L: 2494
-				++class14.Interpreter_intStackSize; // L: 2495
-				return 1; // L: 2496
-			} else {
-				return 2; // L: 2498
-			}
-		} else {
-			--class14.Interpreter_intStackSize; // L: 2490
-			--class295.Interpreter_stringStackSize; // L: 2491
-			return 1; // L: 2492
+	@Export("drawScrollBar")
+	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
+		AbstractWorldMapData.scrollBarSprites[0].drawAt(var0, var1); // L: 11022
+		AbstractWorldMapData.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 11023
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field693); // L: 11024
+		int var5 = var3 * (var3 - 32) / var4; // L: 11025
+		if (var5 < 8) { // L: 11026
+			var5 = 8;
 		}
-	}
+
+		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 11027
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field716); // L: 11028
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field544); // L: 11029
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field544); // L: 11030
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field544); // L: 11031
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field544); // L: 11032
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field509); // L: 11033
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field509); // L: 11034
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field509); // L: 11035
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field509); // L: 11036
+	} // L: 11037
 }
diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java
index 24f6dbb24a..ea3caf81c1 100644
--- a/runescape-client/src/main/java/class13.java
+++ b/runescape-client/src/main/java/class13.java
@@ -1,164 +1,180 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
+import java.io.File;
 import java.io.IOException;
+import java.util.Date;
 import java.util.Hashtable;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 import org.bouncycastle.crypto.tls.DefaultTlsClient;
 import org.bouncycastle.crypto.tls.TlsAuthentication;
 
-@ObfuscatedName("t")
+@ObfuscatedName("h")
 class class13 extends DefaultTlsClient {
+	@ObfuscatedName("t")
+	@Export("cacheDir")
+	public static File cacheDir;
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = 1540402679
+	)
+	@Export("Interpreter_stringStackSize")
+	static int Interpreter_stringStackSize;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lk;"
+		descriptor = "Ld;"
 	)
 	final class12 this$1;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lk;)V"
+		descriptor = "(Ld;)V"
 	)
 	class13(class12 var1) {
-		this.this$1 = var1; // L: 229
+		this.this$1 = var1; // L: 284
 	}
 
 	public Hashtable getClientExtensions() throws IOException {
-		Hashtable var1 = super.getClientExtensions(); // L: 231
-		if (var1 == null) { // L: 232
-			var1 = new Hashtable(); // L: 233
+		Hashtable var1 = super.getClientExtensions(); // L: 287
+		if (var1 == null) { // L: 288
+			var1 = new Hashtable(); // L: 289
 		}
 
-		byte[] var2 = this.this$1.val$host.getBytes(); // L: 235
-		ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 236
-		DataOutputStream var4 = new DataOutputStream(var3); // L: 237
-		var4.writeShort(var2.length + 3); // L: 238
-		var4.writeByte(0); // L: 239
-		var4.writeShort(var2.length); // L: 240
-		var4.write(var2); // L: 241
-		var4.close(); // L: 242
-		var1.put(0, var3.toByteArray()); // L: 243
-		return var1; // L: 244
+		byte[] var2 = this.this$1.val$host.getBytes(); // L: 291
+		ByteArrayOutputStream var3 = new ByteArrayOutputStream(); // L: 292
+		DataOutputStream var4 = new DataOutputStream(var3); // L: 293
+		var4.writeShort(var2.length + 3); // L: 294
+		var4.writeByte(0); // L: 295
+		var4.writeShort(var2.length); // L: 296
+		var4.write(var2); // L: 297
+		var4.close(); // L: 298
+		var1.put(0, var3.toByteArray()); // L: 299
+		return var1; // L: 300
 	}
 
 	public TlsAuthentication getAuthentication() throws IOException {
-		return new class11(this); // L: 248
+		return new class11(this); // L: 305
+	}
+
+	@ObfuscatedName("c")
+	public static String method195(long var0) {
+		Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 31
+		int var2 = Calendar.Calendar_calendar.get(7); // L: 32
+		int var3 = Calendar.Calendar_calendar.get(5); // L: 33
+		int var4 = Calendar.Calendar_calendar.get(2); // L: 34
+		int var5 = Calendar.Calendar_calendar.get(1); // L: 35
+		int var6 = Calendar.Calendar_calendar.get(11); // L: 36
+		int var7 = Calendar.Calendar_calendar.get(12); // L: 37
+		int var8 = Calendar.Calendar_calendar.get(13); // L: 38
+		return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; // L: 39
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;Lnf;I)Lnf;",
-		garbageValue = "261617264"
+		descriptor = "(Ldn;[F[FI)V",
+		garbageValue = "1644015096"
 	)
-	@Export("readStringIntParameters")
-	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
-		int var2 = var0.readUnsignedByte(); // L: 16
-		int var3;
-		if (var1 == null) { // L: 17
-			int var4 = var2 - 1; // L: 21
-			var4 |= var4 >>> 1; // L: 22
-			var4 |= var4 >>> 2; // L: 23
-			var4 |= var4 >>> 4; // L: 24
-			var4 |= var4 >>> 8; // L: 25
-			var4 |= var4 >>> 16; // L: 26
-			var3 = var4 + 1; // L: 27
-			var1 = new IterableNodeHashTable(var3); // L: 30
-		}
+	static void method202(class115 var0, float[] var1, float[] var2) {
+		if (var0 != null) { // L: 224
+			float var3 = var1[3] - var1[0]; // L: 227
+			if ((double)var3 != 0.0D) { // L: 228
+				float var4 = var1[1] - var1[0]; // L: 231
+				float var5 = var1[2] - var1[0]; // L: 232
+				Float var6 = var4 / var3; // L: 233
+				Float var7 = var5 / var3; // L: 234
+				var0.field1398 = var6 == 0.33333334F && var7 == 0.6666667F; // L: 235
+				float var8 = var6; // L: 236
+				float var9 = var7; // L: 237
+				if ((double)var6 < 0.0D) { // L: 238
+					var6 = 0.0F;
+				}
 
-		for (var3 = 0; var3 < var2; ++var3) { // L: 32
-			boolean var7 = var0.readUnsignedByte() == 1; // L: 33
-			int var5 = var0.readMedium(); // L: 34
-			Object var6;
-			if (var7) {
-				var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 36
-			} else {
-				var6 = new IntegerNode(var0.readInt()); // L: 37
-			}
+				if ((double)var7 > 1.0D) { // L: 239
+					var7 = 1.0F;
+				}
 
-			var1.put((Node)var6, (long)var5); // L: 38
-		}
+				if ((double)var6 > 1.0D || var7 < -1.0F) { // L: 240
+					Tile.method3844(var6, var7); // L: 241
+				}
 
-		return var1; // L: 40
-	}
+				if (var6 != var8) { // L: 243
+					var1[1] = var1[0] + var6 * var3; // L: 244
+					if (0.0D != (double)var8) { // L: 245
+						var2[1] = var2[0] + (var2[1] - var2[0]) * var6 / var8; // L: 246
+					}
+				}
 
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "719840218"
-	)
-	static int method173(int var0, Script var1, boolean var2) {
-		Widget var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1391
-		if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1392
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var3)); // L: 1393
-			return 1; // L: 1394
-		} else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1396
-			if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1403
-				if (var3.dataText == null) { // L: 1404
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = "";
-				} else {
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1405
+				if (var7 != var9) { // L: 249
+					var1[2] = var1[0] + var7 * var3; // L: 250
+					if ((double)var9 != 1.0D) { // L: 251
+						var2[2] = (float)((double)var2[3] - (double)(var2[3] - var2[2]) * (1.0D - (double)var7) / (1.0D - (double)var9)); // L: 252
+					}
 				}
 
-				return 1; // L: 1406
-			} else {
-				return 2; // L: 1408
+				var0.field1406 = var1[0]; // L: 255
+				var0.field1394 = var1[3]; // L: 256
+				float var10 = var6; // L: 257
+				float var11 = var7; // L: 258
+				float[] var12 = var0.field1401; // L: 259
+				float var13 = var10 - 0.0F; // L: 261
+				float var14 = var11 - var10; // L: 262
+				float var15 = 1.0F - var11; // L: 263
+				float var16 = var14 - var13; // L: 264
+				var12[3] = var15 - var14 - var16; // L: 265
+				var12[2] = var16 + var16 + var16; // L: 266
+				var12[1] = var13 + var13 + var13; // L: 267
+				var12[0] = 0.0F; // L: 268
+				var13 = var2[0]; // L: 270
+				var14 = var2[1]; // L: 271
+				var15 = var2[2]; // L: 272
+				var16 = var2[3]; // L: 273
+				float[] var17 = var0.field1402; // L: 274
+				float var18 = var14 - var13; // L: 276
+				float var19 = var15 - var14; // L: 277
+				float var20 = var16 - var15; // L: 278
+				float var21 = var19 - var18; // L: 279
+				var17[3] = var20 - var19 - var21; // L: 280
+				var17[2] = var21 + var21 + var21; // L: 281
+				var17[1] = var18 + var18 + var18; // L: 282
+				var17[0] = var13; // L: 283
 			}
-		} else {
-			int var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 1397
-			--var4; // L: 1398
-			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1399
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1400
-			} else {
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = "";
-			}
-
-			return 1; // L: 1401
 		}
-	}
+	} // L: 225 229 285
 
-	@ObfuscatedName("jl")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;IIIIIII)V",
-		garbageValue = "909796147"
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "-18"
 	)
-	static final void method177(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (Client.field465) { // L: 10294
-			Client.alternativeScrollbarWidth = 32;
+	static int method201(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == 3500) { // L: 2111
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2112
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.method398(var3) ? 1 : 0; // L: 2113
+			return 1; // L: 2114
+		} else if (var0 == 3501) { // L: 2116
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2117
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = StructComposition.method3424(var3) ? 1 : 0; // L: 2118
+			return 1; // L: 2119
+		} else if (var0 == 3502) { // L: 2121
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2122
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class117.method2676(var3) ? 1 : 0; // L: 2123
+			return 1; // L: 2124
 		} else {
-			Client.alternativeScrollbarWidth = 0; // L: 10295
-		}
-
-		Client.field465 = false; // L: 10296
-		int var7;
-		if (MouseHandler.MouseHandler_currentButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10297
-			if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10298
-				var0.scrollY -= 4; // L: 10299
-				class184.invalidateWidget(var0); // L: 10300
-			} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10302
-				var0.scrollY += 4; // L: 10303
-				class184.invalidateWidget(var0); // L: 10304
-			} else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10306
-				var7 = var3 * (var3 - 32) / var4; // L: 10307
-				if (var7 < 8) { // L: 10308
-					var7 = 8;
-				}
-
-				int var8 = var6 - var2 - 16 - var7 / 2; // L: 10309
-				int var9 = var3 - 32 - var7; // L: 10310
-				var0.scrollY = var8 * (var4 - var3) / var9; // L: 10311
-				class184.invalidateWidget(var0); // L: 10312
-				Client.field465 = true; // L: 10313
-			}
+			return 2; // L: 2126
 		}
+	}
 
-		if (Client.mouseWheelRotation != 0) { // L: 10316
-			var7 = var0.width; // L: 10317
-			if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10318
-				var0.scrollY += Client.mouseWheelRotation * 45; // L: 10319
-				class184.invalidateWidget(var0); // L: 10320
-			}
+	@ObfuscatedName("jy")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIII)V",
+		garbageValue = "847874180"
+	)
+	@Export("updateRootInterface")
+	static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (class242.loadInterface(var0)) { // L: 11380
+			FriendSystem.updateInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 11381
 		}
-
-	} // L: 10323
+	} // L: 11382
 }
diff --git a/runescape-client/src/main/java/class130.java b/runescape-client/src/main/java/class130.java
index 1d8592b3f8..a24cd5fa2c 100644
--- a/runescape-client/src/main/java/class130.java
+++ b/runescape-client/src/main/java/class130.java
@@ -1,130 +1,75 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ed")
-public class class130 extends class116 {
-	@ObfuscatedName("i")
+@ObfuscatedName("eu")
+public class class130 extends class126 {
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -766044217
+		intValue = 70738287
 	)
-	int field1481;
+	int field1524;
+	@ObfuscatedName("b")
+	byte field1522;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Lda;"
 	)
-	final class119 this$0;
+	final class129 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "(Lda;)V"
 	)
-	class130(class119 var1) {
+	class130(class129 var1) {
 		this.this$0 = var1;
-		this.field1481 = -1; // L: 213
-	} // L: 215
+		this.field1524 = -1; // L: 128
+	} // L: 131
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1481 = var1.readUnsignedShort(); // L: 218
-	} // L: 219
+	void vmethod3029(Buffer var1) {
+		this.field1524 = var1.readUnsignedShort(); // L: 134
+		this.field1522 = var1.readByte(); // L: 135
+	} // L: 136
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2687(this.field1481); // L: 222
-	} // L: 223
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Lii;",
-		garbageValue = "1725898697"
-	)
-	public static class240[] method2748() {
-		return new class240[]{class240.field2782, class240.field2773, class240.field2774, class240.field2775, class240.field2777, class240.field2779, class240.field2778, class240.field2772, class240.field2780, class240.field2781}; // L: 17
-	}
+	void vmethod3028(ClanSettings var1) {
+		var1.method2887(this.field1524, this.field1522); // L: 139
+	} // L: 140
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIB)V",
-		garbageValue = "1"
+		descriptor = "([Lll;IB)Lll;",
+		garbageValue = "5"
 	)
-	static void method2746(int var0, int var1, int var2, int var3) {
-		for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 85
-			if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 86
-				int var5 = 0; // L: 87
-				if (var1 > var4.maxX) { // L: 88
-					var5 += var1 - var4.maxX;
-				} else if (var1 < var4.x) { // L: 89
-					var5 += var4.x - var1;
-				}
-
-				if (var2 > var4.maxY) { // L: 90
-					var5 += var2 - var4.maxY;
-				} else if (var2 < var4.y) { // L: 91
-					var5 += var4.y - var2;
-				}
-
-				if (var5 - 64 <= var4.field773 && class408.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 92
-					var5 -= 64; // L: 103
-					if (var5 < 0) { // L: 104
-						var5 = 0;
-					}
+	@Export("findEnumerated")
+	public static MouseWheel findEnumerated(MouseWheel[] var0, int var1) {
+		MouseWheel[] var2 = var0; // L: 17
 
-					int var6 = (var4.field773 - var5) * class408.clientPreferences.areaSoundEffectsVolume / var4.field773; // L: 105
-					if (var4.stream1 == null) { // L: 106
-						if (var4.soundEffectId >= 0) { // L: 107
-							SoundEffect var7 = SoundEffect.readSoundEffect(class12.archive4, var4.soundEffectId, 0); // L: 108
-							if (var7 != null) { // L: 109
-								RawSound var8 = var7.toRawSound().resample(FontName.decimator); // L: 110
-								RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 111
-								var9.setNumLoops(-1); // L: 112
-								BuddyRankComparator.pcmStreamMixer.addSubStream(var9); // L: 113
-								var4.stream1 = var9; // L: 114
-							}
-						}
-					} else {
-						var4.stream1.method821(var6); // L: 118
-					}
-
-					if (var4.stream2 == null) { // L: 119
-						if (var4.soundEffectIds != null && (var4.field779 -= var3) <= 0) { // L: 120
-							int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 121
-							SoundEffect var12 = SoundEffect.readSoundEffect(class12.archive4, var4.soundEffectIds[var11], 0); // L: 122
-							if (var12 != null) { // L: 123
-								RawSound var13 = var12.toRawSound().resample(FontName.decimator); // L: 124
-								RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 125
-								var10.setNumLoops(0); // L: 126
-								BuddyRankComparator.pcmStreamMixer.addSubStream(var10); // L: 127
-								var4.stream2 = var10; // L: 128
-								var4.field779 = var4.field767 + (int)(Math.random() * (double)(var4.field776 - var4.field767)); // L: 129
-							}
-						}
-					} else {
-						var4.stream2.method821(var6); // L: 134
-						if (!var4.stream2.hasNext()) { // L: 135
-							var4.stream2 = null; // L: 136
-						}
-					}
-				} else {
-					if (var4.stream1 != null) { // L: 93
-						BuddyRankComparator.pcmStreamMixer.removeSubStream(var4.stream1); // L: 94
-						var4.stream1 = null; // L: 95
-					}
-
-					if (var4.stream2 != null) { // L: 97
-						BuddyRankComparator.pcmStreamMixer.removeSubStream(var4.stream2); // L: 98
-						var4.stream2 = null; // L: 99
-					}
-				}
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18
+			MouseWheel var4 = var2[var3]; // L: 19
+			if (var1 == var4.rsOrdinal()) {
+				return var4; // L: 21
 			}
 		}
 
-	} // L: 140
+		return null; // L: 25
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "(Law;I)V",
+		garbageValue = "1459785075"
+	)
+	public static final void method2795(class47 var0) {
+		class11.pcmPlayerProvider = var0; // L: 45
+	} // L: 46
 }
diff --git a/runescape-client/src/main/java/class131.java b/runescape-client/src/main/java/class131.java
index cdfafe89c6..64f43d5725 100644
--- a/runescape-client/src/main/java/class131.java
+++ b/runescape-client/src/main/java/class131.java
@@ -3,109 +3,84 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ej")
-public class class131 extends class116 {
-	@ObfuscatedName("k")
+@ObfuscatedName("et")
+public class class131 extends class126 {
+	@ObfuscatedName("an")
+	@Export("fontHelvetica13")
+	static java.awt.Font fontHelvetica13;
+	@ObfuscatedName("et")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive2")
+	static Archive archive2;
+	@ObfuscatedName("ga")
 	@ObfuscatedGetter(
-		intValue = -1300731739
+		intValue = -366800695
 	)
-	static int field1485;
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "Lkj;"
+	@Export("baseX")
+	static int baseX;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -564677501
+	)
+	int field1526;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = 165982009
 	)
-	@Export("NetCache_currentResponse")
-	public static NetFileRequest NetCache_currentResponse;
-	@ObfuscatedName("i")
+	int field1525;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		longValue = -7049203579552523343L
+		intValue = 1640415355
 	)
-	long field1487;
-	@ObfuscatedName("w")
-	String field1486;
-	@ObfuscatedName("s")
+	int field1528;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -121846283
+		intValue = 1105926385
 	)
-	int field1489;
+	int field1533;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Lda;"
 	)
-	final class119 this$0;
+	final class129 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "(Lda;)V"
 	)
-	class131(class119 var1) {
-		this.this$0 = var1;
-		this.field1487 = -1L; // L: 93
-		this.field1486 = null; // L: 94
-		this.field1489 = 0; // L: 95
-	} // L: 97
+	class131(class129 var1) {
+		this.this$0 = var1; // L: 289
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
 	)
-	void vmethod2847(Buffer var1) {
-		if (var1.readUnsignedByte() != 255) { // L: 100
-			--var1.offset; // L: 101
-			this.field1487 = var1.readLong(); // L: 102
-		}
+	void vmethod3029(Buffer var1) {
+		this.field1526 = var1.readInt(); // L: 292
+		this.field1533 = var1.readInt(); // L: 293
+		this.field1525 = var1.readUnsignedByte(); // L: 294
+		this.field1528 = var1.readUnsignedByte(); // L: 295
+	} // L: 296
 
-		this.field1486 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104
-		this.field1489 = var1.readUnsignedShort(); // L: 105
-	} // L: 106
-
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2655(this.field1487, this.field1486, this.field1489); // L: 109
-	} // L: 110
+	void vmethod3028(ClanSettings var1) {
+		var1.method2860(this.field1526, this.field1533, this.field1525, this.field1528); // L: 299
+	} // L: 300
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-474591339"
+		descriptor = "(IIIIB)I",
+		garbageValue = "-37"
 	)
-	public static void method2753() {
-		try {
-			if (class247.musicPlayerStatus == 1) { // L: 38
-				int var0 = class247.midiPcmStream.method4754(); // L: 39
-				if (var0 > 0 && class247.midiPcmStream.isReady()) { // L: 40
-					var0 -= class247.pcmSampleLength; // L: 41
-					if (var0 < 0) { // L: 42
-						var0 = 0;
-					}
-
-					class247.midiPcmStream.setPcmStreamVolume(var0); // L: 43
-					return; // L: 44
-				}
-
-				class247.midiPcmStream.clear(); // L: 46
-				class247.midiPcmStream.removeAll(); // L: 47
-				if (class128.musicTrackArchive != null) { // L: 48
-					class247.musicPlayerStatus = 2;
-				} else {
-					class247.musicPlayerStatus = 0; // L: 49
-				}
-
-				class14.musicTrack = null; // L: 50
-				class247.soundCache = null; // L: 51
-			}
-		} catch (Exception var2) { // L: 54
-			var2.printStackTrace(); // L: 55
-			class247.midiPcmStream.clear(); // L: 56
-			class247.musicPlayerStatus = 0; // L: 57
-			class14.musicTrack = null; // L: 58
-			class247.soundCache = null; // L: 59
-			class128.musicTrackArchive = null; // L: 60
-		}
-
-	} // L: 62
+	static final int method2802(int var0, int var1, int var2, int var3) {
+		int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 476
+		return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 477
+	}
 }
diff --git a/runescape-client/src/main/java/class132.java b/runescape-client/src/main/java/class132.java
index 5e198df5b1..cca25370d4 100644
--- a/runescape-client/src/main/java/class132.java
+++ b/runescape-client/src/main/java/class132.java
@@ -1,387 +1,97 @@
-import java.io.IOException;
-import java.net.Socket;
-import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("eu")
-public abstract class class132 extends Node {
+@ObfuscatedName("eg")
+public class class132 extends class142 {
+	@ObfuscatedName("o")
+	public static short[] field1540;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1971211247
+	)
+	int field1535;
+	@ObfuscatedName("b")
+	byte field1541;
 	@ObfuscatedName("p")
-	@Export("Widget_loadedInterfaces")
-	public static boolean[] Widget_loadedInterfaces;
-
-	class132() {
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1393452113"
+	@ObfuscatedGetter(
+		intValue = 2049940809
 	)
-	abstract void vmethod2839(Buffer var1);
-
-	@ObfuscatedName("w")
+	int field1536;
+	@ObfuscatedName("m")
+	String field1538;
+	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "(Lea;I)V",
-		garbageValue = "-1714930149"
+		descriptor = "Len;"
 	)
-	abstract void vmethod2838(ClanChannel var1);
+	final class143 this$0;
 
-	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/String;[SIII)V",
-		garbageValue = "-1801380146"
+		descriptor = "(Len;)V"
 	)
-	@Export("sortItemsByName")
-	static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
-		if (var2 < var3) { // L: 13
-			int var4 = (var3 + var2) / 2; // L: 14
-			int var5 = var2; // L: 15
-			String var6 = var0[var4]; // L: 16
-			var0[var4] = var0[var3]; // L: 17
-			var0[var3] = var6;
-			short var7 = var1[var4]; // L: 19
-			var1[var4] = var1[var3]; // L: 20
-			var1[var3] = var7;
-
-			for (int var8 = var2; var8 < var3; ++var8) {
-				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
-					String var9 = var0[var8];
-					var0[var8] = var0[var5];
-					var0[var5] = var9;
-					short var10 = var1[var8];
-					var1[var8] = var1[var5];
-					var1[var5++] = var10;
-				}
-			}
-
-			var0[var3] = var0[var5];
-			var0[var5] = var6;
-			var1[var3] = var1[var5];
-			var1[var5] = var7;
-			sortItemsByName(var0, var1, var2, var5 - 1);
-			sortItemsByName(var0, var1, var5 + 1, var3);
-		}
-
-	}
+	class132(class143 var1) {
+		this.this$0 = var1;
+		this.field1535 = -1; // L: 101
+	} // L: 106
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;Ljava/lang/String;B)I",
-		garbageValue = "101"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "4"
 	)
-	public static int method2769(Buffer var0, String var1) {
-		int var2 = var0.offset; // L: 18
-		int var4 = var1.length(); // L: 21
-		byte[] var5 = new byte[var4]; // L: 22
-
-		for (int var6 = 0; var6 < var4; ++var6) { // L: 23
-			char var7 = var1.charAt(var6); // L: 24
-			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 25
-				var5[var6] = (byte)var7;
-			} else if (var7 == 8364) { // L: 26
-				var5[var6] = -128;
-			} else if (var7 == 8218) { // L: 27
-				var5[var6] = -126;
-			} else if (var7 == 402) { // L: 28
-				var5[var6] = -125;
-			} else if (var7 == 8222) { // L: 29
-				var5[var6] = -124;
-			} else if (var7 == 8230) { // L: 30
-				var5[var6] = -123;
-			} else if (var7 == 8224) { // L: 31
-				var5[var6] = -122;
-			} else if (var7 == 8225) { // L: 32
-				var5[var6] = -121;
-			} else if (var7 == 710) { // L: 33
-				var5[var6] = -120;
-			} else if (var7 == 8240) { // L: 34
-				var5[var6] = -119;
-			} else if (var7 == 352) { // L: 35
-				var5[var6] = -118;
-			} else if (var7 == 8249) { // L: 36
-				var5[var6] = -117;
-			} else if (var7 == 338) { // L: 37
-				var5[var6] = -116;
-			} else if (var7 == 381) { // L: 38
-				var5[var6] = -114;
-			} else if (var7 == 8216) { // L: 39
-				var5[var6] = -111;
-			} else if (var7 == 8217) { // L: 40
-				var5[var6] = -110;
-			} else if (var7 == 8220) { // L: 41
-				var5[var6] = -109;
-			} else if (var7 == 8221) { // L: 42
-				var5[var6] = -108;
-			} else if (var7 == 8226) { // L: 43
-				var5[var6] = -107;
-			} else if (var7 == 8211) { // L: 44
-				var5[var6] = -106;
-			} else if (var7 == 8212) { // L: 45
-				var5[var6] = -105;
-			} else if (var7 == 732) { // L: 46
-				var5[var6] = -104;
-			} else if (var7 == 8482) { // L: 47
-				var5[var6] = -103;
-			} else if (var7 == 353) { // L: 48
-				var5[var6] = -102;
-			} else if (var7 == 8250) { // L: 49
-				var5[var6] = -101;
-			} else if (var7 == 339) { // L: 50
-				var5[var6] = -100;
-			} else if (var7 == 382) { // L: 51
-				var5[var6] = -98;
-			} else if (var7 == 376) { // L: 52
-				var5[var6] = -97;
-			} else {
-				var5[var6] = 63; // L: 53
-			}
-		}
-
-		var0.writeSmartByteShort(var5.length); // L: 58
-		var0.offset += class264.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59
-		return var0.offset - var2; // L: 60
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-79187056"
-	)
-	static int method2766(int var0, Script var1, boolean var2) {
-		int var4 = -1; // L: 617
-		Widget var3;
-		if (var0 >= 2000) { // L: 618
-			var0 -= 1000; // L: 619
-			var4 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 620
-			var3 = UserComparator9.getWidget(var4); // L: 621
-		} else {
-			var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 623
-		}
-
-		if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 624
-			class14.Interpreter_intStackSize -= 2; // L: 625
-			var3.scrollX = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 626
-			if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 627
-				var3.scrollX = var3.scrollWidth - var3.width;
-			}
-
-			if (var3.scrollX < 0) { // L: 628
-				var3.scrollX = 0;
-			}
-
-			var3.scrollY = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 629
-			if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 630
-				var3.scrollY = var3.scrollHeight - var3.height;
-			}
-
-			if (var3.scrollY < 0) { // L: 631
-				var3.scrollY = 0;
-			}
-
-			class184.invalidateWidget(var3); // L: 632
-			return 1; // L: 633
-		} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 635
-			var3.color = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 636
-			class184.invalidateWidget(var3); // L: 637
-			return 1; // L: 638
-		} else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 640
-			var3.fill = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 641
-			class184.invalidateWidget(var3); // L: 642
-			return 1; // L: 643
-		} else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 645
-			var3.transparencyTop = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 646
-			class184.invalidateWidget(var3); // L: 647
-			return 1; // L: 648
-		} else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 650
-			var3.lineWid = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 651
-			class184.invalidateWidget(var3); // L: 652
-			return 1; // L: 653
-		} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 655
-			var3.spriteId2 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 656
-			class184.invalidateWidget(var3); // L: 657
-			return 1; // L: 658
-		} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 660
-			var3.spriteAngle = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 661
-			class184.invalidateWidget(var3); // L: 662
-			return 1; // L: 663
-		} else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 665
-			var3.spriteTiling = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 666
-			class184.invalidateWidget(var3); // L: 667
-			return 1; // L: 668
-		} else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 670
-			var3.modelType = 1; // L: 671
-			var3.modelId = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 672
-			class184.invalidateWidget(var3); // L: 673
-			return 1; // L: 674
-		} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 676
-			class14.Interpreter_intStackSize -= 6; // L: 677
-			var3.modelOffsetX = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 678
-			var3.modelOffsetY = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 679
-			var3.modelAngleX = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 680
-			var3.modelAngleY = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 3]; // L: 681
-			var3.modelAngleZ = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 4]; // L: 682
-			var3.modelZoom = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 5]; // L: 683
-			class184.invalidateWidget(var3); // L: 684
-			return 1; // L: 685
-		} else {
-			int var8;
-			if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 687
-				var8 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 688
-				if (var8 != var3.sequenceId) { // L: 689
-					var3.sequenceId = var8; // L: 690
-					var3.modelFrame = 0; // L: 691
-					var3.modelFrameCycle = 0; // L: 692
-					class184.invalidateWidget(var3); // L: 693
-				}
-
-				return 1; // L: 695
-			} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 697
-				var3.modelOrthog = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 698
-				class184.invalidateWidget(var3); // L: 699
-				return 1; // L: 700
-			} else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 702
-				String var7 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 703
-				if (!var7.equals(var3.text)) { // L: 704
-					var3.text = var7; // L: 705
-					class184.invalidateWidget(var3); // L: 706
-				}
-
-				return 1; // L: 708
-			} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 710
-				var3.fontId = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 711
-				class184.invalidateWidget(var3); // L: 712
-				return 1; // L: 713
-			} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 715
-				class14.Interpreter_intStackSize -= 3; // L: 716
-				var3.textXAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 717
-				var3.textYAlignment = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 718
-				var3.textLineHeight = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 2]; // L: 719
-				class184.invalidateWidget(var3); // L: 720
-				return 1; // L: 721
-			} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 723
-				var3.textShadowed = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 724
-				class184.invalidateWidget(var3); // L: 725
-				return 1; // L: 726
-			} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 728
-				var3.outline = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 729
-				class184.invalidateWidget(var3); // L: 730
-				return 1; // L: 731
-			} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 733
-				var3.spriteShadow = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 734
-				class184.invalidateWidget(var3); // L: 735
-				return 1; // L: 736
-			} else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 738
-				var3.spriteFlipV = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 739
-				class184.invalidateWidget(var3); // L: 740
-				return 1; // L: 741
-			} else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 743
-				var3.spriteFlipH = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 744
-				class184.invalidateWidget(var3); // L: 745
-				return 1; // L: 746
-			} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 748
-				class14.Interpreter_intStackSize -= 2; // L: 749
-				var3.scrollWidth = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 750
-				var3.scrollHeight = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 751
-				class184.invalidateWidget(var3); // L: 752
-				if (var4 != -1 && var3.type == 0) { // L: 753
-					MouseRecorder.revalidateWidgetScroll(WorldMapSection1.Widget_interfaceComponents[var4 >> 16], var3, false);
-				}
-
-				return 1; // L: 754
-			} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 756
-				class92.resumePauseWidget(var3.id, var3.childIndex); // L: 757
-				Client.meslayerContinueWidget = var3; // L: 758
-				class184.invalidateWidget(var3); // L: 759
-				return 1; // L: 760
-			} else if (var0 == 1122) { // L: 762
-				var3.spriteId = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 763
-				class184.invalidateWidget(var3); // L: 764
-				return 1; // L: 765
-			} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 767
-				var3.color2 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 768
-				class184.invalidateWidget(var3); // L: 769
-				return 1; // L: 770
-			} else if (var0 == 1124) { // L: 772
-				var3.transparencyBot = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 773
-				class184.invalidateWidget(var3); // L: 774
-				return 1; // L: 775
-			} else if (var0 == 1125) { // L: 777
-				var8 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 778
-				FillMode var6 = (FillMode)UserComparator4.findEnumerated(Ignored.FillMode_values(), var8); // L: 779
-				if (var6 != null) { // L: 780
-					var3.fillMode = var6; // L: 781
-					class184.invalidateWidget(var3); // L: 782
-				}
-
-				return 1; // L: 784
-			} else {
-				boolean var5;
-				if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 786
-					var5 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 787
-					var3.field3085 = var5; // L: 788
-					return 1; // L: 789
-				} else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 791
-					var5 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 792
-					var3.modelTransparency = var5; // L: 793
-					return 1; // L: 794
-				} else if (var0 == 1128) { // L: 796
-					class14.Interpreter_intStackSize -= 2; // L: 797
-					return 1; // L: 798
-				} else {
-					return 2; // L: 800
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("al")
+	void vmethod3022(Buffer var1) {
+		this.field1535 = var1.readUnsignedShort(); // L: 109
+		this.field1541 = var1.readByte(); // L: 110
+		this.field1536 = var1.readUnsignedShort(); // L: 111
+		var1.readLong(); // L: 112
+		this.field1538 = var1.readStringCp1252NullTerminated(); // L: 113
+	} // L: 114
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/net/Socket;III)Lmp;",
-		garbageValue = "-2068064468"
+		descriptor = "(Lei;B)V",
+		garbageValue = "40"
 	)
-	public static AbstractSocket method2767(Socket var0, int var1, int var2) throws IOException {
-		return new BufferedNetSocket(var0, var1, var2); // L: 10
-	}
-
-	@ObfuscatedName("gu")
+	void vmethod3021(ClanChannel var1) {
+		ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1535); // L: 117
+		var2.rank = this.field1541; // L: 118
+		var2.world = this.field1536; // L: 119
+		var2.username = new Username(this.field1538); // L: 120
+	} // L: 121
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lcx;ZI)V",
-		garbageValue = "1479413091"
+		descriptor = "(I)V",
+		garbageValue = "420472721"
 	)
-	@Export("addPlayerToScene")
-	static void addPlayerToScene(Player var0, boolean var1) {
-		if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 5060
-			var0.isUnanimated = false; // L: 5061
-			if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 5062 5063
-				var0.isUnanimated = true;
-			}
-
-			int var2 = var0.x >> 7; // L: 5065
-			int var3 = var0.y >> 7; // L: 5066
-			if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 5067
-				long var4 = PacketBuffer.calculateTag(0, 0, 0, false, var0.index); // L: 5068
-				if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 5069
-					var0.isUnanimated = false; // L: 5070
-					var0.tileHeight = class392.getTileHeight(var0.x, var0.y, GrandExchangeOfferTotalQuantityComparator.Client_plane); // L: 5071
-					var0.playerCycle = Client.cycle; // L: 5072
-					GameBuild.scene.addNullableObject(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 5073
-				} else {
-					if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 5076
-						if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 5077
-							return;
-						}
-
-						Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 5078
-					}
-
-					var0.tileHeight = class392.getTileHeight(var0.x, var0.y, GrandExchangeOfferTotalQuantityComparator.Client_plane); // L: 5080
-					var0.playerCycle = Client.cycle; // L: 5081
-					GameBuild.scene.drawEntity(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 5082
-				}
-			}
+	static void method2810() {
+		if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 124
+			KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 125
+			KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 126
+			KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 127
+			KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 128
+			KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 129
+			KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 130
+			KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 131
+			KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 132
+			KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 133
+			KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 134
+			KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 135
+			KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 136
+		} else {
+			KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 139
+			KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 140
+			KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 141
+			KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 142
+			KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 143
+			KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 144
+			KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 145
+			KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 146
+			KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 147
+			KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 148
+			KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 149
+			KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 150
 		}
 
-	} // L: 5086
+	} // L: 152
 }
diff --git a/runescape-client/src/main/java/class133.java b/runescape-client/src/main/java/class133.java
index a4e5eaa20e..9562913868 100644
--- a/runescape-client/src/main/java/class133.java
+++ b/runescape-client/src/main/java/class133.java
@@ -3,91 +3,66 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eh")
-public class class133 {
-	@ObfuscatedName("ue")
+@ObfuscatedName("ek")
+public class class133 extends class126 {
+	@ObfuscatedName("ez")
 	@ObfuscatedSignature(
-		descriptor = "Lng;"
+		descriptor = "Lkz;"
 	)
-	@Export("worldMap")
-	static WorldMap worldMap;
-	@ObfuscatedName("d")
+	@Export("archive15")
+	static Archive archive15;
+	@ObfuscatedName("fv")
 	@ObfuscatedGetter(
-		intValue = 47036115
+		intValue = -1093073267
 	)
-	static int field1499;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		longValue = 2363637495059539125L
-	)
-	long field1494;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		longValue = 132184713843925465L
-	)
-	long field1492;
-	@ObfuscatedName("s")
+	@Export("js5Port")
+	static int js5Port;
+	@ObfuscatedName("c")
+	boolean field1543;
+	@ObfuscatedName("b")
+	byte field1547;
+	@ObfuscatedName("p")
+	byte field1544;
+	@ObfuscatedName("m")
+	byte field1542;
+	@ObfuscatedName("t")
+	byte field1546;
+	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lkf;"
+		descriptor = "Lda;"
 	)
-	IterableNodeDeque field1500;
+	final class129 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lda;)V"
 	)
-	public class133(Buffer var1) {
-		this.field1492 = -1L; // L: 10
-		this.field1500 = new IterableNodeDeque(); // L: 11
-		this.method2770(var1); // L: 19
-	} // L: 20
+	class133(class129 var1) {
+		this.this$0 = var1; // L: 248
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-354049752"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
 	)
-	void method2770(Buffer var1) {
-		this.field1494 = var1.readLong(); // L: 23
-		this.field1492 = var1.readLong(); // L: 24
-
-		for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 25 26 36
-			Object var3;
-			if (var2 == 1) { // L: 28
-				var3 = new class128(this);
-			} else if (var2 == 4) {
-				var3 = new class139(this); // L: 29
-			} else if (var2 == 3) { // L: 30
-				var3 = new class124(this);
-			} else if (var2 == 2) { // L: 31
-				var3 = new class122(this);
-			} else {
-				if (var2 != 5) { // L: 32
-					throw new RuntimeException(""); // L: 33
-				}
+	void vmethod3029(Buffer var1) {
+		this.field1543 = var1.readUnsignedByte() == 1; // L: 251
+		this.field1547 = var1.readByte(); // L: 252
+		this.field1544 = var1.readByte(); // L: 253
+		this.field1542 = var1.readByte(); // L: 254
+		this.field1546 = var1.readByte(); // L: 255
+	} // L: 256
 
-				var3 = new class129(this);
-			}
-
-			((class132)var3).vmethod2839(var1); // L: 34
-			this.field1500.addFirst((Node)var3); // L: 35
-		}
-
-	} // L: 38
-
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lea;I)V",
-		garbageValue = "1626491571"
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
 	)
-	public void method2777(ClanChannel var1) {
-		if (this.field1494 == var1.key && this.field1492 == var1.field1514) { // L: 41
-			for (class132 var2 = (class132)this.field1500.last(); var2 != null; var2 = (class132)this.field1500.previous()) { // L: 42
-				var2.vmethod2838(var1); // L: 43
-			}
-
-			++var1.field1514; // L: 45
-		} else {
-			throw new RuntimeException("");
-		}
-	} // L: 46
+	void vmethod3028(ClanSettings var1) {
+		var1.allowGuests = this.field1543; // L: 259
+		var1.field1567 = this.field1547; // L: 260
+		var1.field1568 = this.field1544; // L: 261
+		var1.field1569 = this.field1542; // L: 262
+		var1.field1570 = this.field1546; // L: 263
+	} // L: 264
 }
diff --git a/runescape-client/src/main/java/class134.java b/runescape-client/src/main/java/class134.java
index 60ff38d1eb..f97bd6c215 100644
--- a/runescape-client/src/main/java/class134.java
+++ b/runescape-client/src/main/java/class134.java
@@ -1,85 +1,103 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ec")
-public class class134 extends class116 {
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("Widget_fontsArchive")
-	static AbstractArchive Widget_fontsArchive;
-	@ObfuscatedName("of")
-	@ObfuscatedGetter(
-		intValue = -1434510609
-	)
-	@Export("widgetDragDuration")
-	static int widgetDragDuration;
-	@ObfuscatedName("i")
+@ObfuscatedName("ef")
+public class class134 extends class142 {
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1414305525
+		intValue = 642006289
 	)
-	int field1501;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = 1373462747
-	)
-	int field1502;
+	int field1552;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Len;"
 	)
-	final class119 this$0;
+	final class143 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "(Len;)V"
 	)
-	class134(class119 var1) {
-		this.this$0 = var1; // L: 271
-	}
+	class134(class143 var1) {
+		this.this$0 = var1;
+		this.field1552 = -1; // L: 82
+	} // L: 84
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "4"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1501 = var1.readInt(); // L: 274
-		this.field1502 = var1.readInt(); // L: 275
-	} // L: 276
+	void vmethod3022(Buffer var1) {
+		this.field1552 = var1.readUnsignedShort(); // L: 87
+		var1.readUnsignedByte(); // L: 88
+		if (var1.readUnsignedByte() != 255) { // L: 89
+			--var1.offset; // L: 90
+			var1.readLong(); // L: 91
+		}
+
+	} // L: 93
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(Lei;B)V",
+		garbageValue = "40"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2664(this.field1501, this.field1502); // L: 279
-	} // L: 280
+	void vmethod3021(ClanChannel var1) {
+		var1.removeMember(this.field1552); // L: 96
+	} // L: 97
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "-1799070908"
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "1"
 	)
-	public static String method2788(CharSequence var0) {
-		String var1 = FontName.base37DecodeLong(WorldMapScaleHandler.method4096(var0)); // L: 57
-		if (var1 == null) {
-			var1 = ""; // L: 58
-		}
+	static int method2824(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3533
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class143.getWindowedMode(); // L: 3534
+			return 1; // L: 3535
+		} else {
+			int var3;
+			if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3537
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3538
+				if (var3 == 1 || var3 == 2) { // L: 3539
+					Occluder.setWindowedMode(var3);
+				}
 
-		return var1; // L: 59
-	}
+				return 1; // L: 3540
+			} else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3542
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = SecureRandomFuture.clientPreferences.windowMode; // L: 3543
+				return 1; // L: 3544
+			} else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3546
+				if (var0 == 5310) { // L: 3554
+					--IsaacCipher.Interpreter_intStackSize; // L: 3555
+					return 1; // L: 3556
+				} else if (var0 == 5311) { // L: 3558
+					IsaacCipher.Interpreter_intStackSize -= 2; // L: 3559
+					return 1; // L: 3560
+				} else if (var0 == 5312) { // L: 3562
+					--IsaacCipher.Interpreter_intStackSize; // L: 3563
+					return 1; // L: 3564
+				} else if (var0 == 5350) { // L: 3566
+					class13.Interpreter_stringStackSize -= 2; // L: 3567
+					--IsaacCipher.Interpreter_intStackSize; // L: 3568
+					return 1; // L: 3569
+				} else if (var0 == 5351) { // L: 3571
+					--class13.Interpreter_stringStackSize; // L: 3572
+					return 1; // L: 3573
+				} else {
+					return 2; // L: 3575
+				}
+			} else {
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3547
+				if (var3 == 1 || var3 == 2) { // L: 3548
+					SecureRandomFuture.clientPreferences.windowMode = var3; // L: 3549
+					class127.savePreferences(); // L: 3550
+				}
 
-	@ObfuscatedName("gc")
-	@ObfuscatedSignature(
-		descriptor = "(S)I",
-		garbageValue = "7395"
-	)
-	@Export("getWindowedMode")
-	static int getWindowedMode() {
-		return Client.isResizable ? 2 : 1; // L: 4552
+				return 1; // L: 3552
+			}
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java
index f51f333927..9e2e14f03d 100644
--- a/runescape-client/src/main/java/class135.java
+++ b/runescape-client/src/main/java/class135.java
@@ -1,209 +1,71 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ek")
-public class class135 extends class116 {
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 696533307
-	)
-	int field1509;
+@ObfuscatedName("ev")
+public class class135 extends class126 {
+	@ObfuscatedName("c")
+	String field1555;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Lda;"
 	)
-	final class119 this$0;
+	final class129 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "(Lda;)V"
 	)
-	class135(class119 var1) {
-		this.this$0 = var1;
-		this.field1509 = -1; // L: 144
-	} // L: 146
+	class135(class129 var1) {
+		this.this$0 = var1; // L: 229
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1509 = var1.readUnsignedShort(); // L: 149
-	} // L: 150
+	void vmethod3029(Buffer var1) {
+		this.field1555 = var1.readStringCp1252NullTerminated(); // L: 232
+		var1.readInt(); // L: 233
+	} // L: 234
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2661(this.field1509); // L: 153
-	} // L: 154
+	void vmethod3028(ClanSettings var1) {
+		var1.name = this.field1555; // L: 237
+	} // L: 238
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)[Le;",
-		garbageValue = "588193737"
+		descriptor = "(I)V",
+		garbageValue = "-877203069"
 	)
-	public static class6[] method2797() {
-		return new class6[]{class6.field14}; // L: 12
-	}
+	public static final void method2832() {
+		ViewportMouse.ViewportMouse_isInViewport = false; // L: 95
+		ViewportMouse.ViewportMouse_entityCount = 0; // L: 96
+	} // L: 97
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("lz")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)Ljava/lang/String;",
-		garbageValue = "1"
+		descriptor = "(III)V",
+		garbageValue = "1487689727"
 	)
-	static String method2795(byte[] var0, int var1, int var2) {
-		StringBuilder var3 = new StringBuilder(); // L: 62
-
-		for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 63
-			int var5 = var0[var4] & 255; // L: 64
-			var3.append(class317.field3854[var5 >>> 2]); // L: 65
-			if (var4 < var2 - 1) { // L: 66
-				int var6 = var0[var4 + 1] & 255; // L: 67
-				var3.append(class317.field3854[(var5 & 3) << 4 | var6 >>> 4]); // L: 68
-				if (var4 < var2 - 2) { // L: 69
-					int var7 = var0[var4 + 2] & 255; // L: 70
-					var3.append(class317.field3854[(var6 & 15) << 2 | var7 >>> 6]).append(class317.field3854[var7 & 63]); // L: 71
-				} else {
-					var3.append(class317.field3854[(var6 & 15) << 2]).append("="); // L: 73
-				}
-			} else {
-				var3.append(class317.field3854[(var5 & 3) << 4]).append("=="); // L: 75
+	static final void method2831(int var0, int var1) {
+		ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : UserComparator5.guestClanChannel; // L: 12510
+		if (var2 != null && var1 >= 0 && var1 < var2.method2990()) { // L: 12511
+			ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 12512
+			if (var3.rank == -1) {
+				String var4 = var3.username.getName(); // L: 12514
+				PacketWriter var5 = Client.packetWriter; // L: 12515
+				PacketBufferNode var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2875, var5.isaacCipher); // L: 12516
+				var6.packetBuffer.writeByte(3 + class116.stringCp1252NullTerminatedByteSize(var4)); // L: 12517
+				var6.packetBuffer.writeByte(var0); // L: 12518
+				var6.packetBuffer.writeShort(var1); // L: 12519
+				var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 12520
+				var5.addNode(var6); // L: 12521
 			}
 		}
-
-		return var3.toString(); // L: 77
-	}
-
-	@ObfuscatedName("gi")
-	@ObfuscatedSignature(
-		descriptor = "(Lct;II)V",
-		garbageValue = "-1430389228"
-	)
-	@Export("updateActorSequence")
-	static final void updateActorSequence(Actor var0, int var1) {
-		int var2;
-		int var3;
-		int var4;
-		if (var0.field1131 >= Client.cycle) { // L: 4255
-			var2 = Math.max(1, var0.field1131 - Client.cycle); // L: 4256
-			var3 = var0.field1087 * 64 + var0.field1083 * 128; // L: 4257
-			var4 = var0.field1087 * 64 + var0.field1100 * 128; // L: 4258
-			var0.x += (var3 - var0.x) / var2; // L: 4259
-			var0.y += (var4 - var0.y) / var2; // L: 4260
-			var0.field1085 = 0; // L: 4261
-			var0.orientation = var0.field1133; // L: 4262
-		} else if (var0.field1132 >= Client.cycle) { // L: 4264
-			if (var0.field1132 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > MouseHandler.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4265
-				var2 = var0.field1132 - var0.field1131; // L: 4266
-				var3 = Client.cycle - var0.field1131; // L: 4267
-				var4 = var0.field1087 * 64 + var0.field1083 * 128; // L: 4268
-				int var5 = var0.field1087 * 64 + var0.field1100 * 128; // L: 4269
-				int var6 = var0.field1087 * 64 + var0.field1128 * 128; // L: 4270
-				int var7 = var0.field1087 * 64 + var0.field1130 * 128; // L: 4271
-				var0.x = (var3 * var6 + var4 * (var2 - var3)) / var2; // L: 4272
-				var0.y = (var3 * var7 + var5 * (var2 - var3)) / var2; // L: 4273
-			}
-
-			var0.field1085 = 0; // L: 4275
-			var0.orientation = var0.field1133; // L: 4276
-			var0.rotation = var0.orientation; // L: 4277
-		} else {
-			class138.method2836(var0); // L: 4279
-		}
-
-		if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4280
-			var0.sequence = -1; // L: 4281
-			var0.spotAnimation = -1; // L: 4282
-			var0.field1131 = 0; // L: 4283
-			var0.field1132 = 0; // L: 4284
-			var0.x = var0.field1087 * 64 + var0.pathX[0] * 128; // L: 4285
-			var0.y = var0.pathY[0] * 128 + var0.field1087 * 64; // L: 4286
-			var0.method2165(); // L: 4287
-		}
-
-		if (HealthBarDefinition.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4289 4290
-			var0.sequence = -1; // L: 4291
-			var0.spotAnimation = -1; // L: 4292
-			var0.field1131 = 0; // L: 4293
-			var0.field1132 = 0; // L: 4294
-			var0.x = var0.pathX[0] * 128 + var0.field1087 * 64; // L: 4295
-			var0.y = var0.field1087 * 64 + var0.pathY[0] * 128; // L: 4296
-			var0.method2165(); // L: 4297
-		}
-
-		WorldMapManager.method3814(var0); // L: 4300
-		ClientPacket.method4709(var0); // L: 4301
-	} // L: 4302
-
-	@ObfuscatedName("jb")
-	@ObfuscatedSignature(
-		descriptor = "([Ljf;II)V",
-		garbageValue = "1696973469"
-	)
-	@Export("drawModelComponents")
-	static final void drawModelComponents(Widget[] var0, int var1) {
-		for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11320
-			Widget var3 = var0[var2]; // L: 11321
-			if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !Varcs.isComponentHidden(var3))) { // L: 11322 11323 11324
-				if (var3.type == 0) { // L: 11325
-					if (!var3.isIf3 && Varcs.isComponentHidden(var3) && var3 != WorldMapData_0.mousedOverWidgetIf1) { // L: 11326
-						continue;
-					}
-
-					drawModelComponents(var0, var3.id); // L: 11327
-					if (var3.children != null) { // L: 11328
-						drawModelComponents(var3.children, var3.id);
-					}
-
-					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11329
-					if (var4 != null) { // L: 11330
-						DirectByteArrayCopier.method5179(var4.group);
-					}
-				}
-
-				if (var3.type == 6) { // L: 11332
-					int var5;
-					if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11333
-						boolean var7 = class128.runCs1(var3); // L: 11334
-						if (var7) { // L: 11336
-							var5 = var3.sequenceId2;
-						} else {
-							var5 = var3.sequenceId; // L: 11337
-						}
-
-						if (var5 != -1) { // L: 11338
-							SequenceDefinition var6 = MouseHandler.SequenceDefinition_get(var5); // L: 11339
-
-							for (var3.modelFrameCycle += Client.field531; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class184.invalidateWidget(var3)) { // L: 11340 11341 11348
-								var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11342
-								++var3.modelFrame; // L: 11343
-								if (var3.modelFrame >= var6.frameIds.length) { // L: 11344
-									var3.modelFrame -= var6.frameCount; // L: 11345
-									if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11346
-										var3.modelFrame = 0;
-									}
-								}
-							}
-						}
-					}
-
-					if (var3.field3165 != 0 && !var3.isIf3) { // L: 11352
-						int var8 = var3.field3165 >> 16; // L: 11353
-						var5 = var3.field3165 << 16 >> 16; // L: 11354
-						var8 *= Client.field531; // L: 11355
-						var5 *= Client.field531; // L: 11356
-						var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11357
-						var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11358
-						class184.invalidateWidget(var3); // L: 11359
-					}
-				}
-			}
-		}
-
-	} // L: 11363
+	} // L: 12513 12522
 }
diff --git a/runescape-client/src/main/java/class136.java b/runescape-client/src/main/java/class136.java
new file mode 100644
index 0000000000..c517e6490d
--- /dev/null
+++ b/runescape-client/src/main/java/class136.java
@@ -0,0 +1,145 @@
+import java.awt.Component;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ep")
+public class class136 extends class126 {
+	@ObfuscatedName("gr")
+	@ObfuscatedSignature(
+		descriptor = "Llx;"
+	)
+	@Export("fontBold12")
+	static Font fontBold12;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -1563253375
+	)
+	int field1556;
+	@ObfuscatedName("b")
+	String field1557;
+	// $FF: synthetic field
+	@ObfuscatedSignature(
+		descriptor = "Lda;"
+	)
+	final class129 this$0;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lda;)V"
+	)
+	class136(class129 var1) {
+		this.this$0 = var1; // L: 323
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
+	)
+	void vmethod3029(Buffer var1) {
+		this.field1556 = var1.readInt(); // L: 326
+		this.field1557 = var1.readStringCp1252NullTerminated(); // L: 327
+	} // L: 328
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
+	)
+	void vmethod3028(ClanSettings var1) {
+		var1.method2873(this.field1556, this.field1557); // L: 331
+	} // L: 332
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/awt/Component;I)V",
+		garbageValue = "-54146153"
+	)
+	static void method2839(Component var0) {
+		var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37
+		var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38
+		var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39
+	} // L: 40
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(CB)Z",
+		garbageValue = "-10"
+	)
+	public static boolean method2842(char var0) {
+		if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45
+			if (var0 != 0) { // L: 46
+				char[] var1 = class328.cp1252AsciiExtension; // L: 48
+
+				for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49
+					char var3 = var1[var2]; // L: 50
+					if (var0 == var3) { // L: 52
+						return true;
+					}
+				}
+			}
+
+			return false; // L: 57
+		} else {
+			return true;
+		}
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Z",
+		garbageValue = "-56"
+	)
+	public static boolean method2841(int var0) {
+		return (var0 >> 20 & 1) != 0; // L: 25
+	}
+
+	@ObfuscatedName("ic")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/String;I)V",
+		garbageValue = "429003988"
+	)
+	static void method2840(int var0, String var1) {
+		int var2 = Players.Players_count; // L: 9822
+		int[] var3 = Players.Players_indices; // L: 9823
+		boolean var4 = false; // L: 9824
+		Username var5 = new Username(var1, class194.loginType); // L: 9825
+
+		for (int var6 = 0; var6 < var2; ++var6) { // L: 9826
+			Player var7 = Client.players[var3[var6]]; // L: 9827
+			if (var7 != null && var7 != class340.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 9828
+				PacketBufferNode var8;
+				if (var0 == 1) { // L: 9829
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2887, Client.packetWriter.isaacCipher); // L: 9831
+					var8.packetBuffer.method7343(0); // L: 9832
+					var8.packetBuffer.method7398(var3[var6]); // L: 9833
+					Client.packetWriter.addNode(var8); // L: 9834
+				} else if (var0 == 4) { // L: 9836
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2807, Client.packetWriter.isaacCipher); // L: 9838
+					var8.packetBuffer.method7349(var3[var6]); // L: 9839
+					var8.packetBuffer.writeByte(0); // L: 9840
+					Client.packetWriter.addNode(var8); // L: 9841
+				} else if (var0 == 6) { // L: 9843
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2863, Client.packetWriter.isaacCipher); // L: 9845
+					var8.packetBuffer.method7390(0); // L: 9846
+					var8.packetBuffer.method7398(var3[var6]); // L: 9847
+					Client.packetWriter.addNode(var8); // L: 9848
+				} else if (var0 == 7) { // L: 9850
+					var8 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2906, Client.packetWriter.isaacCipher); // L: 9852
+					var8.packetBuffer.method7362(0); // L: 9853
+					var8.packetBuffer.method7493(var3[var6]); // L: 9854
+					Client.packetWriter.addNode(var8); // L: 9855
+				}
+
+				var4 = true; // L: 9857
+				break;
+			}
+		}
+
+		if (!var4) { // L: 9861
+			class194.addGameMessage(4, "", "Unable to find " + var1);
+		}
+
+	} // L: 9862
+}
diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java
deleted file mode 100644
index 5703b028ce..0000000000
--- a/runescape-client/src/main/java/class137.java
+++ /dev/null
@@ -1,52 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("em")
-public class class137 {
-	@ObfuscatedName("b")
-	public static short[][] field1519;
-
-	@ObfuscatedName("kk")
-	@ObfuscatedSignature(
-		descriptor = "(Ljf;I)V",
-		garbageValue = "644093212"
-	)
-	static final void method2826(Widget var0) {
-		int var1 = var0.contentType; // L: 11468
-		if (var1 == 324) { // L: 11469
-			if (Client.field737 == -1) { // L: 11470
-				Client.field737 = var0.spriteId2; // L: 11471
-				Client.field581 = var0.spriteId; // L: 11472
-			}
-
-			if (Client.playerAppearance.isFemale) { // L: 11474
-				var0.spriteId2 = Client.field737;
-			} else {
-				var0.spriteId2 = Client.field581; // L: 11475
-			}
-
-		} else if (var1 == 325) { // L: 11478
-			if (Client.field737 == -1) { // L: 11479
-				Client.field737 = var0.spriteId2; // L: 11480
-				Client.field581 = var0.spriteId; // L: 11481
-			}
-
-			if (Client.playerAppearance.isFemale) { // L: 11483
-				var0.spriteId2 = Client.field581;
-			} else {
-				var0.spriteId2 = Client.field737; // L: 11484
-			}
-
-		} else if (var1 == 327) { // L: 11487
-			var0.modelAngleX = 150; // L: 11488
-			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11489
-			var0.modelType = 5; // L: 11490
-			var0.modelId = 0; // L: 11491
-		} else if (var1 == 328) { // L: 11494
-			var0.modelAngleX = 150; // L: 11495
-			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11496
-			var0.modelType = 5; // L: 11497
-			var0.modelId = 1; // L: 11498
-		}
-	} // L: 11476 11485 11492 11499 11501
-}
diff --git a/runescape-client/src/main/java/class138.java b/runescape-client/src/main/java/class138.java
index 622c134d18..4fb3253961 100644
--- a/runescape-client/src/main/java/class138.java
+++ b/runescape-client/src/main/java/class138.java
@@ -3,222 +3,64 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ep")
-public class class138 extends class116 {
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
+@ObfuscatedName("er")
+public class class138 extends class142 {
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = -539577351
 	)
-	@Export("NetCache_responseArchiveBuffer")
-	public static Buffer NetCache_responseArchiveBuffer;
-	@ObfuscatedName("i")
+	@Export("loginBoxCenter")
+	static int loginBoxCenter;
+	@ObfuscatedName("c")
+	String field1589;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		longValue = 449318605468420723L
+		intValue = -318281505
 	)
-	long field1525;
-	@ObfuscatedName("w")
-	String field1524;
+	int field1588;
+	@ObfuscatedName("p")
+	byte field1590;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Len;"
 	)
-	final class119 this$0;
+	final class143 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "(Len;)V"
 	)
-	class138(class119 var1) {
+	class138(class143 var1) {
 		this.this$0 = var1;
-		this.field1525 = -1L; // L: 194
-		this.field1524 = null; // L: 195
-	} // L: 197
+		this.field1589 = null; // L: 55
+	} // L: 59
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "4"
 	)
-	void vmethod2847(Buffer var1) {
-		if (var1.readUnsignedByte() != 255) { // L: 200
-			--var1.offset; // L: 201
-			this.field1525 = var1.readLong(); // L: 202
+	void vmethod3022(Buffer var1) {
+		if (var1.readUnsignedByte() != 255) { // L: 62
+			--var1.offset; // L: 63
+			var1.readLong(); // L: 64
 		}
 
-		this.field1524 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204
-	} // L: 205
+		this.field1589 = var1.readStringCp1252NullTerminatedOrNull(); // L: 66
+		this.field1588 = var1.readUnsignedShort(); // L: 67
+		this.field1590 = var1.readByte(); // L: 68
+		var1.readLong(); // L: 69
+	} // L: 70
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(Lei;B)V",
+		garbageValue = "40"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2658(this.field1525, this.field1524); // L: 208
-	} // L: 209
-
-	@ObfuscatedName("a")
-	public static int method2827(long var0) {
-		return (int)(var0 >>> 0 & 127L); // L: 64
-	}
-
-	@ObfuscatedName("gd")
-	@ObfuscatedSignature(
-		descriptor = "(Lct;I)V",
-		garbageValue = "-1003389326"
-	)
-	static final void method2836(Actor var0) {
-		var0.movementSequence = var0.idleSequence; // L: 4305
-		if (var0.pathLength == 0) { // L: 4306
-			var0.field1085 = 0; // L: 4307
-		} else {
-			if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4310
-				SequenceDefinition var1 = MouseHandler.SequenceDefinition_get(var0.sequence); // L: 4311
-				if (var0.field1144 > 0 && var1.field1963 == 0) { // L: 4312
-					++var0.field1085; // L: 4313
-					return; // L: 4314
-				}
-
-				if (var0.field1144 <= 0 && var1.field1956 == 0) { // L: 4316
-					++var0.field1085; // L: 4317
-					return; // L: 4318
-				}
-			}
-
-			int var10 = var0.x; // L: 4321
-			int var2 = var0.y; // L: 4322
-			int var3 = var0.field1087 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4323
-			int var4 = var0.field1087 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4324
-			if (var10 < var3) { // L: 4325
-				if (var2 < var4) { // L: 4326
-					var0.orientation = 1280;
-				} else if (var2 > var4) { // L: 4327
-					var0.orientation = 1792;
-				} else {
-					var0.orientation = 1536; // L: 4328
-				}
-			} else if (var10 > var3) { // L: 4330
-				if (var2 < var4) { // L: 4331
-					var0.orientation = 768;
-				} else if (var2 > var4) { // L: 4332
-					var0.orientation = 256;
-				} else {
-					var0.orientation = 512; // L: 4333
-				}
-			} else if (var2 < var4) { // L: 4335
-				var0.orientation = 1024;
-			} else if (var2 > var4) { // L: 4336
-				var0.orientation = 0;
-			}
-
-			byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 4337
-			if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 4338
-				int var6 = var0.orientation - var0.rotation & 2047; // L: 4345
-				if (var6 > 1024) { // L: 4346
-					var6 -= 2048;
-				}
-
-				int var7 = var0.walkBackSequence; // L: 4347
-				if (var6 >= -256 && var6 <= 256) { // L: 4348
-					var7 = var0.walkSequence;
-				} else if (var6 >= 256 && var6 < 768) { // L: 4349
-					var7 = var0.walkRightSequence;
-				} else if (var6 >= -768 && var6 <= -256) { // L: 4350
-					var7 = var0.walkLeftSequence;
-				}
-
-				if (var7 == -1) { // L: 4351
-					var7 = var0.walkSequence;
-				}
-
-				var0.movementSequence = var7; // L: 4352
-				int var8 = 4; // L: 4353
-				boolean var9 = true; // L: 4354
-				if (var0 instanceof NPC) { // L: 4355
-					var9 = ((NPC)var0).definition.isClickable;
-				}
-
-				if (var9) { // L: 4356
-					if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1138 != 0) { // L: 4357
-						var8 = 2;
-					}
-
-					if (var0.pathLength > 2) { // L: 4358
-						var8 = 6;
-					}
-
-					if (var0.pathLength > 3) { // L: 4359
-						var8 = 8;
-					}
-
-					if (var0.field1085 > 0 && var0.pathLength > 1) { // L: 4360
-						var8 = 8; // L: 4361
-						--var0.field1085; // L: 4362
-					}
-				} else {
-					if (var0.pathLength > 1) { // L: 4366
-						var8 = 6;
-					}
-
-					if (var0.pathLength > 2) { // L: 4367
-						var8 = 8;
-					}
-
-					if (var0.field1085 > 0 && var0.pathLength > 1) { // L: 4368
-						var8 = 8; // L: 4369
-						--var0.field1085; // L: 4370
-					}
-				}
-
-				if (var5 == 2) { // L: 4373
-					var8 <<= 1;
-				}
-
-				if (var8 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { // L: 4374
-					var0.movementSequence = var0.runSequence;
-				}
-
-				if (var10 != var3 || var4 != var2) { // L: 4375
-					if (var10 < var3) { // L: 4376
-						var0.x += var8; // L: 4377
-						if (var0.x > var3) { // L: 4378
-							var0.x = var3;
-						}
-					} else if (var10 > var3) { // L: 4380
-						var0.x -= var8; // L: 4381
-						if (var0.x < var3) { // L: 4382
-							var0.x = var3;
-						}
-					}
-
-					if (var2 < var4) { // L: 4384
-						var0.y += var8; // L: 4385
-						if (var0.y > var4) { // L: 4386
-							var0.y = var4;
-						}
-					} else if (var2 > var4) { // L: 4388
-						var0.y -= var8; // L: 4389
-						if (var0.y < var4) { // L: 4390
-							var0.y = var4;
-						}
-					}
-				}
-
-				if (var3 == var0.x && var4 == var0.y) { // L: 4393
-					--var0.pathLength; // L: 4394
-					if (var0.field1144 > 0) { // L: 4395
-						--var0.field1144;
-					}
-				}
-
-			} else {
-				var0.x = var3; // L: 4339
-				var0.y = var4; // L: 4340
-				--var0.pathLength; // L: 4341
-				if (var0.field1144 > 0) { // L: 4342
-					--var0.field1144;
-				}
-
-			}
-		}
-	} // L: 4308 4343 4397
+	void vmethod3021(ClanChannel var1) {
+		ClanChannelMember var2 = new ClanChannelMember(); // L: 73
+		var2.username = new Username(this.field1589); // L: 74
+		var2.world = this.field1588; // L: 75
+		var2.rank = this.field1590; // L: 76
+		var1.addMember(var2); // L: 77
+	} // L: 78
 }
diff --git a/runescape-client/src/main/java/class139.java b/runescape-client/src/main/java/class139.java
index d768b82d85..e30d553c28 100644
--- a/runescape-client/src/main/java/class139.java
+++ b/runescape-client/src/main/java/class139.java
@@ -1,484 +1,116 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("el")
-public class class139 extends class132 {
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "Low;"
+@ObfuscatedName("em")
+public class class139 extends class142 {
+	@ObfuscatedName("iz")
+	@ObfuscatedGetter(
+		intValue = -723386135
 	)
-	@Export("rightTitleSprite")
-	static SpritePixels rightTitleSprite;
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
+	@Export("selectedItemId")
+	static int selectedItemId;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1906943517
 	)
-	@Export("NetCache_reference")
-	public static Buffer NetCache_reference;
-	@ObfuscatedName("i")
-	String field1526;
-	@ObfuscatedName("w")
-	byte field1527;
-	@ObfuscatedName("s")
-	byte field1528;
+	int field1595;
+	@ObfuscatedName("b")
+	byte field1594;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -1562134813
+	)
+	int field1593;
+	@ObfuscatedName("m")
+	String field1596;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Leh;"
+		descriptor = "Len;"
 	)
-	final class133 this$0;
+	final class143 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Leh;)V"
+		descriptor = "(Len;)V"
 	)
-	class139(class133 var1) {
-		this.this$0 = var1; // L: 155
-	}
+	class139(class143 var1) {
+		this.this$0 = var1;
+		this.field1595 = -1; // L: 125
+	} // L: 130
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-1393452113"
+		descriptor = "(Lpi;B)V",
+		garbageValue = "4"
 	)
-	void vmethod2839(Buffer var1) {
-		this.field1526 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158
-		if (this.field1526 != null) { // L: 159
-			var1.readUnsignedByte(); // L: 160
-			this.field1527 = var1.readByte(); // L: 161
-			this.field1528 = var1.readByte(); // L: 162
-		}
-
-	} // L: 164
+	void vmethod3022(Buffer var1) {
+		var1.readUnsignedByte(); // L: 133
+		this.field1595 = var1.readUnsignedShort(); // L: 134
+		this.field1594 = var1.readByte(); // L: 135
+		this.field1593 = var1.readUnsignedShort(); // L: 136
+		var1.readLong(); // L: 137
+		this.field1596 = var1.readStringCp1252NullTerminated(); // L: 138
+		var1.readUnsignedByte(); // L: 139
+	} // L: 140
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lea;I)V",
-		garbageValue = "-1714930149"
+		descriptor = "(Lei;B)V",
+		garbageValue = "40"
 	)
-	void vmethod2838(ClanChannel var1) {
-		var1.name = this.field1526; // L: 167
-		if (this.field1526 != null) { // L: 168
-			var1.field1516 = this.field1527; // L: 169
-			var1.field1511 = this.field1528; // L: 170
-		}
-
-	} // L: 172
+	void vmethod3021(ClanChannel var1) {
+		ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field1595); // L: 143
+		var2.rank = this.field1594; // L: 144
+		var2.world = this.field1593; // L: 145
+		var2.username = new Username(this.field1596); // L: 146
+	} // L: 147
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-907104971"
+		descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lqg;"
 	)
-	static int method2837(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2133
-			if (class112.friendSystem.field765 == 0) { // L: 2134
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -2;
-			} else if (class112.friendSystem.field765 == 1) { // L: 2135
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class112.friendSystem.friendsList.getSize(); // L: 2136
-			}
-
-			return 1; // L: 2137
+	@Export("newRunException")
+	public static RunException newRunException(Throwable var0, String var1) {
+		RunException var2;
+		if (var0 instanceof RunException) { // L: 57
+			var2 = (RunException)var0; // L: 58
+			var2.message = var2.message + ' ' + var1; // L: 59
 		} else {
-			int var3;
-			if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2140
-				if (class112.friendSystem.method1757() && var3 >= 0 && var3 < class112.friendSystem.friendsList.getSize()) { // L: 2141
-					Friend var8 = (Friend)class112.friendSystem.friendsList.get(var3); // L: 2142
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2143
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2144
-				} else {
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2147
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2148
-				}
-
-				return 1; // L: 2150
-			} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2153
-				if (class112.friendSystem.method1757() && var3 >= 0 && var3 < class112.friendSystem.friendsList.getSize()) { // L: 2154
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((Buddy)class112.friendSystem.friendsList.get(var3)).world; // L: 2155
-				} else {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2157
-				}
-
-				return 1; // L: 2158
-			} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2161
-				if (class112.friendSystem.method1757() && var3 >= 0 && var3 < class112.friendSystem.friendsList.getSize()) { // L: 2162
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((Buddy)class112.friendSystem.friendsList.get(var3)).rank; // L: 2163
-				} else {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2165
-				}
-
-				return 1; // L: 2166
-			} else {
-				String var5;
-				if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
-					var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2169
-					int var6 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2170
-					class11.method107(var5, var6); // L: 2171
-					return 1; // L: 2172
-				} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
-					var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2175
-					class112.friendSystem.addFriend(var5); // L: 2176
-					return 1; // L: 2177
-				} else if (var0 == ScriptOpcodes.FRIEND_DEL) {
-					var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2180
-					class112.friendSystem.removeFriend(var5); // L: 2181
-					return 1; // L: 2182
-				} else if (var0 == ScriptOpcodes.IGNORE_ADD) {
-					var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2185
-					class112.friendSystem.addIgnore(var5); // L: 2186
-					return 1; // L: 2187
-				} else if (var0 == ScriptOpcodes.IGNORE_DEL) {
-					var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2190
-					class112.friendSystem.removeIgnore(var5); // L: 2191
-					return 1; // L: 2192
-				} else if (var0 == ScriptOpcodes.FRIEND_TEST) {
-					var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2195
-					var5 = WallDecoration.method4643(var5); // L: 2196
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class112.friendSystem.isFriended(new Username(var5, GrandExchangeOfferUnitPriceComparator.loginType), false) ? 1 : 0; // L: 2197
-					return 1; // L: 2198
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
-					if (AbstractArchive.friendsChat != null) { // L: 2201
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = AbstractArchive.friendsChat.name; // L: 2202
-					} else {
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2204
-					}
-
-					return 1; // L: 2205
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
-					if (AbstractArchive.friendsChat != null) { // L: 2208
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = AbstractArchive.friendsChat.getSize(); // L: 2209
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2211
-					}
-
-					return 1; // L: 2212
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2215
-					if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize()) { // L: 2216
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = AbstractArchive.friendsChat.get(var3).getUsername().getName(); // L: 2217
-					} else {
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2219
-					}
-
-					return 1; // L: 2220
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2223
-					if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize()) { // L: 2224
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((Buddy)AbstractArchive.friendsChat.get(var3)).getWorld(); // L: 2225
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2227
-					}
-
-					return 1; // L: 2228
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2231
-					if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize()) { // L: 2232
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ((Buddy)AbstractArchive.friendsChat.get(var3)).rank; // L: 2233
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2235
-					}
-
-					return 1; // L: 2236
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = AbstractArchive.friendsChat != null ? AbstractArchive.friendsChat.minKick : 0; // L: 2239
-					return 1; // L: 2240
-				} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
-					var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2243
-					Player.clanKickUser(var5); // L: 2244
-					return 1; // L: 2245
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = AbstractArchive.friendsChat != null ? AbstractArchive.friendsChat.rank * 1093956825 * 1525992297 : 0; // L: 2248
-					return 1; // L: 2249
-				} else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
-					var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2252
-					GrandExchangeOfferOwnWorldComparator.Clan_joinChat(var5); // L: 2253
-					return 1; // L: 2254
-				} else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
-					class21.Clan_leaveChat(); // L: 2257
-					return 1; // L: 2258
-				} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
-					if (!class112.friendSystem.method1757()) { // L: 2261
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1;
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class112.friendSystem.ignoreList.getSize(); // L: 2262
-					}
-
-					return 1; // L: 2263
-				} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2266
-					if (class112.friendSystem.method1757() && var3 >= 0 && var3 < class112.friendSystem.ignoreList.getSize()) { // L: 2267
-						Ignored var4 = (Ignored)class112.friendSystem.ignoreList.get(var3); // L: 2268
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2269
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2270
-					} else {
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2273
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2274
-					}
-
-					return 1; // L: 2276
-				} else if (var0 == ScriptOpcodes.IGNORE_TEST) {
-					var5 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 2279
-					var5 = WallDecoration.method4643(var5); // L: 2280
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class112.friendSystem.isIgnored(new Username(var5, GrandExchangeOfferUnitPriceComparator.loginType)) ? 1 : 0; // L: 2281
-					return 1; // L: 2282
-				} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2285
-					if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize() && AbstractArchive.friendsChat.get(var3).getUsername().equals(HealthBarDefinition.localPlayer.username)) { // L: 2286
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2287
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2289
-					}
-
-					return 1; // L: 2290
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
-					if (AbstractArchive.friendsChat != null && AbstractArchive.friendsChat.owner != null) { // L: 2293
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = AbstractArchive.friendsChat.owner; // L: 2294
-					} else {
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 2296
-					}
-
-					return 1; // L: 2297
-				} else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2300
-					if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize() && ((ClanMate)AbstractArchive.friendsChat.get(var3)).isFriend()) { // L: 2301
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2302
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2304
-					}
-
-					return 1; // L: 2305
-				} else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
-					if (var0 == 3628) {
-						class112.friendSystem.friendsList.removeComparator(); // L: 2316
-						return 1; // L: 2317
-					} else {
-						boolean var7;
-						if (var0 == 3629) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2320
-							class112.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2321
-							return 1; // L: 2322
-						} else if (var0 == 3630) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2325
-							class112.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2326
-							return 1; // L: 2327
-						} else if (var0 == 3631) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2330
-							class112.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2331
-							return 1; // L: 2332
-						} else if (var0 == 3632) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2335
-							class112.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2336
-							return 1; // L: 2337
-						} else if (var0 == 3633) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2340
-							class112.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2341
-							return 1; // L: 2342
-						} else if (var0 == 3634) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2345
-							class112.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2346
-							return 1; // L: 2347
-						} else if (var0 == 3635) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2350
-							class112.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2351
-							return 1; // L: 2352
-						} else if (var0 == 3636) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2355
-							class112.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2356
-							return 1; // L: 2357
-						} else if (var0 == 3637) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2360
-							class112.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2361
-							return 1; // L: 2362
-						} else if (var0 == 3638) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2365
-							class112.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2366
-							return 1; // L: 2367
-						} else if (var0 == 3639) {
-							class112.friendSystem.friendsList.sort(); // L: 2370
-							return 1; // L: 2371
-						} else if (var0 == 3640) {
-							class112.friendSystem.ignoreList.removeComparator(); // L: 2374
-							return 1; // L: 2375
-						} else if (var0 == 3641) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2378
-							class112.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2379
-							return 1; // L: 2380
-						} else if (var0 == 3642) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2383
-							class112.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2384
-							return 1; // L: 2385
-						} else if (var0 == 3643) {
-							class112.friendSystem.ignoreList.sort(); // L: 2388
-							return 1; // L: 2389
-						} else if (var0 == 3644) {
-							if (AbstractArchive.friendsChat != null) { // L: 2392
-								AbstractArchive.friendsChat.removeComparator(); // L: 2393
-							}
-
-							return 1; // L: 2395
-						} else if (var0 == 3645) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2398
-							if (AbstractArchive.friendsChat != null) { // L: 2399
-								AbstractArchive.friendsChat.addComparator(new UserComparator1(var7)); // L: 2400
-							}
-
-							return 1; // L: 2402
-						} else if (var0 == 3646) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2405
-							if (AbstractArchive.friendsChat != null) { // L: 2406
-								AbstractArchive.friendsChat.addComparator(new UserComparator2(var7)); // L: 2407
-							}
-
-							return 1; // L: 2409
-						} else if (var0 == 3647) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2412
-							if (AbstractArchive.friendsChat != null) { // L: 2413
-								AbstractArchive.friendsChat.addComparator(new UserComparator3(var7)); // L: 2414
-							}
-
-							return 1; // L: 2416
-						} else if (var0 == 3648) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2419
-							if (AbstractArchive.friendsChat != null) { // L: 2420
-								AbstractArchive.friendsChat.addComparator(new UserComparator4(var7)); // L: 2421
-							}
-
-							return 1; // L: 2423
-						} else if (var0 == 3649) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2426
-							if (AbstractArchive.friendsChat != null) { // L: 2427
-								AbstractArchive.friendsChat.addComparator(new UserComparator5(var7)); // L: 2428
-							}
-
-							return 1; // L: 2430
-						} else if (var0 == 3650) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2433
-							if (AbstractArchive.friendsChat != null) { // L: 2434
-								AbstractArchive.friendsChat.addComparator(new UserComparator6(var7)); // L: 2435
-							}
-
-							return 1; // L: 2437
-						} else if (var0 == 3651) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2440
-							if (AbstractArchive.friendsChat != null) { // L: 2441
-								AbstractArchive.friendsChat.addComparator(new UserComparator7(var7)); // L: 2442
-							}
-
-							return 1; // L: 2444
-						} else if (var0 == 3652) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2447
-							if (AbstractArchive.friendsChat != null) { // L: 2448
-								AbstractArchive.friendsChat.addComparator(new UserComparator8(var7)); // L: 2449
-							}
-
-							return 1; // L: 2451
-						} else if (var0 == 3653) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2454
-							if (AbstractArchive.friendsChat != null) { // L: 2455
-								AbstractArchive.friendsChat.addComparator(new UserComparator9(var7)); // L: 2456
-							}
-
-							return 1; // L: 2458
-						} else if (var0 == 3654) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2461
-							if (AbstractArchive.friendsChat != null) { // L: 2462
-								AbstractArchive.friendsChat.addComparator(new UserComparator10(var7)); // L: 2463
-							}
-
-							return 1; // L: 2465
-						} else if (var0 == 3655) {
-							if (AbstractArchive.friendsChat != null) { // L: 2468
-								AbstractArchive.friendsChat.sort(); // L: 2469
-							}
+			var2 = new RunException(var0, var1); // L: 61
+		}
 
-							return 1; // L: 2471
-						} else if (var0 == 3656) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2474
-							class112.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2475
-							return 1; // L: 2476
-						} else if (var0 == 3657) {
-							var7 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1; // L: 2479
-							if (AbstractArchive.friendsChat != null) { // L: 2480
-								AbstractArchive.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2481
-							}
+		return var2; // L: 62
+	}
 
-							return 1; // L: 2483
-						} else {
-							return 2; // L: 2485
-						}
-					}
-				} else {
-					var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 2308
-					if (AbstractArchive.friendsChat != null && var3 < AbstractArchive.friendsChat.getSize() && ((ClanMate)AbstractArchive.friendsChat.get(var3)).isIgnored()) { // L: 2309
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 1; // L: 2310
-					} else {
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 2312
-					}
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lbr;",
+		garbageValue = "-1096898317"
+	)
+	@Export("Messages_getMessage")
+	static Message Messages_getMessage(int var0) {
+		return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40
+	}
 
-					return 1; // L: 2313
-				}
-			}
-		}
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "1312744051"
+	)
+	static final int method2932(int var0, int var1) {
+		int var2 = KeyHandler.method367(var0 - 1, var1 - 1) + KeyHandler.method367(var0 + 1, var1 - 1) + KeyHandler.method367(var0 - 1, 1 + var1) + KeyHandler.method367(var0 + 1, var1 + 1); // L: 481
+		int var3 = KeyHandler.method367(var0 - 1, var1) + KeyHandler.method367(var0 + 1, var1) + KeyHandler.method367(var0, var1 - 1) + KeyHandler.method367(var0, 1 + var1); // L: 482
+		int var4 = KeyHandler.method367(var0, var1); // L: 483
+		return var2 / 16 + var3 / 8 + var4 / 4; // L: 484
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-1892812009"
+		descriptor = "(I)Z",
+		garbageValue = "341496897"
 	)
-	static int method2845(int var0, Script var1, boolean var2) {
-		if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4340
-			if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4344
-				if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4348
-					if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4352
-						if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4356
-							if (var0 != 7031 && var0 != 7032) { // L: 4360
-								if (var0 == 7033) { // L: 4365
-									--class295.Interpreter_stringStackSize; // L: 4366
-									return 1; // L: 4367
-								} else if (var0 != 7036 && var0 != 7037) { // L: 4369
-									if (var0 == 7038) { // L: 4373
-										--class14.Interpreter_intStackSize; // L: 4374
-										return 1; // L: 4375
-									} else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4377
-										return 2; // L: 4381
-									} else {
-										--class14.Interpreter_intStackSize; // L: 4378
-										return 1; // L: 4379
-									}
-								} else {
-									class14.Interpreter_intStackSize -= 2; // L: 4370
-									return 1; // L: 4371
-								}
-							} else {
-								--class295.Interpreter_stringStackSize; // L: 4361
-								--class14.Interpreter_intStackSize; // L: 4362
-								return 1; // L: 4363
-							}
-						} else {
-							--class14.Interpreter_intStackSize; // L: 4357
-							return 1; // L: 4358
-						}
-					} else {
-						class14.Interpreter_intStackSize -= 2; // L: 4353
-						return 1; // L: 4354
-					}
-				} else {
-					class14.Interpreter_intStackSize -= 2; // L: 4349
-					return 1; // L: 4350
-				}
-			} else {
-				class14.Interpreter_intStackSize -= 3; // L: 4345
-				return 1; // L: 4346
-			}
-		} else {
-			class14.Interpreter_intStackSize -= 5; // L: 4341
-			return 1; // L: 4342
-		}
+	static final boolean method2931() {
+		return ViewportMouse.ViewportMouse_isInViewport; // L: 100
 	}
 }
diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java
index 6908271d2a..3485c42660 100644
--- a/runescape-client/src/main/java/class14.java
+++ b/runescape-client/src/main/java/class14.java
@@ -2,1189 +2,189 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("l")
+@ObfuscatedName("g")
 public class class14 {
-	@ObfuscatedName("x")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1849354153
+		intValue = -691857245
 	)
-	@Export("Interpreter_intStackSize")
-	static int Interpreter_intStackSize;
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Liv;"
-	)
-	@Export("musicTrack")
-	public static MusicTrack musicTrack;
-	@ObfuscatedName("ex")
-	@ObfuscatedSignature(
-		descriptor = "Lkd;"
-	)
-	@Export("archive12")
-	static Archive archive12;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -255968433
-	)
-	final int field65;
-	@ObfuscatedName("w")
-	final String field62;
-	@ObfuscatedName("s")
-	final ThreadFactory field68;
-	@ObfuscatedName("a")
-	final ThreadPoolExecutor field64;
+	final int field80;
+	@ObfuscatedName("b")
+	final String field79;
+	@ObfuscatedName("p")
+	final ThreadFactory field81;
+	@ObfuscatedName("m")
+	final ThreadPoolExecutor field82;
 
 	public class14(String var1, int var2, int var3) {
-		this.field62 = var1; // L: 15
-		this.field65 = var2; // L: 16
-		this.field68 = new class16(this); // L: 17
-		this.field64 = this.method179(var3); // L: 18
-	} // L: 19
+		this.field79 = var1; // L: 15
+		this.field80 = var2; // L: 16
+		this.field81 = new class16(this); // L: 17
+		this.field82 = this.method203(var3);
+	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/util/concurrent/ThreadPoolExecutor;",
-		garbageValue = "2016209231"
+		garbageValue = "-1684515517"
 	)
-	final ThreadPoolExecutor method179(int var1) {
-		return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field65), this.field68); // L: 22
+	final ThreadPoolExecutor method203(int var1) {
+		return new ThreadPoolExecutor(var1, var1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(this.field80), this.field81);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lx;B)Ld;",
-		garbageValue = "-121"
+		descriptor = "(Lo;I)Lf;",
+		garbageValue = "-977382928"
 	)
-	public class19 method187(class10 var1) {
-		if (this.field64.getQueue().remainingCapacity() <= 0) { // L: 26
-			System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field64.getCorePoolSize() + " Queue capacity " + this.field65); // L: 27
-			return new class19("Queue full"); // L: 28
+	public class19 method213(class10 var1) {
+		if (this.field82.getQueue().remainingCapacity() <= 0) { // L: 26
+			System.err.println("REST thread pool queue is empty\r\nThread pool size " + this.field82.getCorePoolSize() + " Queue capacity " + this.field80);
+			return new class19("Queue full");
 		} else {
-			class19 var2 = new class19(this.field64.submit(new class20(this, var1))); // L: 30
-			return var2; // L: 31
+			class19 var2 = new class19(this.field82.submit(new class20(this, var1))); // L: 30
+			return var2;
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "35"
+		descriptor = "(I)V",
+		garbageValue = "1972637620"
 	)
-	public final void method181() {
+	public final void method206() {
 		try {
-			this.field64.shutdown(); // L: 36
-		} catch (Exception var2) { // L: 38
-			System.err.println("Error shutting down RestRequestService\r\n" + var2); // L: 39
+			this.field82.shutdown();
+		} catch (Exception var2) {
+			System.err.println("Error shutting down RestRequestService\r\n" + var2);
 		}
 
-	} // L: 41
-
-	@ObfuscatedName("am")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "27"
-	)
-	static int method190(int var0, Script var1, boolean var2) {
-		int var3;
-		int var4;
-		if (var0 == ScriptOpcodes.ADD) { // L: 2831
-			Interpreter_intStackSize -= 2; // L: 2832
-			var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2833
-			var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2834
-			Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 + var4; // L: 2835
-			return 1; // L: 2836
-		} else if (var0 == ScriptOpcodes.SUB) { // L: 2838
-			Interpreter_intStackSize -= 2; // L: 2839
-			var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2840
-			var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2841
-			Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 - var4; // L: 2842
-			return 1; // L: 2843
-		} else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2845
-			Interpreter_intStackSize -= 2; // L: 2846
-			var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2847
-			var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2848
-			Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 * var4; // L: 2849
-			return 1; // L: 2850
-		} else if (var0 == ScriptOpcodes.DIV) { // L: 2852
-			Interpreter_intStackSize -= 2; // L: 2853
-			var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2854
-			var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2855
-			Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 / var4; // L: 2856
-			return 1; // L: 2857
-		} else if (var0 == ScriptOpcodes.RANDOM) { // L: 2859
-			var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; // L: 2860
-			Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2861
-			return 1; // L: 2862
-		} else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2864
-			var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; // L: 2865
-			Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2866
-			return 1; // L: 2867
-		} else {
-			int var5;
-			int var6;
-			int var7;
-			if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2869
-				Interpreter_intStackSize -= 5; // L: 2870
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2871
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2872
-				var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 2873
-				var6 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 3]; // L: 2874
-				var7 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 4]; // L: 2875
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 2876
-				return 1; // L: 2877
-			} else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2879
-				Interpreter_intStackSize -= 2; // L: 2880
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2881
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2882
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 2883
-				return 1; // L: 2884
-			} else if (var0 == ScriptOpcodes.SETBIT) { // L: 2886
-				Interpreter_intStackSize -= 2; // L: 2887
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2888
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2889
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2890
-				return 1; // L: 2891
-			} else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2893
-				Interpreter_intStackSize -= 2; // L: 2894
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2895
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2896
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2897
-				return 1; // L: 2898
-			} else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2900
-				Interpreter_intStackSize -= 2; // L: 2901
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2902
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2903
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2904
-				return 1; // L: 2905
-			} else if (var0 == ScriptOpcodes.MOD) { // L: 2907
-				Interpreter_intStackSize -= 2; // L: 2908
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2909
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2910
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 % var4; // L: 2911
-				return 1; // L: 2912
-			} else if (var0 == ScriptOpcodes.POW) { // L: 2914
-				Interpreter_intStackSize -= 2; // L: 2915
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2916
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2917
-				if (var3 == 0) { // L: 2918
-					Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0;
-				} else {
-					Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2919
-				}
-
-				return 1; // L: 2920
-			} else if (var0 == ScriptOpcodes.INVPOW) { // L: 2922
-				Interpreter_intStackSize -= 2; // L: 2923
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2924
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2925
-				if (var3 == 0) { // L: 2926
-					Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0; // L: 2927
-					return 1; // L: 2928
-				} else {
-					switch(var4) { // L: 2930
-					case 0:
-						Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2943
-						break; // L: 2944
-					case 1:
-						Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3; // L: 2958
-						break;
-					case 2:
-						Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2933
-						break;
-					case 3:
-						Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2953
-						break; // L: 2954
-					case 4:
-						Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2948
-						break; // L: 2949
-					default:
-						Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2938
-					}
-
-					return 1; // L: 2962
-				}
-			} else if (var0 == ScriptOpcodes.AND) { // L: 2964
-				Interpreter_intStackSize -= 2; // L: 2965
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2966
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2967
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 & var4; // L: 2968
-				return 1; // L: 2969
-			} else if (var0 == ScriptOpcodes.OR) { // L: 2971
-				Interpreter_intStackSize -= 2; // L: 2972
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2973
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2974
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 | var4; // L: 2975
-				return 1; // L: 2976
-			} else if (var0 == ScriptOpcodes.SCALE) { // L: 2978
-				Interpreter_intStackSize -= 3; // L: 2979
-				long var9 = (long)Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2980
-				long var11 = (long)Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2981
-				long var13 = (long)Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 2982
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); // L: 2983
-				return 1; // L: 2984
-			} else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 2986
-				var3 = Tile.method4199(Interpreter.Interpreter_intStack[--Interpreter_intStackSize]); // L: 2987
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3; // L: 2988
-				return 1; // L: 2989
-			} else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 2991
-				Interpreter_intStackSize -= 2; // L: 2992
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 2993
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 2994
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2995
-				return 1; // L: 2996
-			} else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 2998
-				Interpreter_intStackSize -= 3; // L: 2999
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3000
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3001
-				var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 3002
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.method1162(var3, var4, var5); // L: 3003
-				return 1; // L: 3004
-			} else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3006
-				Interpreter_intStackSize -= 3; // L: 3007
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3008
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3009
-				var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 3010
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = MusicPatch.method4949(var3, var4, var5); // L: 3011
-				return 1; // L: 3012
-			} else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3014
-				Interpreter_intStackSize -= 3; // L: 3015
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3016
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3017
-				var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 3018
-				var6 = 31 - var5; // L: 3019
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; // L: 3020
-				return 1; // L: 3021
-			} else if (var0 == 4030) { // L: 3023
-				Interpreter_intStackSize -= 4; // L: 3024
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3025
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3026
-				var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; // L: 3027
-				var6 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 3]; // L: 3028
-				var3 = MusicPatch.method4949(var3, var5, var6); // L: 3029
-				var7 = class123.method2619(var6 - var5 + 1); // L: 3030
-				if (var4 > var7) { // L: 3031
-					var4 = var7;
-				}
-
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3032
-				return 1; // L: 3033
-			} else if (var0 == 4032) { // L: 3035
-				Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1] = class269.method5190(Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1]); // L: 3036
-				return 1; // L: 3037
-			} else if (var0 == 4033) { // L: 3039
-				Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1] = UserComparator6.method2512(Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1]); // L: 3040
-				return 1; // L: 3041
-			} else if (var0 == 4034) { // L: 3043
-				Interpreter_intStackSize -= 2; // L: 3044
-				var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; // L: 3045
-				var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; // L: 3046
-				var5 = Language.method5533(var3, var4); // L: 3047
-				Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var5; // L: 3048
-				return 1; // L: 3049
-			} else if (var0 == 4035) { // L: 3051
-				Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[Interpreter_intStackSize - 1]); // L: 3052
-				return 1; // L: 3053
-			} else {
-				return 2; // L: 3055
-			}
-		}
 	}
 
-	@ObfuscatedName("fs")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-376967441"
-	)
-	@Export("playPcmPlayers")
-	static final void playPcmPlayers() {
-		if (ScriptEvent.pcmPlayer1 != null) { // L: 4044
-			ScriptEvent.pcmPlayer1.run();
-		}
-
-		if (HealthBar.pcmPlayer0 != null) { // L: 4045
-			HealthBar.pcmPlayer0.run();
-		}
-
-	} // L: 4046
-
-	@ObfuscatedName("hs")
-	@ObfuscatedSignature(
-		descriptor = "(Lcn;I)V",
-		garbageValue = "394697143"
-	)
-	static final void method180(PendingSpawn var0) {
-		long var1 = 0L; // L: 7499
-		int var3 = -1; // L: 7500
-		int var4 = 0; // L: 7501
-		int var5 = 0; // L: 7502
-		if (var0.type == 0) { // L: 7503
-			var1 = GameBuild.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
-		}
-
-		if (var0.type == 1) { // L: 7504
-			var1 = GameBuild.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
-		}
-
-		if (var0.type == 2) { // L: 7505
-			var1 = GameBuild.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
-		}
-
-		if (var0.type == 3) { // L: 7506
-			var1 = GameBuild.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y);
-		}
-
-		if (0L != var1) { // L: 7507
-			int var6 = GameBuild.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7508
-			var3 = class21.Entity_unpackID(var1); // L: 7509
-			var4 = var6 & 31; // L: 7510
-			var5 = var6 >> 6 & 3; // L: 7511
-		}
-
-		var0.objectId = var3; // L: 7513
-		var0.field1076 = var4; // L: 7514
-		var0.field1075 = var5; // L: 7515
-	} // L: 7516
-
-	@ObfuscatedName("id")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V",
-		garbageValue = "-1644375573"
+		descriptor = "(Ldn;FB)F",
+		garbageValue = "1"
 	)
-	@Export("menuAction")
-	static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) {
-		if (var2 >= 2000) { // L: 8273
-			var2 -= 2000;
-		}
-
-		PacketBufferNode var8;
-		if (var2 == 1) { // L: 8274
-			Client.mouseCrossX = var6; // L: 8717
-			Client.mouseCrossY = var7; // L: 8718
-			Client.mouseCrossColor = 2; // L: 8719
-			Client.mouseCrossState = 0; // L: 8720
-			Client.destinationX = var0; // L: 8721
-			Client.destinationY = var1; // L: 8722
-			var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2729, Client.packetWriter.isaacCipher); // L: 8724
-			var8.packetBuffer.method7001(ReflectionCheck.selectedItemSlot); // L: 8725
-			var8.packetBuffer.method7001(DefaultsGroup.baseY + var1); // L: 8726
-			var8.packetBuffer.method7010(MouseHandler.selectedItemWidget); // L: 8727
-			var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8728
-			var8.packetBuffer.method7001(var3); // L: 8729
-			var8.packetBuffer.method7003(SoundSystem.selectedItemId); // L: 8730
-			var8.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8731
-			Client.packetWriter.addNode(var8); // L: 8732
-		} else if (var2 == 2) {
-			Client.mouseCrossX = var6; // L: 8457
-			Client.mouseCrossY = var7; // L: 8458
-			Client.mouseCrossColor = 2; // L: 8459
-			Client.mouseCrossState = 0; // L: 8460
-			Client.destinationX = var0; // L: 8461
-			Client.destinationY = var1; // L: 8462
-			var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2738, Client.packetWriter.isaacCipher); // L: 8463
-			var8.packetBuffer.method7126(FontName.selectedSpellWidget); // L: 8464
-			var8.packetBuffer.method6962(Client.selectedSpellChildIndex); // L: 8465
-			var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8466
-			var8.packetBuffer.method7001(Client.field627); // L: 8467
-			var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8468
-			var8.packetBuffer.method6962(var3); // L: 8469
-			var8.packetBuffer.method7003(DefaultsGroup.baseY + var1); // L: 8470
-			Client.packetWriter.addNode(var8); // L: 8471
-		} else if (var2 == 3) {
-			Client.mouseCrossX = var6; // L: 8894
-			Client.mouseCrossY = var7; // L: 8895
-			Client.mouseCrossColor = 2; // L: 8896
-			Client.mouseCrossState = 0; // L: 8897
-			Client.destinationX = var0; // L: 8898
-			Client.destinationY = var1; // L: 8899
-			var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2744, Client.packetWriter.isaacCipher); // L: 8901
-			var8.packetBuffer.method7001(var0 + class19.baseX); // L: 8902
-			var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8903
-			var8.packetBuffer.method6962(var3); // L: 8904
-			var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8905
-			Client.packetWriter.addNode(var8); // L: 8906
-		} else if (var2 == 4) {
-			Client.mouseCrossX = var6; // L: 8955
-			Client.mouseCrossY = var7; // L: 8956
-			Client.mouseCrossColor = 2; // L: 8957
-			Client.mouseCrossState = 0; // L: 8958
-			Client.destinationX = var0; // L: 8959
-			Client.destinationY = var1; // L: 8960
-			var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher); // L: 8962
-			var8.packetBuffer.method7001(var0 + class19.baseX); // L: 8963
-			var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8964
-			var8.packetBuffer.writeShort(var3); // L: 8965
-			var8.packetBuffer.method7003(DefaultsGroup.baseY + var1); // L: 8966
-			Client.packetWriter.addNode(var8); // L: 8967
-		} else if (var2 == 5) {
-			Client.mouseCrossX = var6; // L: 8619
-			Client.mouseCrossY = var7; // L: 8620
-			Client.mouseCrossColor = 2; // L: 8621
-			Client.mouseCrossState = 0; // L: 8622
-			Client.destinationX = var0; // L: 8623
-			Client.destinationY = var1; // L: 8624
-			var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2690, Client.packetWriter.isaacCipher); // L: 8626
-			var8.packetBuffer.writeShort(var0 + class19.baseX); // L: 8627
-			var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8628
-			var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8629
-			var8.packetBuffer.method6962(var3); // L: 8630
-			Client.packetWriter.addNode(var8); // L: 8631
-		} else if (var2 == 6) {
-			Client.mouseCrossX = var6; // L: 8317
-			Client.mouseCrossY = var7; // L: 8318
-			Client.mouseCrossColor = 2; // L: 8319
-			Client.mouseCrossState = 0; // L: 8320
-			Client.destinationX = var0; // L: 8321
-			Client.destinationY = var1; // L: 8322
-			var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2705, Client.packetWriter.isaacCipher); // L: 8324
-			var8.packetBuffer.method7003(var3); // L: 8325
-			var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8326
-			var8.packetBuffer.method7003(var0 + class19.baseX); // L: 8327
-			var8.packetBuffer.method6947(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8328
-			Client.packetWriter.addNode(var8); // L: 8329
-		} else {
-			PacketBufferNode var9;
-			NPC var13;
-			if (var2 == 7) {
-				var13 = Client.npcs[var3]; // L: 8383
-				if (var13 != null) { // L: 8384
-					Client.mouseCrossX = var6; // L: 8385
-					Client.mouseCrossY = var7; // L: 8386
-					Client.mouseCrossColor = 2; // L: 8387
-					Client.mouseCrossState = 0; // L: 8388
-					Client.destinationX = var0; // L: 8389
-					Client.destinationY = var1; // L: 8390
-					var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2722, Client.packetWriter.isaacCipher); // L: 8392
-					var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8393
-					var9.packetBuffer.method6962(SoundSystem.selectedItemId); // L: 8394
-					var9.packetBuffer.method7001(ReflectionCheck.selectedItemSlot); // L: 8395
-					var9.packetBuffer.method7126(MouseHandler.selectedItemWidget); // L: 8396
-					var9.packetBuffer.method7003(var3); // L: 8397
-					Client.packetWriter.addNode(var9); // L: 8398
-				}
-			} else if (var2 == 8) {
-				var13 = Client.npcs[var3]; // L: 8876
-				if (var13 != null) { // L: 8877
-					Client.mouseCrossX = var6; // L: 8878
-					Client.mouseCrossY = var7; // L: 8879
-					Client.mouseCrossColor = 2; // L: 8880
-					Client.mouseCrossState = 0; // L: 8881
-					Client.destinationX = var0; // L: 8882
-					Client.destinationY = var1; // L: 8883
-					var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2741, Client.packetWriter.isaacCipher); // L: 8884
-					var9.packetBuffer.writeIntME(FontName.selectedSpellWidget); // L: 8885
-					var9.packetBuffer.method6962(Client.selectedSpellChildIndex); // L: 8886
-					var9.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8887
-					var9.packetBuffer.method6962(var3); // L: 8888
-					var9.packetBuffer.writeShort(Client.field627); // L: 8889
-					Client.packetWriter.addNode(var9); // L: 8890
-				}
-			} else if (var2 == 9) {
-				var13 = Client.npcs[var3]; // L: 8603
-				if (var13 != null) { // L: 8604
-					Client.mouseCrossX = var6; // L: 8605
-					Client.mouseCrossY = var7; // L: 8606
-					Client.mouseCrossColor = 2; // L: 8607
-					Client.mouseCrossState = 0; // L: 8608
-					Client.destinationX = var0; // L: 8609
-					Client.destinationY = var1; // L: 8610
-					var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2717, Client.packetWriter.isaacCipher); // L: 8612
-					var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8613
-					var9.packetBuffer.method7001(var3); // L: 8614
-					Client.packetWriter.addNode(var9); // L: 8615
-				}
-			} else if (var2 == 10) {
-				var13 = Client.npcs[var3]; // L: 9022
-				if (var13 != null) { // L: 9023
-					Client.mouseCrossX = var6; // L: 9024
-					Client.mouseCrossY = var7; // L: 9025
-					Client.mouseCrossColor = 2; // L: 9026
-					Client.mouseCrossState = 0; // L: 9027
-					Client.destinationX = var0; // L: 9028
-					Client.destinationY = var1; // L: 9029
-					var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2748, Client.packetWriter.isaacCipher); // L: 9031
-					var9.packetBuffer.method7001(var3); // L: 9032
-					var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9033
-					Client.packetWriter.addNode(var9); // L: 9034
-				}
-			} else if (var2 == 11) {
-				var13 = Client.npcs[var3]; // L: 8833
-				if (var13 != null) { // L: 8834
-					Client.mouseCrossX = var6; // L: 8835
-					Client.mouseCrossY = var7; // L: 8836
-					Client.mouseCrossColor = 2; // L: 8837
-					Client.mouseCrossState = 0; // L: 8838
-					Client.destinationX = var0; // L: 8839
-					Client.destinationY = var1; // L: 8840
-					var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2723, Client.packetWriter.isaacCipher); // L: 8842
-					var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8843
-					var9.packetBuffer.method6962(var3); // L: 8844
-					Client.packetWriter.addNode(var9); // L: 8845
-				}
-			} else if (var2 == 12) {
-				var13 = Client.npcs[var3]; // L: 8518
-				if (var13 != null) { // L: 8519
-					Client.mouseCrossX = var6; // L: 8520
-					Client.mouseCrossY = var7; // L: 8521
-					Client.mouseCrossColor = 2; // L: 8522
-					Client.mouseCrossState = 0; // L: 8523
-					Client.destinationX = var0; // L: 8524
-					Client.destinationY = var1; // L: 8525
-					var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2730, Client.packetWriter.isaacCipher); // L: 8527
-					var9.packetBuffer.method7001(var3); // L: 8528
-					var9.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8529
-					Client.packetWriter.addNode(var9); // L: 8530
-				}
-			} else if (var2 == 13) {
-				var13 = Client.npcs[var3]; // L: 8634
-				if (var13 != null) { // L: 8635
-					Client.mouseCrossX = var6; // L: 8636
-					Client.mouseCrossY = var7; // L: 8637
-					Client.mouseCrossColor = 2; // L: 8638
-					Client.mouseCrossState = 0; // L: 8639
-					Client.destinationX = var0; // L: 8640
-					Client.destinationY = var1; // L: 8641
-					var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2672, Client.packetWriter.isaacCipher); // L: 8643
-					var9.packetBuffer.method6947(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8644
-					var9.packetBuffer.writeShort(var3); // L: 8645
-					Client.packetWriter.addNode(var9); // L: 8646
-				}
+	static float method210(class115 var0, float var1) {
+		if (var0 != null && var0.method2637() != 0) { // L: 18
+			if (var1 < (float)var0.field1393[0].field1359) { // L: 21
+				return var0.field1410 == class114.field1390 ? var0.field1393[0].field1349 : class213.method4354(var0, var1, true); // L: 22 23 25
+			} else if (var1 > (float)var0.field1393[var0.method2637() - 1].field1359) { // L: 27
+				return var0.field1396 == class114.field1390 ? var0.field1393[var0.method2637() - 1].field1349 : class213.method4354(var0, var1, false); // L: 28 29 31
+			} else if (var0.field1408) { // L: 33
+				return var0.field1393[0].field1349; // L: 34
 			} else {
-				Player var15;
-				if (var2 == 14) {
-					var15 = Client.players[var3]; // L: 8792
-					if (var15 != null) { // L: 8793
-						Client.mouseCrossX = var6; // L: 8794
-						Client.mouseCrossY = var7; // L: 8795
-						Client.mouseCrossColor = 2; // L: 8796
-						Client.mouseCrossState = 0; // L: 8797
-						Client.destinationX = var0; // L: 8798
-						Client.destinationY = var1; // L: 8799
-						var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2678, Client.packetWriter.isaacCipher); // L: 8801
-						var9.packetBuffer.method6962(var3); // L: 8802
-						var9.packetBuffer.method6962(SoundSystem.selectedItemId); // L: 8803
-						var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8804
-						var9.packetBuffer.method6962(ReflectionCheck.selectedItemSlot); // L: 8805
-						var9.packetBuffer.writeIntME(MouseHandler.selectedItemWidget); // L: 8806
-						Client.packetWriter.addNode(var9); // L: 8807
-					}
-				} else if (var2 == 15) {
-					var15 = Client.players[var3]; // L: 8751
-					if (var15 != null) { // L: 8752
-						Client.mouseCrossX = var6; // L: 8753
-						Client.mouseCrossY = var7; // L: 8754
-						Client.mouseCrossColor = 2; // L: 8755
-						Client.mouseCrossState = 0; // L: 8756
-						Client.destinationX = var0; // L: 8757
-						Client.destinationY = var1; // L: 8758
-						var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2760, Client.packetWriter.isaacCipher); // L: 8759
-						var9.packetBuffer.method6962(Client.field627); // L: 8760
-						var9.packetBuffer.method7003(var3); // L: 8761
-						var9.packetBuffer.method7003(Client.selectedSpellChildIndex); // L: 8762
-						var9.packetBuffer.writeInt(FontName.selectedSpellWidget); // L: 8763
-						var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8764
-						Client.packetWriter.addNode(var9); // L: 8765
-					}
-				} else if (var2 == 16) {
-					Client.mouseCrossX = var6; // L: 8699
-					Client.mouseCrossY = var7; // L: 8700
-					Client.mouseCrossColor = 2; // L: 8701
-					Client.mouseCrossState = 0; // L: 8702
-					Client.destinationX = var0; // L: 8703
-					Client.destinationY = var1; // L: 8704
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2756, Client.packetWriter.isaacCipher); // L: 8706
-					var8.packetBuffer.method7003(var3); // L: 8707
-					var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8708
-					var8.packetBuffer.writeShort(SoundSystem.selectedItemId); // L: 8709
-					var8.packetBuffer.writeShort(var0 + class19.baseX); // L: 8710
-					var8.packetBuffer.method6947(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8711
-					var8.packetBuffer.method7003(ReflectionCheck.selectedItemSlot); // L: 8712
-					var8.packetBuffer.method7010(MouseHandler.selectedItemWidget); // L: 8713
-					Client.packetWriter.addNode(var8); // L: 8714
-				} else if (var2 == 17) {
-					Client.mouseCrossX = var6; // L: 8650
-					Client.mouseCrossY = var7; // L: 8651
-					Client.mouseCrossColor = 2; // L: 8652
-					Client.mouseCrossState = 0; // L: 8653
-					Client.destinationX = var0; // L: 8654
-					Client.destinationY = var1; // L: 8655
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2735, Client.packetWriter.isaacCipher); // L: 8656
-					var8.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8657
-					var8.packetBuffer.method7003(Client.field627); // L: 8658
-					var8.packetBuffer.method6962(var3); // L: 8659
-					var8.packetBuffer.method7001(DefaultsGroup.baseY + var1); // L: 8660
-					var8.packetBuffer.writeInt(FontName.selectedSpellWidget); // L: 8661
-					var8.packetBuffer.method7001(Client.selectedSpellChildIndex); // L: 8662
-					var8.packetBuffer.method7003(var0 + class19.baseX); // L: 8663
-					Client.packetWriter.addNode(var8); // L: 8664
-				} else if (var2 == 18) {
-					Client.mouseCrossX = var6; // L: 8487
-					Client.mouseCrossY = var7; // L: 8488
-					Client.mouseCrossColor = 2; // L: 8489
-					Client.mouseCrossState = 0; // L: 8490
-					Client.destinationX = var0; // L: 8491
-					Client.destinationY = var1; // L: 8492
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2701, Client.packetWriter.isaacCipher); // L: 8494
-					var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8495
-					var8.packetBuffer.writeShort(var3); // L: 8496
-					var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8497
-					var8.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8498
-					Client.packetWriter.addNode(var8); // L: 8499
-				} else if (var2 == 19) {
-					Client.mouseCrossX = var6; // L: 8909
-					Client.mouseCrossY = var7; // L: 8910
-					Client.mouseCrossColor = 2; // L: 8911
-					Client.mouseCrossState = 0; // L: 8912
-					Client.destinationX = var0; // L: 8913
-					Client.destinationY = var1; // L: 8914
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2768, Client.packetWriter.isaacCipher); // L: 8916
-					var8.packetBuffer.method7003(DefaultsGroup.baseY + var1); // L: 8917
-					var8.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8918
-					var8.packetBuffer.method7001(var3); // L: 8919
-					var8.packetBuffer.writeShort(var0 + class19.baseX); // L: 8920
-					Client.packetWriter.addNode(var8); // L: 8921
-				} else if (var2 == 20) {
-					Client.mouseCrossX = var6; // L: 8431
-					Client.mouseCrossY = var7; // L: 8432
-					Client.mouseCrossColor = 2; // L: 8433
-					Client.mouseCrossState = 0; // L: 8434
-					Client.destinationX = var0; // L: 8435
-					Client.destinationY = var1; // L: 8436
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2709, Client.packetWriter.isaacCipher); // L: 8438
-					var8.packetBuffer.method6962(DefaultsGroup.baseY + var1); // L: 8439
-					var8.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8440
-					var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8441
-					var8.packetBuffer.method6962(var3); // L: 8442
-					Client.packetWriter.addNode(var8); // L: 8443
-				} else if (var2 == 21) {
-					Client.mouseCrossX = var6; // L: 8402
-					Client.mouseCrossY = var7; // L: 8403
-					Client.mouseCrossColor = 2; // L: 8404
-					Client.mouseCrossState = 0; // L: 8405
-					Client.destinationX = var0; // L: 8406
-					Client.destinationY = var1; // L: 8407
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2763, Client.packetWriter.isaacCipher); // L: 8409
-					var8.packetBuffer.method6962(DefaultsGroup.baseY + var1); // L: 8410
-					var8.packetBuffer.writeShort(var3); // L: 8411
-					var8.packetBuffer.method7003(var0 + class19.baseX); // L: 8412
-					var8.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8413
-					Client.packetWriter.addNode(var8); // L: 8414
-				} else if (var2 == 22) {
-					Client.mouseCrossX = var6; // L: 8302
-					Client.mouseCrossY = var7; // L: 8303
-					Client.mouseCrossColor = 2; // L: 8304
-					Client.mouseCrossState = 0; // L: 8305
-					Client.destinationX = var0; // L: 8306
-					Client.destinationY = var1; // L: 8307
-					var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2767, Client.packetWriter.isaacCipher); // L: 8309
-					var8.packetBuffer.method6947(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8310
-					var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8311
-					var8.packetBuffer.method7003(var3); // L: 8312
-					var8.packetBuffer.writeShort(DefaultsGroup.baseY + var1); // L: 8313
-					Client.packetWriter.addNode(var8); // L: 8314
-				} else if (var2 == 23) {
-					if (Client.isMenuOpen) { // L: 8362
-						GameBuild.scene.setViewportWalking(); // L: 8363
-					} else {
-						GameBuild.scene.menuOpen(GrandExchangeOfferTotalQuantityComparator.Client_plane, var0, var1, true); // L: 8366
-					}
+				class111 var2 = var0.method2631(var1); // L: 36
+				boolean var3 = false; // L: 37
+				boolean var4 = false; // L: 38
+				if (var2 == null) { // L: 39
+					return 0.0F; // L: 134
 				} else {
-					PacketBufferNode var11;
-					Widget var16;
-					if (var2 == 24) {
-						var16 = UserComparator9.getWidget(var1); // L: 8937
-						boolean var12 = true; // L: 8938
-						if (var16.contentType > 0) { // L: 8939
-							var12 = GrandExchangeOfferAgeComparator.method5423(var16);
-						}
+					if (0.0D == (double)var2.field1352 && (double)var2.field1357 == 0.0D) { // L: 40
+						var3 = true; // L: 41
+					} else if (Float.MAX_VALUE == var2.field1352 && var2.field1357 == Float.MAX_VALUE) { // L: 43
+						var4 = true; // L: 44
+					} else if (var2.field1354 != null) { // L: 46
+						if (var0.field1403) { // L: 47
+							float[] var5 = new float[4]; // L: 48
+							float[] var6 = new float[4]; // L: 49
+							var5[0] = (float)var2.field1359; // L: 50
+							var6[0] = var2.field1349; // L: 51
+							var5[1] = var5[0] + var2.field1352 * 0.33333334F; // L: 52
+							var6[1] = var6[0] + 0.33333334F * var2.field1357; // L: 53
+							var5[3] = (float)var2.field1354.field1359; // L: 54
+							var6[3] = var2.field1354.field1349; // L: 55
+							var5[2] = var5[3] - var2.field1354.field1350 * 0.33333334F; // L: 56
+							var6[2] = var6[3] - var2.field1354.field1351 * 0.33333334F; // L: 57
+							if (var0.field1397) { // L: 58
+								class13.method202(var0, var5, var6); // L: 59
+							} else {
+								UserComparator4.method2504(var0, var5, var6); // L: 62
+							}
 
-						if (var12) { // L: 8940
-							var11 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2739, Client.packetWriter.isaacCipher); // L: 8942
-							var11.packetBuffer.writeInt(var1); // L: 8943
-							Client.packetWriter.addNode(var11); // L: 8944
+							var0.field1403 = false; // L: 64
 						}
 					} else {
-						if (var2 == 25) {
-							var16 = ItemContainer.getWidgetChild(var1, var0); // L: 8924
-							if (var16 != null) { // L: 8925
-								class262.Widget_runOnTargetLeave(); // L: 8926
-								Decimator.selectSpell(var1, var0, SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var16)), var16.itemId); // L: 8927
-								Client.isItemSelected = 0; // L: 8928
-								Client.selectedSpellActionName = class20.Widget_getSpellActionName(var16); // L: 8929
-								if (Client.selectedSpellActionName == null) { // L: 8930
-									Client.selectedSpellActionName = "null";
-								}
+						var3 = true; // L: 68
+					}
 
-								if (var16.isIf3) { // L: 8931
-									Client.selectedSpellName = var16.dataText + MouseHandler.colorStartTag(16777215);
+					if (var3) { // L: 70
+						return var2.field1349; // L: 71
+					} else if (var4) { // L: 73
+						return (float)var2.field1359 != var1 && var2.field1354 != null ? var2.field1354.field1349 : var2.field1349; // L: 74 75 78
+					} else {
+						float var11;
+						float var12;
+						if (var0.field1397) { // L: 81
+							if (var0 == null) { // L: 84
+								var12 = 0.0F; // L: 85
+							} else {
+								if (var1 == var0.field1406) { // L: 89
+									var11 = 0.0F; // L: 90
+								} else if (var1 == var0.field1394) { // L: 92
+									var11 = 1.0F; // L: 93
 								} else {
-									Client.selectedSpellName = MouseHandler.colorStartTag(65280) + var16.spellName + MouseHandler.colorStartTag(16777215); // L: 8932
+									var11 = (var1 - var0.field1406) / (var0.field1394 - var0.field1406); // L: 96
 								}
-							}
-
-							return; // L: 8934
-						}
 
-						if (var2 == 26) {
-							method191(); // L: 8359
-						} else {
-							int var10;
-							Widget var14;
-							if (var2 == 28) {
-								var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2739, Client.packetWriter.isaacCipher); // L: 8781
-								var8.packetBuffer.writeInt(var1); // L: 8782
-								Client.packetWriter.addNode(var8); // L: 8783
-								var14 = UserComparator9.getWidget(var1); // L: 8784
-								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8785
-									var10 = var14.cs1Instructions[0][1]; // L: 8786
-									Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 8787
-									WorldMapLabelSize.changeGameOptions(var10); // L: 8788
-								}
-							} else if (var2 == 29) {
-								var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2739, Client.packetWriter.isaacCipher); // L: 8418
-								var8.packetBuffer.writeInt(var1); // L: 8419
-								Client.packetWriter.addNode(var8); // L: 8420
-								var14 = UserComparator9.getWidget(var1); // L: 8421
-								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8422
-									var10 = var14.cs1Instructions[0][1]; // L: 8423
-									if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8424
-										Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8425
-										WorldMapLabelSize.changeGameOptions(var10); // L: 8426
-									}
-								}
-							} else if (var2 == 30) {
-								if (Client.meslayerContinueWidget == null) { // L: 8948
-									class92.resumePauseWidget(var1, var0); // L: 8949
-									Client.meslayerContinueWidget = ItemContainer.getWidgetChild(var1, var0); // L: 8950
-									class184.invalidateWidget(Client.meslayerContinueWidget); // L: 8951
-								}
-							} else if (var2 == 31) {
-								var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2702, Client.packetWriter.isaacCipher); // L: 8971
-								var8.packetBuffer.method6962(var3); // L: 8972
-								var8.packetBuffer.method7010(var1); // L: 8973
-								var8.packetBuffer.writeShort(var0); // L: 8974
-								var8.packetBuffer.method7010(MouseHandler.selectedItemWidget); // L: 8975
-								var8.packetBuffer.method7003(SoundSystem.selectedItemId); // L: 8976
-								var8.packetBuffer.method6962(ReflectionCheck.selectedItemSlot); // L: 8977
-								Client.packetWriter.addNode(var8); // L: 8978
-								Client.field576 = 0; // L: 8979
-								WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8980
-								Client.field577 = var0; // L: 8981
-							} else if (var2 == 32) {
-								var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2695, Client.packetWriter.isaacCipher); // L: 9039
-								var8.packetBuffer.method7003(var0); // L: 9040
-								var8.packetBuffer.writeInt(FontName.selectedSpellWidget); // L: 9041
-								var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 9042
-								var8.packetBuffer.method7010(var1); // L: 9043
-								var8.packetBuffer.method6962(var3); // L: 9044
-								Client.packetWriter.addNode(var8); // L: 9045
-								Client.field576 = 0; // L: 9046
-								WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 9047
-								Client.field577 = var0; // L: 9048
-							} else if (var2 == 33) {
-								var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2706, Client.packetWriter.isaacCipher); // L: 8546
-								var8.packetBuffer.method7003(var3); // L: 8547
-								var8.packetBuffer.method7001(var0); // L: 8548
-								var8.packetBuffer.writeIntME(var1); // L: 8549
-								Client.packetWriter.addNode(var8); // L: 8550
-								Client.field576 = 0; // L: 8551
-								WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8552
-								Client.field577 = var0; // L: 8553
-							} else if (var2 == 34) {
-								var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2740, Client.packetWriter.isaacCipher); // L: 8276
-								var8.packetBuffer.method6962(var3); // L: 8277
-								var8.packetBuffer.method6962(var0); // L: 8278
-								var8.packetBuffer.writeIntME(var1); // L: 8279
-								Client.packetWriter.addNode(var8); // L: 8280
-								Client.field576 = 0; // L: 8281
-								WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8282
-								Client.field577 = var0; // L: 8283
-							} else if (var2 == 35) {
-								var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 9001
-								var8.packetBuffer.method7003(var3); // L: 9002
-								var8.packetBuffer.method6962(var0); // L: 9003
-								var8.packetBuffer.writeIntME(var1); // L: 9004
-								Client.packetWriter.addNode(var8); // L: 9005
-								Client.field576 = 0; // L: 9006
-								WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 9007
-								Client.field577 = var0; // L: 9008
-							} else if (var2 == 36) {
-								var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher); // L: 8689
-								var8.packetBuffer.method7003(var3); // L: 8690
-								var8.packetBuffer.method7001(var0); // L: 8691
-								var8.packetBuffer.method7126(var1); // L: 8692
-								Client.packetWriter.addNode(var8); // L: 8693
-								Client.field576 = 0; // L: 8694
-								WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8695
-								Client.field577 = var0; // L: 8696
-							} else if (var2 == 37) {
-								var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2731, Client.packetWriter.isaacCipher); // L: 8535
-								var8.packetBuffer.method6962(var0); // L: 8536
-								var8.packetBuffer.writeShort(var3); // L: 8537
-								var8.packetBuffer.method7010(var1); // L: 8538
-								Client.packetWriter.addNode(var8); // L: 8539
-								Client.field576 = 0; // L: 8540
-								WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8541
-								Client.field577 = var0; // L: 8542
-							} else {
-								if (var2 == 38) {
-									class262.Widget_runOnTargetLeave(); // L: 8849
-									var16 = UserComparator9.getWidget(var1); // L: 8850
-									Client.isItemSelected = 1; // L: 8851
-									ReflectionCheck.selectedItemSlot = var0; // L: 8852
-									MouseHandler.selectedItemWidget = var1; // L: 8853
-									SoundSystem.selectedItemId = var3; // L: 8854
-									class184.invalidateWidget(var16); // L: 8855
-									Client.selectedItemName = MouseHandler.colorStartTag(16748608) + TaskHandler.ItemDefinition_get(var3).name + MouseHandler.colorStartTag(16777215); // L: 8856
-									if (Client.selectedItemName == null) { // L: 8857
-										Client.selectedItemName = "null";
+								float var7;
+								if (var0.field1398) { // L: 99
+									var7 = var11; // L: 100
+								} else {
+									float[] var8 = new float[]{var0.field1401[0] - var11, var0.field1401[1], var0.field1401[2], var0.field1401[3]}; // L: 103 104 105 106 107
+									float[] var9 = new float[5]; // L: 108
+									int var10 = class144.method2971(var8, 3, 0.0F, true, 1.0F, true, var9); // L: 109
+									if (var10 == 1) { // L: 110
+										var7 = var9[0]; // L: 111
+									} else {
+										var7 = 0.0F; // L: 114
 									}
-
-									return; // L: 8858
 								}
 
-								if (var2 == 39) {
-									var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2691, Client.packetWriter.isaacCipher); // L: 8770
-									var8.packetBuffer.method7001(var3); // L: 8771
-									var8.packetBuffer.writeShort(var0); // L: 8772
-									var8.packetBuffer.writeInt(var1); // L: 8773
-									Client.packetWriter.addNode(var8); // L: 8774
-									Client.field576 = 0; // L: 8775
-									WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8776
-									Client.field577 = var0; // L: 8777
-								} else if (var2 == 40) {
-									var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher); // L: 9012
-									var8.packetBuffer.writeInt(var1); // L: 9013
-									var8.packetBuffer.writeShort(var3); // L: 9014
-									var8.packetBuffer.method7001(var0); // L: 9015
-									Client.packetWriter.addNode(var8); // L: 9016
-									Client.field576 = 0; // L: 9017
-									WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 9018
-									Client.field577 = var0; // L: 9019
-								} else if (var2 == 41) {
-									var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2718, Client.packetWriter.isaacCipher); // L: 8447
-									var8.packetBuffer.writeIntME(var1); // L: 8448
-									var8.packetBuffer.method7003(var0); // L: 8449
-									var8.packetBuffer.writeShort(var3); // L: 8450
-									Client.packetWriter.addNode(var8); // L: 8451
-									Client.field576 = 0; // L: 8452
-									WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8453
-									Client.field577 = var0; // L: 8454
-								} else if (var2 == 42) {
-									var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher); // L: 8668
-									var8.packetBuffer.writeShort(var3); // L: 8669
-									var8.packetBuffer.writeIntME(var1); // L: 8670
-									var8.packetBuffer.writeShort(var0); // L: 8671
-									Client.packetWriter.addNode(var8); // L: 8672
-									Client.field576 = 0; // L: 8673
-									WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8674
-									Client.field577 = var0; // L: 8675
-								} else if (var2 == 43) {
-									var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2694, Client.packetWriter.isaacCipher); // L: 8349
-									var8.packetBuffer.writeInt(var1); // L: 8350
-									var8.packetBuffer.writeShort(var0); // L: 8351
-									var8.packetBuffer.method7003(var3); // L: 8352
-									Client.packetWriter.addNode(var8); // L: 8353
-									Client.field576 = 0; // L: 8354
-									WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8355
-									Client.field577 = var0; // L: 8356
-								} else if (var2 == 44) {
-									var15 = Client.players[var3]; // L: 8502
-									if (var15 != null) { // L: 8503
-										Client.mouseCrossX = var6; // L: 8504
-										Client.mouseCrossY = var7; // L: 8505
-										Client.mouseCrossColor = 2; // L: 8506
-										Client.mouseCrossState = 0; // L: 8507
-										Client.destinationX = var0; // L: 8508
-										Client.destinationY = var1; // L: 8509
-										var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2733, Client.packetWriter.isaacCipher); // L: 8511
-										var9.packetBuffer.writeShort(var3); // L: 8512
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8513
-										Client.packetWriter.addNode(var9); // L: 8514
-									}
-								} else if (var2 == 45) {
-									var15 = Client.players[var3]; // L: 8332
-									if (var15 != null) { // L: 8333
-										Client.mouseCrossX = var6; // L: 8334
-										Client.mouseCrossY = var7; // L: 8335
-										Client.mouseCrossColor = 2; // L: 8336
-										Client.mouseCrossState = 0; // L: 8337
-										Client.destinationX = var0; // L: 8338
-										Client.destinationY = var1; // L: 8339
-										var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2687, Client.packetWriter.isaacCipher); // L: 8341
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8342
-										var9.packetBuffer.method6962(var3); // L: 8343
-										Client.packetWriter.addNode(var9); // L: 8344
-									}
-								} else if (var2 == 46) {
-									var15 = Client.players[var3]; // L: 9051
-									if (var15 != null) { // L: 9052
-										Client.mouseCrossX = var6; // L: 9053
-										Client.mouseCrossY = var7; // L: 9054
-										Client.mouseCrossColor = 2; // L: 9055
-										Client.mouseCrossState = 0; // L: 9056
-										Client.destinationX = var0; // L: 9057
-										Client.destinationY = var1; // L: 9058
-										var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2710, Client.packetWriter.isaacCipher); // L: 9060
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 9061
-										var9.packetBuffer.writeShort(var3); // L: 9062
-										Client.packetWriter.addNode(var9); // L: 9063
-									}
-								} else if (var2 == 47) {
-									var15 = Client.players[var3]; // L: 8984
-									if (var15 != null) { // L: 8985
-										Client.mouseCrossX = var6; // L: 8986
-										Client.mouseCrossY = var7; // L: 8987
-										Client.mouseCrossColor = 2; // L: 8988
-										Client.mouseCrossState = 0; // L: 8989
-										Client.destinationX = var0; // L: 8990
-										Client.destinationY = var1; // L: 8991
-										var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2769, Client.packetWriter.isaacCipher); // L: 8993
-										var9.packetBuffer.method6962(var3); // L: 8994
-										var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8995
-										Client.packetWriter.addNode(var9); // L: 8996
-									}
-								} else if (var2 == 48) {
-									var15 = Client.players[var3]; // L: 8556
-									if (var15 != null) { // L: 8557
-										Client.mouseCrossX = var6; // L: 8558
-										Client.mouseCrossY = var7; // L: 8559
-										Client.mouseCrossColor = 2; // L: 8560
-										Client.mouseCrossState = 0; // L: 8561
-										Client.destinationX = var0; // L: 8562
-										Client.destinationY = var1; // L: 8563
-										var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2692, Client.packetWriter.isaacCipher); // L: 8565
-										var9.packetBuffer.method7003(var3); // L: 8566
-										var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8567
-										Client.packetWriter.addNode(var9); // L: 8568
-									}
-								} else if (var2 == 49) {
-									var15 = Client.players[var3]; // L: 8286
-									if (var15 != null) { // L: 8287
-										Client.mouseCrossX = var6; // L: 8288
-										Client.mouseCrossY = var7; // L: 8289
-										Client.mouseCrossColor = 2; // L: 8290
-										Client.mouseCrossState = 0; // L: 8291
-										Client.destinationX = var0; // L: 8292
-										Client.destinationY = var1; // L: 8293
-										var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2714, Client.packetWriter.isaacCipher); // L: 8295
-										var9.packetBuffer.method7001(var3); // L: 8296
-										var9.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8297
-										Client.packetWriter.addNode(var9); // L: 8298
-									}
-								} else if (var2 == 50) {
-									var15 = Client.players[var3]; // L: 8817
-									if (var15 != null) { // L: 8818
-										Client.mouseCrossX = var6; // L: 8819
-										Client.mouseCrossY = var7; // L: 8820
-										Client.mouseCrossColor = 2; // L: 8821
-										Client.mouseCrossState = 0; // L: 8822
-										Client.destinationX = var0; // L: 8823
-										Client.destinationY = var1; // L: 8824
-										var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 8826
-										var9.packetBuffer.writeShort(var3); // L: 8827
-										var9.packetBuffer.method7171(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8828
-										Client.packetWriter.addNode(var9); // L: 8829
-									}
-								} else if (var2 == 51) {
-									var15 = Client.players[var3]; // L: 8735
-									if (var15 != null) { // L: 8736
-										Client.mouseCrossX = var6; // L: 8737
-										Client.mouseCrossY = var7; // L: 8738
-										Client.mouseCrossColor = 2; // L: 8739
-										Client.mouseCrossState = 0; // L: 8740
-										Client.destinationX = var0; // L: 8741
-										Client.destinationY = var1; // L: 8742
-										var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2728, Client.packetWriter.isaacCipher); // L: 8744
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8745
-										var9.packetBuffer.method7003(var3); // L: 8746
-										Client.packetWriter.addNode(var9); // L: 8747
-									}
-								} else {
-									label646: {
-										if (var2 != 57) {
-											if (var2 == 58) {
-												var16 = ItemContainer.getWidgetChild(var1, var0); // L: 8572
-												if (var16 != null) { // L: 8573
-													var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2753, Client.packetWriter.isaacCipher); // L: 8575
-													var9.packetBuffer.method6962(var16.itemId); // L: 8576
-													var9.packetBuffer.writeInt(FontName.selectedSpellWidget); // L: 8577
-													var9.packetBuffer.method6962(var0); // L: 8578
-													var9.packetBuffer.writeInt(var1); // L: 8579
-													var9.packetBuffer.method6962(Client.field627); // L: 8580
-													var9.packetBuffer.method6962(Client.selectedSpellChildIndex); // L: 8581
-													Client.packetWriter.addNode(var9); // L: 8582
-												}
-												break label646;
-											}
-
-											if (var2 == 1001) {
-												Client.mouseCrossX = var6; // L: 8861
-												Client.mouseCrossY = var7; // L: 8862
-												Client.mouseCrossColor = 2; // L: 8863
-												Client.mouseCrossState = 0; // L: 8864
-												Client.destinationX = var0; // L: 8865
-												Client.destinationY = var1; // L: 8866
-												var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2693, Client.packetWriter.isaacCipher); // L: 8868
-												var8.packetBuffer.method6962(var0 + class19.baseX); // L: 8869
-												var8.packetBuffer.method7003(var3); // L: 8870
-												var8.packetBuffer.method7003(DefaultsGroup.baseY + var1); // L: 8871
-												var8.packetBuffer.method6993(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8872
-												Client.packetWriter.addNode(var8); // L: 8873
-												break label646;
-											}
-
-											if (var2 == 1002) {
-												Client.mouseCrossX = var6; // L: 8678
-												Client.mouseCrossY = var7; // L: 8679
-												Client.mouseCrossColor = 2; // L: 8680
-												Client.mouseCrossState = 0; // L: 8681
-												var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2697, Client.packetWriter.isaacCipher); // L: 8683
-												var8.packetBuffer.method7001(var3); // L: 8684
-												Client.packetWriter.addNode(var8); // L: 8685
-												break label646;
-											}
-
-											if (var2 == 1003) {
-												Client.mouseCrossX = var6; // L: 8586
-												Client.mouseCrossY = var7; // L: 8587
-												Client.mouseCrossColor = 2; // L: 8588
-												Client.mouseCrossState = 0; // L: 8589
-												var13 = Client.npcs[var3]; // L: 8590
-												if (var13 != null) { // L: 8591
-													NPCComposition var17 = var13.definition; // L: 8592
-													if (var17.transforms != null) { // L: 8593
-														var17 = var17.transform();
-													}
-
-													if (var17 != null) { // L: 8594
-														var11 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2757, Client.packetWriter.isaacCipher); // L: 8596
-														var11.packetBuffer.writeShort(var17.id); // L: 8597
-														Client.packetWriter.addNode(var11); // L: 8598
-													}
-												}
-												break label646;
-											}
-
-											if (var2 == 1004) {
-												Client.mouseCrossX = var6; // L: 8373
-												Client.mouseCrossY = var7; // L: 8374
-												Client.mouseCrossColor = 2; // L: 8375
-												Client.mouseCrossState = 0; // L: 8376
-												var8 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2755, Client.packetWriter.isaacCipher); // L: 8378
-												var8.packetBuffer.method7003(var3); // L: 8379
-												Client.packetWriter.addNode(var8); // L: 8380
-												break label646;
-											}
-
-											if (var2 == 1005) {
-												var16 = UserComparator9.getWidget(var1); // L: 8474
-												if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8475
-													class397.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + TaskHandler.ItemDefinition_get(var3).name);
-												} else {
-													var9 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2755, Client.packetWriter.isaacCipher); // L: 8478
-													var9.packetBuffer.method7003(var3); // L: 8479
-													Client.packetWriter.addNode(var9); // L: 8480
-												}
-
-												Client.field576 = 0; // L: 8482
-												WorldMapSection2.field2037 = UserComparator9.getWidget(var1); // L: 8483
-												Client.field577 = var0; // L: 8484
-												break label646;
-											}
-
-											if (var2 != 1007) {
-												if (var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1008 || var2 == 1012) {
-													class133.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8370
-												}
-												break label646;
-											}
-										}
+								var12 = var0.field1402[0] + var7 * (var0.field1402[1] + var7 * (var0.field1402[2] + var7 * var0.field1402[3])); // L: 117
+							}
 
-										var16 = ItemContainer.getWidgetChild(var1, var0); // L: 8811
-										if (var16 != null) { // L: 8812
-											GrandExchangeEvents.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8813
-										}
-									}
-								}
+							return var12; // L: 119
+						} else {
+							if (var0 == null) { // L: 124
+								var12 = 0.0F; // L: 125
+							} else {
+								var11 = var1 - var0.field1406; // L: 128
+								var12 = (var11 * (var11 * var0.field1401[0] + var0.field1401[1]) + var0.field1401[2]) * var11 + var0.field1401[3]; // L: 129
 							}
+
+							return var12; // L: 131
 						}
 					}
 				}
 			}
+		} else {
+			return 0.0F; // L: 19
 		}
+	}
 
-		if (Client.isItemSelected != 0) { // L: 9066
-			Client.isItemSelected = 0; // L: 9067
-			class184.invalidateWidget(UserComparator9.getWidget(MouseHandler.selectedItemWidget)); // L: 9068
-		}
-
-		if (Client.isSpellSelected) { // L: 9070
-			class262.Widget_runOnTargetLeave();
-		}
-
-		if (WorldMapSection2.field2037 != null && Client.field576 == 0) { // L: 9071
-			class184.invalidateWidget(WorldMapSection2.field2037);
-		}
-
-	} // L: 9072
-
-	@ObfuscatedName("kg")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "2112486118"
+		descriptor = "(ZZI)I",
+		garbageValue = "-1522814517"
 	)
-	static final void method178(int var0) {
-		var0 = Math.min(Math.max(var0, 0), 255); // L: 11376
-		if (var0 != class408.clientPreferences.musicVolume) { // L: 11377
-			if (class408.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11378
-				Archive var1 = Messages.archive6; // L: 11379
-				int var2 = Client.currentTrackGroupId; // L: 11380
-				class247.musicPlayerStatus = 1; // L: 11382
-				class128.musicTrackArchive = var1; // L: 11383
-				FillMode.musicTrackGroupId = var2; // L: 11384
-				ArchiveDiskActionHandler.musicTrackFileId = 0; // L: 11385
-				class247.musicTrackVolume = var0; // L: 11386
-				SecureRandomCallable.musicTrackBoolean = false; // L: 11387
-				class247.pcmSampleLength = 10000; // L: 11388
-				Client.field710 = false; // L: 11390
-			} else if (var0 == 0) { // L: 11392
-				WorldMapCacheName.method4027(); // L: 11393
-				Client.field710 = false; // L: 11394
-			} else {
-				WorldMapSection0.method3917(var0); // L: 11396
-			}
-
-			class408.clientPreferences.musicVolume = var0; // L: 11397
-			Login.savePreferences(); // L: 11398
-		}
-
-	} // L: 11400
+	public static int method214(boolean var0, boolean var1) {
+		byte var2 = 0; // L: 259
+		int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; // L: 260
+		return var3; // L: 261
+	}
 
-	@ObfuscatedName("kx")
+	@ObfuscatedName("id")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1351549041"
+		descriptor = "(I)Z",
+		garbageValue = "724384814"
 	)
-	static final void method191() {
-		PacketBufferNode var0 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2712, Client.packetWriter.isaacCipher); // L: 11505
-		Client.packetWriter.addNode(var0); // L: 11506
-
-		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11507
-			if (var1.type == 0 || var1.type == 3) { // L: 11508
-				Players.closeInterface(var1, true);
-			}
-		}
-
-		if (Client.meslayerContinueWidget != null) { // L: 11510
-			class184.invalidateWidget(Client.meslayerContinueWidget); // L: 11511
-			Client.meslayerContinueWidget = null; // L: 11512
-		}
-
-	} // L: 11514
+	static final boolean method204() {
+		return Client.isMenuOpen; // L: 8857
+	}
 }
diff --git a/runescape-client/src/main/java/class140.java b/runescape-client/src/main/java/class140.java
index b9dc78c4de..7eba465a97 100644
--- a/runescape-client/src/main/java/class140.java
+++ b/runescape-client/src/main/java/class140.java
@@ -1,48 +1,71 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("et")
-public class class140 extends class116 {
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 1541912545
+@ObfuscatedName("el")
+public class class140 extends class126 {
+	@ObfuscatedName("ef")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
 	)
-	int field1536;
-	@ObfuscatedName("w")
+	@Export("archive5")
+	static Archive archive5;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = -8264772663538436025L
+		intValue = 471941729
 	)
-	long field1531;
+	int field1603;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Ldg;"
+		descriptor = "Lda;"
 	)
-	final class119 this$0;
+	final class129 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ldg;)V"
+		descriptor = "(Lda;)V"
 	)
-	class140(class119 var1) {
-		this.this$0 = var1; // L: 307
-	}
+	class140(class129 var1) {
+		this.this$0 = var1;
+		this.field1603 = -1; // L: 213
+	} // L: 215
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-2002779676"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
 	)
-	void vmethod2847(Buffer var1) {
-		this.field1536 = var1.readInt(); // L: 310
-		this.field1531 = var1.readLong(); // L: 311
-	} // L: 312
+	void vmethod3029(Buffer var1) {
+		this.field1603 = var1.readUnsignedShort(); // L: 218
+	} // L: 219
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ldm;I)V",
-		garbageValue = "-293908864"
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
 	)
-	void vmethod2848(ClanSettings var1) {
-		var1.method2666(this.field1536, this.field1531); // L: 315
-	} // L: 316
+	void vmethod3028(ClanSettings var1) {
+		var1.method2854(this.field1603); // L: 222
+	} // L: 223
+
+	@ObfuscatedName("kn")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "4"
+	)
+	@Export("Widget_resetModelFrames")
+	static final void Widget_resetModelFrames(int var0) {
+		if (class242.loadInterface(var0)) { // L: 12059
+			Widget[] var1 = MouseRecorder.Widget_interfaceComponents[var0]; // L: 12060
+
+			for (int var2 = 0; var2 < var1.length; ++var2) { // L: 12061
+				Widget var3 = var1[var2]; // L: 12062
+				if (var3 != null) { // L: 12063
+					var3.modelFrame = 0; // L: 12064
+					var3.modelFrameCycle = 0; // L: 12065
+				}
+			}
+
+		}
+	} // L: 12067
 }
diff --git a/runescape-client/src/main/java/class141.java b/runescape-client/src/main/java/class141.java
new file mode 100644
index 0000000000..622dbfc20a
--- /dev/null
+++ b/runescape-client/src/main/java/class141.java
@@ -0,0 +1,134 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("eo")
+public class class141 extends class126 {
+	@ObfuscatedName("m")
+	@Export("SpriteBuffer_xOffsets")
+	public static int[] SpriteBuffer_xOffsets;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		longValue = 2275648101234972147L
+	)
+	long field1610;
+	@ObfuscatedName("b")
+	String field1607;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 65665449
+	)
+	int field1608;
+	// $FF: synthetic field
+	@ObfuscatedSignature(
+		descriptor = "Lda;"
+	)
+	final class129 this$0;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lda;)V"
+	)
+	class141(class129 var1) {
+		this.this$0 = var1;
+		this.field1610 = -1L; // L: 93
+		this.field1607 = null; // L: 94
+		this.field1608 = 0; // L: 95
+	} // L: 97
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
+	)
+	void vmethod3029(Buffer var1) {
+		if (var1.readUnsignedByte() != 255) { // L: 100
+			--var1.offset; // L: 101
+			this.field1610 = var1.readLong(); // L: 102
+		}
+
+		this.field1607 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104
+		this.field1608 = var1.readUnsignedShort(); // L: 105
+	} // L: 106
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
+	)
+	void vmethod3028(ClanSettings var1) {
+		var1.method2850(this.field1610, this.field1607, this.field1608); // L: 109
+	} // L: 110
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1452138237"
+	)
+	@Export("clearItemContainer")
+	static void clearItemContainer(int var0) {
+		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63
+		if (var1 != null) { // L: 64
+			for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65
+				var1.ids[var2] = -1; // L: 66
+				var1.quantities[var2] = 0; // L: 67
+			}
+
+		}
+	} // L: 69
+
+	@ObfuscatedName("ap")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-1880227128"
+	)
+	static int method2950(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3579
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 3580
+			var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3581
+			int var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3582
+			if (!Client.isCameraLocked) { // L: 3583
+				Client.camAngleX = var3; // L: 3584
+				Client.camAngleY = var4; // L: 3585
+			}
+
+			return 1; // L: 3587
+		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3589
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3590
+			return 1; // L: 3591
+		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3593
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3594
+			return 1; // L: 3595
+		} else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3597
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3598
+			if (var3 < 0) { // L: 3599
+				var3 = 0;
+			}
+
+			Client.camFollowHeight = var3; // L: 3600
+			return 1; // L: 3601
+		} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3603
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3604
+			return 1; // L: 3605
+		} else {
+			return 2; // L: 3607
+		}
+	}
+
+	@ObfuscatedName("lf")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "921441126"
+	)
+	@Export("Clan_joinChat")
+	static final void Clan_joinChat(String var0) {
+		if (!var0.equals("")) { // L: 12494
+			PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2857, Client.packetWriter.isaacCipher); // L: 12496
+			var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); // L: 12497
+			var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12498
+			Client.packetWriter.addNode(var1); // L: 12499
+		}
+	} // L: 12500
+}
diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java
new file mode 100644
index 0000000000..1a9658b4ca
--- /dev/null
+++ b/runescape-client/src/main/java/class142.java
@@ -0,0 +1,38 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ee")
+public abstract class class142 extends Node {
+	@ObfuscatedName("sp")
+	@ObfuscatedGetter(
+		intValue = -843354001
+	)
+	static int field1615;
+
+	class142() {
+	} // L: 49
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;B)V",
+		garbageValue = "4"
+	)
+	abstract void vmethod3022(Buffer var1);
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lei;B)V",
+		garbageValue = "40"
+	)
+	abstract void vmethod3021(ClanChannel var1);
+
+	@ObfuscatedName("fu")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "-1686144009"
+	)
+	static int method2958(int var0) {
+		return var0 * 3 + 600; // L: 2168
+	}
+}
diff --git a/runescape-client/src/main/java/class143.java b/runescape-client/src/main/java/class143.java
new file mode 100644
index 0000000000..c2e7bcb768
--- /dev/null
+++ b/runescape-client/src/main/java/class143.java
@@ -0,0 +1,342 @@
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.util.Iterator;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("en")
+public class class143 {
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -1200015243
+	)
+	@Export("idxCount")
+	public static int idxCount;
+	@ObfuscatedName("ke")
+	@ObfuscatedSignature(
+		descriptor = "Ljm;"
+	)
+	@Export("dragInventoryWidget")
+	static Widget dragInventoryWidget;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		longValue = -313153463126813519L
+	)
+	long field1626;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		longValue = 1337134792886760215L
+	)
+	long field1625;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Llr;"
+	)
+	IterableNodeDeque field1618;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;)V"
+	)
+	public class143(Buffer var1) {
+		this.field1625 = -1L; // L: 10
+		this.field1618 = new IterableNodeDeque(); // L: 11
+		this.method2961(var1); // L: 19
+	} // L: 20
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V",
+		garbageValue = "178883097"
+	)
+	void method2961(Buffer var1) {
+		this.field1626 = var1.readLong(); // L: 23
+		this.field1625 = var1.readLong(); // L: 24
+
+		for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 25 26 36
+			Object var3;
+			if (var2 == 1) { // L: 28
+				var3 = new class138(this);
+			} else if (var2 == 4) {
+				var3 = new class149(this); // L: 29
+			} else if (var2 == 3) { // L: 30
+				var3 = new class134(this);
+			} else if (var2 == 2) { // L: 31
+				var3 = new class132(this);
+			} else {
+				if (var2 != 5) { // L: 32
+					throw new RuntimeException(""); // L: 33
+				}
+
+				var3 = new class139(this);
+			}
+
+			((class142)var3).vmethod3022(var1); // L: 34
+			this.field1618.addFirst((Node)var3); // L: 35
+		}
+
+	} // L: 38
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lei;B)V",
+		garbageValue = "5"
+	)
+	public void method2960(ClanChannel var1) {
+		if (var1.key == this.field1626 && this.field1625 == var1.field1640) { // L: 41
+			for (class142 var2 = (class142)this.field1618.last(); var2 != null; var2 = (class142)this.field1618.previous()) { // L: 42
+				var2.vmethod3021(var1); // L: 43
+			}
+
+			++var1.field1640; // L: 45
+		} else {
+			throw new RuntimeException("");
+		}
+	} // L: 46
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "100"
+	)
+	static int method2959(int var0, Script var1, boolean var2) {
+		int var4 = -1; // L: 614
+		Widget var3;
+		if (var0 >= 2000) { // L: 615
+			var0 -= 1000; // L: 616
+			var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 617
+			var3 = ChatChannel.getWidget(var4); // L: 618
+		} else {
+			var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 620
+		}
+
+		if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 621
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 622
+			var3.scrollX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 623
+			if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 624
+				var3.scrollX = var3.scrollWidth - var3.width;
+			}
+
+			if (var3.scrollX < 0) { // L: 625
+				var3.scrollX = 0;
+			}
+
+			var3.scrollY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 626
+			if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 627
+				var3.scrollY = var3.scrollHeight - var3.height;
+			}
+
+			if (var3.scrollY < 0) { // L: 628
+				var3.scrollY = 0;
+			}
+
+			SecureRandomCallable.invalidateWidget(var3); // L: 629
+			return 1; // L: 630
+		} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 632
+			var3.color = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 633
+			SecureRandomCallable.invalidateWidget(var3); // L: 634
+			return 1; // L: 635
+		} else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 637
+			var3.fill = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 638
+			SecureRandomCallable.invalidateWidget(var3); // L: 639
+			return 1; // L: 640
+		} else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 642
+			var3.transparencyTop = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 643
+			SecureRandomCallable.invalidateWidget(var3); // L: 644
+			return 1; // L: 645
+		} else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 647
+			var3.lineWid = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 648
+			SecureRandomCallable.invalidateWidget(var3); // L: 649
+			return 1; // L: 650
+		} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 652
+			var3.spriteId2 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 653
+			SecureRandomCallable.invalidateWidget(var3); // L: 654
+			return 1; // L: 655
+		} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 657
+			var3.spriteAngle = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 658
+			SecureRandomCallable.invalidateWidget(var3); // L: 659
+			return 1; // L: 660
+		} else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 662
+			var3.spriteTiling = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 663
+			SecureRandomCallable.invalidateWidget(var3); // L: 664
+			return 1; // L: 665
+		} else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 667
+			var3.modelType = 1; // L: 668
+			var3.modelId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 669
+			SecureRandomCallable.invalidateWidget(var3); // L: 670
+			return 1; // L: 671
+		} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 673
+			IsaacCipher.Interpreter_intStackSize -= 6; // L: 674
+			var3.modelOffsetX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 675
+			var3.modelOffsetY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 676
+			var3.modelAngleX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 677
+			var3.modelAngleY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 678
+			var3.modelAngleZ = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 4]; // L: 679
+			var3.modelZoom = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 5]; // L: 680
+			SecureRandomCallable.invalidateWidget(var3); // L: 681
+			return 1; // L: 682
+		} else {
+			int var8;
+			if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 684
+				var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 685
+				if (var8 != var3.sequenceId) { // L: 686
+					var3.sequenceId = var8; // L: 687
+					var3.modelFrame = 0; // L: 688
+					var3.modelFrameCycle = 0; // L: 689
+					SecureRandomCallable.invalidateWidget(var3); // L: 690
+				}
+
+				return 1; // L: 692
+			} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 694
+				var3.modelOrthog = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 695
+				SecureRandomCallable.invalidateWidget(var3); // L: 696
+				return 1; // L: 697
+			} else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 699
+				String var7 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 700
+				if (!var7.equals(var3.text)) { // L: 701
+					var3.text = var7; // L: 702
+					SecureRandomCallable.invalidateWidget(var3); // L: 703
+				}
+
+				return 1; // L: 705
+			} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 707
+				var3.fontId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 708
+				SecureRandomCallable.invalidateWidget(var3); // L: 709
+				return 1; // L: 710
+			} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 712
+				IsaacCipher.Interpreter_intStackSize -= 3; // L: 713
+				var3.textXAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 714
+				var3.textYAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 715
+				var3.textLineHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 716
+				SecureRandomCallable.invalidateWidget(var3); // L: 717
+				return 1; // L: 718
+			} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 720
+				var3.textShadowed = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 721
+				SecureRandomCallable.invalidateWidget(var3); // L: 722
+				return 1; // L: 723
+			} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 725
+				var3.outline = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 726
+				SecureRandomCallable.invalidateWidget(var3); // L: 727
+				return 1; // L: 728
+			} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 730
+				var3.spriteShadow = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 731
+				SecureRandomCallable.invalidateWidget(var3); // L: 732
+				return 1; // L: 733
+			} else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 735
+				var3.spriteFlipV = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 736
+				SecureRandomCallable.invalidateWidget(var3); // L: 737
+				return 1; // L: 738
+			} else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 740
+				var3.spriteFlipH = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 741
+				SecureRandomCallable.invalidateWidget(var3); // L: 742
+				return 1; // L: 743
+			} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 745
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 746
+				var3.scrollWidth = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 747
+				var3.scrollHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 748
+				SecureRandomCallable.invalidateWidget(var3); // L: 749
+				if (var4 != -1 && var3.type == 0) { // L: 750
+					class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var4 >> 16], var3, false);
+				}
+
+				return 1; // L: 751
+			} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 753
+				class288.resumePauseWidget(var3.id, var3.childIndex); // L: 754
+				Client.meslayerContinueWidget = var3; // L: 755
+				SecureRandomCallable.invalidateWidget(var3); // L: 756
+				return 1; // L: 757
+			} else if (var0 == 1122) { // L: 759
+				var3.spriteId = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 760
+				SecureRandomCallable.invalidateWidget(var3); // L: 761
+				return 1; // L: 762
+			} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 764
+				var3.color2 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 765
+				SecureRandomCallable.invalidateWidget(var3); // L: 766
+				return 1; // L: 767
+			} else if (var0 == 1124) { // L: 769
+				var3.transparencyBot = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 770
+				SecureRandomCallable.invalidateWidget(var3); // L: 771
+				return 1; // L: 772
+			} else if (var0 == 1125) { // L: 774
+				var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 775
+				FillMode var6 = (FillMode)class130.findEnumerated(class253.FillMode_values(), var8); // L: 776
+				if (var6 != null) { // L: 777
+					var3.fillMode = var6; // L: 778
+					SecureRandomCallable.invalidateWidget(var3); // L: 779
+				}
+
+				return 1; // L: 781
+			} else {
+				boolean var5;
+				if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 783
+					var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 784
+					var3.field3359 = var5; // L: 785
+					return 1; // L: 786
+				} else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 788
+					var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 789
+					var3.modelTransparency = var5; // L: 790
+					return 1; // L: 791
+				} else if (var0 == 1128) { // L: 793
+					IsaacCipher.Interpreter_intStackSize -= 2; // L: 794
+					return 1; // L: 795
+				} else {
+					return 2; // L: 797
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("au")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-317869339"
+	)
+	@Export("getGcDuration")
+	protected static int getGcDuration() {
+		int var0 = 0; // L: 569
+		if (PacketBufferNode.garbageCollector == null || !PacketBufferNode.garbageCollector.isValid()) { // L: 570
+			try {
+				Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 572
+
+				while (var1.hasNext()) {
+					GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 573
+					if (var2.isValid()) { // L: 575
+						PacketBufferNode.garbageCollector = var2; // L: 576
+						GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 577
+						GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 578
+					}
+				}
+			} catch (Throwable var11) { // L: 583
+			}
+		}
+
+		if (PacketBufferNode.garbageCollector != null) { // L: 585
+			long var9 = Ignored.method6459(); // L: 586
+			long var3 = PacketBufferNode.garbageCollector.getCollectionTime(); // L: 587
+			if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 588
+				long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 589
+				long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 590
+				if (0L != var7) { // L: 591
+					var0 = (int)(var5 * 100L / var7);
+				}
+			}
+
+			GameEngine.garbageCollectorLastCollectionTime = var3; // L: 593
+			GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 594
+		}
+
+		return var0; // L: 596
+	}
+
+	@ObfuscatedName("gy")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "74"
+	)
+	@Export("getWindowedMode")
+	static int getWindowedMode() {
+		return Client.isResizable ? 2 : 1; // L: 4969
+	}
+}
diff --git a/runescape-client/src/main/java/class144.java b/runescape-client/src/main/java/class144.java
index a927ded248..938d02e57f 100644
--- a/runescape-client/src/main/java/class144.java
+++ b/runescape-client/src/main/java/class144.java
@@ -1,14 +1,407 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eg")
-public interface class144 {
-	@ObfuscatedName("s")
+@ObfuscatedName("ez")
+public class class144 extends class126 {
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1660660111
+	)
+	int field1632;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = 160433807
+	)
+	int field1628;
+	// $FF: synthetic field
+	@ObfuscatedSignature(
+		descriptor = "Lda;"
+	)
+	final class129 this$0;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lda;)V"
+	)
+	class144(class129 var1) {
+		this.this$0 = var1; // L: 271
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
+	)
+	void vmethod3029(Buffer var1) {
+		this.field1632 = var1.readInt(); // L: 274
+		this.field1628 = var1.readInt(); // L: 275
+	} // L: 276
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
+	)
+	void vmethod3028(ClanSettings var1) {
+		var1.method2859(this.field1632, this.field1628); // L: 279
+	} // L: 280
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1160529550"
+		descriptor = "([FIFZFZ[FI)I",
+		garbageValue = "-493873929"
 	)
-	@Export("useRotation")
-	int useRotation();
+	public static int method2971(float[] var0, int var1, float var2, boolean var3, float var4, boolean var5, float[] var6) {
+		float var7 = 0.0F;
+
+		for (int var8 = 0; var8 < var1 + 1; ++var8) {
+			var7 += Math.abs(var0[var8]); // L: 17
+		}
+
+		float var44 = (Math.abs(var2) + Math.abs(var4)) * (float)(var1 + 1) * class112.field1361;
+		if (var7 <= var44) {
+			return -1; // L: 21
+		} else {
+			float[] var9 = new float[var1 + 1];
+
+			int var10;
+			for (var10 = 0; var10 < var1 + 1; ++var10) {
+				var9[var10] = var0[var10] * (1.0F / var7);
+			}
+
+			while (Math.abs(var9[var1]) < var44) {
+				--var1;
+			}
+
+			var10 = 0;
+			if (var1 == 0) { // L: 31
+				return var10;
+			} else if (var1 == 1) { // L: 34
+				var6[0] = -var9[0] / var9[1];
+				boolean var42 = var3 ? var2 < var44 + var6[0] : var2 < var6[0] - var44;
+				boolean var43 = var5 ? var4 > var6[0] - var44 : var4 > var44 + var6[0]; // L: 37
+				var10 = var42 && var43 ? 1 : 0; // L: 38
+				if (var10 > 0) {
+					if (var3 && var6[0] < var2) {
+						var6[0] = var2; // L: 41
+					} else if (var5 && var6[0] > var4) {
+						var6[0] = var4;
+					}
+				}
+
+				return var10;
+			} else {
+				class368 var11 = new class368(var9, var1); // L: 50
+				float[] var12 = new float[var1 + 1];
+
+				for (int var13 = 1; var13 <= var1; ++var13) {
+					var12[var13 - 1] = (float)var13 * var9[var13]; // L: 53
+				}
+
+				float[] var41 = new float[var1 + 1];
+				int var14 = method2971(var12, var1 - 1, var2, false, var4, false, var41); // L: 56
+				if (var14 == -1) {
+					return 0; // L: 58
+				} else {
+					boolean var15 = false;
+					float var17 = 0.0F; // L: 62
+					float var18 = 0.0F; // L: 63
+					float var19 = 0.0F;
+
+					for (int var20 = 0; var20 <= var14; ++var20) {
+						if (var10 > var1) { // L: 66
+							return var10;
+						}
+
+						float var16;
+						if (var20 == 0) { // L: 67
+							var16 = var2;
+							var18 = MidiPcmStream.method5196(var9, var1, var2);
+							if (Math.abs(var18) <= var44 && var3) { // L: 70
+								var6[var10++] = var2;
+							}
+						} else {
+							var16 = var19;
+							var18 = var17; // L: 74
+						}
+
+						if (var20 == var14) {
+							var19 = var4;
+							var15 = false; // L: 78
+						} else {
+							var19 = var41[var20]; // L: 81
+						}
+
+						var17 = MidiPcmStream.method5196(var9, var1, var19);
+						if (var15) {
+							var15 = false;
+						} else if (Math.abs(var17) < var44) {
+							if (var14 != var20 || var5) { // L: 89
+								var6[var10++] = var19; // L: 90
+								var15 = true;
+							}
+						} else if (var18 < 0.0F && var17 > 0.0F || var18 > 0.0F && var17 < 0.0F) {
+							int var22 = var10++;
+							float var24 = var16;
+							float var25 = var19;
+							float var26 = MidiPcmStream.method5196(var11.field4212, var11.field4211, var16);
+							float var23;
+							if (Math.abs(var26) < class112.field1361) {
+								var23 = var16;
+							} else {
+								float var27 = MidiPcmStream.method5196(var11.field4212, var11.field4211, var19);
+								if (Math.abs(var27) < class112.field1361) {
+									var23 = var19;
+								} else {
+									float var28 = 0.0F;
+									float var29 = 0.0F;
+									float var30 = 0.0F;
+									float var35 = 0.0F; // L: 118
+									boolean var36 = true; // L: 119
+									boolean var37 = false;
+
+									do {
+										var37 = false; // L: 122
+										if (var36) { // L: 123
+											var28 = var24; // L: 124
+											var35 = var26; // L: 125
+											var29 = var25 - var24; // L: 126
+											var30 = var29; // L: 127
+											var36 = false; // L: 128
+										}
+
+										if (Math.abs(var35) < Math.abs(var27)) { // L: 130
+											var24 = var25; // L: 131
+											var25 = var28; // L: 132
+											var28 = var24; // L: 133
+											var26 = var27; // L: 134
+											var27 = var35; // L: 135
+											var35 = var26; // L: 136
+										}
+
+										float var38 = class112.field1362 * Math.abs(var25) + 0.0F; // L: 138
+										float var39 = 0.5F * (var28 - var25); // L: 139
+										boolean var40 = Math.abs(var39) > var38 && var27 != 0.0F; // L: 140
+										if (var40) { // L: 141
+											if (Math.abs(var30) >= var38 && Math.abs(var26) > Math.abs(var27)) { // L: 142
+												float var34 = var27 / var26; // L: 147
+												float var31;
+												float var32;
+												if (var28 == var24) { // L: 148
+													var31 = 2.0F * var39 * var34; // L: 149
+													var32 = 1.0F - var34; // L: 150
+												} else {
+													var32 = var26 / var35; // L: 153
+													float var33 = var27 / var35; // L: 154
+													var31 = ((var32 - var33) * 2.0F * var39 * var32 - (var25 - var24) * (var33 - 1.0F)) * var34; // L: 155
+													var32 = (var32 - 1.0F) * (var33 - 1.0F) * (var34 - 1.0F); // L: 156
+												}
+
+												if ((double)var31 > 0.0D) { // L: 158
+													var32 = -var32;
+												} else {
+													var31 = -var31; // L: 159
+												}
+
+												var34 = var30; // L: 160
+												var30 = var29; // L: 161
+												if (var31 * 2.0F < 3.0F * var39 * var32 - Math.abs(var38 * var32) && var31 < Math.abs(var32 * 0.5F * var34)) { // L: 162
+													var29 = var31 / var32; // L: 163
+												} else {
+													var29 = var39; // L: 166
+													var30 = var39; // L: 167
+												}
+											} else {
+												var29 = var39; // L: 143
+												var30 = var39; // L: 144
+											}
+
+											var24 = var25; // L: 170
+											var26 = var27; // L: 171
+											if (Math.abs(var29) > var38) { // L: 172
+												var25 += var29;
+											} else if ((double)var39 > 0.0D) { // L: 173
+												var25 += var38;
+											} else {
+												var25 -= var38; // L: 174
+											}
+
+											var27 = MidiPcmStream.method5196(var11.field4212, var11.field4211, var25); // L: 175
+											if ((double)(var27 * (var35 / Math.abs(var35))) > 0.0D) { // L: 176
+												var36 = true; // L: 177
+												var37 = true; // L: 178
+											} else {
+												var37 = true; // L: 181
+											}
+										}
+									} while(var37);
+
+									var23 = var25; // L: 185
+								}
+							}
+
+							var6[var22] = var23; // L: 187
+							if (var10 > 1 && var6[var10 - 2] >= var6[var10 - 1] - var44) { // L: 188
+								var6[var10 - 2] = (var6[var10 - 2] + var6[var10 - 1]) * 0.5F; // L: 189
+								--var10; // L: 190
+							}
+						}
+					}
+
+					return var10; // L: 196
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Llf;I)I",
+		garbageValue = "-890625443"
+	)
+	@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
+		byte var7 = 0; // L: 15
+		byte 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 = (char)var7; // L: 24
+				boolean var14 = false; // L: 25
+			} else {
+				var9 = var0.charAt(var5++); // L: 27
+			}
+
+			char var10;
+			if (var8 != 0) { // L: 28
+				var10 = (char)var8; // L: 29
+				boolean var15 = false; // L: 30
+			} else {
+				var10 = var1.charAt(var6++); // L: 32
+			}
+
+			byte var11;
+			if (var9 == 198) { // L: 35
+				var11 = 69; // L: 36
+			} else if (var9 == 230) { // L: 39
+				var11 = 101; // L: 40
+			} else if (var9 == 223) { // L: 43
+				var11 = 115; // L: 44
+			} else if (var9 == 338) { // L: 47
+				var11 = 69; // L: 48
+			} else if (var9 == 339) { // L: 51
+				var11 = 101; // L: 52
+			} else {
+				var11 = 0; // L: 55
+			}
+
+			var7 = var11; // L: 57
+			byte var12;
+			if (var10 == 198) { // L: 60
+				var12 = 69; // L: 61
+			} else if (var10 == 230) { // L: 64
+				var12 = 101; // L: 65
+			} else if (var10 == 223) { // L: 68
+				var12 = 115; // L: 69
+			} else if (var10 == 338) { // L: 72
+				var12 = 69; // L: 73
+			} else if (var10 == 339) { // L: 76
+				var12 = 101; // L: 77
+			} else {
+				var12 = 0; // L: 80
+			}
+
+			var8 = var12; // L: 82
+			var9 = Renderable.standardizeChar(var9, var2); // L: 83
+			var10 = Renderable.standardizeChar(var10, var2); // L: 84
+			if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 85
+				var9 = Character.toLowerCase(var9); // L: 86
+				var10 = Character.toLowerCase(var10); // L: 87
+				if (var9 != var10) { // L: 88
+					return Interpreter.lowercaseChar(var9, var2) - Interpreter.lowercaseChar(var10, var2);
+				}
+			}
+		}
+
+		int var16 = Math.min(var3, var4); // L: 91
+
+		int var17;
+		char var20;
+		for (var17 = 0; var17 < var16; ++var17) { // L: 92
+			if (var2 == Language.Language_FR) { // L: 93
+				var5 = var3 - 1 - var17; // L: 94
+				var6 = var4 - 1 - var17; // L: 95
+			} else {
+				var6 = var17;
+				var5 = var17;
+			}
+
+			char var18 = var0.charAt(var5);
+			var20 = var1.charAt(var6); // L: 99
+			if (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) {
+				var18 = Character.toLowerCase(var18);
+				var20 = Character.toLowerCase(var20);
+				if (var18 != var20) {
+					return Interpreter.lowercaseChar(var18, var2) - Interpreter.lowercaseChar(var20, var2); // L: 103
+				}
+			}
+		}
+
+		var17 = var3 - var4;
+		if (var17 != 0) { // L: 107
+			return var17;
+		} else {
+			for (int var19 = 0; var19 < var16; ++var19) {
+				var20 = var0.charAt(var19);
+				char var13 = var1.charAt(var19);
+				if (var13 != var20) { // L: 111
+					return Interpreter.lowercaseChar(var20, var2) - Interpreter.lowercaseChar(var13, var2);
+				}
+			}
+
+			return 0;
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "([BI)V",
+		garbageValue = "161572575"
+	)
+	@Export("ByteArrayPool_release")
+	public static synchronized void ByteArrayPool_release(byte[] var0) {
+		if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < ByteArrayPool.field4023) { // L: 96
+			ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 97
+		} else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < ByteArrayPool.field4028) { // L: 100
+			ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 101
+		} else if (var0.length == 10000 && ByteArrayPool.ByteArrayPool_largeCount < ByteArrayPool.field4021) { // L: 104
+			ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 105
+		} else if (var0.length == 30000 && ByteArrayPool.field4026 < ByteArrayPool.field4030) { // L: 108
+			ByteArrayPool.field4034[++ByteArrayPool.field4026 - 1] = var0; // L: 109
+		} else {
+			if (World.ByteArrayPool_arrays != null) { // L: 112
+				for (int var1 = 0; var1 < SoundCache.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 113
+					if (var0.length == SoundCache.ByteArrayPool_alternativeSizes[var1] && ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var1] < World.ByteArrayPool_arrays[var1].length) { // L: 114
+						World.ByteArrayPool_arrays[var1][ApproximateRouteStrategy.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 115
+						return; // L: 116
+					}
+				}
+			}
+
+		}
+	} // L: 98 102 106 110 120
 }
diff --git a/runescape-client/src/main/java/class145.java b/runescape-client/src/main/java/class145.java
new file mode 100644
index 0000000000..e2e010c4b2
--- /dev/null
+++ b/runescape-client/src/main/java/class145.java
@@ -0,0 +1,176 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("eh")
+public class class145 extends class126 {
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 802544023
+	)
+	int field1634;
+	// $FF: synthetic field
+	@ObfuscatedSignature(
+		descriptor = "Lda;"
+	)
+	final class129 this$0;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lda;)V"
+	)
+	class145(class129 var1) {
+		this.this$0 = var1;
+		this.field1634 = -1;
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
+	)
+	void vmethod3029(Buffer var1) {
+		this.field1634 = var1.readUnsignedShort(); // L: 149
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
+	)
+	void vmethod3028(ClanSettings var1) {
+		var1.method2863(this.field1634); // L: 153
+	} // L: 154
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "([BI)Lbn;",
+		garbageValue = "1172830323"
+	)
+	@Export("newScript")
+	static Script newScript(byte[] var0) {
+		Script var1 = new Script(); // L: 112
+		Buffer var2 = new Buffer(var0); // L: 113
+		var2.offset = var2.array.length - 2; // L: 114
+		int var3 = var2.readUnsignedShort(); // L: 115
+		int var4 = var2.array.length - 2 - var3 - 12; // L: 116
+		var2.offset = var4; // L: 117
+		int var5 = var2.readInt(); // L: 118
+		var1.localIntCount = var2.readUnsignedShort(); // L: 119
+		var1.localStringCount = var2.readUnsignedShort(); // L: 120
+		var1.intArgumentCount = var2.readUnsignedShort(); // L: 121
+		var1.stringArgumentCount = var2.readUnsignedShort(); // L: 122
+		int var6 = var2.readUnsignedByte(); // L: 123
+		int var7;
+		int var8;
+		if (var6 > 0) { // L: 124
+			var1.switches = var1.newIterableNodeHashTable(var6); // L: 125
+
+			for (var7 = 0; var7 < var6; ++var7) { // L: 126
+				var8 = var2.readUnsignedShort(); // L: 127
+				IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? SpotAnimationDefinition.method3362(var8) : 1); // L: 128
+				var1.switches[var7] = var9; // L: 129
+
+				while (var8-- > 0) { // L: 130
+					int var10 = var2.readInt(); // L: 131
+					int var11 = var2.readInt(); // L: 132
+					var9.put(new IntegerNode(var11), (long)var10); // L: 133
+				}
+			}
+		}
+
+		var2.offset = 0; // L: 137
+		var1.field937 = var2.readStringCp1252NullTerminatedOrNull(); // L: 138
+		var1.opcodes = new int[var5]; // L: 139
+		var1.intOperands = new int[var5]; // L: 140
+		var1.stringOperands = new String[var5]; // L: 141
+
+		for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 142 143 148
+			var8 = var2.readUnsignedShort(); // L: 144
+			if (var8 == 3) { // L: 145
+				var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
+			} else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
+				var1.intOperands[var7] = var2.readInt(); // L: 146
+			} else {
+				var1.intOperands[var7] = var2.readUnsignedByte(); // L: 147
+			}
+		}
+
+		return var1; // L: 150
+	}
+
+	@ObfuscatedName("gn")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "578120171"
+	)
+	static final void method2985() {
+		if (class20.Client_plane != Client.field570) { // L: 4395
+			Client.field570 = class20.Client_plane; // L: 4396
+			int var0 = class20.Client_plane; // L: 4397
+			int[] var1 = class29.sceneMinimapSprite.pixels; // L: 4399
+			int var2 = var1.length; // L: 4400
+
+			int var3;
+			for (var3 = 0; var3 < var2; ++var3) { // L: 4401
+				var1[var3] = 0;
+			}
+
+			int var4;
+			int var5;
+			for (var3 = 1; var3 < 103; ++var3) { // L: 4402
+				var4 = (103 - var3) * 2048 + 24628; // L: 4403
+
+				for (var5 = 1; var5 < 103; ++var5) { // L: 4404
+					if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 4405
+						class7.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3);
+					}
+
+					if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 4406
+						class7.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3);
+					}
+
+					var4 += 4; // L: 4407
+				}
+			}
+
+			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: 4410
+			var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 4411
+			class29.sceneMinimapSprite.setRaster(); // L: 4412
+
+			int var6;
+			for (var5 = 1; var5 < 103; ++var5) { // L: 4413
+				for (var6 = 1; var6 < 103; ++var6) { // L: 4414
+					if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 4415
+						class33.drawObject(var0, var6, var5, var3, var4);
+					}
+
+					if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 4416
+						class33.drawObject(var0 + 1, var6, var5, var3, var4);
+					}
+				}
+			}
+
+			Client.mapIconCount = 0; // L: 4419
+
+			for (var5 = 0; var5 < 104; ++var5) { // L: 4420
+				for (var6 = 0; var6 < 104; ++var6) { // L: 4421
+					long var7 = class7.scene.getFloorDecorationTag(class20.Client_plane, var5, var6); // L: 4422
+					if (var7 != 0L) { // L: 4423
+						int var9 = PacketWriter.Entity_unpackID(var7); // L: 4424
+						int var10 = class148.getObjectDefinition(var9).mapIconId; // L: 4425
+						if (var10 >= 0 && class78.WorldMapElement_get(var10).field1759) { // L: 4426 4427
+							Client.mapIcons[Client.mapIconCount] = class78.WorldMapElement_get(var10).getSpriteBool(false); // L: 4430
+							Client.mapIconXs[Client.mapIconCount] = var5; // L: 4431
+							Client.mapIconYs[Client.mapIconCount] = var6; // L: 4432
+							++Client.mapIconCount; // L: 4433
+						}
+					}
+				}
+			}
+
+			class19.rasterProvider.apply(); // L: 4438
+		}
+
+	} // L: 4441
+}
diff --git a/runescape-client/src/main/java/class147.java b/runescape-client/src/main/java/class147.java
new file mode 100644
index 0000000000..831b0bf506
--- /dev/null
+++ b/runescape-client/src/main/java/class147.java
@@ -0,0 +1,20 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ed")
+public class class147 {
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Lku;III)Z",
+		garbageValue = "-1711899825"
+	)
+	public static boolean method3009(AbstractArchive var0, int var1, int var2) {
+		byte[] var3 = var0.takeFile(var1, var2); // L: 88
+		if (var3 == null) { // L: 89
+			return false;
+		} else {
+			WorldMapSection0.SpriteBuffer_decode(var3); // L: 90
+			return true; // L: 91
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class148.java b/runescape-client/src/main/java/class148.java
new file mode 100644
index 0000000000..8466db67a8
--- /dev/null
+++ b/runescape-client/src/main/java/class148.java
@@ -0,0 +1,894 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("ea")
+public class class148 extends class126 {
+	@ObfuscatedName("bs")
+	@ObfuscatedGetter(
+		intValue = -1737427253
+	)
+	static int field1651;
+	@ObfuscatedName("bj")
+	@ObfuscatedSignature(
+		descriptor = "[Lpl;"
+	)
+	@Export("worldSelectBackSprites")
+	static SpritePixels[] worldSelectBackSprites;
+	@ObfuscatedName("eh")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive19")
+	static Archive archive19;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		longValue = 1306318514738640099L
+	)
+	long field1658;
+	@ObfuscatedName("b")
+	String field1652;
+	// $FF: synthetic field
+	@ObfuscatedSignature(
+		descriptor = "Lda;"
+	)
+	final class129 this$0;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lda;)V"
+	)
+	class148(class129 var1) {
+		this.this$0 = var1;
+		this.field1658 = -1L; // L: 194
+		this.field1652 = null; // L: 195
+	} // L: 197
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
+	)
+	void vmethod3029(Buffer var1) {
+		if (var1.readUnsignedByte() != 255) { // L: 200
+			--var1.offset; // L: 201
+			this.field1658 = var1.readLong(); // L: 202
+		}
+
+		this.field1652 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204
+	} // L: 205
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
+	)
+	void vmethod3028(ClanSettings var1) {
+		var1.method2853(this.field1658, this.field1652); // L: 208
+	} // L: 209
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lfm;",
+		garbageValue = "-2041302751"
+	)
+	@Export("getObjectDefinition")
+	public static ObjectComposition getObjectDefinition(int var0) {
+		ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 79
+		if (var1 != null) { // L: 80
+			return var1;
+		} else {
+			byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 81
+			var1 = new ObjectComposition(); // L: 82
+			var1.id = var0; // L: 83
+			if (var2 != null) { // L: 84
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode(); // L: 85
+			if (var1.isSolid) { // L: 86
+				var1.interactType = 0; // L: 87
+				var1.boolean1 = false; // L: 88
+			}
+
+			ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90
+			return var1; // L: 91
+		}
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "498482718"
+	)
+	static int method3019(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1200
+		if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1201
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class404.Widget_unpackTargetMask(class363.getWidgetFlags(var3)); // L: 1202
+			return 1; // L: 1203
+		} else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1205
+			if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1212
+				if (var3.dataText == null) { // L: 1213
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = "";
+				} else {
+					Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1214
+				}
+
+				return 1; // L: 1215
+			} else {
+				return 2; // L: 1217
+			}
+		} else {
+			int var4 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 1206
+			--var4; // L: 1207
+			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1208
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1209
+			} else {
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = "";
+			}
+
+			return 1; // L: 1210
+		}
+	}
+
+	@ObfuscatedName("fl")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1459552058"
+	)
+	@Export("playPcmPlayers")
+	static final void playPcmPlayers() {
+		if (PacketWriter.pcmPlayer1 != null) { // L: 4298
+			PacketWriter.pcmPlayer1.run();
+		}
+
+		if (JagexCache.pcmPlayer0 != null) { // L: 4299
+			JagexCache.pcmPlayer0.run();
+		}
+
+	} // L: 4300
+
+	@ObfuscatedName("hd")
+	@ObfuscatedSignature(
+		descriptor = "(Lcy;IIIIII)V",
+		garbageValue = "1260846152"
+	)
+	@Export("drawActor2d")
+	static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
+		if (var0 != null && var0.isVisible()) { // L: 5592
+			if (var0 instanceof NPC) { // L: 5593
+				NPCComposition var6 = ((NPC)var0).definition; // L: 5594
+				if (var6.transforms != null) { // L: 5595
+					var6 = var6.transform();
+				}
+
+				if (var6 == null) { // L: 5596
+					return;
+				}
+			}
+
+			int var75 = Players.Players_count; // L: 5598
+			int[] var7 = Players.Players_indices; // L: 5599
+			byte var8 = 0; // L: 5600
+			Player var10;
+			if (var1 < var75 && var0.playerCycle == Client.cycle) { // L: 5601
+				var10 = (Player)var0; // L: 5603
+				boolean var9;
+				if (Client.drawPlayerNames == 0) { // L: 5605
+					var9 = false; // L: 5606
+				} else if (var10 == class340.localPlayer) { // L: 5609
+					var9 = class329.method6133(); // L: 5628
+				} else {
+					boolean var11 = MilliClock.method3121(); // L: 5610
+					boolean var12;
+					if (!var11) { // L: 5611
+						var12 = (Client.drawPlayerNames & 1) != 0; // L: 5614
+						var11 = var12 && var10.isFriend(); // L: 5616
+					}
+
+					var12 = var11; // L: 5618
+					if (!var11) { // L: 5619
+						boolean var13 = (Client.drawPlayerNames & 2) != 0; // L: 5622
+						var12 = var13 && var10.isFriendsChatMember(); // L: 5624
+					}
+
+					var9 = var12; // L: 5626
+				}
+
+				if (var9) { // L: 5630
+					Player var76 = (Player)var0; // L: 5631
+					if (var1 < var75) { // L: 5632
+						VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5633
+						AbstractFont var77 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 5634
+						byte var91 = 9; // L: 5635
+						var77.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var91, 16777215, 0); // L: 5636
+						var8 = 18; // L: 5637
+					}
+				}
+			}
+
+			int var87 = -2; // L: 5641
+			int var15;
+			int var22;
+			int var23;
+			if (!var0.healthBars.method5915()) { // L: 5642
+				VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5643
+
+				for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { // L: 5644
+					HealthBarUpdate var95 = var88.get(Client.cycle); // L: 5645
+					if (var95 == null) { // L: 5646
+						if (var88.isEmpty()) { // L: 5704
+							var88.remove();
+						}
+					} else {
+						HealthBarDefinition var96 = var88.definition; // L: 5647
+						SpritePixels var79 = var96.getBackSprite(); // L: 5648
+						SpritePixels var81 = var96.getFrontSprite(); // L: 5649
+						int var82 = 0; // L: 5651
+						if (var79 != null && var81 != null) { // L: 5652
+							if (var96.widthPadding * 2 < var81.subWidth) { // L: 5653
+								var82 = var96.widthPadding;
+							}
+
+							var15 = var81.subWidth - var82 * 2; // L: 5654
+						} else {
+							var15 = var96.width; // L: 5656
+						}
+
+						int var17 = 255; // L: 5657
+						boolean var83 = true; // L: 5658
+						int var84 = Client.cycle - var95.cycle; // L: 5659
+						int var85 = var15 * var95.health2 / var96.width; // L: 5660
+						int var86;
+						int var98;
+						if (var95.cycleOffset > var84) { // L: 5661
+							var86 = var96.field1798 == 0 ? 0 : var96.field1798 * (var84 / var96.field1798); // L: 5662
+							var22 = var15 * var95.health / var96.width; // L: 5663
+							var98 = var86 * (var85 - var22) / var95.cycleOffset + var22; // L: 5664
+						} else {
+							var98 = var85; // L: 5667
+							var86 = var95.cycleOffset + var96.int5 - var84; // L: 5668
+							if (var96.int3 >= 0) { // L: 5669
+								var17 = (var86 << 8) / (var96.int5 - var96.int3);
+							}
+						}
+
+						if (var95.health2 > 0 && var98 < 1) { // L: 5671
+							var98 = 1;
+						}
+
+						if (var79 != null && var81 != null) { // L: 5672
+							if (var98 == var15) { // L: 5673
+								var98 += var82 * 2;
+							} else {
+								var98 += var82; // L: 5674
+							}
+
+							var86 = var79.subHeight; // L: 5675
+							var87 += var86; // L: 5676
+							var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 5677
+							var23 = var3 + Client.viewportTempY - var87; // L: 5678
+							var22 -= var82; // L: 5679
+							if (var17 >= 0 && var17 < 255) { // L: 5680
+								var79.drawTransAt(var22, var23, var17); // L: 5681
+								Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var98 + var22, var23 + var86); // L: 5682
+								var81.drawTransAt(var22, var23, var17); // L: 5683
+							} else {
+								var79.drawTransBgAt(var22, var23); // L: 5686
+								Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var98, var86 + var23); // L: 5687
+								var81.drawTransBgAt(var22, var23); // L: 5688
+							}
+
+							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 5690
+							var87 += 2; // L: 5691
+						} else {
+							var87 += 5; // L: 5694
+							if (Client.viewportTempX > -1) { // L: 5695
+								var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 5696
+								var22 = var3 + Client.viewportTempY - var87; // L: 5697
+								Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var98, 5, 65280); // L: 5698
+								Rasterizer2D.Rasterizer2D_fillRectangle(var98 + var86, var22, var15 - var98, 5, 16711680); // L: 5699
+							}
+
+							var87 += 2; // L: 5701
+						}
+					}
+				}
+			}
+
+			if (var87 == -2) { // L: 5707
+				var87 += 7;
+			}
+
+			var87 += var8; // L: 5708
+			if (var1 < var75) { // L: 5709
+				var10 = (Player)var0; // L: 5710
+				if (var10.isHidden) { // L: 5711
+					return;
+				}
+
+				if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 5712
+					VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5713
+					if (Client.viewportTempX > -1) { // L: 5714
+						if (var10.headIconPk != -1) { // L: 5715
+							var87 += 25; // L: 5716
+							class286.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 5717
+						}
+
+						if (var10.headIconPrayer != -1) { // L: 5719
+							var87 += 25; // L: 5720
+							PlayerComposition.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 5721
+						}
+					}
+				}
+
+				if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 5725
+					VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5726
+					if (Client.viewportTempX > -1) { // L: 5727
+						var87 += class260.headIconHintSprites[1].subHeight; // L: 5728
+						class260.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 5729
+					}
+				}
+			} else {
+				NPCComposition var89 = ((NPC)var0).definition; // L: 5734
+				if (var89.transforms != null) { // L: 5735
+					var89 = var89.transform();
+				}
+
+				if (var89.headIconPrayer >= 0 && var89.headIconPrayer < PlayerComposition.headIconPrayerSprites.length) { // L: 5736
+					VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5737
+					if (Client.viewportTempX > -1) { // L: 5738
+						PlayerComposition.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 5739
+					}
+				}
+
+				if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 5742
+					VarpDefinition.method3167(var0, var0.defaultHeight + 15); // L: 5743
+					if (Client.viewportTempX > -1) { // L: 5744
+						class260.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
+					}
+				}
+			}
+
+			if (var0.overheadText != null && (var1 >= var75 || !var0.field1114 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5747 5748
+				VarpDefinition.method3167(var0, var0.defaultHeight); // L: 5749
+				if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5750
+					Client.overheadTextXOffsets[Client.overheadTextCount] = class136.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5751
+					Client.overheadTextAscents[Client.overheadTextCount] = class136.fontBold12.ascent; // L: 5752
+					Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5753
+					Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5754
+					Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5755
+					Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5756
+					Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5757
+					Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5758
+					++Client.overheadTextCount; // L: 5759
+				}
+			}
+
+			for (int var78 = 0; var78 < 4; ++var78) { // L: 5763
+				int var90 = var0.hitSplatCycles[var78]; // L: 5764
+				int var92 = var0.hitSplatTypes[var78]; // L: 5765
+				HitSplatDefinition var97 = null; // L: 5766
+				int var14 = 0; // L: 5767
+				if (var92 >= 0) { // L: 5768
+					if (var90 <= Client.cycle) { // L: 5769
+						continue;
+					}
+
+					var97 = UserComparator6.method2554(var0.hitSplatTypes[var78]); // L: 5770
+					var14 = var97.field1934; // L: 5771
+					if (var97 != null && var97.transforms != null) { // L: 5772
+						var97 = var97.transform(); // L: 5773
+						if (var97 == null) { // L: 5774
+							var0.hitSplatCycles[var78] = -1; // L: 5775
+							continue; // L: 5776
+						}
+					}
+				} else if (var90 < 0) { // L: 5780
+					continue;
+				}
+
+				var15 = var0.hitSplatTypes2[var78]; // L: 5781
+				HitSplatDefinition var16 = null; // L: 5782
+				if (var15 >= 0) { // L: 5783
+					var16 = UserComparator6.method2554(var15); // L: 5784
+					if (var16 != null && var16.transforms != null) { // L: 5785
+						var16 = var16.transform();
+					}
+				}
+
+				if (var90 - var14 <= Client.cycle) { // L: 5787
+					if (var97 == null) { // L: 5788
+						var0.hitSplatCycles[var78] = -1; // L: 5789
+					} else {
+						VarpDefinition.method3167(var0, var0.defaultHeight / 2); // L: 5792
+						if (Client.viewportTempX > -1) { // L: 5793
+							boolean var93 = true; // L: 5794
+							if (var78 == 1) { // L: 5795
+								Client.viewportTempY -= 20; // L: 5796
+							}
+
+							if (var78 == 2) { // L: 5798
+								Client.viewportTempX -= 15; // L: 5799
+								Client.viewportTempY -= 10; // L: 5800
+							}
+
+							if (var78 == 3) { // L: 5802
+								Client.viewportTempX += 15; // L: 5803
+								Client.viewportTempY -= 10; // L: 5804
+							}
+
+							SpritePixels var18 = null; // L: 5806
+							SpritePixels var19 = null; // L: 5807
+							SpritePixels var20 = null; // L: 5808
+							SpritePixels var21 = null; // L: 5809
+							var22 = 0; // L: 5810
+							var23 = 0; // L: 5811
+							int var24 = 0; // L: 5812
+							int var25 = 0; // L: 5813
+							int var26 = 0; // L: 5814
+							int var27 = 0; // L: 5815
+							int var28 = 0; // L: 5816
+							int var29 = 0; // L: 5817
+							SpritePixels var30 = null; // L: 5818
+							SpritePixels var31 = null; // L: 5819
+							SpritePixels var32 = null; // L: 5820
+							SpritePixels var33 = null; // L: 5821
+							int var34 = 0; // L: 5822
+							int var35 = 0; // L: 5823
+							int var36 = 0; // L: 5824
+							int var37 = 0; // L: 5825
+							int var38 = 0; // L: 5826
+							int var39 = 0; // L: 5827
+							int var40 = 0; // L: 5828
+							int var41 = 0; // L: 5829
+							int var42 = 0; // L: 5830
+							var18 = var97.method3451(); // L: 5831
+							int var43;
+							if (var18 != null) { // L: 5832
+								var22 = var18.subWidth; // L: 5833
+								var43 = var18.subHeight; // L: 5834
+								if (var43 > var42) { // L: 5835
+									var42 = var43;
+								}
+
+								var26 = var18.xOffset; // L: 5836
+							}
+
+							var19 = var97.method3452(); // L: 5838
+							if (var19 != null) { // L: 5839
+								var23 = var19.subWidth; // L: 5840
+								var43 = var19.subHeight; // L: 5841
+								if (var43 > var42) { // L: 5842
+									var42 = var43;
+								}
+
+								var27 = var19.xOffset; // L: 5843
+							}
+
+							var20 = var97.method3453(); // L: 5845
+							if (var20 != null) { // L: 5846
+								var24 = var20.subWidth; // L: 5847
+								var43 = var20.subHeight; // L: 5848
+								if (var43 > var42) { // L: 5849
+									var42 = var43;
+								}
+
+								var28 = var20.xOffset; // L: 5850
+							}
+
+							var21 = var97.method3454(); // L: 5852
+							if (var21 != null) { // L: 5853
+								var25 = var21.subWidth; // L: 5854
+								var43 = var21.subHeight; // L: 5855
+								if (var43 > var42) { // L: 5856
+									var42 = var43;
+								}
+
+								var29 = var21.xOffset; // L: 5857
+							}
+
+							if (var16 != null) { // L: 5859
+								var30 = var16.method3451(); // L: 5860
+								if (var30 != null) { // L: 5861
+									var34 = var30.subWidth; // L: 5862
+									var43 = var30.subHeight; // L: 5863
+									if (var43 > var42) { // L: 5864
+										var42 = var43;
+									}
+
+									var38 = var30.xOffset; // L: 5865
+								}
+
+								var31 = var16.method3452(); // L: 5867
+								if (var31 != null) { // L: 5868
+									var35 = var31.subWidth; // L: 5869
+									var43 = var31.subHeight; // L: 5870
+									if (var43 > var42) { // L: 5871
+										var42 = var43;
+									}
+
+									var39 = var31.xOffset; // L: 5872
+								}
+
+								var32 = var16.method3453(); // L: 5874
+								if (var32 != null) { // L: 5875
+									var36 = var32.subWidth; // L: 5876
+									var43 = var32.subHeight; // L: 5877
+									if (var43 > var42) { // L: 5878
+										var42 = var43;
+									}
+
+									var40 = var32.xOffset; // L: 5879
+								}
+
+								var33 = var16.method3454(); // L: 5881
+								if (var33 != null) { // L: 5882
+									var37 = var33.subWidth; // L: 5883
+									var43 = var33.subHeight; // L: 5884
+									if (var43 > var42) { // L: 5885
+										var42 = var43;
+									}
+
+									var41 = var33.xOffset; // L: 5886
+								}
+							}
+
+							Font var80 = var97.getFont(); // L: 5891
+							if (var80 == null) { // L: 5892
+								var80 = class307.fontPlain11;
+							}
+
+							Font var44;
+							if (var16 != null) { // L: 5893
+								var44 = var16.getFont(); // L: 5894
+								if (var44 == null) { // L: 5895
+									var44 = class307.fontPlain11;
+								}
+							} else {
+								var44 = class307.fontPlain11; // L: 5897
+							}
+
+							String var45 = null; // L: 5898
+							String var46 = null; // L: 5899
+							boolean var47 = false; // L: 5900
+							int var48 = 0; // L: 5901
+							var45 = var97.getString(var0.hitSplatValues[var78]); // L: 5902
+							int var94 = var80.stringWidth(var45); // L: 5903
+							if (var16 != null) { // L: 5904
+								var46 = var16.getString(var0.hitSplatValues2[var78]); // L: 5905
+								var48 = var44.stringWidth(var46); // L: 5906
+							}
+
+							int var49 = 0; // L: 5908
+							int var50 = 0; // L: 5909
+							if (var23 > 0) { // L: 5910
+								if (var20 == null && var21 == null) { // L: 5911
+									var49 = 1; // L: 5912
+								} else {
+									var49 = var94 / var23 + 1;
+								}
+							}
+
+							if (var16 != null && var35 > 0) { // L: 5914 5915
+								if (var32 == null && var33 == null) { // L: 5916
+									var50 = 1; // L: 5917
+								} else {
+									var50 = var48 / var35 + 1;
+								}
+							}
+
+							int var51 = 0; // L: 5920
+							int var52 = var51; // L: 5921
+							if (var22 > 0) {
+								var51 += var22; // L: 5922
+							}
+
+							var51 += 2; // L: 5923
+							int var53 = var51; // L: 5924
+							if (var24 > 0) { // L: 5925
+								var51 += var24;
+							}
+
+							int var54 = var51; // L: 5926
+							int var55 = var51; // L: 5927
+							int var56;
+							if (var23 > 0) { // L: 5928
+								var56 = var49 * var23; // L: 5929
+								var51 += var56; // L: 5930
+								var55 += (var56 - var94) / 2; // L: 5931
+							} else {
+								var51 += var94; // L: 5934
+							}
+
+							var56 = var51; // L: 5936
+							if (var25 > 0) { // L: 5937
+								var51 += var25;
+							}
+
+							int var57 = 0; // L: 5938
+							int var58 = 0; // L: 5939
+							int var59 = 0; // L: 5940
+							int var60 = 0; // L: 5941
+							int var61 = 0; // L: 5942
+							int var62;
+							if (var16 != null) { // L: 5943
+								var51 += 2; // L: 5944
+								var57 = var51; // L: 5945
+								if (var34 > 0) { // L: 5946
+									var51 += var34;
+								}
+
+								var51 += 2; // L: 5947
+								var58 = var51; // L: 5948
+								if (var36 > 0) { // L: 5949
+									var51 += var36;
+								}
+
+								var59 = var51; // L: 5950
+								var61 = var51; // L: 5951
+								if (var35 > 0) { // L: 5952
+									var62 = var50 * var35; // L: 5953
+									var51 += var62; // L: 5954
+									var61 += (var62 - var48) / 2; // L: 5955
+								} else {
+									var51 += var48; // L: 5958
+								}
+
+								var60 = var51; // L: 5960
+								if (var37 > 0) { // L: 5961
+									var51 += var37;
+								}
+							}
+
+							var62 = var0.hitSplatCycles[var78] - Client.cycle; // L: 5963
+							int var63 = var97.field1929 - var62 * var97.field1929 / var97.field1934; // L: 5964
+							int var64 = var62 * var97.field1940 / var97.field1934 + -var97.field1940; // L: 5965
+							int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 5966
+							int var66 = var64 + (var3 + Client.viewportTempY - 12); // L: 5967
+							int var67 = var66; // L: 5968
+							int var68 = var66 + var42; // L: 5969
+							int var69 = var66 + var97.field1944 + 15; // L: 5970
+							int var70 = var69 - var80.maxAscent; // L: 5971
+							int var71 = var69 + var80.maxDescent; // L: 5972
+							if (var70 < var66) { // L: 5973
+								var67 = var70;
+							}
+
+							if (var71 > var68) { // L: 5974
+								var68 = var71;
+							}
+
+							int var72 = 0; // L: 5975
+							int var73;
+							int var74;
+							if (var16 != null) { // L: 5976
+								var72 = var66 + var16.field1944 + 15; // L: 5977
+								var73 = var72 - var44.maxAscent; // L: 5978
+								var74 = var72 + var44.maxDescent; // L: 5979
+								if (var73 < var67) { // L: 5980
+									;
+								}
+
+								if (var74 > var68) { // L: 5981
+									;
+								}
+							}
+
+							var73 = 255; // L: 5983
+							if (var97.field1943 >= 0) { // L: 5984
+								var73 = (var62 << 8) / (var97.field1934 - var97.field1943);
+							}
+
+							if (var73 >= 0 && var73 < 255) { // L: 5985
+								if (var18 != null) { // L: 5986
+									var18.drawTransAt(var65 + var52 - var26, var66, var73);
+								}
+
+								if (var20 != null) { // L: 5987
+									var20.drawTransAt(var53 + var65 - var28, var66, var73);
+								}
+
+								if (var19 != null) { // L: 5988
+									for (var74 = 0; var74 < var49; ++var74) { // L: 5989
+										var19.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73); // L: 5990
+									}
+								}
+
+								if (var21 != null) { // L: 5993
+									var21.drawTransAt(var56 + var65 - var29, var66, var73);
+								}
+
+								var80.drawAlpha(var45, var65 + var55, var69, var97.textColor, 0, var73); // L: 5994
+								if (var16 != null) { // L: 5995
+									if (var30 != null) { // L: 5996
+										var30.drawTransAt(var65 + var57 - var38, var66, var73);
+									}
+
+									if (var32 != null) { // L: 5997
+										var32.drawTransAt(var65 + var58 - var40, var66, var73);
+									}
+
+									if (var31 != null) { // L: 5998
+										for (var74 = 0; var74 < var50; ++var74) { // L: 5999
+											var31.drawTransAt(var74 * var35 + (var59 + var65 - var39), var66, var73); // L: 6000
+										}
+									}
+
+									if (var33 != null) { // L: 6003
+										var33.drawTransAt(var65 + var60 - var41, var66, var73);
+									}
+
+									var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 6004
+								}
+							} else {
+								if (var18 != null) { // L: 6008
+									var18.drawTransBgAt(var65 + var52 - var26, var66);
+								}
+
+								if (var20 != null) { // L: 6009
+									var20.drawTransBgAt(var65 + var53 - var28, var66);
+								}
+
+								if (var19 != null) { // L: 6010
+									for (var74 = 0; var74 < var49; ++var74) { // L: 6011
+										var19.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); // L: 6012
+									}
+								}
+
+								if (var21 != null) { // L: 6015
+									var21.drawTransBgAt(var56 + var65 - var29, var66);
+								}
+
+								var80.draw(var45, var65 + var55, var69, var97.textColor | -16777216, 0); // L: 6016
+								if (var16 != null) { // L: 6017
+									if (var30 != null) { // L: 6018
+										var30.drawTransBgAt(var65 + var57 - var38, var66);
+									}
+
+									if (var32 != null) { // L: 6019
+										var32.drawTransBgAt(var58 + var65 - var40, var66);
+									}
+
+									if (var31 != null) { // L: 6020
+										for (var74 = 0; var74 < var50; ++var74) { // L: 6021
+											var31.drawTransBgAt(var35 * var74 + (var59 + var65 - var39), var66); // L: 6022
+										}
+									}
+
+									if (var33 != null) { // L: 6025
+										var33.drawTransBgAt(var60 + var65 - var41, var66);
+									}
+
+									var44.draw(var46, var65 + var61, var72, var16.textColor | -16777216, 0); // L: 6026
+								}
+							}
+						}
+					}
+				}
+			}
+
+		}
+	} // L: 6031
+
+	@ObfuscatedName("kc")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;IIIB)V",
+		garbageValue = "1"
+	)
+	@Export("drawMinimap")
+	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
+		playPcmPlayers(); // L: 12324
+		SpriteMask var4 = var0.getSpriteMask(false); // L: 12325
+		if (var4 != null) { // L: 12326
+			Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 12327
+			if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 12328
+				int var5 = Client.camAngleY & 2047; // L: 12329
+				int var6 = class340.localPlayer.x / 32 + 48; // L: 12330
+				int var7 = 464 - class340.localPlayer.y / 32; // L: 12331
+				class29.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 12332
+
+				int var8;
+				int var10;
+				int var16;
+				for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 12333
+					var16 = Client.mapIconXs[var8] * 4 + 2 - class340.localPlayer.x / 32; // L: 12334
+					var10 = Client.mapIconYs[var8] * 4 + 2 - class340.localPlayer.y / 32; // L: 12335
+					ArchiveDisk.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 12336
+				}
+
+				int var11;
+				int var12;
+				for (var8 = 0; var8 < 104; ++var8) { // L: 12338
+					for (var16 = 0; var16 < 104; ++var16) { // L: 12339
+						NodeDeque var14 = Client.groundItems[class20.Client_plane][var8][var16]; // L: 12340
+						if (var14 != null) { // L: 12341
+							var11 = var8 * 4 + 2 - class340.localPlayer.x / 32; // L: 12342
+							var12 = var16 * 4 + 2 - class340.localPlayer.y / 32; // L: 12343
+							ArchiveDisk.drawSpriteOnMinimap(var1, var2, var11, var12, class111.mapDotSprites[0], var4); // L: 12344
+						}
+					}
+				}
+
+				for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 12348
+					NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 12349
+					if (var9 != null && var9.isVisible()) { // L: 12350
+						NPCComposition var18 = var9.definition; // L: 12351
+						if (var18 != null && var18.transforms != null) { // L: 12352
+							var18 = var18.transform();
+						}
+
+						if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 12353
+							var11 = var9.x / 32 - class340.localPlayer.x / 32; // L: 12354
+							var12 = var9.y / 32 - class340.localPlayer.y / 32; // L: 12355
+							ArchiveDisk.drawSpriteOnMinimap(var1, var2, var11, var12, class111.mapDotSprites[1], var4); // L: 12356
+						}
+					}
+				}
+
+				var8 = Players.Players_count; // L: 12360
+				int[] var17 = Players.Players_indices; // L: 12361
+
+				for (var10 = 0; var10 < var8; ++var10) { // L: 12362
+					Player var15 = Client.players[var17[var10]]; // L: 12363
+					if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class340.localPlayer) { // L: 12364
+						var12 = var15.x / 32 - class340.localPlayer.x / 32; // L: 12365
+						int var13 = var15.y / 32 - class340.localPlayer.y / 32; // L: 12366
+						if (var15.isFriend()) { // L: 12367
+							ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[3], var4);
+						} else if (class340.localPlayer.team != 0 && var15.team != 0 && var15.team == class340.localPlayer.team) { // L: 12368
+							ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[4], var4);
+						} else if (var15.isFriendsChatMember()) { // L: 12369
+							ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[5], var4);
+						} else if (var15.isClanMember()) { // L: 12370
+							ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[6], var4);
+						} else {
+							ArchiveDisk.drawSpriteOnMinimap(var1, var2, var12, var13, class111.mapDotSprites[2], var4); // L: 12371
+						}
+					}
+				}
+
+				if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 12374
+					if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 12375
+						NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 12376
+						if (var19 != null) { // L: 12377
+							var11 = var19.x / 32 - class340.localPlayer.x / 32; // L: 12378
+							var12 = var19.y / 32 - class340.localPlayer.y / 32; // L: 12379
+							class409.worldToMinimap(var1, var2, var11, var12, UserComparator7.mapMarkerSprites[1], var4); // L: 12380
+						}
+					}
+
+					if (Client.hintArrowType == 2) { // L: 12383
+						var10 = Client.hintArrowX * 4 - class131.baseX * 4 + 2 - class340.localPlayer.x / 32; // L: 12384
+						var11 = Client.hintArrowY * 4 - TileItem.baseY * 4 + 2 - class340.localPlayer.y / 32; // L: 12385
+						class409.worldToMinimap(var1, var2, var10, var11, UserComparator7.mapMarkerSprites[1], var4); // L: 12386
+					}
+
+					if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 12388
+						Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 12389
+						if (var20 != null) { // L: 12390
+							var11 = var20.x / 32 - class340.localPlayer.x / 32; // L: 12391
+							var12 = var20.y / 32 - class340.localPlayer.y / 32; // L: 12392
+							class409.worldToMinimap(var1, var2, var11, var12, UserComparator7.mapMarkerSprites[1], var4); // L: 12393
+						}
+					}
+				}
+
+				if (Client.destinationX != 0) { // L: 12397
+					var10 = Client.destinationX * 4 + 2 - class340.localPlayer.x / 32; // L: 12398
+					var11 = Client.destinationY * 4 + 2 - class340.localPlayer.y / 32; // L: 12399
+					ArchiveDisk.drawSpriteOnMinimap(var1, var2, var10, var11, UserComparator7.mapMarkerSprites[0], var4); // L: 12400
+				}
+
+				if (!class340.localPlayer.isHidden) { // L: 12402
+					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: 12404
+			}
+
+			Client.field686[var3] = true; // L: 12405
+		}
+	} // L: 12406
+}
diff --git a/runescape-client/src/main/java/class149.java b/runescape-client/src/main/java/class149.java
new file mode 100644
index 0000000000..a3e24e571b
--- /dev/null
+++ b/runescape-client/src/main/java/class149.java
@@ -0,0 +1,71 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ex")
+public class class149 extends class142 {
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 351712585
+	)
+	public static int field1663;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = -1386681445
+	)
+	static int field1661;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lpi;"
+	)
+	@Export("NetCache_responseArchiveBuffer")
+	public static Buffer NetCache_responseArchiveBuffer;
+	@ObfuscatedName("c")
+	String field1662;
+	@ObfuscatedName("b")
+	byte field1660;
+	@ObfuscatedName("p")
+	byte field1659;
+	// $FF: synthetic field
+	@ObfuscatedSignature(
+		descriptor = "Len;"
+	)
+	final class143 this$0;
+
+	@ObfuscatedSignature(
+		descriptor = "(Len;)V"
+	)
+	class149(class143 var1) {
+		this.this$0 = var1; // L: 155
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;B)V",
+		garbageValue = "4"
+	)
+	void vmethod3022(Buffer var1) {
+		this.field1662 = var1.readStringCp1252NullTerminatedOrNull(); // L: 158
+		if (this.field1662 != null) { // L: 159
+			var1.readUnsignedByte(); // L: 160
+			this.field1660 = var1.readByte(); // L: 161
+			this.field1659 = var1.readByte(); // L: 162
+		}
+
+	} // L: 164
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lei;B)V",
+		garbageValue = "40"
+	)
+	void vmethod3021(ClanChannel var1) {
+		var1.name = this.field1662; // L: 167
+		if (this.field1662 != null) { // L: 168
+			var1.field1636 = this.field1660; // L: 169
+			var1.field1643 = this.field1659; // L: 170
+		}
+
+	} // L: 172
+}
diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java
index 4e9a254d48..0fe7c18cc0 100644
--- a/runescape-client/src/main/java/class15.java
+++ b/runescape-client/src/main/java/class15.java
@@ -12,10 +12,10 @@
 import org.bouncycastle.crypto.tls.TlsClientProtocol;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
-@ObfuscatedName("u")
+@ObfuscatedName("e")
 public class class15 extends SSLSocketFactory {
-	@ObfuscatedName("i")
-	SecureRandom field70;
+	@ObfuscatedName("c")
+	SecureRandom field85;
 
 	static {
 		if (Security.getProvider("BC") == null) { // L: 40
@@ -25,52 +25,52 @@ public class class15 extends SSLSocketFactory {
 	} // L: 41
 
 	class15() {
-		this.field70 = new SecureRandom(); // L: 43
+		this.field85 = new SecureRandom(); // L: 43
 	} // L: 45
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;I)Ljavax/net/ssl/SSLSocket;",
-		garbageValue = "-115547208"
+		descriptor = "(Ljava/lang/String;Lorg/bouncycastle/crypto/tls/TlsClientProtocol;B)Ljavax/net/ssl/SSLSocket;",
+		garbageValue = "117"
 	)
-	SSLSocket method197(String var1, TlsClientProtocol var2) {
-		return new class12(this, var2, var1); // L: 83
+	SSLSocket method227(String var1, TlsClientProtocol var2) {
+		return new class12(this, var2, var1); // L: 90
 	}
 
 	public Socket createSocket(Socket var1, String var2, int var3, boolean var4) throws IOException {
-		if (var1 == null) { // L: 48
-			var1 = new Socket(); // L: 49
+		if (var1 == null) { // L: 49
+			var1 = new Socket(); // L: 50
 		}
 
-		if (!var1.isConnected()) { // L: 51
-			var1.connect(new InetSocketAddress(var2, var3)); // L: 52
+		if (!var1.isConnected()) { // L: 52
+			var1.connect(new InetSocketAddress(var2, var3)); // L: 53
 		}
 
-		TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field70); // L: 54
-		return this.method197(var2, var5); // L: 55
+		TlsClientProtocol var5 = new TlsClientProtocol(var1.getInputStream(), var1.getOutputStream(), this.field85); // L: 55
+		return this.method227(var2, var5); // L: 56
 	}
 
-	public String[] getDefaultCipherSuites() {
-		return null; // L: 59
+	public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException {
+		return null; // L: 86
 	}
 
-	public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException {
-		return null; // L: 67
+	public String[] getDefaultCipherSuites() {
+		return null; // L: 61
 	}
 
-	public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException {
-		return null; // L: 75
+	public String[] getSupportedCipherSuites() {
+		return null; // L: 66
 	}
 
-	public Socket createSocket(InetAddress var1, int var2) throws IOException {
+	public Socket createSocket(String var1, int var2) throws IOException, UnknownHostException {
 		return null; // L: 71
 	}
 
-	public String[] getSupportedCipherSuites() {
-		return null; // L: 63
+	public Socket createSocket(InetAddress var1, int var2) throws IOException {
+		return null; // L: 76
 	}
 
-	public Socket createSocket(InetAddress var1, int var2, InetAddress var3, int var4) throws IOException {
-		return null; // L: 79
+	public Socket createSocket(String var1, int var2, InetAddress var3, int var4) throws IOException, UnknownHostException {
+		return null; // L: 81
 	}
 }
diff --git a/runescape-client/src/main/java/class150.java b/runescape-client/src/main/java/class150.java
index 704a8c66d5..f5ec9c33cf 100644
--- a/runescape-client/src/main/java/class150.java
+++ b/runescape-client/src/main/java/class150.java
@@ -3,123 +3,50 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ey")
-public class class150 {
-	@ObfuscatedName("os")
+@ObfuscatedName("ec")
+public class class150 extends class126 {
+	@ObfuscatedName("dc")
+	@Export("mouseCam")
+	static boolean mouseCam;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 341290279
+		intValue = 43726911
 	)
-	static int field1604;
-	@ObfuscatedName("s")
-	public short[] field1598;
-	@ObfuscatedName("a")
-	public short[] field1600;
-
-	class150(int var1) {
-		ItemComposition var2 = TaskHandler.ItemDefinition_get(var1); // L: 12
-		if (var2.method3368()) { // L: 13
-			this.field1598 = new short[var2.recolorTo.length];
-			System.arraycopy(var2.recolorTo, 0, this.field1598, 0, this.field1598.length); // L: 15
-		}
-
-		if (var2.method3347()) { // L: 17
-			this.field1600 = new short[var2.retextureTo.length]; // L: 18
-			System.arraycopy(var2.retextureTo, 0, this.field1600, 0, this.field1600.length); // L: 19
-		}
-
-	} // L: 21
-
-	@ObfuscatedName("i")
+	int field1666;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		longValue = -6413239553486837791L
+	)
+	long field1669;
+	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "(I)[Lfg;",
-		garbageValue = "-639525716"
+		descriptor = "Lda;"
 	)
-	static VerticalAlignment[] method2969() {
-		return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1744, VerticalAlignment.field1743}; // L: 14
-	}
+	final class129 this$0;
 
-	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lfy;",
-		garbageValue = "5"
+		descriptor = "(Lda;)V"
 	)
-	public static VarbitComposition method2965(int var0) {
-		VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 32
-		if (var1 != null) { // L: 33
-			return var1;
-		} else {
-			byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 34
-			var1 = new VarbitComposition(); // L: 35
-			if (var2 != null) { // L: 36
-				var1.decode(new Buffer(var2));
-			}
-
-			VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 37
-			return var1; // L: 38
-		}
+	class150(class129 var1) {
+		this.this$0 = var1; // L: 307
 	}
 
-	@ObfuscatedName("hm")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "1306272035"
+		descriptor = "(Lpi;I)V",
+		garbageValue = "1416770155"
 	)
-	static int method2971(int var0, int var1) {
-		int var2 = var1 - 334; // L: 5656
-		if (var2 < 0) { // L: 5657
-			var2 = 0;
-		} else if (var2 > 100) { // L: 5658
-			var2 = 100;
-		}
+	void vmethod3029(Buffer var1) {
+		this.field1666 = var1.readInt(); // L: 310
+		this.field1669 = var1.readLong(); // L: 311
+	} // L: 312
 
-		int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5659
-		return var0 * var3 / 256; // L: 5660
-	}
-
-	@ObfuscatedName("jp")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "([Ljf;IB)V",
-		garbageValue = "-37"
+		descriptor = "(Lej;I)V",
+		garbageValue = "-1531735008"
 	)
-	@Export("runComponentCloseListeners")
-	static final void runComponentCloseListeners(Widget[] var0, int var1) {
-		for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11126
-			Widget var3 = var0[var2]; // L: 11127
-			if (var3 != null) { // L: 11128
-				if (var3.type == 0) { // L: 11129
-					if (var3.children != null) { // L: 11130
-						runComponentCloseListeners(var3.children, var1);
-					}
-
-					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11131
-					if (var4 != null) { // L: 11132
-						ItemComposition.runIntfCloseListeners(var4.group, var1);
-					}
-				}
-
-				ScriptEvent var5;
-				if (var1 == 0 && var3.onDialogAbort != null) { // L: 11134
-					var5 = new ScriptEvent(); // L: 11135
-					var5.widget = var3; // L: 11136
-					var5.args = var3.onDialogAbort; // L: 11137
-					Tile.runScriptEvent(var5); // L: 11138
-				}
-
-				if (var1 == 1 && var3.onSubChange != null) { // L: 11140
-					if (var3.childIndex >= 0) { // L: 11141
-						Widget var6 = UserComparator9.getWidget(var3.id); // L: 11142
-						if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 11143
-							continue;
-						}
-					}
-
-					var5 = new ScriptEvent(); // L: 11147
-					var5.widget = var3; // L: 11148
-					var5.args = var3.onSubChange; // L: 11149
-					Tile.runScriptEvent(var5); // L: 11150
-				}
-			}
-		}
-
-	} // L: 11153
+	void vmethod3028(ClanSettings var1) {
+		var1.method2856(this.field1666, this.field1669); // L: 315
+	} // L: 316
 }
diff --git a/runescape-client/src/main/java/class154.java b/runescape-client/src/main/java/class154.java
new file mode 100644
index 0000000000..b20691c0f9
--- /dev/null
+++ b/runescape-client/src/main/java/class154.java
@@ -0,0 +1,14 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("eq")
+public interface class154 {
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "-65"
+	)
+	@Export("useRotation")
+	int useRotation();
+}
diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/class157.java
deleted file mode 100644
index 7f86e0fc3c..0000000000
--- a/runescape-client/src/main/java/class157.java
+++ /dev/null
@@ -1,39 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("fa")
-public class class157 {
-	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = -720969089
-	)
-	static int field1675;
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Ljd;",
-		garbageValue = "1047371147"
-	)
-	public static StudioGame[] method3084() {
-		return new StudioGame[]{StudioGame.game5, StudioGame.stellardawn, StudioGame.runescape, StudioGame.game3, StudioGame.game4, StudioGame.oldscape}; // L: 17
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)I",
-		garbageValue = "-130227421"
-	)
-	@Export("hashString")
-	public static int hashString(CharSequence var0) {
-		int var1 = var0.length(); // L: 140
-		int var2 = 0; // L: 141
-
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 142
-			var2 = (var2 << 5) - var2 + AbstractSocket.charToByteCp1252(var0.charAt(var3));
-		}
-
-		return var2; // L: 143
-	}
-}
diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java
index 68b3f3f527..6c4d3b8ce8 100644
--- a/runescape-client/src/main/java/class16.java
+++ b/runescape-client/src/main/java/class16.java
@@ -1,481 +1,67 @@
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InvalidClassException;
-import java.io.ObjectInputStream;
-import java.io.OptionalDataException;
-import java.io.StreamCorruptedException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
 
-@ObfuscatedName("n")
+@ObfuscatedName("a")
 public class class16 implements ThreadFactory {
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "Loe;"
-	)
-	@Export("logoSprite")
-	static IndexedSprite logoSprite;
-	@ObfuscatedName("i")
-	final ThreadGroup field74;
-	@ObfuscatedName("w")
-	final AtomicInteger field75;
+	@ObfuscatedName("c")
+	final ThreadGroup field87;
+	@ObfuscatedName("b")
+	final AtomicInteger field86;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Ll;"
+		descriptor = "Lg;"
 	)
 	final class14 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ll;)V"
+		descriptor = "(Lg;)V"
 	)
 	class16(class14 var1) {
-		this.this$0 = var1;
-		this.field75 = new AtomicInteger(1);
-		SecurityManager var2 = System.getSecurityManager();
-		this.field74 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup();
-	} // L: 70
+		this.this$0 = var1; // L: 68
+		this.field86 = new AtomicInteger(1); // L: 66
+		SecurityManager var2 = System.getSecurityManager(); // L: 69
+		this.field87 = var2 != null ? var2.getThreadGroup() : Thread.currentThread().getThreadGroup(); // L: 70
+	} // L: 71
 
 	public Thread newThread(Runnable var1) {
-		Thread var2 = new Thread(this.field74, var1, this.this$0.field62 + "-rest-request-" + this.field75.getAndIncrement(), 0L);
-		var2.setDaemon(true); // L: 74
-		var2.setPriority(5);
-		return var2; // L: 76
+		Thread var2 = new Thread(this.field87, var1, this.this$0.field79 + "-rest-request-" + this.field86.getAndIncrement(), 0L); // L: 75
+		var2.setDaemon(true); // L: 76
+		var2.setPriority(5); // L: 77
+		return var2; // L: 78
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Loj;I)V",
-		garbageValue = "-8513816"
+		descriptor = "(Ljm;II)V",
+		garbageValue = "-158278735"
 	)
-	@Export("performReflectionCheck")
-	public static void performReflectionCheck(PacketBuffer var0) {
-		ReflectionCheck var1 = (ReflectionCheck)class54.reflectionChecks.last(); // L: 29
-		if (var1 != null) { // L: 30
-			int var2 = var0.offset; // L: 31
-			var0.writeInt(var1.id); // L: 32
-
-			for (int var3 = 0; var3 < var1.size; ++var3) { // L: 33
-				if (var1.creationErrors[var3] != 0) { // L: 34
-					var0.writeByte(var1.creationErrors[var3]); // L: 35
-				} else {
-					try {
-						int var4 = var1.operations[var3]; // L: 39
-						Field var5;
-						int var6;
-						if (var4 == 0) { // L: 40
-							var5 = var1.fields[var3]; // L: 41
-							var6 = Reflection.getInt(var5, (Object)null); // L: 42
-							var0.writeByte(0); // L: 43
-							var0.writeInt(var6); // L: 44
-						} else if (var4 == 1) { // L: 46
-							var5 = var1.fields[var3]; // L: 47
-							Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 48
-							var0.writeByte(0); // L: 49
-						} else if (var4 == 2) { // L: 51
-							var5 = var1.fields[var3]; // L: 52
-							var6 = var5.getModifiers(); // L: 53
-							var0.writeByte(0); // L: 54
-							var0.writeInt(var6); // L: 55
-						}
-
-						Method var25;
-						if (var4 != 3) { // L: 57
-							if (var4 == 4) { // L: 77
-								var25 = var1.methods[var3]; // L: 78
-								var6 = var25.getModifiers(); // L: 79
-								var0.writeByte(0); // L: 80
-								var0.writeInt(var6); // L: 81
-							}
-						} else {
-							var25 = var1.methods[var3]; // L: 58
-							byte[][] var10 = var1.arguments[var3]; // L: 59
-							Object[] var7 = new Object[var10.length]; // L: 60
-
-							for (int var8 = 0; var8 < var10.length; ++var8) { // L: 61
-								ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 62
-								var7[var8] = var9.readObject(); // L: 63
-							}
-
-							Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 65
-							if (var11 == null) { // L: 66
-								var0.writeByte(0);
-							} else if (var11 instanceof Number) { // L: 67
-								var0.writeByte(1); // L: 68
-								var0.writeLong(((Number)var11).longValue()); // L: 69
-							} else if (var11 instanceof String) { // L: 71
-								var0.writeByte(2); // L: 72
-								var0.writeStringCp1252NullTerminated((String)var11); // L: 73
-							} else {
-								var0.writeByte(4); // L: 75
-							}
-						}
-					} catch (ClassNotFoundException var13) { // L: 84
-						var0.writeByte(-10); // L: 85
-					} catch (InvalidClassException var14) { // L: 87
-						var0.writeByte(-11); // L: 88
-					} catch (StreamCorruptedException var15) { // L: 90
-						var0.writeByte(-12); // L: 91
-					} catch (OptionalDataException var16) { // L: 93
-						var0.writeByte(-13); // L: 94
-					} catch (IllegalAccessException var17) { // L: 96
-						var0.writeByte(-14); // L: 97
-					} catch (IllegalArgumentException var18) { // L: 99
-						var0.writeByte(-15); // L: 100
-					} catch (InvocationTargetException var19) { // L: 102
-						var0.writeByte(-16); // L: 103
-					} catch (SecurityException var20) { // L: 105
-						var0.writeByte(-17); // L: 106
-					} catch (IOException var21) { // L: 108
-						var0.writeByte(-18); // L: 109
-					} catch (NullPointerException var22) { // L: 111
-						var0.writeByte(-19); // L: 112
-					} catch (Exception var23) { // L: 114
-						var0.writeByte(-20); // L: 115
-					} catch (Throwable var24) { // L: 117
-						var0.writeByte(-21); // L: 118
-					}
-				}
+	@Export("Widget_setKeyIgnoreHeld")
+	static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) {
+		if (var0.field3300 == null) { // L: 1004
+			throw new RuntimeException(); // L: 1005
+		} else {
+			if (var0.field3368 == null) { // L: 1007
+				var0.field3368 = new int[var0.field3300.length]; // L: 1008
 			}
 
-			var0.writeCrc(var2); // L: 121
-			var1.remove(); // L: 122
+			var0.field3368[var1] = Integer.MAX_VALUE; // L: 1010
 		}
-	} // L: 123
+	} // L: 1011
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ko")
 	@ObfuscatedSignature(
-		descriptor = "(ILie;ZI)V",
-		garbageValue = "-1672363550"
+		descriptor = "(IB)V",
+		garbageValue = "74"
 	)
-	static void method219(int var0, Coord var1, boolean var2) {
-		WorldMapArea var3 = class54.getWorldMap().getMapArea(var0); // L: 4478
-		int var4 = HealthBarDefinition.localPlayer.plane; // L: 4479
-		int var5 = (HealthBarDefinition.localPlayer.x >> 7) + class19.baseX; // L: 4480
-		int var6 = (HealthBarDefinition.localPlayer.y >> 7) + DefaultsGroup.baseY; // L: 4481
-		Coord var7 = new Coord(var4, var5, var6); // L: 4482
-		class54.getWorldMap().method6635(var3, var7, var1, var2); // L: 4483
-	} // L: 4484
-
-	@ObfuscatedName("hp")
-	@ObfuscatedSignature(
-		descriptor = "(ZLoj;I)V",
-		garbageValue = "-615408576"
-	)
-	@Export("updateNpcs")
-	static final void updateNpcs(boolean var0, PacketBuffer var1) {
-		Client.field591 = 0; // L: 7764
-		Client.field512 = 0; // L: 7765
-		WorldMapLabel.method3970(); // L: 7766
-
-		int var2;
-		NPC var4;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		int var9;
-		while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7769
-			var2 = var1.readBits(15); // L: 7770
-			if (var2 == 32767) { // L: 7771
-				break;
-			}
-
-			boolean var3 = false; // L: 7772
-			if (Client.npcs[var2] == null) { // L: 7773
-				Client.npcs[var2] = new NPC(); // L: 7774
-				var3 = true; // L: 7775
-			}
-
-			var4 = Client.npcs[var2]; // L: 7777
-			Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7778
-			var4.npcCycle = Client.cycle; // L: 7779
-			boolean var10;
-			if (Players.field1254) { // L: 7783
-				var4.definition = ScriptFrame.getNpcDefinition(var1.readBits(14)); // L: 7784
-				if (var0) { // L: 7785
-					var6 = var1.readBits(8); // L: 7786
-					if (var6 > 127) { // L: 7787
-						var6 -= 256;
-					}
-				} else {
-					var6 = var1.readBits(5); // L: 7790
-					if (var6 > 15) { // L: 7791
-						var6 -= 32;
-					}
-				}
-
-				var8 = var1.readBits(1); // L: 7793
-				if (var8 == 1) { // L: 7794
-					Client.field513[++Client.field512 - 1] = var2;
-				}
-
-				var9 = Client.defaultRotations[var1.readBits(3)]; // L: 7795
-				if (var3) { // L: 7796
-					var4.orientation = var4.rotation = var9;
-				}
-
-				var10 = var1.readBits(1) == 1; // L: 7797
-				if (var10) { // L: 7798
-					var1.readBits(32); // L: 7799
-				}
-
-				if (var0) { // L: 7801
-					var7 = var1.readBits(8); // L: 7802
-					if (var7 > 127) { // L: 7803
-						var7 -= 256;
-					}
-				} else {
-					var7 = var1.readBits(5); // L: 7806
-					if (var7 > 15) { // L: 7807
-						var7 -= 32;
-					}
-				}
-
-				var5 = var1.readBits(1); // L: 7809
-			} else {
-				if (var0) { // L: 7812
-					var6 = var1.readBits(8); // L: 7813
-					if (var6 > 127) { // L: 7814
-						var6 -= 256;
-					}
-				} else {
-					var6 = var1.readBits(5); // L: 7817
-					if (var6 > 15) { // L: 7818
-						var6 -= 32;
-					}
-				}
-
-				var4.definition = ScriptFrame.getNpcDefinition(var1.readBits(14)); // L: 7820
-				if (var0) { // L: 7821
-					var7 = var1.readBits(8); // L: 7822
-					if (var7 > 127) { // L: 7823
-						var7 -= 256;
-					}
-				} else {
-					var7 = var1.readBits(5); // L: 7826
-					if (var7 > 15) { // L: 7827
-						var7 -= 32;
-					}
-				}
-
-				var5 = var1.readBits(1); // L: 7829
-				var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7830
-				if (var3) { // L: 7831
-					var4.orientation = var4.rotation = var8;
-				}
-
-				var9 = var1.readBits(1); // L: 7832
-				if (var9 == 1) { // L: 7833
-					Client.field513[++Client.field512 - 1] = var2;
-				}
-
-				var10 = var1.readBits(1) == 1; // L: 7834
-				if (var10) { // L: 7835
-					var1.readBits(32); // L: 7836
-				}
-			}
-
-			var4.field1087 = var4.definition.size; // L: 7839
-			var4.field1138 = var4.definition.rotation; // L: 7840
-			if (var4.field1138 == 0) { // L: 7841
-				var4.rotation = 0;
-			}
-
-			var4.walkSequence = var4.definition.walkSequence; // L: 7842
-			var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7843
-			var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7844
-			var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7845
-			var4.idleSequence = var4.definition.idleSequence; // L: 7846
-			var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7847
-			var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7848
-			var4.method2249(HealthBarDefinition.localPlayer.pathX[0] + var6, HealthBarDefinition.localPlayer.pathY[0] + var7, var5 == 1); // L: 7849
-		}
-
-		var1.exportIndex(); // L: 7851
-
-		int var14;
-		for (var2 = 0; var2 < Client.field512; ++var2) { // L: 7854
-			var14 = Client.field513[var2]; // L: 7855
-			var4 = Client.npcs[var14]; // L: 7856
-			var5 = var1.readUnsignedByte(); // L: 7857
-			if (Players.field1254 && (var5 & 128) != 0) { // L: 7858
-				var6 = var1.readUnsignedByte(); // L: 7859
-				var5 += var6 << 8; // L: 7860
-			}
-
-			if ((var5 & 4) != 0) { // L: 7862
-				var6 = var1.method6996(); // L: 7863
-				int var11;
-				int var12;
-				int var15;
-				if (var6 > 0) { // L: 7864
-					for (var7 = 0; var7 < var6; ++var7) { // L: 7865
-						var9 = -1; // L: 7867
-						var15 = -1; // L: 7868
-						var11 = -1; // L: 7869
-						var8 = var1.readUShortSmart(); // L: 7870
-						if (var8 == 32767) { // L: 7871
-							var8 = var1.readUShortSmart(); // L: 7872
-							var15 = var1.readUShortSmart(); // L: 7873
-							var9 = var1.readUShortSmart(); // L: 7874
-							var11 = var1.readUShortSmart(); // L: 7875
-						} else if (var8 != 32766) { // L: 7877
-							var15 = var1.readUShortSmart(); // L: 7878
-						} else {
-							var8 = -1; // L: 7880
-						}
-
-						var12 = var1.readUShortSmart(); // L: 7881
-						var4.addHitSplat(var8, var15, var9, var11, Client.cycle, var12); // L: 7882
-					}
-				}
-
-				var7 = var1.method6995(); // L: 7885
-				if (var7 > 0) { // L: 7886
-					for (var8 = 0; var8 < var7; ++var8) { // L: 7887
-						var9 = var1.readUShortSmart(); // L: 7888
-						var15 = var1.readUShortSmart(); // L: 7889
-						if (var15 != 32767) { // L: 7890
-							var11 = var1.readUShortSmart(); // L: 7891
-							var12 = var1.readUnsignedByte(); // L: 7892
-							int var13 = var15 > 0 ? var1.method6995() : var12; // L: 7893
-							var4.addHealthBar(var9, Client.cycle, var15, var11, var12, var13); // L: 7894
-						} else {
-							var4.removeHealthBar(var9); // L: 7896
-						}
-					}
-				}
-			}
-
-			if ((var5 & 512) != 0) { // L: 7900
-				var4.field1145 = var1.readInt(); // L: 7901
-			}
-
-			if ((var5 & 2) != 0) { // L: 7903
-				var4.definition = ScriptFrame.getNpcDefinition(var1.method7120()); // L: 7904
-				var4.field1087 = var4.definition.size; // L: 7905
-				var4.field1138 = var4.definition.rotation; // L: 7906
-				var4.walkSequence = var4.definition.walkSequence; // L: 7907
-				var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7908
-				var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7909
-				var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7910
-				var4.idleSequence = var4.definition.idleSequence; // L: 7911
-				var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7912
-				var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7913
-			}
-
-			if ((var5 & 16) != 0) { // L: 7915
-				var4.targetIndex = var1.method7004(); // L: 7916
-				if (var4.targetIndex == 65535) { // L: 7917
-					var4.targetIndex = -1;
-				}
-			}
-
-			if ((var5 & 1) != 0) { // L: 7919
-				var6 = var1.method7006(); // L: 7920
-				var7 = var1.method7006(); // L: 7921
-				if (Players.field1254) { // L: 7922
-					var4.field1127 = var1.method6995() == 1; // L: 7923
-				}
-
-				var8 = var4.x - (var6 - class19.baseX - class19.baseX) * 64; // L: 7925
-				var9 = var4.y - (var7 - DefaultsGroup.baseY - DefaultsGroup.baseY) * 64; // L: 7926
-				if (var8 != 0 || var9 != 0) { // L: 7927
-					var4.field1112 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047;
-				}
-			}
-
-			if (Players.field1254 && (var5 & 256) != 0 || !Players.field1254 && (var5 & 128) != 0) { // L: 7929
-				var4.field1083 = var1.method7128(); // L: 7930
-				var4.field1100 = var1.method6973(); // L: 7931
-				var4.field1128 = var1.method7128(); // L: 7932
-				var4.field1130 = var1.method6999(); // L: 7933
-				var4.field1131 = var1.method7120() + Client.cycle; // L: 7934
-				var4.field1132 = var1.readUnsignedShort() + Client.cycle; // L: 7935
-				var4.field1133 = var1.method7004(); // L: 7936
-				var4.pathLength = 1; // L: 7937
-				var4.field1144 = 0; // L: 7938
-				var4.field1083 += var4.pathX[0]; // L: 7939
-				var4.field1100 += var4.pathY[0]; // L: 7940
-				var4.field1128 += var4.pathX[0]; // L: 7941
-				var4.field1130 += var4.pathY[0]; // L: 7942
-			}
-
-			if ((var5 & 32) != 0) { // L: 7944
-				var6 = var1.method7004(); // L: 7945
-				if (var6 == 65535) { // L: 7946
-					var6 = -1;
-				}
-
-				var7 = var1.readUnsignedByte(); // L: 7947
-				if (var6 == var4.sequence && var6 != -1) { // L: 7948
-					var8 = MouseHandler.SequenceDefinition_get(var6).field1965; // L: 7949
-					if (var8 == 1) { // L: 7950
-						var4.sequenceFrame = 0; // L: 7951
-						var4.sequenceFrameCycle = 0; // L: 7952
-						var4.sequenceDelay = var7; // L: 7953
-						var4.field1116 = 0; // L: 7954
-					}
-
-					if (var8 == 2) { // L: 7956
-						var4.field1116 = 0; // L: 7957
-					}
-				} else if (var6 == -1 || var4.sequence == -1 || MouseHandler.SequenceDefinition_get(var6).field1959 >= MouseHandler.SequenceDefinition_get(var4.sequence).field1959) { // L: 7960
-					var4.sequence = var6; // L: 7961
-					var4.sequenceFrame = 0; // L: 7962
-					var4.sequenceFrameCycle = 0; // L: 7963
-					var4.sequenceDelay = var7; // L: 7964
-					var4.field1116 = 0; // L: 7965
-					var4.field1144 = var4.pathLength; // L: 7966
-				}
-			}
-
-			if ((var5 & 64) != 0) { // L: 7970
-				var4.spotAnimation = var1.readUnsignedShort(); // L: 7971
-				var6 = var1.method7044(); // L: 7972
-				var4.field1126 = var6 >> 16; // L: 7973
-				var4.field1125 = (var6 & 65535) + Client.cycle; // L: 7974
-				var4.spotAnimationFrame = 0; // L: 7975
-				var4.spotAnimationFrameCycle = 0; // L: 7976
-				if (var4.field1125 > Client.cycle) { // L: 7977
-					var4.spotAnimationFrame = -1;
-				}
-
-				if (var4.spotAnimation == 65535) { // L: 7978
-					var4.spotAnimation = -1;
-				}
-			}
-
-			if ((var5 & 8) != 0) { // L: 7980
-				var4.overheadText = var1.readStringCp1252NullTerminated(); // L: 7981
-				var4.overheadTextCyclesRemaining = 100; // L: 7982
-			}
-		}
-
-		for (var2 = 0; var2 < Client.field591; ++var2) { // L: 7986
-			var14 = Client.field592[var2]; // L: 7987
-			if (Client.npcs[var14].npcCycle != Client.cycle) { // L: 7988
-				Client.npcs[var14].definition = null; // L: 7989
-				Client.npcs[var14] = null; // L: 7990
-			}
-		}
-
-		if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7993
-			throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
-		} else {
-			for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 7994
-				if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 7995
-					throw new RuntimeException(var2 + "," + Client.npcCount); // L: 7996
-				}
-			}
-
-		}
-	} // L: 7999
+	static void method239(int var0) {
+		class87.tempMenuAction = new MenuAction(); // L: 12023
+		class87.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 12024
+		class87.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 12025
+		class87.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 12026
+		class87.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 12027
+		class87.tempMenuAction.action = Client.menuActions[var0]; // L: 12028
+	} // L: 12029
 }
diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java
new file mode 100644
index 0000000000..ae8a8982c1
--- /dev/null
+++ b/runescape-client/src/main/java/class160.java
@@ -0,0 +1,23 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("fe")
+public class class160 {
+	@ObfuscatedName("p")
+	public short[] field1732;
+	@ObfuscatedName("m")
+	public short[] field1738;
+
+	class160(int var1) {
+		ItemComposition var2 = UserComparator6.ItemDefinition_get(var1); // L: 12
+		if (var2.method3560()) { // L: 13
+			this.field1732 = new short[var2.recolorTo.length]; // L: 14
+			System.arraycopy(var2.recolorTo, 0, this.field1732, 0, this.field1732.length); // L: 15
+		}
+
+		if (var2.method3572()) { // L: 17
+			this.field1738 = new short[var2.retextureTo.length]; // L: 18
+			System.arraycopy(var2.retextureTo, 0, this.field1738, 0, this.field1738.length); // L: 19
+		}
+
+	} // L: 21
+}
diff --git a/runescape-client/src/main/java/class167.java b/runescape-client/src/main/java/class167.java
new file mode 100644
index 0000000000..f2f1b10bac
--- /dev/null
+++ b/runescape-client/src/main/java/class167.java
@@ -0,0 +1,267 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("fq")
+public class class167 {
+	@ObfuscatedName("sh")
+	@ObfuscatedGetter(
+		intValue = 2133081727
+	)
+	static int field1811;
+	@ObfuscatedName("hv")
+	@ObfuscatedGetter(
+		intValue = 1655093891
+	)
+	static int field1813;
+
+	@ObfuscatedName("ao")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "1"
+	)
+	static int method3269(int var0, Script var1, boolean var2) {
+		if (var0 != 3700 && var0 != 3701) { // L: 2486
+			if (var0 == 3702) { // L: 2491
+				++IsaacCipher.Interpreter_intStackSize; // L: 2492
+				return 1; // L: 2493
+			} else {
+				return 2; // L: 2495
+			}
+		} else {
+			--IsaacCipher.Interpreter_intStackSize; // L: 2487
+			--class13.Interpreter_stringStackSize; // L: 2488
+			return 1; // L: 2489
+		}
+	}
+
+	@ObfuscatedName("au")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "553813410"
+	)
+	static int method3270(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3314
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3315
+			return 1; // L: 3316
+		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3318
+			IsaacCipher.Interpreter_intStackSize -= 3; // L: 3319
+			Client.publicChatMode = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3320
+			Projectile.privateChatMode = WorldMapData_0.method4353(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]); // L: 3321
+			if (Projectile.privateChatMode == null) { // L: 3322
+				Projectile.privateChatMode = PrivateChatMode.field4596;
+			}
+
+			Client.tradeChatMode = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3323
+			PacketBufferNode var13 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2855, Client.packetWriter.isaacCipher); // L: 3325
+			var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3326
+			var13.packetBuffer.writeByte(Projectile.privateChatMode.field4597); // L: 3327
+			var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3328
+			Client.packetWriter.addNode(var13); // L: 3329
+			return 1; // L: 3330
+		} else {
+			PacketBufferNode var6;
+			int var7;
+			String var8;
+			int var9;
+			if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3332
+				var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3333
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 3334
+				var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3335
+				var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3336
+				var6 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2851, Client.packetWriter.isaacCipher); // L: 3338
+				var6.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3339
+				var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3340
+				var6.packetBuffer.writeByte(var7 - 1); // L: 3341
+				var6.packetBuffer.writeByte(var9); // L: 3342
+				Client.packetWriter.addNode(var6); // L: 3343
+				return 1; // L: 3344
+			} else {
+				int var3;
+				Message var5;
+				if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3346
+					IsaacCipher.Interpreter_intStackSize -= 2; // L: 3347
+					var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3348
+					var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3349
+					var5 = ItemComposition.Messages_getByChannelAndID(var3, var7); // L: 3350
+					if (var5 != null) { // L: 3351
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.count; // L: 3352
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.cycle; // L: 3353
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3354
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3355
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3356
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3357
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3360
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3361
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3362
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3363
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3364
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3365
+					}
+
+					return 1; // L: 3367
+				} else {
+					Message var4;
+					if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3369
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3370
+						var4 = class139.Messages_getMessage(var3); // L: 3371
+						if (var4 != null) { // L: 3372
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.type; // L: 3373
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.cycle; // L: 3374
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3375
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3376
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3377
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3378
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3381
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3382
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3383
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3384
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3385
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3386
+						}
+
+						return 1; // L: 3388
+					} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3390
+						if (Projectile.privateChatMode == null) { // L: 3391
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1;
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Projectile.privateChatMode.field4597; // L: 3392
+						}
+
+						return 1; // L: 3393
+					} else {
+						PacketBufferNode var12;
+						if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3395
+							var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3396
+							var7 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3397
+							var12 = BufferedSource.method6527(var7, var8, ScriptFrame.clientLanguage, -1); // L: 3398
+							Client.packetWriter.addNode(var12); // L: 3399
+							return 1; // L: 3400
+						} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3402
+							class13.Interpreter_stringStackSize -= 2; // L: 3403
+							var8 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize]; // L: 3404
+							String var11 = Interpreter.Interpreter_stringStack[class13.Interpreter_stringStackSize + 1]; // L: 3405
+							var12 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2849, Client.packetWriter.isaacCipher); // L: 3407
+							var12.packetBuffer.writeShort(0); // L: 3408
+							int var10 = var12.packetBuffer.offset; // L: 3409
+							var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3410
+							class370.method6755(var12.packetBuffer, var11); // L: 3411
+							var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3412
+							Client.packetWriter.addNode(var12); // L: 3413
+							return 1; // L: 3414
+						} else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3416
+							var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3417
+							IsaacCipher.Interpreter_intStackSize -= 2; // L: 3418
+							var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3419
+							var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3420
+							var6 = BufferedSource.method6527(var7, var8, ScriptFrame.clientLanguage, var9); // L: 3421
+							Client.packetWriter.addNode(var6); // L: 3422
+							return 1; // L: 3423
+						} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3425
+							if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3432
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3433
+								return 1; // L: 3434
+							} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3436
+								var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3437
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = PlayerComposition.Messages_getHistorySize(var3); // L: 3438
+								return 1; // L: 3439
+							} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3441
+								var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3442
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = VertexNormal.Messages_getLastChatID(var3); // L: 3443
+								return 1; // L: 3444
+							} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3446
+								var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3447
+								Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Actor.method2233(var3); // L: 3448
+								return 1; // L: 3449
+							} else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3451
+								var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3452
+								RouteStrategy.doCheat(var8); // L: 3453
+								return 1; // L: 3454
+							} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3456
+								Client.field645 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3457
+								return 1; // L: 3458
+							} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3460
+								Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Client.field645; // L: 3461
+								return 1; // L: 3462
+							} else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3464
+								var8 = Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]; // L: 3465
+								System.out.println(var8); // L: 3466
+								return 1; // L: 3467
+							} else if (var0 == 5024) { // L: 3469
+								--IsaacCipher.Interpreter_intStackSize; // L: 3470
+								return 1; // L: 3471
+							} else if (var0 == 5025) { // L: 3473
+								++IsaacCipher.Interpreter_intStackSize; // L: 3474
+								return 1; // L: 3475
+							} else if (var0 == 5030) { // L: 3477
+								IsaacCipher.Interpreter_intStackSize -= 2; // L: 3478
+								var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3479
+								var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3480
+								var5 = ItemComposition.Messages_getByChannelAndID(var3, var7); // L: 3481
+								if (var5 != null) { // L: 3482
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.count; // L: 3483
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.cycle; // L: 3484
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3485
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3486
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3487
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3488
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3489
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3490
+								} else {
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3493
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3494
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3495
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3496
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3497
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3498
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3499
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3500
+								}
+
+								return 1; // L: 3502
+							} else if (var0 == 5031) { // L: 3504
+								var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 3505
+								var4 = class139.Messages_getMessage(var3); // L: 3506
+								if (var4 != null) { // L: 3507
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.type; // L: 3508
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.cycle; // L: 3509
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3510
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3511
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3512
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3513
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3514
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3515
+								} else {
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 3518
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3519
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3520
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3521
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3522
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3523
+									Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 3524
+									Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 3525
+								}
+
+								return 1; // L: 3527
+							} else {
+								return 2; // L: 3529
+							}
+						} else {
+							if (class340.localPlayer != null && class340.localPlayer.username != null) { // L: 3427
+								var8 = class340.localPlayer.username.getName();
+							} else {
+								var8 = ""; // L: 3428
+							}
+
+							Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var8; // L: 3429
+							return 1; // L: 3430
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java
index 7a6d210c03..573eb8e33b 100644
--- a/runescape-client/src/main/java/class17.java
+++ b/runescape-client/src/main/java/class17.java
@@ -5,132 +5,159 @@
 import javax.net.ssl.SSLSessionContext;
 import javax.security.cert.X509Certificate;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("z")
+@ObfuscatedName("u")
 class class17 implements SSLSession {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("StructDefinition_archive")
+	static AbstractArchive StructDefinition_archive;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 1007360263
+	)
+	static int field93;
+	@ObfuscatedName("ha")
+	@ObfuscatedGetter(
+		intValue = -303525593
+	)
+	static int field90;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lk;"
+		descriptor = "Ld;"
 	)
 	final class12 this$1;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lk;)V"
+		descriptor = "(Ld;)V"
 	)
 	class17(class12 var1) {
-		this.this$1 = var1; // L: 117
+		this.this$1 = var1; // L: 133
 	}
 
 	public int getApplicationBufferSize() {
-		return 0; // L: 119
+		return 0; // L: 136
 	}
 
-	public String getCipherSuite() {
-		throw new UnsupportedOperationException(); // L: 123
+	public void invalidate() {
+		throw new UnsupportedOperationException(); // L: 221
+	}
+
+	public long getCreationTime() {
+		throw new UnsupportedOperationException(); // L: 146
 	}
 
 	public byte[] getId() {
-		throw new UnsupportedOperationException(); // L: 131
+		throw new UnsupportedOperationException(); // L: 151
 	}
 
 	public long getLastAccessedTime() {
-		throw new UnsupportedOperationException(); // L: 135
+		throw new UnsupportedOperationException(); // L: 156
 	}
 
-	public Principal getLocalPrincipal() {
-		throw new UnsupportedOperationException(); // L: 143
+	public Certificate[] getLocalCertificates() {
+		throw new UnsupportedOperationException(); // L: 161
 	}
 
-	public int getPacketBufferSize() {
-		throw new UnsupportedOperationException(); // L: 147
+	public void putValue(String var1, Object var2) {
+		throw new UnsupportedOperationException(); // L: 231
 	}
 
-	public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException {
-		return null; // L: 151
+	public int getPacketBufferSize() {
+		throw new UnsupportedOperationException(); // L: 171
 	}
 
 	public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException {
-		return this.this$1.field53; // L: 155
-	}
-
-	public String getPeerHost() {
-		throw new UnsupportedOperationException(); // L: 159
+		return this.this$1.field67; // L: 181
 	}
 
 	public int getPeerPort() {
-		return 0; // L: 163
-	}
-
-	public Principal getPeerPrincipal() throws SSLPeerUnverifiedException {
-		return null; // L: 167
+		return 0; // L: 191
 	}
 
 	public String getProtocol() {
-		throw new UnsupportedOperationException(); // L: 171
+		throw new UnsupportedOperationException(); // L: 201
 	}
 
 	public SSLSessionContext getSessionContext() {
-		throw new UnsupportedOperationException(); // L: 175
+		throw new UnsupportedOperationException(); // L: 206
 	}
 
 	public Object getValue(String var1) {
-		throw new UnsupportedOperationException(); // L: 179
+		throw new UnsupportedOperationException(); // L: 211
 	}
 
-	public boolean isValid() {
-		throw new UnsupportedOperationException(); // L: 191
+	public String[] getValueNames() {
+		throw new UnsupportedOperationException(); // L: 216
 	}
 
-	public void removeValue(String var1) {
-		throw new UnsupportedOperationException(); // L: 199
+	public Principal getLocalPrincipal() {
+		throw new UnsupportedOperationException(); // L: 166
 	}
 
-	public void invalidate() {
-		throw new UnsupportedOperationException(); // L: 187
+	public boolean isValid() {
+		throw new UnsupportedOperationException(); // L: 226
 	}
 
-	public long getCreationTime() {
-		throw new UnsupportedOperationException(); // L: 127
+	public String getPeerHost() {
+		throw new UnsupportedOperationException(); // L: 186
 	}
 
-	public String[] getValueNames() {
-		throw new UnsupportedOperationException(); // L: 183
+	public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException {
+		return null; // L: 176
 	}
 
-	public Certificate[] getLocalCertificates() {
-		throw new UnsupportedOperationException(); // L: 139
+	public void removeValue(String var1) {
+		throw new UnsupportedOperationException(); // L: 236
 	}
 
-	public void putValue(String var1, Object var2) {
-		throw new UnsupportedOperationException(); // L: 195
+	public Principal getPeerPrincipal() throws SSLPeerUnverifiedException {
+		return null; // L: 196
+	}
+
+	public String getCipherSuite() {
+		throw new UnsupportedOperationException(); // L: 141
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)I",
-		garbageValue = "-560273502"
+		descriptor = "(I)V",
+		garbageValue = "-1239241420"
 	)
-	@Export("hslToRgb")
-	static final int hslToRgb(int var0, int var1, int var2) {
-		if (var2 > 179) { // L: 592
-			var1 /= 2;
-		}
+	protected static final void method292() {
+		class91.clock.mark(); // L: 405
 
-		if (var2 > 192) { // L: 593
-			var1 /= 2;
+		int var0;
+		for (var0 = 0; var0 < 32; ++var0) { // L: 406
+			GameEngine.graphicsTickTimes[var0] = 0L;
 		}
 
-		if (var2 > 217) { // L: 594
-			var1 /= 2;
+		for (var0 = 0; var0 < 32; ++var0) { // L: 407
+			GameEngine.clientTickTimes[var0] = 0L;
 		}
 
-		if (var2 > 243) { // L: 595
-			var1 /= 2;
-		}
+		GameEngine.gameCyclesToDo = 0; // L: 408
+	} // L: 409
 
-		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 596
-		return var3; // L: 597
-	}
+	@ObfuscatedName("ik")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "40"
+	)
+	static final void method291(int var0) {
+		if (var0 >= 0) { // L: 9004
+			int var1 = Client.menuArguments1[var0]; // L: 9005
+			int var2 = Client.menuArguments2[var0]; // L: 9006
+			int var3 = Client.menuOpcodes[var0]; // L: 9007
+			int var4 = Client.menuIdentifiers[var0]; // L: 9008
+			String var5 = Client.menuActions[var0]; // L: 9009
+			String var6 = Client.menuTargets[var0]; // L: 9010
+			Decimator.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 9011
+		}
+	} // L: 9012
 }
diff --git a/runescape-client/src/main/java/class174.java b/runescape-client/src/main/java/class174.java
index bd073a345f..bbfa644b79 100644
--- a/runescape-client/src/main/java/class174.java
+++ b/runescape-client/src/main/java/class174.java
@@ -1,84 +1,42 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fs")
-public class class174 {
-	@ObfuscatedName("s")
-	@Export("directions")
-	public static int[][] directions;
-	@ObfuscatedName("a")
-	@Export("distances")
-	public static int[][] distances;
-	@ObfuscatedName("p")
-	@Export("bufferX")
-	public static int[] bufferX;
-	@ObfuscatedName("j")
-	@Export("bufferY")
-	public static int[] bufferY;
-	@ObfuscatedName("io")
-	@ObfuscatedGetter(
-		intValue = -1116273289
-	)
-	@Export("cameraY")
-	static int cameraY;
-
+@ObfuscatedName("fy")
+public class class174 extends DualNode {
 	static {
-		directions = new int[128][128]; // L: 6
-		distances = new int[128][128]; // L: 7
-		bufferX = new int[4096]; // L: 11
-		bufferY = new int[4096]; // L: 12
-	}
+		new EvictingDualNodeHashTable(64); // L: 9
+	} // L: 10
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Low;IIII)V",
-		garbageValue = "-1139186342"
+		descriptor = "(I)V",
+		garbageValue = "1822723426"
 	)
-	static void method3512(SpritePixels var0, int var1, int var2, int var3) {
-		WorldMapRegion.WorldMapRegion_cachedSprites.put(var0, NetSocket.method2923(var1, var2, var3), var0.pixels.length * 4); // L: 46
-	} // L: 47
+	static void method3383() {
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 48
+			if (ArchiveDiskActionHandler.field3815 == 0) { // L: 49
+				KeyHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 50
+				KeyHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 51
+				KeyHandler.ArchiveDiskActionHandler_thread.start(); // L: 52
+				KeyHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 53
+			}
 
-	@ObfuscatedName("a")
+			ArchiveDiskActionHandler.field3815 = 600; // L: 55
+		}
+	} // L: 57
+
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "18"
+		descriptor = "(Lku;IB)Z",
+		garbageValue = "97"
 	)
-	@Export("loadInterface")
-	public static boolean loadInterface(int var0) {
-		if (class132.Widget_loadedInterfaces[var0]) { // L: 216
-			return true;
-		} else if (!class283.Widget_archive.tryLoadGroup(var0)) { // L: 217
+	static boolean method3382(AbstractArchive var0, int var1) {
+		byte[] var2 = var0.takeFileFlat(var1); // L: 95
+		if (var2 == null) { // L: 96
 			return false;
 		} else {
-			int var1 = class283.Widget_archive.getGroupFileCount(var0); // L: 218
-			if (var1 == 0) { // L: 219
-				class132.Widget_loadedInterfaces[var0] = true; // L: 220
-				return true; // L: 221
-			} else {
-				if (WorldMapSection1.Widget_interfaceComponents[var0] == null) { // L: 223
-					WorldMapSection1.Widget_interfaceComponents[var0] = new Widget[var1];
-				}
-
-				for (int var2 = 0; var2 < var1; ++var2) { // L: 224
-					if (WorldMapSection1.Widget_interfaceComponents[var0][var2] == null) { // L: 225
-						byte[] var3 = class283.Widget_archive.takeFile(var0, var2); // L: 226
-						if (var3 != null) { // L: 227
-							WorldMapSection1.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 228
-							WorldMapSection1.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 229
-							if (var3[0] == -1) { // L: 230
-								WorldMapSection1.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3));
-							} else {
-								WorldMapSection1.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 231
-							}
-						}
-					}
-				}
-
-				class132.Widget_loadedInterfaces[var0] = true; // L: 235
-				return true; // L: 236
-			}
+			WorldMapSection0.SpriteBuffer_decode(var2); // L: 97
+			return true; // L: 98
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/class176.java b/runescape-client/src/main/java/class176.java
deleted file mode 100644
index eb588f195b..0000000000
--- a/runescape-client/src/main/java/class176.java
+++ /dev/null
@@ -1,22 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("fz")
-public class class176 {
-	@ObfuscatedName("n")
-	@Export("ByteArrayPool_alternativeSizes")
-	static int[] ByteArrayPool_alternativeSizes;
-	@ObfuscatedName("r")
-	@Export("formattedOperatingSystemName")
-	public static String formattedOperatingSystemName;
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(S)Z",
-		garbageValue = "28777"
-	)
-	static final boolean method3531() {
-		return ViewportMouse.ViewportMouse_isInViewport; // L: 99
-	}
-}
diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java
index f4ba4f7e3c..2df7868f3e 100644
--- a/runescape-client/src/main/java/class18.java
+++ b/runescape-client/src/main/java/class18.java
@@ -1,45 +1,143 @@
+import java.awt.Image;
 import java.util.Comparator;
 import java.util.Map.Entry;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("q")
+@ObfuscatedName("k")
 class class18 implements Comparator {
-	@ObfuscatedName("jw")
-	@ObfuscatedGetter(
-		intValue = 433538639
-	)
-	@Export("oculusOrbFocalPointY")
-	static int oculusOrbFocalPointY;
+	@ObfuscatedName("av")
+	static Image field97;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lx;"
+		descriptor = "Lo;"
 	)
 	final class10 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lx;)V"
+		descriptor = "(Lo;)V"
 	)
 	class18(class10 var1) {
 		this.this$0 = var1; // L: 40
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;B)I",
-		garbageValue = "-59"
+		descriptor = "(Ljava/util/Map$Entry;Ljava/util/Map$Entry;I)I",
+		garbageValue = "661952074"
 	)
-	int method272(Entry var1, Entry var2) {
+	int method294(Entry var1, Entry var2) {
 		return ((Float)var2.getValue()).compareTo((Float)var1.getValue()); // L: 42
 	}
 
+	public boolean equals(Object var1) {
+		return super.equals(var1); // L: 50
+	}
+
 	public int compare(Object var1, Object var2) {
-		return this.method272((Entry)var1, (Entry)var2); // L: 46
+		return this.method294((Entry)var1, (Entry)var2); // L: 46
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 50
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lfw;",
+		garbageValue = "-1896200601"
+	)
+	public static FloorOverlayDefinition method302(int var0) {
+		FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0);
+			var1 = new FloorOverlayDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2), var0);
+			}
+
+			var1.postDecode(); // L: 31
+			FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32
+			return var1; // L: 33
+		}
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lfp;",
+		garbageValue = "28"
+	)
+	@Export("StructDefinition_getStructDefinition")
+	public static StructComposition StructDefinition_getStructDefinition(int var0) {
+		StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23
+		if (var1 != null) { // L: 24
+			return var1;
+		} else {
+			byte[] var2 = class17.StructDefinition_archive.takeFile(34, var0); // L: 25
+			var1 = new StructComposition(); // L: 26
+			if (var2 != null) { // L: 27
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode(); // L: 28
+			StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29
+			return var1; // L: 30
+		}
 	}
+
+	@ObfuscatedName("fn")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "5"
+	)
+	@Export("playSong")
+	static void playSong(int var0) {
+		if (var0 == -1 && !Client.field743) { // L: 4341
+			StructComposition.method3444(); // L: 4342
+		} else if (var0 != -1 && var0 != Client.currentTrackGroupId && SecureRandomFuture.clientPreferences.musicVolume != 0 && !Client.field743) { // L: 4344
+			Archive var1 = WorldMapScaleHandler.archive6; // L: 4345
+			int var2 = SecureRandomFuture.clientPreferences.musicVolume; // L: 4346
+			class260.musicPlayerStatus = 1; // L: 4348
+			class124.musicTrackArchive = var1; // L: 4349
+			VarcInt.musicTrackGroupId = var0; // L: 4350
+			class260.musicTrackFileId = 0; // L: 4351
+			ChatChannel.musicTrackVolume = var2; // L: 4352
+			DynamicObject.musicTrackBoolean = false; // L: 4353
+			class260.pcmSampleLength = 2; // L: 4354
+		}
+
+		Client.currentTrackGroupId = var0; // L: 4357
+	} // L: 4358
+
+	@ObfuscatedName("gb")
+	@ObfuscatedSignature(
+		descriptor = "(Lcy;I)V",
+		garbageValue = "-1637898710"
+	)
+	static final void method293(Actor var0) {
+		if (var0.field1157 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > UserComparator5.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4810
+			int var1 = var0.field1157 - var0.field1136; // L: 4811
+			int var2 = Client.cycle - var0.field1136; // L: 4812
+			int var3 = var0.field1120 * 64 + var0.field1132 * 128; // L: 4813
+			int var4 = var0.field1120 * 64 + var0.field1134 * 128; // L: 4814
+			int var5 = var0.field1120 * 64 + var0.field1133 * 128; // L: 4815
+			int var6 = var0.field1120 * 64 + var0.field1135 * 128; // L: 4816
+			var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; // L: 4817
+			var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; // L: 4818
+		}
+
+		var0.field1117 = 0; // L: 4820
+		var0.orientation = var0.field1138; // L: 4821
+		var0.rotation = var0.orientation; // L: 4822
+	} // L: 4823
+
+	@ObfuscatedName("jh")
+	@ObfuscatedSignature(
+		descriptor = "(IIIZI)V",
+		garbageValue = "-1056239746"
+	)
+	static final void method297(int var0, int var1, int var2, boolean var3) {
+		if (class242.loadInterface(var0)) { // L: 10935
+			class92.resizeInterface(MouseRecorder.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 10936
+		}
+	} // L: 10937
 }
diff --git a/runescape-client/src/main/java/class184.java b/runescape-client/src/main/java/class184.java
deleted file mode 100644
index 8503383d2f..0000000000
--- a/runescape-client/src/main/java/class184.java
+++ /dev/null
@@ -1,208 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-
-@ObfuscatedName("gd")
-public class class184 implements WorldMapSection {
-	@ObfuscatedName("hl")
-	@Export("regionMapArchives")
-	static byte[][] regionMapArchives;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -1246442681
-	)
-	int field2093;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -1207528751
-	)
-	int field2099;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1509662935
-	)
-	int field2102;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 1558504127
-	)
-	int field2094;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = -1609707315
-	)
-	int field2095;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -1074300817
-	)
-	int field2096;
-	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = 1892822935
-	)
-	int field2092;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 1654705375
-	)
-	int field2098;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -123705663
-	)
-	int field2091;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = 902477063
-	)
-	int field2100;
-
-	class184() {
-	} // L: 18
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lfb;I)V",
-		garbageValue = "-1844012640"
-	)
-	@Export("expandBounds")
-	public void expandBounds(WorldMapArea var1) {
-		if (var1.regionLowX > this.field2095) { // L: 21
-			var1.regionLowX = this.field2095;
-		}
-
-		if (var1.regionHighX < this.field2095) {
-			var1.regionHighX = this.field2095; // L: 22
-		}
-
-		if (var1.regionLowY > this.field2096) { // L: 23
-			var1.regionLowY = this.field2096;
-		}
-
-		if (var1.regionHighY < this.field2096) { // L: 24
-			var1.regionHighY = this.field2096;
-		}
-
-	} // L: 25
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)Z",
-		garbageValue = "-1501827396"
-	)
-	@Export("containsCoord")
-	public boolean containsCoord(int var1, int var2, int var3) {
-		if (var1 >= this.field2093 && var1 < this.field2099 + this.field2093) { // L: 28
-			return var2 >= (this.field2102 << 6) + (this.field2092 << 3) && var2 <= (this.field2102 << 6) + (this.field2092 << 3) + 7 && var3 >= (this.field2094 << 6) + (this.field2098 << 3) && var3 <= (this.field2094 << 6) + (this.field2098 << 3) + 7; // L: 31
-		} else {
-			return false; // L: 29
-		}
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(III)Z",
-		garbageValue = "-356013678"
-	)
-	@Export("containsPosition")
-	public boolean containsPosition(int var1, int var2) {
-		return var1 >= (this.field2095 << 6) + (this.field2091 << 3) && var1 <= (this.field2095 << 6) + (this.field2091 << 3) + 7 && var2 >= (this.field2096 << 6) + (this.field2100 << 3) && var2 <= (this.field2096 << 6) + (this.field2100 << 3) + 7; // L: 35
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(IIIB)[I",
-		garbageValue = "-79"
-	)
-	@Export("getBorderTileLengths")
-	public int[] getBorderTileLengths(int var1, int var2, int var3) {
-		if (!this.containsCoord(var1, var2, var3)) { // L: 39
-			return null; // L: 40
-		} else {
-			int[] var4 = new int[]{var2 + (this.field2095 * 64 - this.field2102 * 64) + (this.field2091 * 8 - this.field2092 * 8), var3 + (this.field2096 * 64 - this.field2094 * 64) + (this.field2100 * 8 - this.field2098 * 8)}; // L: 42 43 44
-			return var4; // L: 45
-		}
-	}
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(III)Lie;",
-		garbageValue = "494177498"
-	)
-	@Export("coord")
-	public Coord coord(int var1, int var2) {
-		if (!this.containsPosition(var1, var2)) { // L: 49
-			return null; // L: 50
-		} else {
-			int var3 = this.field2102 * 64 - this.field2095 * 64 + (this.field2092 * 8 - this.field2091 * 8) + var1; // L: 52
-			int var4 = var2 + (this.field2094 * 64 - this.field2096 * 64) + (this.field2098 * 8 - this.field2100 * 8); // L: 53
-			return new Coord(this.field2093, var3, var4); // L: 54
-		}
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "-682362313"
-	)
-	@Export("read")
-	public void read(Buffer var1) {
-		this.field2093 = var1.readUnsignedByte(); // L: 58
-		this.field2099 = var1.readUnsignedByte(); // L: 59
-		this.field2102 = var1.readUnsignedShort(); // L: 60
-		this.field2092 = var1.readUnsignedByte(); // L: 61
-		this.field2094 = var1.readUnsignedShort(); // L: 62
-		this.field2098 = var1.readUnsignedByte(); // L: 63
-		this.field2095 = var1.readUnsignedShort(); // L: 64
-		this.field2091 = var1.readUnsignedByte(); // L: 65
-		this.field2096 = var1.readUnsignedShort(); // L: 66
-		this.field2100 = var1.readUnsignedByte(); // L: 67
-		this.method3852(); // L: 68
-	} // L: 69
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "517860362"
-	)
-	void method3852() {
-	} // L: 71
-
-	@ObfuscatedName("ac")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-265491210"
-	)
-	static int method3871(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.LOGOUT) { // L: 3614
-			Client.logoutTimer = 250; // L: 3615
-			return 1; // L: 3616
-		} else if (var0 != 5631 && var0 != 5633) { // L: 3618
-			if (var0 == 5632) { // L: 3622
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 26; // L: 3623
-				return 1; // L: 3624
-			} else {
-				return 2; // L: 3626
-			}
-		} else {
-			class295.Interpreter_stringStackSize -= 2; // L: 3619
-			return 1; // L: 3620
-		}
-	}
-
-	@ObfuscatedName("jq")
-	@ObfuscatedSignature(
-		descriptor = "(Ljf;I)V",
-		garbageValue = "648897355"
-	)
-	@Export("invalidateWidget")
-	static void invalidateWidget(Widget var0) {
-		if (var0.cycle == Client.field678) { // L: 11277
-			Client.field594[var0.rootIndex] = true; // L: 11278
-		}
-
-	} // L: 11280
-}
diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java
index bc69386a33..a2c039791f 100644
--- a/runescape-client/src/main/java/class185.java
+++ b/runescape-client/src/main/java/class185.java
@@ -1,18 +1,72 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("go")
-public class class185 {
-	@ObfuscatedName("j")
+@ObfuscatedName("gj")
+public enum class185 implements MouseWheel {
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "1"
+		descriptor = "Lgj;"
 	)
-	public static final void method3872(int var0, int var1) {
-		ViewportMouse.ViewportMouse_x = var0; // L: 91
-		ViewportMouse.ViewportMouse_y = var1; // L: 92
-		ViewportMouse.ViewportMouse_isInViewport = true; // L: 93
-		ViewportMouse.ViewportMouse_entityCount = 0; // L: 94
-		ViewportMouse.ViewportMouse_false0 = false; // L: 95
-	} // L: 96
+	field2119((byte)-1),
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lgj;"
+	)
+	field2120((byte)0),
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lgj;"
+	)
+	field2123((byte)1),
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lgj;"
+	)
+	field2122((byte)2);
+
+	@ObfuscatedName("ft")
+	@Export("worldHost")
+	static String worldHost;
+	@ObfuscatedName("t")
+	public byte field2121;
+
+	class185(byte var3) {
+		this.field2121 = var3; // L: 14
+	} // L: 15
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "48"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field2121; // L: 19
+	}
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "964558054"
+	)
+	static void method3731(boolean var0) {
+		byte var1 = 0; // L: 1047
+		if (!AttackOption.method2356()) { // L: 1048
+			var1 = 12; // L: 1049
+		} else if (class295.client.method1154()) { // L: 1051
+			var1 = 10; // L: 1052
+		}
+
+		PlayerType.method5521(var1); // L: 1054
+		if (var0) { // L: 1055
+			Login.Login_username = ""; // L: 1056
+			Login.Login_password = ""; // L: 1057
+			class148.field1651 = 0; // L: 1058
+			BufferedSource.otp = ""; // L: 1059
+		}
+
+		HealthBar.method2311(); // L: 1061
+		WorldMapID.method4805(); // L: 1062
+	} // L: 1063
 }
diff --git a/runescape-client/src/main/java/class186.java b/runescape-client/src/main/java/class186.java
new file mode 100644
index 0000000000..2bbc5b6411
--- /dev/null
+++ b/runescape-client/src/main/java/class186.java
@@ -0,0 +1,68 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("gm")
+public class class186 {
+	@ObfuscatedName("p")
+	@Export("directions")
+	public static int[][] directions;
+	@ObfuscatedName("m")
+	@Export("distances")
+	public static int[][] distances;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = 2119093831
+	)
+	public static int field2129;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -479037751
+	)
+	public static int field2130;
+	@ObfuscatedName("w")
+	@Export("bufferX")
+	public static int[] bufferX;
+	@ObfuscatedName("n")
+	@Export("bufferY")
+	public static int[] bufferY;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -1673283901
+	)
+	static int field2135;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = 1374404947
+	)
+	@Export("canvasWidth")
+	public static int canvasWidth;
+
+	static {
+		directions = new int[128][128]; // L: 6
+		distances = new int[128][128]; // L: 7
+		bufferX = new int[4096]; // L: 11
+		bufferY = new int[4096]; // L: 12
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(B)[Lfc;",
+		garbageValue = "45"
+	)
+	static HorizontalAlignment[] method3739() {
+		return new HorizontalAlignment[]{HorizontalAlignment.field1829, HorizontalAlignment.field1826, HorizontalAlignment.HorizontalAlignment_centered}; // L: 14
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lku;Lku;ZI)V",
+		garbageValue = "19498859"
+	)
+	public static void method3740(AbstractArchive var0, AbstractArchive var1, boolean var2) {
+		ObjectComposition.ObjectDefinition_archive = var0; // L: 73
+		ObjectComposition.ObjectDefinition_modelsArchive = var1; // L: 74
+		ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75
+	} // L: 76
+}
diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java
index 12245caac7..6fda49d4fa 100644
--- a/runescape-client/src/main/java/class19.java
+++ b/runescape-client/src/main/java/class19.java
@@ -1,273 +1,174 @@
-import java.awt.Image;
+import java.security.SecureRandom;
 import java.util.concurrent.Future;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("d")
+@ObfuscatedName("f")
 public class class19 {
-	@ObfuscatedName("at")
-	static Image field89;
-	@ObfuscatedName("gk")
-	@ObfuscatedGetter(
-		intValue = -1107399791
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lpa;"
 	)
-	@Export("baseX")
-	static int baseX;
-	@ObfuscatedName("i")
-	Future field92;
-	@ObfuscatedName("w")
-	String field90;
+	@Export("titlebuttonSprite")
+	static IndexedSprite titlebuttonSprite;
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		descriptor = "Lpn;"
+	)
+	@Export("rasterProvider")
+	public static AbstractRasterProvider rasterProvider;
+	@ObfuscatedName("eg")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive4")
+	static Archive archive4;
+	@ObfuscatedName("fa")
+	@Export("secureRandom")
+	static SecureRandom secureRandom;
+	@ObfuscatedName("c")
+	Future field100;
+	@ObfuscatedName("b")
+	String field101;
 
 	class19(Future var1) {
-		this.field92 = var1; // L: 10
+		this.field100 = var1; // L: 10
 	} // L: 11
 
 	class19(String var1) {
-		this.method278(var1); // L: 14
+		this.method306(var1); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "1091176174"
+		garbageValue = "-1875205384"
 	)
-	void method278(String var1) {
+	void method306(String var1) {
 		if (var1 == null) { // L: 18
 			var1 = "";
 		}
 
-		this.field90 = var1; // L: 19
-		if (this.field92 != null) { // L: 20
-			this.field92.cancel(true);
-			this.field92 = null; // L: 22
+		this.field101 = var1; // L: 19
+		if (this.field100 != null) { // L: 20
+			this.field100.cancel(true);
+			this.field100 = null;
 		}
 
 	} // L: 24
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "1"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "-1673495368"
 	)
-	public final String method293() {
-		return this.field90; // L: 27
+	public final String method307() {
+		return this.field101; // L: 27
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "390878741"
+		garbageValue = "-274193431"
 	)
-	public boolean method276() {
-		return this.field90 != null || this.field92 == null; // L: 31
+	public boolean method331() {
+		return this.field101 != null || this.field100 == null; // L: 31
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1402334300"
+		garbageValue = "1434821214"
 	)
-	public final boolean method280() {
-		return this.method276() ? true : this.field92.isDone(); // L: 35 36
+	public final boolean method309() {
+		return this.method331() ? true : this.field100.isDone(); // L: 35 36
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lm;",
-		garbageValue = "-2099684088"
+		descriptor = "(B)Lq;",
+		garbageValue = "-45"
 	)
-	public final class21 method281() {
-		if (this.method276()) { // L: 40
-			return new class21(this.field90);
-		} else if (!this.method280()) {
-			return null; // L: 41
+	public final class21 method310() {
+		if (this.method331()) { // L: 40
+			return new class21(this.field101);
+		} else if (!this.method309()) { // L: 41
+			return null;
 		} else {
 			try {
-				return (class21)this.field92.get(); // L: 43
+				return (class21)this.field100.get(); // L: 43
 			} catch (Exception var3) { // L: 45
 				String var2 = "Error retrieving REST request reply"; // L: 46
 				System.err.println(var2 + "\r\n" + var3); // L: 47
-				this.method278(var2); // L: 48
+				this.method306(var2); // L: 48
 				return new class21(var2); // L: 49
 			}
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-394554028"
+		descriptor = "(Lku;I)V",
+		garbageValue = "1773955351"
 	)
-	public static boolean method279(int var0) {
-		return (var0 >> 21 & 1) != 0; // L: 21
-	}
+	public static void method330(AbstractArchive var0) {
+		FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; // L: 21
+	} // L: 22
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-444636057"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
+		garbageValue = "1264521641"
 	)
-	static int method290(int var0, Script var1, boolean var2) {
-		Widget var3;
-		if (var0 >= 2000) { // L: 805
-			var0 -= 1000; // L: 806
-			var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 807
-		} else {
-			var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 809
-		}
-
-		class184.invalidateWidget(var3); // L: 810
-		if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 811
-			if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 831
-				var3.modelType = 2; // L: 832
-				var3.modelId = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 833
-				return 1; // L: 834
-			} else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 836
-				var3.modelType = 3; // L: 837
-				var3.modelId = HealthBarDefinition.localPlayer.appearance.getChatHeadId(); // L: 838
-				return 1; // L: 839
-			} else {
-				return 2; // L: 841
-			}
+	@Export("setLoginResponseString")
+	static void setLoginResponseString(String var0, String var1, String var2) {
+		Login.Login_response1 = var0; // L: 1665
+		Login.Login_response2 = var1; // L: 1666
+		Login.Login_response3 = var2; // L: 1667
+	} // L: 1668
+
+	@ObfuscatedName("ki")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;I)Z",
+		garbageValue = "111761811"
+	)
+	static final boolean method329(Widget var0) {
+		int var1 = var0.contentType; // L: 12296
+		if (var1 == 205) { // L: 12297
+			Client.logoutTimer = 250; // L: 12298
+			return true; // L: 12299
 		} else {
-			class14.Interpreter_intStackSize -= 2; // L: 812
-			int var4 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 813
-			int var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 814
-			var3.itemId = var4; // L: 815
-			var3.itemQuantity = var5; // L: 816
-			ItemComposition var6 = TaskHandler.ItemDefinition_get(var4); // L: 817
-			var3.modelAngleX = var6.xan2d; // L: 818
-			var3.modelAngleY = var6.yan2d; // L: 819
-			var3.modelAngleZ = var6.zan2d; // L: 820
-			var3.modelOffsetX = var6.offsetX2d; // L: 821
-			var3.modelOffsetY = var6.offsetY2d; // L: 822
-			var3.modelZoom = var6.zoom2d; // L: 823
-			if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 824
-				var3.itemQuantityMode = 0;
-			} else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 825
-				var3.itemQuantityMode = 1;
-			} else {
-				var3.itemQuantityMode = 2; // L: 826
+			int var2;
+			int var3;
+			if (var1 >= 300 && var1 <= 313) { // L: 12301
+				var2 = (var1 - 300) / 2; // L: 12302
+				var3 = var1 & 1; // L: 12303
+				Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 12304
 			}
 
-			if (var3.field3106 > 0) { // L: 827
-				var3.modelZoom = var3.modelZoom * 32 / var3.field3106;
-			} else if (var3.rawWidth > 0) { // L: 828
-				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
+			if (var1 >= 314 && var1 <= 323) { // L: 12306
+				var2 = (var1 - 314) / 2; // L: 12307
+				var3 = var1 & 1; // L: 12308
+				Client.playerAppearance.method5391(var2, var3 == 1); // L: 12309
 			}
 
-			return 1; // L: 829
-		}
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(IIIB)I",
-		garbageValue = "69"
-	)
-	static final int method291(int var0, int var1, int var2) {
-		int var3 = var0 / var2; // L: 538
-		int var4 = var0 & var2 - 1; // L: 539
-		int var5 = var1 / var2; // L: 540
-		int var6 = var1 & var2 - 1; // L: 541
-		int var7 = DynamicObject.method2002(var3, var5); // L: 542
-		int var8 = DynamicObject.method2002(var3 + 1, var5); // L: 543
-		int var9 = DynamicObject.method2002(var3, var5 + 1); // L: 544
-		int var10 = DynamicObject.method2002(var3 + 1, var5 + 1); // L: 545
-		int var11 = Messages.method2376(var7, var8, var4, var2); // L: 546
-		int var12 = Messages.method2376(var9, var10, var4, var2); // L: 547
-		return Messages.method2376(var11, var12, var6, var2); // L: 548
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-165591138"
-	)
-	public static String method277(String var0) {
-		int var1 = var0.length(); // L: 166
-		char[] var2 = new char[var1]; // L: 167
-		byte var3 = 2; // L: 168
-
-		for (int var4 = 0; var4 < var1; ++var4) { // L: 169
-			char var5 = var0.charAt(var4); // L: 170
-			if (var3 == 0) { // L: 171
-				var5 = Character.toLowerCase(var5);
-			} else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 172
-				char var6;
-				if (var5 != 181 && var5 != 402) { // L: 175
-					var6 = Character.toTitleCase(var5); // L: 179
-				} else {
-					var6 = var5; // L: 176
-				}
+			if (var1 == 324) {
+				Client.playerAppearance.changeSex(false); // L: 12311
+			}
 
-				var5 = var6; // L: 181
+			if (var1 == 325) { // L: 12312
+				Client.playerAppearance.changeSex(true);
 			}
 
-			if (Character.isLetter(var5)) { // L: 183
-				var3 = 0;
-			} else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 184
-				if (Character.isSpaceChar(var5)) { // L: 185
-					if (var3 != 2) { // L: 186
-						var3 = 1;
-					}
-				} else {
-					var3 = 1; // L: 188
-				}
+			if (var1 == 326) { // L: 12313
+				PacketBufferNode var4 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2904, Client.packetWriter.isaacCipher); // L: 12315
+				Client.playerAppearance.write(var4.packetBuffer); // L: 12316
+				Client.packetWriter.addNode(var4); // L: 12317
+				return true; // L: 12318
 			} else {
-				var3 = 2;
+				return false; // L: 12320
 			}
-
-			var2[var4] = var5; // L: 189
 		}
-
-		return new String(var2); // L: 191
 	}
-
-	@ObfuscatedName("fu")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1058992948"
-	)
-	static final void method289() {
-		FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 3217
-		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 3220
-		class87.method2223(); // L: 3222
-		ArchiveDisk.method6322(); // L: 3223
-		NPCComposition.NpcDefinition_cached.clear(); // L: 3225
-		NPCComposition.NpcDefinition_cachedModels.clear(); // L: 3226
-		CollisionMap.method3492(); // L: 3228
-		class78.method2078(); // L: 3229
-		ScriptFrame.method1117(); // L: 3230
-		VarbitComposition.VarbitDefinition_cached.clear(); // L: 3232
-		VarpDefinition.VarpDefinition_cached.clear(); // L: 3235
-		FileSystem.field1564.method6811(); // L: 3237
-		class240.HitSplatDefinition_cachedSprites.method6811(); // L: 3238
-		HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 3240
-		HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 3241
-		HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 3242
-		FileSystem.method2908(); // L: 3244
-		StructComposition.StructDefinition_cached.clear(); // L: 3246
-		ParamComposition.ParamDefinition_cached.clear(); // L: 3249
-		WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 3252
-		PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 3255
-		PacketWriter.method2401(); // L: 3257
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3258
-		Script.Script_cached.clear(); // L: 3259
-		InvDefinition.archive0.clearFiles(); // L: 3260
-		ApproximateRouteStrategy.archive1.clearFiles(); // L: 3261
-		ParamComposition.archive3.clearFiles(); // L: 3262
-		class12.archive4.clearFiles(); // L: 3263
-		class11.archive5.clearFiles(); // L: 3264
-		Messages.archive6.clearFiles(); // L: 3265
-		HorizontalAlignment.archive7.clearFiles(); // L: 3266
-		GrandExchangeOfferOwnWorldComparator.archive8.clearFiles(); // L: 3267
-		SecureRandomFuture.archive9.clearFiles(); // L: 3268
-		ChatChannel.archive10.clearFiles(); // L: 3269
-		AbstractWorldMapIcon.archive11.clearFiles(); // L: 3270
-		class14.archive12.clearFiles(); // L: 3271
-	} // L: 3272
 }
diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java
index 5bb422d268..154ea4cf42 100644
--- a/runescape-client/src/main/java/class194.java
+++ b/runescape-client/src/main/java/class194.java
@@ -3,41 +3,225 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gs")
+@ObfuscatedName("gq")
 public class class194 {
-	@ObfuscatedName("i")
+	@ObfuscatedName("n")
+	static int[][] field2280;
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
-		descriptor = "Lgs;"
+		descriptor = "Low;"
 	)
-	static final class194 field2177;
-	@ObfuscatedName("w")
+	@Export("loginType")
+	static LoginType loginType;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lgs;"
+		descriptor = "[Ldf;"
 	)
-	static final class194 field2178;
-	@ObfuscatedName("s")
+	class113[] field2278;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1031005125
+		intValue = -750906287
+	)
+	int field2279;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V"
+	)
+	class194(Buffer var1, int var2) {
+		this.field2278 = new class113[var2]; // L: 13
+		this.field2279 = var1.readUnsignedByte(); // L: 14
+
+		for (int var3 = 0; var3 < this.field2278.length; ++var3) { // L: 15
+			class113 var4 = new class113(this.field2279, var1, false); // L: 16
+			this.field2278[var3] = var4; // L: 17
+		}
+
+		this.method3921();
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1651999275"
+	)
+	void method3921() {
+		class113[] var1 = this.field2278; // L: 24
+
+		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 25
+			class113 var3 = var1[var2]; // L: 26
+			if (var3.field1377 >= 0) { // L: 28
+				var3.field1366 = this.field2278[var3.field1377]; // L: 29
+			}
+		}
+
+	} // L: 34
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(S)I",
+		garbageValue = "-18164"
 	)
-	@Export("value")
-	final int value;
+	public int method3935() {
+		return this.field2278.length; // L: 37
+	}
 
-	static {
-		field2177 = new class194(0); // L: 4
-		field2178 = new class194(1); // L: 5
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(II)Ldf;",
+		garbageValue = "-989126871"
+	)
+	class113 method3923(int var1) {
+		return this.field2278[var1]; // L: 41
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(B)[Ldf;",
+		garbageValue = "-59"
+	)
+	class113[] method3924() {
+		return this.field2278; // L: 45
 	}
 
-	class194(int var1) {
-		this.value = var1; // L: 9
-	} // L: 10
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(Ldb;II)V",
+		garbageValue = "-1934519141"
+	)
+	void method3939(class120 var1, int var2) {
+		this.method3940(var1, var2, (boolean[])null, false); // L: 49
+	} // L: 50
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Ldb;I[ZZI)V",
+		garbageValue = "-2019767334"
+	)
+	void method3940(class120 var1, int var2, boolean[] var3, boolean var4) {
+		int var5 = var1.method2694(); // L: 53
+		int var6 = 0; // L: 54
+		class113[] var7 = this.method3924(); // L: 56
+
+		for (int var8 = 0; var8 < var7.length; ++var8) { // L: 57
+			class113 var9 = var7[var8]; // L: 58
+			if (var3 == null || var4 == var3[var6]) { // L: 60
+				var1.method2700(var2, var9, var6, var5); // L: 61
+			}
+
+			++var6; // L: 63
+		}
+
+	} // L: 67
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V",
+		garbageValue = "-664085"
+	)
+	@Export("addGameMessage")
+	static void addGameMessage(int var0, String var1, String var2) {
+		DevicePcmPlayerProvider.addChatMessage(var0, var1, var2, (String)null); // L: 19
+	} // L: 20
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lku;Lku;Lku;Lku;I)V",
+		garbageValue = "-1945600553"
+	)
+	public static void method3937(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) {
+		CollisionMap.Widget_archive = var0; // L: 190
+		Widget.Widget_modelsArchive = var1; // L: 191
+		GraphicsObject.Widget_spritesArchive = var2; // L: 192
+		NPC.Widget_fontsArchive = var3;
+		MouseRecorder.Widget_interfaceComponents = new Widget[CollisionMap.Widget_archive.getGroupCount()][];
+		Widget.Widget_loadedInterfaces = new boolean[CollisionMap.Widget_archive.getGroupCount()];
+	} // L: 196
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;B)[B",
+		garbageValue = "16"
+	)
+	public static byte[] method3933(CharSequence var0) {
+		int var1 = var0.length(); // L: 77
+		byte[] var2 = new byte[var1]; // L: 78
+
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 79
+			char var4 = var0.charAt(var3); // L: 80
+			if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 81
+				var2[var3] = (byte)var4;
+			} else if (var4 == 8364) { // L: 82
+				var2[var3] = -128;
+			} else if (var4 == 8218) { // L: 83
+				var2[var3] = -126;
+			} else if (var4 == 402) { // L: 84
+				var2[var3] = -125;
+			} else if (var4 == 8222) { // L: 85
+				var2[var3] = -124;
+			} else if (var4 == 8230) { // L: 86
+				var2[var3] = -123;
+			} else if (var4 == 8224) { // L: 87
+				var2[var3] = -122;
+			} else if (var4 == 8225) { // L: 88
+				var2[var3] = -121;
+			} else if (var4 == 710) { // L: 89
+				var2[var3] = -120;
+			} else if (var4 == 8240) { // L: 90
+				var2[var3] = -119;
+			} else if (var4 == 352) {
+				var2[var3] = -118; // L: 91
+			} else if (var4 == 8249) { // L: 92
+				var2[var3] = -117;
+			} else if (var4 == 338) { // L: 93
+				var2[var3] = -116;
+			} else if (var4 == 381) { // L: 94
+				var2[var3] = -114;
+			} else if (var4 == 8216) { // L: 95
+				var2[var3] = -111;
+			} else if (var4 == 8217) { // L: 96
+				var2[var3] = -110;
+			} else if (var4 == 8220) { // L: 97
+				var2[var3] = -109;
+			} else if (var4 == 8221) { // L: 98
+				var2[var3] = -108;
+			} else if (var4 == 8226) { // L: 99
+				var2[var3] = -107;
+			} else if (var4 == 8211) { // L: 100
+				var2[var3] = -106;
+			} else if (var4 == 8212) { // L: 101
+				var2[var3] = -105;
+			} else if (var4 == 732) { // L: 102
+				var2[var3] = -104;
+			} else if (var4 == 8482) { // L: 103
+				var2[var3] = -103;
+			} else if (var4 == 353) { // L: 104
+				var2[var3] = -102;
+			} else if (var4 == 8250) {
+				var2[var3] = -101; // L: 105
+			} else if (var4 == 339) { // L: 106
+				var2[var3] = -100;
+			} else if (var4 == 382) { // L: 107
+				var2[var3] = -98;
+			} else if (var4 == 376) { // L: 108
+				var2[var3] = -97;
+			} else {
+				var2[var3] = 63; // L: 109
+			}
+		}
+
+		return var2; // L: 111
+	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(II)[B",
-		garbageValue = "-1906665444"
+		descriptor = "(IS)I",
+		garbageValue = "-13840"
 	)
-	@Export("ByteArrayPool_getArray")
-	public static synchronized byte[] ByteArrayPool_getArray(int var0) {
-		return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 112
+	public static int method3926(int var0) {
+		if (var0 > 0) { // L: 193
+			return 1;
+		} else {
+			return var0 < 0 ? -1 : 0; // L: 194 195
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java
deleted file mode 100644
index c07fef0641..0000000000
--- a/runescape-client/src/main/java/class196.java
+++ /dev/null
@@ -1,66 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-
-@ObfuscatedName("gr")
-public class class196 {
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "145453040"
-	)
-	static int method3972(int var0, Script var1, boolean var2) {
-		Widget var3 = UserComparator9.getWidget(Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]); // L: 1296
-		if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1297
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1298
-			return 1; // L: 1299
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1301
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1302
-			return 1; // L: 1303
-		} else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1305
-			Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.text; // L: 1306
-			return 1; // L: 1307
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1309
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1310
-			return 1; // L: 1311
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1313
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1314
-			return 1; // L: 1315
-		} else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1317
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1318
-			return 1; // L: 1319
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1321
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1322
-			return 1; // L: 1323
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1325
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1326
-			return 1; // L: 1327
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1329
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1330
-			return 1; // L: 1331
-		} else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1333
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1334
-			return 1; // L: 1335
-		} else if (var0 == 2610) { // L: 1337
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1338
-			return 1; // L: 1339
-		} else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1341
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.color; // L: 1342
-			return 1; // L: 1343
-		} else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1345
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.color2; // L: 1346
-			return 1; // L: 1347
-		} else if (var0 == 2613) { // L: 1349
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1350
-			return 1; // L: 1351
-		} else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1353
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1354
-			return 1; // L: 1355
-		} else if (var0 != 2615 && var0 != 2616) { // L: 1357
-			return 2; // L: 1361
-		} else {
-			++class14.Interpreter_intStackSize; // L: 1358
-			return 1; // L: 1359
-		}
-	}
-}
diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java
index 9e5794741e..f3b4f9be81 100644
--- a/runescape-client/src/main/java/class2.java
+++ b/runescape-client/src/main/java/class2.java
@@ -1,5 +1,5 @@
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("s")
+@ObfuscatedName("p")
 public interface class2 {
 }
diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java
index 0cbb761c26..f16daf160d 100644
--- a/runescape-client/src/main/java/class20.java
+++ b/runescape-client/src/main/java/class20.java
@@ -1,125 +1,73 @@
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("r")
+@ObfuscatedName("l")
 public class class20 implements Callable {
-	@ObfuscatedName("i")
+	@ObfuscatedName("kk")
+	@ObfuscatedGetter(
+		intValue = -943773093
+	)
+	@Export("Client_plane")
+	static int Client_plane;
+	@ObfuscatedName("no")
+	@ObfuscatedGetter(
+		intValue = -1799052417
+	)
+	@Export("selectedSpellWidget")
+	static int selectedSpellWidget;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lx;"
+		descriptor = "Lo;"
 	)
-	final class10 field94;
+	final class10 field110;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Ll;"
+		descriptor = "Lg;"
 	)
 	final class14 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ll;Lx;)V"
+		descriptor = "(Lg;Lo;)V"
 	)
 	class20(class14 var1, class10 var2) {
-		this.this$0 = var1;
-		this.field94 = var2;
-	}
+		this.this$0 = var1; // L: 46
+		this.field110 = var2; // L: 47
+	} // L: 48
 
 	public Object call() throws Exception {
 		try {
-			while (this.field94.method89()) { // L: 52
-				FloorUnderlayDefinition.method3190(10L); // L: 53
+			while (this.field110.method105()) { // L: 53
+				Bounds.method6608(10L); // L: 54
 			}
-		} catch (IOException var2) { // L: 56
-			return new class21("Error servicing REST query: " + var2.getMessage()); // L: 57
+		} catch (IOException var2) { // L: 57
+			return new class21("Error servicing REST query: " + var2.getMessage()); // L: 58
 		}
 
-		return this.field94.method100(); // L: 59
+		return this.field110.method106(); // L: 60
 	}
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;Lko;Lko;I)V",
-		garbageValue = "1541093699"
-	)
-	public static void method295(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
-		HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46
-		HitSplatDefinition.field1799 = var1; // L: 47
-		HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; // L: 48
-	} // L: 49
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-23497381"
-	)
-	@Export("clearItemContainer")
-	static void clearItemContainer(int var0) {
-		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63
-		if (var1 != null) { // L: 64
-			for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65
-				var1.ids[var2] = -1; // L: 66
-				var1.quantities[var2] = 0; // L: 67
-			}
-
-		}
-	} // L: 69
-
-	@ObfuscatedName("e")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lbw;",
-		garbageValue = "-632858850"
+		descriptor = "(II)Z",
+		garbageValue = "-76614425"
 	)
-	@Export("worldListStart")
-	static World worldListStart() {
-		World.World_listCount = 0; // L: 247
-		return class91.getNextWorldListWorld(); // L: 248
+	public static boolean method332(int var0) {
+		return (var0 & 1) != 0; // L: 9
 	}
 
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-93"
-	)
-	static final void method294() {
-		Object var10000 = null; // L: 114
-		String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members";
-		class397.addGameMessage(30, "", var0); // L: 116
-	} // L: 118
-
-	@ObfuscatedName("kf")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-1226248726"
-	)
-	static final void method298(int var0, int var1) {
-		if (Client.currentClanChannels[var0] != null) { // L: 11843
-			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2809()) { // L: 11844
-				ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11845
-				if (var2.rank == -1) { // L: 11846
-					PacketWriter var3 = Client.packetWriter; // L: 11847
-					PacketBufferNode var4 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2737, var3.isaacCipher); // L: 11848
-					var4.packetBuffer.writeByte(3 + Client.stringCp1252NullTerminatedByteSize(var2.username.getName())); // L: 11849
-					var4.packetBuffer.writeByte(var0); // L: 11850
-					var4.packetBuffer.writeShort(var1); // L: 11851
-					var4.packetBuffer.writeStringCp1252NullTerminated(var2.username.getName()); // L: 11852
-					var3.addNode(var4); // L: 11853
-				}
-			}
-		}
-	} // L: 11854
-
-	@ObfuscatedName("ly")
+	@ObfuscatedName("ke")
 	@ObfuscatedSignature(
-		descriptor = "(Ljf;I)Ljava/lang/String;",
-		garbageValue = "2082215061"
+		descriptor = "(II)V",
+		garbageValue = "-1917740045"
 	)
-	@Export("Widget_getSpellActionName")
-	static String Widget_getSpellActionName(Widget var0) {
-		if (SecureRandomCallable.Widget_unpackTargetMask(PendingSpawn.getWidgetFlags(var0)) == 0) { // L: 11917
-			return null;
-		} else {
-			return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11918 11919 11921
-		}
-	}
+	@Export("updateSoundEffectVolume")
+	static final void updateSoundEffectVolume(int var0) {
+		var0 = Math.min(Math.max(var0, 0), 127); // L: 12149
+		SecureRandomFuture.clientPreferences.soundEffectsVolume = var0; // L: 12150
+		class127.savePreferences(); // L: 12151
+	} // L: 12152
 }
diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java
index b59e6e42a7..9fe0be4757 100644
--- a/runescape-client/src/main/java/class21.java
+++ b/runescape-client/src/main/java/class21.java
@@ -8,36 +8,40 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("m")
+@ObfuscatedName("q")
 public class class21 {
-	@ObfuscatedName("b")
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Ljk;"
+	)
+	@Export("musicTrack")
+	public static MusicTrack musicTrack;
+	@ObfuscatedName("d")
+	static boolean field116;
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
-		descriptor = "Lcm;"
+		descriptor = "Lpa;"
 	)
-	@Export("World_request")
-	static UrlRequest World_request;
-	@ObfuscatedName("hw")
-	@Export("regionLandArchiveIds")
-	static int[] regionLandArchiveIds;
-	@ObfuscatedName("i")
+	static IndexedSprite field118;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1952099167
+		intValue = -1676321481
 	)
-	final int field102;
-	@ObfuscatedName("w")
-	final String field104;
+	final int field115;
+	@ObfuscatedName("b")
+	final String field114;
 
 	class21(String var1) {
-		this.field102 = 400; // L: 32
-		this.field104 = ""; // L: 33
+		this.field115 = 400; // L: 32
+		this.field114 = ""; // L: 33
 	} // L: 34
 
 	class21(HttpURLConnection var1) throws IOException {
-		this.field102 = var1.getResponseCode(); // L: 14
+		this.field115 = var1.getResponseCode(); // L: 14
 		var1.getResponseMessage(); // L: 15
 		var1.getHeaderFields(); // L: 16
 		StringBuilder var2 = new StringBuilder(); // L: 17
-		InputStream var3 = this.field102 >= 300 ? var1.getErrorStream() : var1.getInputStream(); // L: 18
+		InputStream var3 = this.field115 >= 300 ? var1.getErrorStream() : var1.getInputStream(); // L: 18
 		if (var3 != null) { // L: 19
 			InputStreamReader var4 = new InputStreamReader(var3); // L: 20
 			BufferedReader var5 = new BufferedReader(var4); // L: 21
@@ -50,374 +54,46 @@ public class class21 {
 			var3.close(); // L: 26
 		}
 
-		this.field104 = var2.toString(); // L: 28
+		this.field114 = var2.toString(); // L: 28
 	} // L: 29
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-701476326"
-	)
-	public int method310() {
-		return this.field102; // L: 37
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "932621711"
+		garbageValue = "1543760704"
 	)
-	public String method303() {
-		return this.field104;
+	public int method338() {
+		return this.field115; // L: 37
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lko;III)[Low;",
-		garbageValue = "-1741368742"
+		descriptor = "(S)Ljava/lang/String;",
+		garbageValue = "128"
 	)
-	public static SpritePixels[] method312(AbstractArchive var0, int var1, int var2) {
-		byte[] var4 = var0.takeFile(var1, var2); // L: 40
-		boolean var3;
-		if (var4 == null) { // L: 41
-			var3 = false; // L: 42
-		} else {
-			Script.SpriteBuffer_decode(var4); // L: 45
-			var3 = true; // L: 46
-		}
-
-		return !var3 ? null : class283.method5221(); // L: 48 49
-	}
-
-	@ObfuscatedName("e")
-	@Export("Entity_unpackID")
-	public static int Entity_unpackID(long var0) {
-		return (int)(var0 >>> 17 & 4294967295L); // L: 81
+	public String method339() {
+		return this.field114; // L: 41
 	}
 
-	@ObfuscatedName("hw")
+	@ObfuscatedName("if")
 	@ObfuscatedSignature(
-		descriptor = "(Lii;I)V",
-		garbageValue = "1398139213"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
+		garbageValue = "1482446677"
 	)
-	static final void method309(class240 var0) {
-		PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7205
-		int var2;
-		int var3;
-		int var4;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		int var9;
-		if (class240.field2781 == var0) { // L: 7206
-			var2 = var1.method6995(); // L: 7207
-			var3 = (var2 >> 4 & 7) + ItemComposition.field1931; // L: 7208
-			var4 = (var2 & 7) + Actor.field1146; // L: 7209
-			var5 = var1.readUnsignedByte(); // L: 7210
-			var6 = var5 >> 2; // L: 7211
-			var7 = var5 & 3; // L: 7212
-			var8 = Client.field530[var6]; // L: 7213
-			var9 = var1.method7004(); // L: 7214
-			if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7215
-				WorldMapLabelSize.updatePendingSpawn(GrandExchangeOfferTotalQuantityComparator.Client_plane, var3, var4, var8, var9, var6, var7, 0, -1); // L: 7216
-			}
-
-		} else if (class240.field2777 == var0) { // L: 7220
-			var2 = var1.method6997(); // L: 7221
-			var3 = var2 >> 2; // L: 7222
-			var4 = var2 & 3; // L: 7223
-			var5 = Client.field530[var3]; // L: 7224
-			var6 = var1.readUnsignedByte(); // L: 7225
-			var7 = (var6 >> 4 & 7) + ItemComposition.field1931; // L: 7226
-			var8 = (var6 & 7) + Actor.field1146; // L: 7227
-			if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7228
-				WorldMapLabelSize.updatePendingSpawn(GrandExchangeOfferTotalQuantityComparator.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 7229
+	@Export("insertMenuItem")
+	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
+		if (!Client.isMenuOpen) { // L: 10045
+			if (Client.menuOptionsCount < 500) { // L: 10046
+				Client.menuActions[Client.menuOptionsCount] = var0; // L: 10047
+				Client.menuTargets[Client.menuOptionsCount] = var1; // L: 10048
+				Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 10049
+				Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 10050
+				Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 10051
+				Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 10052
+				Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 10053
+				++Client.menuOptionsCount; // L: 10054
 			}
 
-		} else if (class240.field2773 == var0) { // L: 7233
-			var2 = var1.readUnsignedByte(); // L: 7234
-			var3 = (var2 >> 4 & 7) + ItemComposition.field1931; // L: 7235
-			var4 = (var2 & 7) + Actor.field1146; // L: 7236
-			var5 = var1.method7120(); // L: 7237
-			var6 = var1.method7120(); // L: 7238
-			var7 = var1.method7006(); // L: 7239
-			if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7240
-				NodeDeque var46 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var3][var4]; // L: 7241
-				if (var46 != null) { // L: 7242
-					for (TileItem var36 = (TileItem)var46.last(); var36 != null; var36 = (TileItem)var46.previous()) { // L: 7243 7244 7249
-						if ((var6 & 32767) == var36.id && var7 == var36.quantity) { // L: 7245
-							var36.quantity = var5; // L: 7246
-							break;
-						}
-					}
-
-					WallDecoration.updateItemPile(var3, var4); // L: 7251
-				}
-			}
-
-		} else {
-			int var10;
-			int var11;
-			int var12;
-			int var14;
-			if (class240.field2782 == var0) { // L: 7256
-				byte var37 = var1.readByte(); // L: 7257
-				var3 = var1.method7006(); // L: 7258
-				var4 = var1.method7004(); // L: 7259
-				var5 = var1.method6996() * 4; // L: 7260
-				var6 = var1.method7008(); // L: 7261
-				byte var39 = var1.method6973(); // L: 7262
-				var8 = var1.method6995(); // L: 7263
-				var9 = (var8 >> 4 & 7) + ItemComposition.field1931; // L: 7264
-				var10 = (var8 & 7) + Actor.field1146; // L: 7265
-				var11 = var1.readUnsignedByte() * 4; // L: 7266
-				var12 = var1.method6997(); // L: 7267
-				int var42 = var1.method7006(); // L: 7268
-				var14 = var1.method6997(); // L: 7269
-				var7 = var39 + var9; // L: 7270
-				var2 = var37 + var10; // L: 7271
-				if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var7 >= 0 && var2 >= 0 && var7 < 104 && var2 < 104 && var42 != 65535) { // L: 7272
-					var9 = var9 * 128 + 64; // L: 7273
-					var10 = var10 * 128 + 64; // L: 7274
-					var7 = var7 * 128 + 64; // L: 7275
-					var2 = var2 * 128 + 64; // L: 7276
-					Projectile var35 = new Projectile(var42, GrandExchangeOfferTotalQuantityComparator.Client_plane, var9, var10, class392.getTileHeight(var9, var10, GrandExchangeOfferTotalQuantityComparator.Client_plane) - var5, var4 + Client.cycle, var3 + Client.cycle, var14, var12, var6, var11); // L: 7277
-					var35.setDestination(var7, var2, class392.getTileHeight(var7, var2, GrandExchangeOfferTotalQuantityComparator.Client_plane) - var11, var4 + Client.cycle); // L: 7278
-					Client.projectiles.addFirst(var35); // L: 7279
-				}
-
-			} else {
-				TileItem var33;
-				if (class240.field2780 == var0) { // L: 7283
-					var2 = var1.method6995(); // L: 7284
-					var3 = (var2 >> 4 & 7) + ItemComposition.field1931; // L: 7285
-					var4 = (var2 & 7) + Actor.field1146; // L: 7286
-					var5 = var1.method7004(); // L: 7287
-					if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7288
-						NodeDeque var34 = Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var3][var4]; // L: 7289
-						if (var34 != null) { // L: 7290
-							for (var33 = (TileItem)var34.last(); var33 != null; var33 = (TileItem)var34.previous()) { // L: 7291 7292 7297
-								if ((var5 & 32767) == var33.id) { // L: 7293
-									var33.remove(); // L: 7294
-									break;
-								}
-							}
-
-							if (var34.last() == null) { // L: 7299
-								Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var3][var4] = null;
-							}
-
-							WallDecoration.updateItemPile(var3, var4); // L: 7300
-						}
-					}
-
-				} else {
-					if (class240.field2772 == var0) { // L: 7305
-						var2 = var1.readUnsignedByte(); // L: 7306
-						var3 = var2 >> 4 & 15; // L: 7307
-						var4 = var2 & 7; // L: 7308
-						var5 = var1.method6997(); // L: 7309
-						var6 = (var5 >> 4 & 7) + ItemComposition.field1931; // L: 7310
-						var7 = (var5 & 7) + Actor.field1146; // L: 7311
-						var8 = var1.method6996(); // L: 7312
-						var9 = var1.method7004(); // L: 7313
-						if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7314
-							var10 = var3 + 1; // L: 7315
-							if (HealthBarDefinition.localPlayer.pathX[0] >= var6 - var10 && HealthBarDefinition.localPlayer.pathX[0] <= var6 + var10 && HealthBarDefinition.localPlayer.pathY[0] >= var7 - var10 && HealthBarDefinition.localPlayer.pathY[0] <= var7 + var10 && class408.clientPreferences.areaSoundEffectsVolume != 0 && var4 > 0 && Client.soundEffectCount < 50) { // L: 7316 7317
-								Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7318
-								Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 7319
-								Client.queuedSoundEffectDelays[Client.soundEffectCount] = var8; // L: 7320
-								Client.soundEffects[Client.soundEffectCount] = null; // L: 7321
-								Client.soundLocations[Client.soundEffectCount] = var3 + (var7 << 8) + (var6 << 16); // L: 7322
-								++Client.soundEffectCount; // L: 7323
-							}
-						}
-					}
-
-					if (class240.field2775 == var0) { // L: 7328
-						var2 = var1.method7004(); // L: 7329
-						var3 = var1.method7120(); // L: 7330
-						var4 = var1.method6995(); // L: 7331
-						var5 = (var4 >> 4 & 7) + ItemComposition.field1931; // L: 7332
-						var6 = (var4 & 7) + Actor.field1146; // L: 7333
-						if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 7334
-							var33 = new TileItem(); // L: 7335
-							var33.id = var2; // L: 7336
-							var33.quantity = var3; // L: 7337
-							if (Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var5][var6] == null) { // L: 7338
-								Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var5][var6] = new NodeDeque();
-							}
-
-							Client.groundItems[GrandExchangeOfferTotalQuantityComparator.Client_plane][var5][var6].addFirst(var33); // L: 7339
-							WallDecoration.updateItemPile(var5, var6); // L: 7340
-						}
-
-					} else {
-						if (class240.field2778 == var0) { // L: 7344
-							var2 = var1.method7120(); // L: 7345
-							var3 = var1.method7006(); // L: 7346
-							var4 = var1.method6996(); // L: 7347
-							var5 = var4 >> 2; // L: 7348
-							var6 = var4 & 3; // L: 7349
-							var7 = Client.field530[var5]; // L: 7350
-							byte var38 = var1.method6973(); // L: 7351
-							byte var40 = var1.method7128(); // L: 7352
-							byte var41 = var1.method6973(); // L: 7353
-							var11 = var1.method7120(); // L: 7354
-							var12 = var1.readUnsignedShort(); // L: 7355
-							byte var13 = var1.readByte(); // L: 7356
-							var14 = var1.method6995(); // L: 7357
-							int var15 = (var14 >> 4 & 7) + ItemComposition.field1931; // L: 7358
-							int var16 = (var14 & 7) + Actor.field1146; // L: 7359
-							Player var17;
-							if (var11 == Client.localPlayerIndex) { // L: 7361
-								var17 = HealthBarDefinition.localPlayer;
-							} else {
-								var17 = Client.players[var11]; // L: 7362
-							}
-
-							if (var17 != null) { // L: 7363
-								ObjectComposition var18 = KitDefinition.getObjectDefinition(var12); // L: 7364
-								int var19;
-								int var20;
-								if (var6 != 1 && var6 != 3) { // L: 7367
-									var19 = var18.sizeX; // L: 7372
-									var20 = var18.sizeY; // L: 7373
-								} else {
-									var19 = var18.sizeY; // L: 7368
-									var20 = var18.sizeX; // L: 7369
-								}
-
-								int var21 = var15 + (var19 >> 1); // L: 7375
-								int var22 = var15 + (var19 + 1 >> 1); // L: 7376
-								int var23 = var16 + (var20 >> 1); // L: 7377
-								int var24 = var16 + (var20 + 1 >> 1); // L: 7378
-								int[][] var25 = Tiles.Tiles_heights[GrandExchangeOfferTotalQuantityComparator.Client_plane]; // L: 7379
-								int var26 = var25[var22][var24] + var25[var21][var23] + var25[var22][var23] + var25[var21][var24] >> 2; // L: 7380
-								int var27 = (var15 << 7) + (var19 << 6); // L: 7381
-								int var28 = (var16 << 7) + (var20 << 6); // L: 7382
-								Model var29 = var18.getModel(var5, var6, var25, var27, var26, var28); // L: 7383
-								if (var29 != null) { // L: 7384
-									WorldMapLabelSize.updatePendingSpawn(GrandExchangeOfferTotalQuantityComparator.Client_plane, var15, var16, var7, -1, 0, 0, var3 + 1, var2 + 1); // L: 7385
-									var17.animationCycleStart = var3 + Client.cycle; // L: 7386
-									var17.animationCycleEnd = var2 + Client.cycle; // L: 7387
-									var17.model0 = var29; // L: 7388
-									var17.field1042 = var19 * 64 + var15 * 128; // L: 7389
-									var17.field1052 = var20 * 64 + var16 * 128; // L: 7390
-									var17.tileHeight2 = var26; // L: 7391
-									byte var30;
-									if (var41 > var13) { // L: 7392
-										var30 = var41; // L: 7393
-										var41 = var13; // L: 7394
-										var13 = var30; // L: 7395
-									}
-
-									if (var38 > var40) { // L: 7397
-										var30 = var38; // L: 7398
-										var38 = var40; // L: 7399
-										var40 = var30; // L: 7400
-									}
-
-									var17.minX = var41 + var15; // L: 7402
-									var17.maxX = var15 + var13; // L: 7403
-									var17.minY = var16 + var38; // L: 7404
-									var17.maxY = var40 + var16; // L: 7405
-								}
-							}
-						}
-
-						if (class240.field2779 == var0) { // L: 7409
-							var2 = var1.method7006(); // L: 7410
-							var3 = var1.readUnsignedByte(); // L: 7411
-							var4 = var1.method7006(); // L: 7412
-							var5 = var1.method6996(); // L: 7413
-							var6 = (var5 >> 4 & 7) + ItemComposition.field1931; // L: 7414
-							var7 = (var5 & 7) + Actor.field1146; // L: 7415
-							if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7416
-								var6 = var6 * 128 + 64; // L: 7417
-								var7 = var7 * 128 + 64; // L: 7418
-								GraphicsObject var32 = new GraphicsObject(var2, GrandExchangeOfferTotalQuantityComparator.Client_plane, var6, var7, class392.getTileHeight(var6, var7, GrandExchangeOfferTotalQuantityComparator.Client_plane) - var3, var4, Client.cycle); // L: 7419
-								Client.graphicsObjects.addFirst(var32); // L: 7420
-							}
-
-						} else if (class240.field2774 == var0) { // L: 7424
-							var2 = var1.readUnsignedShort(); // L: 7425
-							var3 = var1.method6996(); // L: 7426
-							var4 = (var3 >> 4 & 7) + ItemComposition.field1931; // L: 7427
-							var5 = (var3 & 7) + Actor.field1146; // L: 7428
-							var6 = var1.method6997(); // L: 7429
-							var7 = var6 >> 2; // L: 7430
-							var8 = var6 & 3; // L: 7431
-							var9 = Client.field530[var7]; // L: 7432
-							if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) { // L: 7433
-								if (var9 == 0) { // L: 7434
-									BoundaryObject var31 = GameBuild.scene.method4301(GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5); // L: 7435
-									if (var31 != null) { // L: 7436
-										var11 = Entity_unpackID(var31.tag); // L: 7437
-										if (var7 == 2) { // L: 7438
-											var31.renderable1 = new DynamicObject(var11, 2, var8 + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var31.renderable1); // L: 7439
-											var31.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var31.renderable2); // L: 7440
-										} else {
-											var31.renderable1 = new DynamicObject(var11, var7, var8, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var31.renderable1); // L: 7442
-										}
-									}
-								}
-
-								if (var9 == 1) { // L: 7445
-									WallDecoration var43 = GameBuild.scene.method4410(GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5); // L: 7446
-									if (var43 != null) { // L: 7447
-										var11 = Entity_unpackID(var43.tag); // L: 7448
-										if (var7 != 4 && var7 != 5) { // L: 7449
-											if (var7 == 6) { // L: 7450
-												var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable1);
-											} else if (var7 == 7) { // L: 7451
-												var43.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable1);
-											} else if (var7 == 8) { // L: 7452
-												var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable1); // L: 7453
-												var43.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable2); // L: 7454
-											}
-										} else {
-											var43.renderable1 = new DynamicObject(var11, 4, var8, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var43.renderable1);
-										}
-									}
-								}
-
-								if (var9 == 2) { // L: 7458
-									GameObject var44 = GameBuild.scene.getGameObject(GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5); // L: 7459
-									if (var7 == 11) { // L: 7460
-										var7 = 10;
-									}
-
-									if (var44 != null) { // L: 7461
-										var44.renderable = new DynamicObject(Entity_unpackID(var44.tag), var7, var8, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var44.renderable);
-									}
-								}
-
-								if (var9 == 3) { // L: 7463
-									FloorDecoration var45 = GameBuild.scene.getFloorDecoration(GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5); // L: 7464
-									if (var45 != null) { // L: 7465
-										var45.renderable = new DynamicObject(Entity_unpackID(var45.tag), 22, var8, GrandExchangeOfferTotalQuantityComparator.Client_plane, var4, var5, var2, false, var45.renderable);
-									}
-								}
-							}
-
-						}
-					}
-				}
-			}
 		}
-	} // L: 7218 7231 7254 7281 7303 7342 7422 7468 7470
-
-	@ObfuscatedName("kn")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "148255026"
-	)
-	@Export("Clan_leaveChat")
-	static final void Clan_leaveChat() {
-		PacketBufferNode var0 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2758, Client.packetWriter.isaacCipher); // L: 11822
-		var0.packetBuffer.writeByte(0); // L: 11823
-		Client.packetWriter.addNode(var0); // L: 11824
-	} // L: 11825
+	} // L: 10056
 }
diff --git a/runescape-client/src/main/java/class213.java b/runescape-client/src/main/java/class213.java
new file mode 100644
index 0000000000..8e68dfc040
--- /dev/null
+++ b/runescape-client/src/main/java/class213.java
@@ -0,0 +1,124 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("hd")
+public class class213 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lkt;",
+		garbageValue = "1655670329"
+	)
+	static class288[] method4355() {
+		return new class288[]{class288.field3436, class288.field3438}; // L: 35
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Ldn;FZI)F",
+		garbageValue = "244172504"
+	)
+	static float method4354(class115 var0, float var1, boolean var2) {
+		float var3 = 0.0F; // L: 138
+		if (var0 != null && var0.method2637() != 0) { // L: 139
+			float var4 = (float)var0.field1393[0].field1359; // L: 142
+			float var5 = (float)var0.field1393[var0.method2637() - 1].field1359; // L: 143
+			float var6 = var5 - var4; // L: 144
+			if (0.0D == (double)var6) { // L: 145
+				return var0.field1393[0].field1349; // L: 146
+			} else {
+				float var7 = 0.0F; // L: 148
+				if (var1 > var5) { // L: 149
+					var7 = (var1 - var5) / var6; // L: 150
+				} else {
+					var7 = (var1 - var4) / var6; // L: 153
+				}
+
+				double var8 = (double)((int)var7); // L: 155
+				float var10 = Math.abs((float)((double)var7 - var8)); // L: 156
+				float var11 = var10 * var6; // L: 157
+				var8 = Math.abs(var8 + 1.0D); // L: 158
+				double var12 = var8 / 2.0D; // L: 159
+				double var14 = (double)((int)var12); // L: 160
+				var10 = (float)(var12 - var14); // L: 161
+				float var16;
+				float var17;
+				if (var2) { // L: 164
+					if (var0.field1410 == class114.field1386) { // L: 165
+						if ((double)var10 != 0.0D) { // L: 166
+							var11 += var4; // L: 167
+						} else {
+							var11 = var5 - var11; // L: 170
+						}
+					} else if (var0.field1410 != class114.field1384 && var0.field1410 != class114.field1391) { // L: 173
+						if (var0.field1410 == class114.field1383) { // L: 176
+							var11 = var4 - var1; // L: 177
+							var16 = var0.field1393[0].field1350; // L: 178
+							var17 = var0.field1393[0].field1351; // L: 179
+							var3 = var0.field1393[0].field1349; // L: 180
+							if (0.0D != (double)var16) { // L: 181
+								var3 -= var11 * var17 / var16; // L: 182
+							}
+
+							return var3; // L: 184
+						}
+					} else {
+						var11 = var5 - var11; // L: 174
+					}
+				} else if (var0.field1396 == class114.field1386) { // L: 188
+					if ((double)var10 != 0.0D) { // L: 189
+						var11 = var5 - var11; // L: 190
+					} else {
+						var11 += var4; // L: 193
+					}
+				} else if (var0.field1396 != class114.field1384 && var0.field1396 != class114.field1391) { // L: 196
+					if (var0.field1396 == class114.field1383) { // L: 199
+						var11 = var1 - var5; // L: 200
+						var16 = var0.field1393[var0.method2637() - 1].field1352; // L: 201
+						var17 = var0.field1393[var0.method2637() - 1].field1357; // L: 202
+						var3 = var0.field1393[var0.method2637() - 1].field1349; // L: 203
+						if (0.0D != (double)var16) { // L: 204
+							var3 += var17 * var11 / var16; // L: 205
+						}
+
+						return var3; // L: 207
+					}
+				} else {
+					var11 += var4; // L: 197
+				}
+
+				var3 = class14.method210(var0, var11); // L: 210
+				float var18;
+				if (var2 && var0.field1410 == class114.field1391) { // L: 212
+					var18 = var0.field1393[var0.method2637() - 1].field1349 - var0.field1393[0].field1349; // L: 213
+					var3 = (float)((double)var3 - var8 * (double)var18); // L: 214
+				} else if (!var2 && var0.field1396 == class114.field1391) { // L: 216
+					var18 = var0.field1393[var0.method2637() - 1].field1349 - var0.field1393[0].field1349; // L: 217
+					var3 = (float)((double)var3 + (double)var18 * var8); // L: 218
+				}
+
+				return var3; // L: 220
+			}
+		} else {
+			return var3; // L: 140
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1639930062"
+	)
+	public static void method4356() {
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 107
+			if (ArchiveDiskActionHandler.field3815 != 0) { // L: 108
+				ArchiveDiskActionHandler.field3815 = 1; // L: 109
+
+				try {
+					ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 111
+				} catch (InterruptedException var3) { // L: 113
+				}
+			}
+
+		}
+	} // L: 116
+}
diff --git a/runescape-client/src/main/java/class221.java b/runescape-client/src/main/java/class221.java
new file mode 100644
index 0000000000..72cbf95fa4
--- /dev/null
+++ b/runescape-client/src/main/java/class221.java
@@ -0,0 +1,187 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("hy")
+public class class221 implements WorldMapSection {
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 80872319
+	)
+	int field2658;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = 442101873
+	)
+	int field2664;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -1896112631
+	)
+	int field2657;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1105092511
+	)
+	int field2662;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -56111117
+	)
+	int field2659;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -813588247
+	)
+	int field2660;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 652100539
+	)
+	int field2661;
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		intValue = 484039067
+	)
+	int field2656;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = 1695529863
+	)
+	int field2663;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -1057648431
+	)
+	int field2655;
+
+	class221() {
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lhr;I)V",
+		garbageValue = "2069930856"
+	)
+	@Export("expandBounds")
+	public void expandBounds(WorldMapArea var1) {
+		if (var1.regionLowX > this.field2659) { // L: 22
+			var1.regionLowX = this.field2659;
+		}
+
+		if (var1.regionHighX < this.field2659) {
+			var1.regionHighX = this.field2659; // L: 23
+		}
+
+		if (var1.regionLowY > this.field2660) { // L: 24
+			var1.regionLowY = this.field2660;
+		}
+
+		if (var1.regionHighY < this.field2660) { // L: 25
+			var1.regionHighY = this.field2660;
+		}
+
+	} // L: 26
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(IIIB)Z",
+		garbageValue = "81"
+	)
+	@Export("containsCoord")
+	public boolean containsCoord(int var1, int var2, int var3) {
+		if (var1 >= this.field2658 && var1 < this.field2664 + this.field2658) { // L: 30
+			return var2 >= (this.field2657 << 6) + (this.field2661 << 3) && var2 <= (this.field2657 << 6) + (this.field2661 << 3) + 7 && var3 >= (this.field2662 << 6) + (this.field2656 << 3) && var3 <= (this.field2662 << 6) + (this.field2656 << 3) + 7; // L: 33
+		} else {
+			return false; // L: 31
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(III)Z",
+		garbageValue = "42159517"
+	)
+	@Export("containsPosition")
+	public boolean containsPosition(int var1, int var2) {
+		return var1 >= (this.field2659 << 6) + (this.field2663 << 3) && var1 <= (this.field2659 << 6) + (this.field2663 << 3) + 7 && var2 >= (this.field2660 << 6) + (this.field2655 << 3) && var2 <= (this.field2660 << 6) + (this.field2655 << 3) + 7; // L: 38
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)[I",
+		garbageValue = "22240711"
+	)
+	@Export("getBorderTileLengths")
+	public int[] getBorderTileLengths(int var1, int var2, int var3) {
+		if (!this.containsCoord(var1, var2, var3)) { // L: 43
+			return null; // L: 44
+		} else {
+			int[] var4 = new int[]{var2 + (this.field2659 * 64 - this.field2657 * 64) + (this.field2663 * 8 - this.field2661 * 8), var3 + (this.field2660 * 64 - this.field2662 * 64) + (this.field2655 * 8 - this.field2656 * 8)}; // L: 46 47 48
+			return var4; // L: 49
+		}
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(IIS)Lju;",
+		garbageValue = "5000"
+	)
+	@Export("coord")
+	public Coord coord(int var1, int var2) {
+		if (!this.containsPosition(var1, var2)) { // L: 54
+			return null; // L: 55
+		} else {
+			int var3 = this.field2657 * 64 - this.field2659 * 64 + (this.field2661 * 8 - this.field2663 * 8) + var1; // L: 57
+			int var4 = var2 + (this.field2662 * 64 - this.field2660 * 64) + (this.field2656 * 8 - this.field2655 * 8); // L: 58
+			return new Coord(this.field2658, var3, var4); // L: 59
+		}
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;S)V",
+		garbageValue = "-15299"
+	)
+	@Export("read")
+	public void read(Buffer var1) {
+		this.field2658 = var1.readUnsignedByte(); // L: 64
+		this.field2664 = var1.readUnsignedByte(); // L: 65
+		this.field2657 = var1.readUnsignedShort(); // L: 66
+		this.field2661 = var1.readUnsignedByte(); // L: 67
+		this.field2662 = var1.readUnsignedShort(); // L: 68
+		this.field2656 = var1.readUnsignedByte(); // L: 69
+		this.field2659 = var1.readUnsignedShort(); // L: 70
+		this.field2663 = var1.readUnsignedByte(); // L: 71
+		this.field2660 = var1.readUnsignedShort(); // L: 72
+		this.field2655 = var1.readUnsignedByte(); // L: 73
+		this.method4678(); // L: 74
+	} // L: 75
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1997336841"
+	)
+	void method4678() {
+	} // L: 77
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Ljava/lang/String;",
+		garbageValue = "34"
+	)
+	static String method4705(int var0) {
+		return "<img=" + var0 + ">"; // L: 18
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lku;B)V",
+		garbageValue = "-91"
+	)
+	public static void method4700(AbstractArchive var0) {
+		class17.StructDefinition_archive = var0; // L: 19
+	} // L: 20
+}
diff --git a/runescape-client/src/main/java/class222.java b/runescape-client/src/main/java/class222.java
new file mode 100644
index 0000000000..d5e1a08bf0
--- /dev/null
+++ b/runescape-client/src/main/java/class222.java
@@ -0,0 +1,13 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("hc")
+public class class222 {
+	@ObfuscatedName("rj")
+	@ObfuscatedSignature(
+		descriptor = "Lej;"
+	)
+	@Export("guestClanSettings")
+	static ClanSettings guestClanSettings;
+}
diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java
deleted file mode 100644
index 03c9228625..0000000000
--- a/runescape-client/src/main/java/class228.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("hi")
-public interface class228 extends class230 {
-}
diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java
deleted file mode 100644
index 21746adba3..0000000000
--- a/runescape-client/src/main/java/class229.java
+++ /dev/null
@@ -1,19 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("hh")
-public abstract class class229 implements class231 {
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 159985607
-	)
-	protected int field2647;
-
-	@ObfuscatedSignature(
-		descriptor = "(Ljd;Lkz;I)V"
-	)
-	protected class229(StudioGame var1, Language var2, int var3) {
-		this.field2647 = var3; // L: 10
-	} // L: 11
-}
diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java
deleted file mode 100644
index eee5e3105c..0000000000
--- a/runescape-client/src/main/java/class230.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("hz")
-public interface class230 {
-}
diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java
index eb1ee42924..386b1d3f11 100644
--- a/runescape-client/src/main/java/class231.java
+++ b/runescape-client/src/main/java/class231.java
@@ -1,5 +1,304 @@
+import java.io.File;
+import java.io.IOException;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hy")
-public interface class231 extends Iterable {
+@ObfuscatedName("hi")
+public class class231 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lhi;"
+	)
+	static final class231 field2736;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lhi;"
+	)
+	static final class231 field2735;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -2085650501
+	)
+	@Export("value")
+	final int value;
+
+	static {
+		field2736 = new class231(0); // L: 4
+		field2735 = new class231(1); // L: 5
+	}
+
+	class231(int var1) {
+		this.value = var1; // L: 9
+	} // L: 10
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(I)Liw;",
+		garbageValue = "-1942249843"
+	)
+	public static PacketBufferNode method4802() {
+		PacketBufferNode var0;
+		if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 47
+			var0 = new PacketBufferNode(); // L: 48
+		} else {
+			var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 51
+		}
+
+		var0.clientPacket = null; // L: 54
+		var0.clientPacketLength = 0; // L: 55
+		var0.packetBuffer = new PacketBuffer(5000); // L: 56
+		return var0; // L: 57
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Loa;",
+		garbageValue = "-12"
+	)
+	@Export("getPreferencesFile")
+	public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
+		File var3 = new File(class13.cacheDir, "preferences" + var0 + ".dat"); // L: 73
+		if (var3.exists()) { // L: 74
+			try {
+				AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 76
+				return var10; // L: 77
+			} catch (IOException var9) { // L: 79
+			}
+		}
+
+		String var4 = ""; // L: 81
+		if (UserComparator3.cacheGamebuild == 33) { // L: 82
+			var4 = "_rc";
+		} else if (UserComparator3.cacheGamebuild == 34) { // L: 83
+			var4 = "_wip";
+		}
+
+		File var5 = new File(class409.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 84
+		AccessFile var6;
+		if (!var2 && var5.exists()) { // L: 85
+			try {
+				var6 = new AccessFile(var5, "rw", 10000L); // L: 87
+				return var6; // L: 88
+			} catch (IOException var8) { // L: 90
+			}
+		}
+
+		try {
+			var6 = new AccessFile(var3, "rw", 10000L); // L: 93
+			return var6; // L: 94
+		} catch (IOException var7) { // L: 96
+			throw new RuntimeException(); // L: 97
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Lpj;IB)V",
+		garbageValue = "-19"
+	)
+	@Export("readPlayerUpdate")
+	static void readPlayerUpdate(PacketBuffer var0, int var1) {
+		boolean var2 = var0.readBits(1) == 1; // L: 197
+		if (var2) { // L: 198
+			Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
+		}
+
+		int var3 = var0.readBits(2); // L: 199
+		Player var4 = Client.players[var1]; // L: 200
+		if (var3 == 0) { // L: 201
+			if (var2) { // L: 202
+				var4.field1055 = false; // L: 203
+			} else if (Client.localPlayerIndex == var1) { // L: 206
+				throw new RuntimeException();
+			} else {
+				Players.Players_regions[var1] = (var4.plane << 28) + (TileItem.baseY + var4.pathY[0] >> 13) + (class131.baseX + var4.pathX[0] >> 13 << 14); // L: 207
+				if (var4.field1122 != -1) { // L: 208
+					Players.Players_orientations[var1] = var4.field1122;
+				} else {
+					Players.Players_orientations[var1] = var4.orientation; // L: 209
+				}
+
+				Players.Players_targetIndices[var1] = var4.targetIndex; // L: 210
+				Client.players[var1] = null; // L: 211
+				if (var0.readBits(1) != 0) { // L: 212
+					Decimator.updateExternalPlayer(var0, var1);
+				}
+
+			}
+		} else {
+			int var5;
+			int var6;
+			int var7;
+			if (var3 == 1) { // L: 215
+				var5 = var0.readBits(3); // L: 216
+				var6 = var4.pathX[0]; // L: 217
+				var7 = var4.pathY[0]; // L: 218
+				if (var5 == 0) { // L: 219
+					--var6; // L: 220
+					--var7; // L: 221
+				} else if (var5 == 1) { // L: 223
+					--var7;
+				} else if (var5 == 2) { // L: 224
+					++var6; // L: 225
+					--var7; // L: 226
+				} else if (var5 == 3) { // L: 228
+					--var6;
+				} else if (var5 == 4) { // L: 229
+					++var6;
+				} else if (var5 == 5) { // L: 230
+					--var6; // L: 231
+					++var7; // L: 232
+				} else if (var5 == 6) { // L: 234
+					++var7;
+				} else if (var5 == 7) { // L: 235
+					++var6; // L: 236
+					++var7; // L: 237
+				}
+
+				if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 239
+					var4.resetPath(var6, var7); // L: 240
+					var4.field1055 = false; // L: 241
+				} else if (var2) { // L: 243
+					var4.field1055 = true; // L: 244
+					var4.tileX = var6; // L: 245
+					var4.tileY = var7; // L: 246
+				} else {
+					var4.field1055 = false; // L: 249
+					var4.method2175(var6, var7, Players.field1246[var1]); // L: 250
+				}
+
+			} else if (var3 == 2) { // L: 254
+				var5 = var0.readBits(4); // L: 255
+				var6 = var4.pathX[0]; // L: 256
+				var7 = var4.pathY[0]; // L: 257
+				if (var5 == 0) { // L: 258
+					var6 -= 2; // L: 259
+					var7 -= 2; // L: 260
+				} else if (var5 == 1) { // L: 262
+					--var6; // L: 263
+					var7 -= 2; // L: 264
+				} else if (var5 == 2) { // L: 266
+					var7 -= 2;
+				} else if (var5 == 3) { // L: 267
+					++var6; // L: 268
+					var7 -= 2; // L: 269
+				} else if (var5 == 4) { // L: 271
+					var6 += 2; // L: 272
+					var7 -= 2; // L: 273
+				} else if (var5 == 5) { // L: 275
+					var6 -= 2; // L: 276
+					--var7; // L: 277
+				} else if (var5 == 6) { // L: 279
+					var6 += 2; // L: 280
+					--var7; // L: 281
+				} else if (var5 == 7) { // L: 283
+					var6 -= 2;
+				} else if (var5 == 8) { // L: 284
+					var6 += 2;
+				} else if (var5 == 9) { // L: 285
+					var6 -= 2; // L: 286
+					++var7; // L: 287
+				} else if (var5 == 10) { // L: 289
+					var6 += 2; // L: 290
+					++var7; // L: 291
+				} else if (var5 == 11) { // L: 293
+					var6 -= 2; // L: 294
+					var7 += 2; // L: 295
+				} else if (var5 == 12) { // L: 297
+					--var6; // L: 298
+					var7 += 2; // L: 299
+				} else if (var5 == 13) { // L: 301
+					var7 += 2;
+				} else if (var5 == 14) { // L: 302
+					++var6; // L: 303
+					var7 += 2; // L: 304
+				} else if (var5 == 15) { // L: 306
+					var6 += 2; // L: 307
+					var7 += 2; // L: 308
+				}
+
+				if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 310
+					var4.resetPath(var6, var7); // L: 311
+					var4.field1055 = false; // L: 312
+				} else if (var2) { // L: 314
+					var4.field1055 = true; // L: 315
+					var4.tileX = var6; // L: 316
+					var4.tileY = var7; // L: 317
+				} else {
+					var4.field1055 = false; // L: 320
+					var4.method2175(var6, var7, Players.field1246[var1]); // L: 321
+				}
+
+			} else {
+				var5 = var0.readBits(1); // L: 325
+				int var8;
+				int var9;
+				int var10;
+				int var11;
+				if (var5 == 0) { // L: 326
+					var6 = var0.readBits(12); // L: 327
+					var7 = var6 >> 10; // L: 328
+					var8 = var6 >> 5 & 31; // L: 329
+					if (var8 > 15) { // L: 330
+						var8 -= 32;
+					}
+
+					var9 = var6 & 31; // L: 331
+					if (var9 > 15) { // L: 332
+						var9 -= 32;
+					}
+
+					var10 = var8 + var4.pathX[0]; // L: 333
+					var11 = var9 + var4.pathY[0]; // L: 334
+					if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 335
+						if (var2) { // L: 339
+							var4.field1055 = true; // L: 340
+							var4.tileX = var10; // L: 341
+							var4.tileY = var11; // L: 342
+						} else {
+							var4.field1055 = false; // L: 345
+							var4.method2175(var10, var11, Players.field1246[var1]); // L: 346
+						}
+					} else {
+						var4.resetPath(var10, var11); // L: 336
+						var4.field1055 = false; // L: 337
+					}
+
+					var4.plane = (byte)(var7 + var4.plane & 3); // L: 348
+					if (Client.localPlayerIndex == var1) { // L: 349
+						class20.Client_plane = var4.plane;
+					}
+
+				} else {
+					var6 = var0.readBits(30); // L: 352
+					var7 = var6 >> 28; // L: 353
+					var8 = var6 >> 14 & 16383; // L: 354
+					var9 = var6 & 16383; // L: 355
+					var10 = (var8 + class131.baseX + var4.pathX[0] & 16383) - class131.baseX; // L: 356
+					var11 = (var9 + TileItem.baseY + var4.pathY[0] & 16383) - TileItem.baseY; // L: 357
+					if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 358
+						if (var2) { // L: 362
+							var4.field1055 = true; // L: 363
+							var4.tileX = var10; // L: 364
+							var4.tileY = var11; // L: 365
+						} else {
+							var4.field1055 = false; // L: 368
+							var4.method2175(var10, var11, Players.field1246[var1]); // L: 369
+						}
+					} else {
+						var4.resetPath(var10, var11); // L: 359
+						var4.field1055 = false; // L: 360
+					}
+
+					var4.plane = (byte)(var7 + var4.plane & 3); // L: 371
+					if (Client.localPlayerIndex == var1) { // L: 372
+						class20.Client_plane = var4.plane;
+					}
+
+				}
+			}
+		}
+	} // L: 204 213 252 323 350 373
 }
diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java
deleted file mode 100644
index f927266711..0000000000
--- a/runescape-client/src/main/java/class232.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("hu")
-public interface class232 {
-	@ObfuscatedName("i")
-	void method4651(Object var1);
-}
diff --git a/runescape-client/src/main/java/class233.java b/runescape-client/src/main/java/class233.java
new file mode 100644
index 0000000000..0d8824e214
--- /dev/null
+++ b/runescape-client/src/main/java/class233.java
@@ -0,0 +1,73 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("hx")
+public class class233 {
+	@ObfuscatedName("il")
+	@ObfuscatedSignature(
+		descriptor = "(Lck;IIII)V",
+		garbageValue = "-513750809"
+	)
+	@Export("addPlayerToMenu")
+	static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
+		if (class340.localPlayer != var0) { // L: 10310
+			if (Client.menuOptionsCount < 400) { // L: 10311
+				String var4;
+				if (var0.skillLevel == 0) { // L: 10313
+					var4 = var0.actions[0] + var0.username + var0.actions[1] + Tiles.method2108(var0.combatLevel, class340.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
+				} else {
+					var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 10314
+				}
+
+				int var5;
+				if (Client.isItemSelected == 1) { // L: 10315
+					class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 10316
+				} else if (Client.isSpellSelected) { // L: 10319
+					if ((class91.selectedSpellFlags & 8) == 8) { // L: 10320
+						class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 10321
+					}
+				} else {
+					for (var5 = 7; var5 >= 0; --var5) { // L: 10326
+						if (Client.playerMenuActions[var5] != null) { // L: 10327
+							short var6 = 0; // L: 10328
+							if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { // L: 10329
+								if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 10330
+									continue;
+								}
+
+								if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class340.localPlayer.combatLevel) { // L: 10331
+									var6 = 2000; // L: 10332
+								}
+
+								if (class340.localPlayer.team != 0 && var0.team != 0) { // L: 10334
+									if (var0.team == class340.localPlayer.team) { // L: 10335
+										var6 = 2000;
+									} else {
+										var6 = 0; // L: 10336
+									}
+								} else if (AttackOption.field1234 == Client.playerAttackOption && var0.isClanMember()) { // L: 10338
+									var6 = 2000; // L: 10339
+								}
+							} else if (Client.playerOptionsPriorities[var5]) { // L: 10342
+								var6 = 2000;
+							}
+
+							boolean var7 = false; // L: 10343
+							int var8 = Client.playerMenuOpcodes[var5] + var6; // L: 10344
+							class11.insertMenuItemNoShift(Client.playerMenuActions[var5], UserComparator5.colorStartTag(16777215) + var4, var8, var1, var2, var3); // L: 10345
+						}
+					}
+				}
+
+				for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 10350
+					if (Client.menuOpcodes[var5] == 23) { // L: 10351
+						Client.menuTargets[var5] = UserComparator5.colorStartTag(16777215) + var4; // L: 10352
+						break;
+					}
+				}
+
+			}
+		}
+	} // L: 10356
+}
diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java
deleted file mode 100644
index 178131f063..0000000000
--- a/runescape-client/src/main/java/class238.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("ip")
-public interface class238 {
-}
diff --git a/runescape-client/src/main/java/class240.java b/runescape-client/src/main/java/class240.java
deleted file mode 100644
index 26e6dbfe13..0000000000
--- a/runescape-client/src/main/java/class240.java
+++ /dev/null
@@ -1,92 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ii")
-public class class240 {
-	@ObfuscatedName("pv")
-	@ObfuscatedSignature(
-		descriptor = "Lno;"
-	)
-	@Export("HitSplatDefinition_cachedSprites")
-	static class387 HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2782;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2773;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2774;
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2775;
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2777;
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2779;
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2778;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2772;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2780;
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "Lii;"
-	)
-	public static final class240 field2781;
-
-	static {
-		field2782 = new class240(15); // L: 5
-		field2773 = new class240(7); // L: 6
-		field2774 = new class240(4); // L: 7
-		field2775 = new class240(5); // L: 8
-		field2777 = new class240(2); // L: 9
-		field2779 = new class240(6); // L: 10
-		field2778 = new class240(14); // L: 11
-		field2772 = new class240(5); // L: 12
-		field2780 = new class240(3); // L: 13
-		field2781 = new class240(4); // L: 14
-	}
-
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "15"
-	)
-	class240(int var1) {
-	} // L: 20
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Lim;",
-		garbageValue = "1489383005"
-	)
-	static LoginPacket[] method4711() {
-		return new LoginPacket[]{LoginPacket.field2897, LoginPacket.field2901, LoginPacket.field2900, LoginPacket.field2899, LoginPacket.field2896, LoginPacket.field2894}; // L: 22
-	}
-}
diff --git a/runescape-client/src/main/java/class241.java b/runescape-client/src/main/java/class241.java
new file mode 100644
index 0000000000..aa66906d33
--- /dev/null
+++ b/runescape-client/src/main/java/class241.java
@@ -0,0 +1,5 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ib")
+public interface class241 extends class243 {
+}
diff --git a/runescape-client/src/main/java/class242.java b/runescape-client/src/main/java/class242.java
new file mode 100644
index 0000000000..6762867347
--- /dev/null
+++ b/runescape-client/src/main/java/class242.java
@@ -0,0 +1,62 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ia")
+public abstract class class242 implements class244 {
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 991744633
+	)
+	protected int field2787;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lko;Llf;I)V"
+	)
+	protected class242(StudioGame var1, Language var2, int var3) {
+		this.field2787 = var3; // L: 10
+	} // L: 11
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Z",
+		garbageValue = "-49"
+	)
+	@Export("loadInterface")
+	public static boolean loadInterface(int var0) {
+		if (Widget.Widget_loadedInterfaces[var0]) { // L: 216
+			return true;
+		} else if (!CollisionMap.Widget_archive.tryLoadGroup(var0)) { // L: 217
+			return false;
+		} else {
+			int var1 = CollisionMap.Widget_archive.getGroupFileCount(var0); // L: 218
+			if (var1 == 0) { // L: 219
+				Widget.Widget_loadedInterfaces[var0] = true; // L: 220
+				return true; // L: 221
+			} else {
+				if (MouseRecorder.Widget_interfaceComponents[var0] == null) { // L: 223
+					MouseRecorder.Widget_interfaceComponents[var0] = new Widget[var1];
+				}
+
+				for (int var2 = 0; var2 < var1; ++var2) { // L: 224
+					if (MouseRecorder.Widget_interfaceComponents[var0][var2] == null) { // L: 225
+						byte[] var3 = CollisionMap.Widget_archive.takeFile(var0, var2); // L: 226
+						if (var3 != null) { // L: 227
+							MouseRecorder.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 228
+							MouseRecorder.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 229
+							if (var3[0] == -1) { // L: 230
+								MouseRecorder.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3));
+							} else {
+								MouseRecorder.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 231
+							}
+						}
+					}
+				}
+
+				Widget.Widget_loadedInterfaces[var0] = true; // L: 235
+				return true; // L: 236
+			}
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class243.java b/runescape-client/src/main/java/class243.java
new file mode 100644
index 0000000000..9e2aa8220b
--- /dev/null
+++ b/runescape-client/src/main/java/class243.java
@@ -0,0 +1,5 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ik")
+public interface class243 {
+}
diff --git a/runescape-client/src/main/java/class244.java b/runescape-client/src/main/java/class244.java
index 4a610c7a78..e51a3e470d 100644
--- a/runescape-client/src/main/java/class244.java
+++ b/runescape-client/src/main/java/class244.java
@@ -1,35 +1,5 @@
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ih")
-public class class244 {
-	@ObfuscatedName("av")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "44"
-	)
-	static int method4727(int var0, Script var1, boolean var2) {
-		if (var0 == 6800) { // L: 4304
-			Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4305
-			return 1; // L: 4306
-		} else if (var0 != 6801 && var0 != 6802) { // L: 4308
-			if (var0 == 6850) { // L: 4312
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = ""; // L: 4313
-				return 1; // L: 4314
-			} else if (var0 != 6851 && var0 != 6852) { // L: 4316
-				if (var0 == 6853) { // L: 4320
-					Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4321
-					return 1; // L: 4322
-				} else {
-					return 2; // L: 4324
-				}
-			} else {
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4317
-				return 1; // L: 4318
-			}
-		} else {
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4309
-			return 1; // L: 4310
-		}
-	}
+@ObfuscatedName("iy")
+public interface class244 extends Iterable {
 }
diff --git a/runescape-client/src/main/java/class245.java b/runescape-client/src/main/java/class245.java
index ccdd79bf70..ed15d00669 100644
--- a/runescape-client/src/main/java/class245.java
+++ b/runescape-client/src/main/java/class245.java
@@ -1,30 +1,7 @@
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("il")
-public class class245 {
-	@ObfuscatedName("i")
-	static int[] field2908;
-
-	static {
-		new Object();
-		field2908 = new int[33]; // L: 8
-		field2908[0] = 0; // L: 11
-		int var0 = 2; // L: 12
-
-		for (int var1 = 1; var1 < 33; ++var1) {
-			field2908[var1] = var0 - 1; // L: 14
-			var0 += var0; // L: 15
-		}
-
-	} // L: 17
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(S)[Ljk;",
-		garbageValue = "15748"
-	)
-	static GameBuild[] method4742() {
-		return new GameBuild[]{GameBuild.LIVE, GameBuild.WIP, GameBuild.RC, GameBuild.BUILDLIVE}; // L: 13
-	}
+@ObfuscatedName("io")
+public interface class245 {
+	@ObfuscatedName("c")
+	void method4944(Object var1);
 }
diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java
deleted file mode 100644
index 895d312cb7..0000000000
--- a/runescape-client/src/main/java/class247.java
+++ /dev/null
@@ -1,91 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ir")
-public class class247 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("musicPatchesArchive")
-	public static AbstractArchive musicPatchesArchive;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("musicSamplesArchive")
-	public static AbstractArchive musicSamplesArchive;
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lio;"
-	)
-	@Export("midiPcmStream")
-	public static MidiPcmStream midiPcmStream;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = 1167067929
-	)
-	@Export("musicPlayerStatus")
-	public static int musicPlayerStatus;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = 2050223797
-	)
-	@Export("musicTrackVolume")
-	public static int musicTrackVolume;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = -609469797
-	)
-	@Export("pcmSampleLength")
-	public static int pcmSampleLength;
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "Lad;"
-	)
-	@Export("soundCache")
-	public static SoundCache soundCache;
-	@ObfuscatedName("kh")
-	@ObfuscatedSignature(
-		descriptor = "Ljf;"
-	)
-	@Export("dragInventoryWidget")
-	static Widget dragInventoryWidget;
-
-	static {
-		musicPlayerStatus = 0; // L: 11
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-1859511667"
-	)
-	static final void method4751(int var0, int var1, int var2, int var3) {
-		for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 63
-			for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 64
-				if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 65
-					class54.field419[0][var5][var4] = 127; // L: 66
-					if (var0 == var5 && var5 > 0) { // L: 67
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
-					}
-
-					if (var0 + var2 == var5 && var5 < 103) { // L: 68
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
-					}
-
-					if (var4 == var1 && var4 > 0) { // L: 69
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
-					}
-
-					if (var3 + var1 == var4 && var4 < 103) { // L: 70
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
-					}
-				}
-			}
-		}
-
-	} // L: 74
-}
diff --git a/runescape-client/src/main/java/class251.java b/runescape-client/src/main/java/class251.java
new file mode 100644
index 0000000000..51cedb0775
--- /dev/null
+++ b/runescape-client/src/main/java/class251.java
@@ -0,0 +1,5 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("in")
+public interface class251 {
+}
diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java
new file mode 100644
index 0000000000..c2f18ca51f
--- /dev/null
+++ b/runescape-client/src/main/java/class253.java
@@ -0,0 +1,486 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("if")
+public class class253 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2918;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2911;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2912;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2913;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2914;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2915;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2916;
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2917;
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2920;
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "Lif;"
+	)
+	public static final class253 field2919;
+
+	static {
+		field2918 = new class253(2); // L: 5
+		field2911 = new class253(4); // L: 6
+		field2912 = new class253(6); // L: 7
+		field2913 = new class253(14); // L: 8
+		field2914 = new class253(5); // L: 9
+		field2915 = new class253(5); // L: 10
+		field2916 = new class253(4); // L: 11
+		field2917 = new class253(3); // L: 12
+		field2920 = new class253(15); // L: 13
+		field2919 = new class253(7); // L: 14
+	}
+
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "2"
+	)
+	class253(int var1) {
+	} // L: 20
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lpg;",
+		garbageValue = "-850723008"
+	)
+	@Export("FillMode_values")
+	public static FillMode[] FillMode_values() {
+		return new FillMode[]{FillMode.SOLID, FillMode.field4552, FillMode.field4553}; // L: 15
+	}
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(Llx;Llx;Llx;I)V",
+		garbageValue = "1280031541"
+	)
+	@Export("drawTitle")
+	static void drawTitle(Font var0, Font var1, Font var2) {
+		Login.xPadding = (class186.canvasWidth - 765) / 2; // L: 1254
+		Login.loginBoxX = Login.xPadding + 202; // L: 1255
+		class138.loginBoxCenter = Login.loginBoxX + 180; // L: 1256
+		if (Login.worldSelectOpen) { // L: 1257
+			Language.method5841(var0, var1); // L: 1258
+		} else {
+			WorldMapCacheName.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1261
+			NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1262
+			Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 1263
+			int var4;
+			if (Client.gameState == 0 || Client.gameState == 5) { // L: 1264
+				byte var3 = 20; // L: 1265
+				var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1266
+				var4 = 253 - var3; // L: 1267
+				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1268
+				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1269
+				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1270
+				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1271
+				var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1272
+			}
+
+			String var5;
+			String var6;
+			String var7;
+			short var23;
+			int var24;
+			short var25;
+			if (Client.gameState == 20) { // L: 1274
+				AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX + 180 - AbstractByteArrayCopier.titleboxSprite.subWidth / 2, 271 - AbstractByteArrayCopier.titleboxSprite.subHeight / 2); // L: 1275
+				var23 = 201; // L: 1276
+				var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1277
+				var24 = var23 + 15; // L: 1278
+				var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1279
+				var24 += 15; // L: 1280
+				var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1281
+				var24 += 15; // L: 1282
+				var24 += 7; // L: 1283
+				if (Login.loginIndex != 4 && Login.loginIndex != 10) { // L: 1284
+					var0.draw("Login: ", Login.loginBoxX + 180 - 110, var24, 16777215, 0); // L: 1285
+					var25 = 200; // L: 1286
+					var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; // L: 1289
+
+					for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(0, var6.length() - 1)) { // L: 1291 1292 1293
+					}
+
+					var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var24, 16777215, 0); // L: 1295
+					var24 += 15; // L: 1296
+
+					for (var7 = LoginPacket.method5019(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { // L: 1297 1298 1299
+					}
+
+					var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var24, 16777215, 0); // L: 1301
+					var24 += 15; // L: 1302
+				}
+			}
+
+			if (Client.gameState == 10 || Client.gameState == 11) { // L: 1305
+				AbstractByteArrayCopier.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1306
+				short var18;
+				if (Login.loginIndex == 0) { // L: 1307
+					var23 = 251; // L: 1308
+					var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1309
+					var24 = var23 + 30; // L: 1310
+					var4 = Login.loginBoxX + 180 - 80; // L: 1311
+					var18 = 291; // L: 1312
+					class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1313
+					var0.drawLines("New User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1314
+					var4 = Login.loginBoxX + 180 + 80; // L: 1315
+					class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1316
+					var0.drawLines("Existing User", var4 - 73, var18 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1317
+				} else if (Login.loginIndex == 1) { // L: 1319
+					var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1320
+					var23 = 236; // L: 1321
+					var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1322
+					var24 = var23 + 15; // L: 1323
+					var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1324
+					var24 += 15; // L: 1325
+					var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1326
+					var24 += 15; // L: 1327
+					var4 = Login.loginBoxX + 180 - 80; // L: 1328
+					var18 = 321; // L: 1329
+					class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1330
+					var0.drawCentered("Continue", var4, var18 + 5, 16777215, 0); // L: 1331
+					var4 = Login.loginBoxX + 180 + 80; // L: 1332
+					class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1333
+					var0.drawCentered("Cancel", var4, var18 + 5, 16777215, 0); // L: 1334
+				} else if (Login.loginIndex == 2) { // L: 1336
+					var23 = 201; // L: 1337
+					var0.drawCentered(Login.Login_response1, class138.loginBoxCenter, var23, 16776960, 0); // L: 1338
+					var24 = var23 + 15; // L: 1339
+					var0.drawCentered(Login.Login_response2, class138.loginBoxCenter, var24, 16776960, 0); // L: 1340
+					var24 += 15; // L: 1341
+					var0.drawCentered(Login.Login_response3, class138.loginBoxCenter, var24, 16776960, 0); // L: 1342
+					var24 += 15; // L: 1343
+					var24 += 7; // L: 1344
+					var0.draw("Login: ", class138.loginBoxCenter - 110, var24, 16777215, 0); // L: 1345
+					var25 = 200; // L: 1346
+					var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; // L: 1349
+
+					for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { // L: 1351 1352 1353
+					}
+
+					var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), class138.loginBoxCenter - 70, var24, 16777215, 0); // L: 1355
+					var24 += 15; // L: 1356
+
+					for (var7 = LoginPacket.method5019(Login.Login_password); var0.stringWidth(var7) > var25; var7 = var7.substring(1)) { // L: 1357 1358 1359
+					}
+
+					var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), class138.loginBoxCenter - 108, var24, 16777215, 0); // L: 1361
+					var24 += 15; // L: 1362
+					var23 = 277; // L: 1363
+					int var8 = class138.loginBoxCenter + -117; // L: 1364
+					boolean var10 = Client.Login_isUsernameRemembered; // L: 1366
+					boolean var11 = Login.field880; // L: 1367
+					IndexedSprite var9 = var10 ? (var11 ? Login.field888 : LoginType.options_buttons_2Sprite) : (var11 ? UserComparator9.field1336 : KeyHandler.options_buttons_0Sprite); // L: 1369
+					var9.drawAt(var8, var23); // L: 1372
+					var8 = var8 + var9.subWidth + 5; // L: 1373
+					var1.draw("Remember username", var8, var23 + 13, 16776960, 0); // L: 1374
+					var8 = class138.loginBoxCenter + 24; // L: 1375
+					boolean var14 = SecureRandomFuture.clientPreferences.hideUsername; // L: 1377
+					boolean var15 = Login.field881; // L: 1378
+					IndexedSprite var13 = var14 ? (var15 ? Login.field888 : LoginType.options_buttons_2Sprite) : (var15 ? UserComparator9.field1336 : KeyHandler.options_buttons_0Sprite); // L: 1380
+					var13.drawAt(var8, var23); // L: 1383
+					var8 = var8 + var13.subWidth + 5; // L: 1384
+					var1.draw("Hide username", var8, var23 + 13, 16776960, 0); // L: 1385
+					var24 = var23 + 15; // L: 1386
+					int var16 = class138.loginBoxCenter - 80; // L: 1387
+					short var17 = 321; // L: 1388
+					class19.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); // L: 1389
+					var0.drawCentered("Login", var16, var17 + 5, 16777215, 0); // L: 1390
+					var16 = class138.loginBoxCenter + 80; // L: 1391
+					class19.titlebuttonSprite.drawAt(var16 - 73, var17 - 20); // L: 1392
+					var0.drawCentered("Cancel", var16, var17 + 5, 16777215, 0); // L: 1393
+					var23 = 357; // L: 1394
+					switch(Login.field872) { // L: 1395
+					case 2:
+						class10.field58 = "Having trouble logging in?"; // L: 1397
+						break;
+					default:
+						class10.field58 = "Can't login? Click here."; // L: 1400
+					}
+
+					WorldMapData_1.field2652 = new Bounds(class138.loginBoxCenter, var23, var1.stringWidth(class10.field58), 11); // L: 1403
+					MouseRecorder.field1044 = new Bounds(class138.loginBoxCenter, var23, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1404
+					var1.drawCentered(class10.field58, class138.loginBoxCenter, var23, 16777215, 0); // L: 1405
+				} else if (Login.loginIndex == 3) { // L: 1407
+					var23 = 201; // L: 1408
+					var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1409
+					var24 = var23 + 20; // L: 1410
+					var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1411
+					var24 += 15; // L: 1412
+					var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1413
+					var24 += 15; // L: 1414
+					var4 = Login.loginBoxX + 180; // L: 1415
+					var18 = 276; // L: 1416
+					class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1417
+					var2.drawCentered("Try again", var4, var18 + 5, 16777215, 0); // L: 1418
+					var4 = Login.loginBoxX + 180; // L: 1419
+					var18 = 326; // L: 1420
+					class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1421
+					var2.drawCentered("Forgotten password?", var4, var18 + 5, 16777215, 0); // L: 1422
+				} else {
+					int var20;
+					short var27;
+					if (Login.loginIndex == 4) { // L: 1424
+						var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1425
+						var23 = 236; // L: 1426
+						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1427
+						var24 = var23 + 15; // L: 1428
+						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1429
+						var24 += 15; // L: 1430
+						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1431
+						var24 += 15; // L: 1432
+						var0.draw("PIN: " + LoginPacket.method5019(BufferedSource.otp) + (Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var24, 16777215, 0); // L: 1433
+						var24 -= 8; // L: 1434
+						var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var24, 16776960, 0); // L: 1435
+						var24 += 15; // L: 1436
+						var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var24, 16776960, 0); // L: 1437
+						var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1438
+						int var28 = var24 - var0.ascent; // L: 1439
+						IndexedSprite var26;
+						if (Login.field882) { // L: 1441
+							var26 = LoginType.options_buttons_2Sprite; // L: 1442
+						} else {
+							var26 = KeyHandler.options_buttons_0Sprite; // L: 1445
+						}
+
+						var26.drawAt(var4, var28); // L: 1447
+						var24 += 15; // L: 1448
+						var20 = Login.loginBoxX + 180 - 80; // L: 1449
+						var27 = 321; // L: 1450
+						class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1451
+						var0.drawCentered("Continue", var20, var27 + 5, 16777215, 0); // L: 1452
+						var20 = Login.loginBoxX + 180 + 80; // L: 1453
+						class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1454
+						var0.drawCentered("Cancel", var20, var27 + 5, 16777215, 0); // L: 1455
+						var1.drawCentered("<u=ff>Can't Log In?</u>", Login.loginBoxX + 180, var27 + 36, 255, 0); // L: 1456
+					} else if (Login.loginIndex == 5) { // L: 1458
+						var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1459
+						var23 = 221; // L: 1460
+						var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1461
+						var24 = var23 + 15; // L: 1462
+						var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1463
+						var24 += 15; // L: 1464
+						var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1465
+						var24 += 15; // L: 1466
+						var24 += 14; // L: 1467
+						var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var24, 16777215, 0); // L: 1468
+						var25 = 174; // L: 1469
+						var5 = SecureRandomFuture.clientPreferences.hideUsername ? LoginPacket.method5019(Login.Login_username) : Login.Login_username; // L: 1472
+
+						for (var6 = var5; var0.stringWidth(var6) > var25; var6 = var6.substring(1)) { // L: 1474 1475 1476
+						}
+
+						var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? UserComparator5.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var24, 16777215, 0); // L: 1478
+						var24 += 15; // L: 1479
+						var20 = Login.loginBoxX + 180 - 80; // L: 1480
+						var27 = 321; // L: 1481
+						class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1482
+						var0.drawCentered("Recover", var20, var27 + 5, 16777215, 0); // L: 1483
+						var20 = Login.loginBoxX + 180 + 80; // L: 1484
+						class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1485
+						var0.drawCentered("Back", var20, var27 + 5, 16777215, 0); // L: 1486
+						var27 = 356; // L: 1487
+						var1.drawCentered("Still having trouble logging in?", class138.loginBoxCenter, var27, 268435455, 0); // L: 1488
+					} else if (Login.loginIndex == 6) { // L: 1490
+						var23 = 201; // L: 1491
+						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1492
+						var24 = var23 + 15; // L: 1493
+						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1494
+						var24 += 15; // L: 1495
+						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1496
+						var24 += 15; // L: 1497
+						var4 = Login.loginBoxX + 180; // L: 1498
+						var18 = 321; // L: 1499
+						class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1500
+						var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); // L: 1501
+					} else if (Login.loginIndex == 7) { // L: 1503
+						var23 = 216; // L: 1504
+						var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1505
+						var24 = var23 + 15; // L: 1506
+						var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1507
+						var24 += 15; // L: 1508
+						var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1509
+						var24 += 15; // L: 1510
+						var4 = Login.loginBoxX + 180 - 80; // L: 1511
+						var18 = 321; // L: 1512
+						class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1513
+						var0.drawCentered("Set Date of Birth", var4, var18 + 5, 16777215, 0); // L: 1514
+						var4 = Login.loginBoxX + 180 + 80; // L: 1515
+						class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1516
+						var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); // L: 1517
+					} else if (Login.loginIndex == 8) { // L: 1519
+						var23 = 216; // L: 1520
+						var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1521
+						var24 = var23 + 15; // L: 1522
+						var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1523
+						var24 += 15; // L: 1524
+						var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var24, 16776960, 0); // L: 1525
+						var24 += 15; // L: 1526
+						var4 = Login.loginBoxX + 180 - 80; // L: 1527
+						var18 = 321; // L: 1528
+						class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1529
+						var0.drawCentered("Privacy Policy", var4, var18 + 5, 16777215, 0); // L: 1530
+						var4 = Login.loginBoxX + 180 + 80; // L: 1531
+						class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1532
+						var0.drawCentered("Back", var4, var18 + 5, 16777215, 0); // L: 1533
+					} else if (Login.loginIndex == 9) { // L: 1535
+						var23 = 221; // L: 1536
+						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1537
+						var24 = var23 + 25; // L: 1538
+						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1539
+						var24 += 25; // L: 1540
+						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1541
+						var4 = Login.loginBoxX + 180; // L: 1542
+						var18 = 311; // L: 1543
+						class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1544
+						var0.drawCentered("Try again", var4, var18 + 5, 16777215, 0); // L: 1545
+					} else if (Login.loginIndex == 10) { // L: 1547
+						var24 = Login.loginBoxX + 180; // L: 1548
+						var25 = 209; // L: 1549
+						var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var25, 16776960, 0); // L: 1550
+						var4 = var25 + 20; // L: 1551
+						Login.field894.drawAt(var24 - 109, var4); // L: 1552
+						Login.field864.drawAt(var24 - 48, var4 + 18); // L: 1553
+					} else if (Login.loginIndex == 12) { // L: 1555
+						var24 = class138.loginBoxCenter; // L: 1556
+						var25 = 216; // L: 1557
+						var2.drawCentered("Before using this app, please read and accept our", var24, var25, 16777215, 0); // L: 1558
+						var4 = var25 + 17; // L: 1559
+						var2.drawCentered("<col=ffd200>terms of use</col>, <col=ffd200>privacy policy</col>, and <col=ffd200>end user licence</col>", var24, var4, 16777215, 0); // L: 1560
+						var4 += 17; // L: 1561
+						var2.drawCentered("<col=ffd200>agreement (EULA)</col>.", var24, var4, 16777215, 0); // L: 1562
+						var4 += 17; // L: 1563
+						var2.drawCentered("By accepting, you agree to these documents.", var24, var4, 16777215, 0); // L: 1564
+						var24 = class138.loginBoxCenter - 80; // L: 1565
+						var25 = 311; // L: 1566
+						class19.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); // L: 1567
+						var0.drawCentered("Accept", var24, var25 + 5, 16777215, 0); // L: 1568
+						var24 = class138.loginBoxCenter + 80; // L: 1569
+						class19.titlebuttonSprite.drawAt(var24 - 73, var25 - 20); // L: 1570
+						var0.drawCentered("Decline", var24, var25 + 5, 16777215, 0); // L: 1571
+					} else if (Login.loginIndex == 13) { // L: 1573
+						var23 = 231; // L: 1574
+						var2.drawCentered("You must accept our terms of use, privacy policy,", Login.loginBoxX + 180, var23, 16777215, 0); // L: 1575
+						var24 = var23 + 20; // L: 1576
+						var2.drawCentered("and end user licence agreement to continue.", Login.loginBoxX + 180, var24, 16777215, 0); // L: 1577
+						var4 = Login.loginBoxX + 180; // L: 1578
+						var23 = 311; // L: 1579
+						class19.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1580
+						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1581
+					} else if (Login.loginIndex == 14) { // L: 1583
+						var23 = 201; // L: 1584
+						String var19 = ""; // L: 1585
+						var5 = ""; // L: 1586
+						var6 = ""; // L: 1587
+						switch(Login.field871) { // L: 1588
+						case 0:
+							var19 = "Your account has been disabled."; // L: 1591
+							var5 = Strings.field3523; // L: 1592
+							var6 = ""; // L: 1593
+							break;
+						case 1:
+							var19 = "Account locked as we suspect it has been stolen."; // L: 1598
+							var5 = Strings.field3562; // L: 1599
+							var6 = ""; // L: 1600
+							break; // L: 1601
+						default:
+							class67.Login_promptCredentials(false); // L: 1605
+						}
+
+						var0.drawCentered(var19, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1609
+						var24 = var23 + 15; // L: 1610
+						var2.drawCentered(var5, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1611
+						var24 += 15; // L: 1612
+						var2.drawCentered(var6, Login.loginBoxX + 180, var24, 16776960, 0); // L: 1613
+						var24 += 15; // L: 1614
+						var20 = Login.loginBoxX + 180; // L: 1615
+						var27 = 276; // L: 1616
+						class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1617
+						var0.drawCentered("Support Page", var20, var27 + 5, 16777215, 0); // L: 1618
+						var20 = Login.loginBoxX + 180; // L: 1619
+						var27 = 326; // L: 1620
+						class19.titlebuttonSprite.drawAt(var20 - 73, var27 - 20); // L: 1621
+						var0.drawCentered("Back", var20, var27 + 5, 16777215, 0); // L: 1622
+					} else if (Login.loginIndex == 24) { // L: 1624
+						var23 = 221; // L: 1625
+						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1626
+						var24 = var23 + 15; // L: 1627
+						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1628
+						var24 += 15; // L: 1629
+						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var24, 16777215, 0); // L: 1630
+						var24 += 15; // L: 1631
+						var4 = Login.loginBoxX + 180; // L: 1632
+						var18 = 301; // L: 1633
+						class19.titlebuttonSprite.drawAt(var4 - 73, var18 - 20); // L: 1634
+						var0.drawCentered("Ok", var4, var18 + 5, 16777215, 0); // L: 1635
+					}
+				}
+			}
+
+			if (Client.gameState >= 10) { // L: 1638
+				int[] var21 = new int[4]; // L: 1639
+				Rasterizer2D.Rasterizer2D_getClipArray(var21); // L: 1640
+				Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, BoundaryObject.canvasHeight); // L: 1641
+				Client.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1642
+				Client.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1643
+				Rasterizer2D.Rasterizer2D_setClipArray(var21); // L: 1644
+			}
+
+			Login.title_muteSprite[SecureRandomFuture.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1646
+			if (Client.gameState > 5 && ScriptFrame.clientLanguage == Language.Language_EN) { // L: 1647
+				if (class21.field118 != null) { // L: 1648
+					var24 = Login.xPadding + 5; // L: 1649
+					var25 = 463; // L: 1650
+					byte var29 = 100; // L: 1651
+					byte var22 = 35; // L: 1652
+					class21.field118.drawAt(var24, var25); // L: 1653
+					var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var24, var22 / 2 + var25 - 2, 16777215, 0); // L: 1654
+					if (HorizontalAlignment.World_request != null) { // L: 1655
+						var1.drawCentered("Loading...", var29 / 2 + var24, var22 / 2 + var25 + 12, 16777215, 0);
+					} else {
+						var1.drawCentered("Click to switch", var29 / 2 + var24, var22 / 2 + var25 + 12, 16777215, 0); // L: 1656
+					}
+				} else {
+					class21.field118 = ClientPreferences.SpriteBuffer_getIndexedSpriteByName(UserComparator6.archive8, "sl_button", ""); // L: 1659
+				}
+			}
+
+		}
+	} // L: 1259 1662
+}
diff --git a/runescape-client/src/main/java/class257.java b/runescape-client/src/main/java/class257.java
new file mode 100644
index 0000000000..c0a8ca776a
--- /dev/null
+++ b/runescape-client/src/main/java/class257.java
@@ -0,0 +1,36 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ih")
+public class class257 {
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -523015899
+	)
+	static int field3042;
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "Laa;"
+	)
+	@Export("soundCache")
+	public static SoundCache soundCache;
+	@ObfuscatedName("em")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	@Export("archive10")
+	static Archive archive10;
+	@ObfuscatedName("fc")
+	static String field3044;
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "-1757234345"
+	)
+	public static boolean method5020(int var0) {
+		return (var0 >> 28 & 1) != 0; // L: 29
+	}
+}
diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java
new file mode 100644
index 0000000000..08787cc4d6
--- /dev/null
+++ b/runescape-client/src/main/java/class258.java
@@ -0,0 +1,31 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ii")
+public class class258 {
+	@ObfuscatedName("c")
+	static int[] field3049;
+
+	static {
+		new Object();
+		field3049 = new int[33]; // L: 8
+		field3049[0] = 0; // L: 11
+		int var0 = 2; // L: 12
+
+		for (int var1 = 1; var1 < 33; ++var1) { // L: 13
+			field3049[var1] = var0 - 1; // L: 14
+			var0 += var0; // L: 15
+		}
+
+	} // L: 17
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lku;Lku;I)V",
+		garbageValue = "-156509951"
+	)
+	public static void method5047(AbstractArchive var0, AbstractArchive var1) {
+		NPCComposition.NpcDefinition_archive = var0; // L: 57
+		NPCComposition.NpcDefinition_modelArchive = var1; // L: 58
+	} // L: 59
+}
diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java
index 2087a9d170..4bdac0c4e1 100644
--- a/runescape-client/src/main/java/class260.java
+++ b/runescape-client/src/main/java/class260.java
@@ -1,24 +1,112 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jx")
+@ObfuscatedName("jd")
 public class class260 {
-	@ObfuscatedName("i")
-	public static final short[] field3035;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("musicPatchesArchive")
+	public static AbstractArchive musicPatchesArchive;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("soundEffectsArchive")
+	public static AbstractArchive soundEffectsArchive;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("midiPcmStream")
+	public static MidiPcmStream midiPcmStream;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -1837592887
+	)
+	@Export("musicPlayerStatus")
+	public static int musicPlayerStatus;
 	@ObfuscatedName("w")
-	public static final short[][] field3039;
-	@ObfuscatedName("s")
-	public static final short[] field3036;
-	@ObfuscatedName("a")
-	public static final short[][] field3037;
-	@ObfuscatedName("q")
-	@Export("ByteArrayPool_arrays")
-	static byte[][][] ByteArrayPool_arrays;
+	@ObfuscatedGetter(
+		intValue = 1576356909
+	)
+	@Export("musicTrackFileId")
+	public static int musicTrackFileId;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 1257628969
+	)
+	@Export("pcmSampleLength")
+	public static int pcmSampleLength;
+	@ObfuscatedName("hk")
+	@ObfuscatedSignature(
+		descriptor = "[Lpl;"
+	)
+	@Export("headIconHintSprites")
+	static SpritePixels[] headIconHintSprites;
 
 	static {
-		field3035 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4
-		field3039 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5
-		field3036 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12
-		field3037 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13
+		musicPlayerStatus = 0;
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
+		garbageValue = "0"
+	)
+	public static String method5070(CharSequence var0) {
+		int var1 = var0.length(); // L: 11
+		StringBuilder var2 = new StringBuilder(var1); // L: 12
+
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 13
+			char var4 = var0.charAt(var3); // L: 14
+			if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15
+				if (var4 == ' ') { // L: 16
+					var2.append('+');
+				} else {
+					byte var5 = class372.charToByteCp1252(var4); // L: 18
+					var2.append('%'); // L: 19
+					int var6 = var5 >> 4 & 15; // L: 20
+					if (var6 >= 10) { // L: 21
+						var2.append((char)(var6 + 55));
+					} else {
+						var2.append((char)(var6 + 48)); // L: 22
+					}
+
+					var6 = var5 & 15; // L: 23
+					if (var6 >= 10) { // L: 24
+						var2.append((char)(var6 + 55));
+					} else {
+						var2.append((char)(var6 + 48));
+					}
+				}
+			} else {
+				var2.append(var4); // L: 25
+			}
+		}
+
+		return var2.toString(); // L: 28
+	}
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)I",
+		garbageValue = "-68634034"
+	)
+	static final int method5069(int var0, int var1, int var2) {
+		int var3 = var0 / var2; // L: 462
+		int var4 = var0 & var2 - 1; // L: 463
+		int var5 = var1 / var2; // L: 464
+		int var6 = var1 & var2 - 1; // L: 465
+		int var7 = class139.method2932(var3, var5); // L: 466
+		int var8 = class139.method2932(var3 + 1, var5); // L: 467
+		int var9 = class139.method2932(var3, var5 + 1); // L: 468
+		int var10 = class139.method2932(var3 + 1, var5 + 1); // L: 469
+		int var11 = class131.method2802(var7, var8, var4, var2); // L: 470
+		int var12 = class131.method2802(var9, var10, var4, var2); // L: 471
+		return class131.method2802(var11, var12, var6, var2); // L: 472
 	}
 }
diff --git a/runescape-client/src/main/java/class262.java b/runescape-client/src/main/java/class262.java
deleted file mode 100644
index c6e3820b39..0000000000
--- a/runescape-client/src/main/java/class262.java
+++ /dev/null
@@ -1,37 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jl")
-public class class262 {
-	@ObfuscatedName("hu")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1378458919"
-	)
-	static void method5136() {
-		class392.method6871(ObjectComposition.menuWidth / 2 + SecureRandomCallable.menuX, Frames.menuY); // L: 8227
-	} // L: 8228
-
-	@ObfuscatedName("ik")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "292857439"
-	)
-	@Export("Widget_runOnTargetLeave")
-	static void Widget_runOnTargetLeave() {
-		if (Client.isSpellSelected) { // L: 9134
-			Widget var0 = ItemContainer.getWidgetChild(FontName.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 9135
-			if (var0 != null && var0.onTargetLeave != null) { // L: 9136
-				ScriptEvent var1 = new ScriptEvent(); // L: 9137
-				var1.widget = var0; // L: 9138
-				var1.args = var0.onTargetLeave; // L: 9139
-				Tile.runScriptEvent(var1); // L: 9140
-			}
-
-			Client.field627 = -1; // L: 9142
-			Client.isSpellSelected = false; // L: 9143
-			class184.invalidateWidget(var0); // L: 9144
-		}
-	} // L: 9145
-}
diff --git a/runescape-client/src/main/java/class264.java b/runescape-client/src/main/java/class264.java
deleted file mode 100644
index cc4f94d07c..0000000000
--- a/runescape-client/src/main/java/class264.java
+++ /dev/null
@@ -1,57 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jw")
-public class class264 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Ljy;"
-	)
-	@Export("huffman")
-	static Huffman huffman;
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "([BIIB)Ljava/lang/String;",
-		garbageValue = "1"
-	)
-	@Export("decodeStringCp1252")
-	public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
-		char[] var3 = new char[var2]; // L: 111
-		int var4 = 0; // L: 112
-
-		for (int var5 = 0; var5 < var2; ++var5) { // L: 113
-			int var6 = var0[var5 + var1] & 255; // L: 114
-			if (var6 != 0) { // L: 115
-				if (var6 >= 128 && var6 < 160) { // L: 116
-					char var7 = class316.cp1252AsciiExtension[var6 - 128]; // L: 117
-					if (var7 == 0) { // L: 118
-						var7 = '?';
-					}
-
-					var6 = var7; // L: 119
-				}
-
-				var3[var4++] = (char)var6; // L: 121
-			}
-		}
-
-		return new String(var3, 0, var4); // L: 123
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;J)V"
-	)
-	static void method5144(Buffer var0, long var1) {
-		var1 /= 10L; // L: 63
-		if (var1 < 0L) { // L: 64
-			var1 = 0L;
-		} else if (var1 > 65535L) { // L: 65
-			var1 = 65535L;
-		}
-
-		var0.writeShort((int)var1); // L: 66
-	} // L: 67
-}
diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java
deleted file mode 100644
index ec7c395d59..0000000000
--- a/runescape-client/src/main/java/class268.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("jn")
-public class class268 {
-}
diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java
index 5fa4376879..211bc173dc 100644
--- a/runescape-client/src/main/java/class269.java
+++ b/runescape-client/src/main/java/class269.java
@@ -1,95 +1,57 @@
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("je")
-public enum class269 implements MouseWheel {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lje;"
-	)
-	field3216(0),
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lje;"
-	)
-	field3217(1),
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lje;"
-	)
-	field3218(2),
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lje;"
-	)
-	field3220(3),
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lje;"
-	)
-	field3219(4);
-
-	@ObfuscatedName("sg")
-	@ObfuscatedGetter(
-		intValue = 681305729
-	)
-	static int field3221;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -833696691
-	)
-	final int field3215;
-
-	class269(int var3) {
-		this.field3215 = var3; // L: 14
-	} // L: 15
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
-	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field3215; // L: 18
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(IS)I",
-		garbageValue = "234"
-	)
-	public static int method5190(int var0) {
-		return class361.field4051[var0 & 16383];
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "-2127089164"
-	)
-	@Export("addChatMessage")
-	static void addChatMessage(int var0, String var1, String var2, String var3) {
-		ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 27
-		if (var4 == null) { // L: 28
-			var4 = new ChatChannel(); // L: 29
-			Messages.Messages_channels.put(var0, var4); // L: 30
+@ObfuscatedName("jh")
+public class class269 {
+	@ObfuscatedName("hh")
+	@Export("regions")
+	static int[] regions;
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Lkz;IIIBZI)V",
+		garbageValue = "1369454050"
+	)
+	@Export("requestNetFile")
+	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
+		long var6 = (long)((var1 << 16) + var2); // L: 211
+		NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 212
+		if (var8 == null) { // L: 213
+			var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 214
+			if (var8 == null) { // L: 215
+				var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 216
+				if (var8 != null) { // L: 217
+					if (var5) { // L: 218
+						var8.removeDual(); // L: 219
+						NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 220
+						--NetCache.NetCache_pendingWritesCount; // L: 221
+						++NetCache.NetCache_pendingPriorityWritesCount; // L: 222
+					}
+
+				} else {
+					if (!var5) { // L: 226
+						var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 227
+						if (var8 != null) { // L: 228
+							return;
+						}
+					}
+
+					var8 = new NetFileRequest(); // L: 230
+					var8.archive = var0; // L: 231
+					var8.crc = var3; // L: 232
+					var8.padding = var4; // L: 233
+					if (var5) { // L: 234
+						NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 235
+						++NetCache.NetCache_pendingPriorityWritesCount; // L: 236
+					} else {
+						NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 239
+						NetCache.NetCache_pendingWrites.put(var8, var6); // L: 240
+						++NetCache.NetCache_pendingWritesCount; // L: 241
+					}
+
+				}
+			}
 		}
-
-		Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 32
-		Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 33
-		Messages.Messages_queue.add(var5); // L: 34
-		Client.chatCycle = Client.cycleCntr; // L: 35
-	} // L: 36
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "6"
-	)
-	public static void method5189() {
-		WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 54
-	} // L: 55
+	} // L: 224 243
 }
diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java
index c4ec98cfab..db3ae71340 100644
--- a/runescape-client/src/main/java/class27.java
+++ b/runescape-client/src/main/java/class27.java
@@ -3,23 +3,23 @@
 import net.runelite.mapping.ObfuscatedSignature;
 import netscape.javascript.JSObject;
 
-@ObfuscatedName("ae")
+@ObfuscatedName("ao")
 public class class27 {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V",
-		garbageValue = "-1032442444"
+		garbageValue = "1638077488"
 	)
-	public static void method393(Applet var0, String var1) throws Throwable {
+	public static void method432(Applet var0, String var1) throws Throwable {
 		JSObject.getWindow(var0).eval(var1); // L: 13
 	} // L: 14
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;",
-		garbageValue = "1889226474"
+		garbageValue = "-1601030388"
 	)
-	public static Object method394(Applet var0, String var1, Object[] var2) throws Throwable {
+	static Object method433(Applet var0, String var1, Object[] var2) throws Throwable {
 		return JSObject.getWindow(var0).call(var1, var2); // L: 17
 	}
 }
diff --git a/runescape-client/src/main/java/class272.java b/runescape-client/src/main/java/class272.java
deleted file mode 100644
index 17584835f4..0000000000
--- a/runescape-client/src/main/java/class272.java
+++ /dev/null
@@ -1,627 +0,0 @@
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("js")
-public class class272 {
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(Lai;Lle;I)V",
-		garbageValue = "-740150909"
-	)
-	static void method5197(GameEngine var0, Font var1) {
-		if (Login.worldSelectOpen) { // L: 322
-			PcmPlayer.method757(var0); // L: 323
-		} else {
-			int var4;
-			if ((MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 326
-				class408.clientPreferences.titleMusicDisabled = !class408.clientPreferences.titleMusicDisabled; // L: 327
-				Login.savePreferences(); // L: 328
-				if (!class408.clientPreferences.titleMusicDisabled) { // L: 329
-					Archive var2 = Messages.archive6; // L: 330
-					int var3 = var2.getGroupId("scape main"); // L: 332
-					var4 = var2.getFileId(var3, ""); // L: 333
-					class247.musicPlayerStatus = 1; // L: 335
-					class128.musicTrackArchive = var2; // L: 336
-					FillMode.musicTrackGroupId = var3; // L: 337
-					ArchiveDiskActionHandler.musicTrackFileId = var4; // L: 338
-					class247.musicTrackVolume = 255; // L: 339
-					SecureRandomCallable.musicTrackBoolean = false; // L: 340
-					class247.pcmSampleLength = 10000; // L: 341
-				} else {
-					WorldMapCacheName.method4027(); // L: 345
-				}
-			}
-
-			if (Client.gameState != 5) { // L: 347
-				if (Login.field876 == -1L) { // L: 348
-					Login.field876 = class111.method2516() + 1000L; // L: 349
-				}
-
-				long var16 = class111.method2516(); // L: 351
-				if (Client.method1643() && Login.field884 == -1L) { // L: 352 353
-					Login.field884 = var16; // L: 354
-					if (Login.field884 > Login.field876) { // L: 355
-						Login.field876 = Login.field884; // L: 356
-					}
-				}
-
-				if (Client.gameState == 10 || Client.gameState == 11) { // L: 360
-					if (MouseHandler.clientLanguage == Language.Language_EN) { // L: 361
-						if (MouseHandler.MouseHandler_lastButton == 1 || !ApproximateRouteStrategy.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 362
-							var4 = Login.xPadding + 5; // L: 363
-							short var5 = 463; // L: 364
-							byte var6 = 100; // L: 365
-							byte var7 = 35; // L: 366
-							if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var6 + var4 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var5 + var7) { // L: 367
-								if (MusicPatch.loadWorlds()) { // L: 369
-									Login.worldSelectOpen = true; // L: 370
-									Login.worldSelectPage = 0; // L: 371
-									Login.worldSelectPagesCount = 0; // L: 372
-								}
-
-								return; // L: 375
-							}
-						}
-
-						if (class21.World_request != null && MusicPatch.loadWorlds()) { // L: 378 379
-							Login.worldSelectOpen = true; // L: 380
-							Login.worldSelectPage = 0; // L: 381
-							Login.worldSelectPagesCount = 0; // L: 382
-						}
-					}
-
-					var4 = MouseHandler.MouseHandler_lastButton; // L: 386
-					int var25 = MouseHandler.MouseHandler_lastPressedX; // L: 387
-					int var26 = MouseHandler.MouseHandler_lastPressedY; // L: 388
-					if (var4 == 0) { // L: 389
-						var25 = MouseHandler.MouseHandler_x; // L: 390
-						var26 = MouseHandler.MouseHandler_y; // L: 391
-					}
-
-					if (!ApproximateRouteStrategy.mouseCam && var4 == 4) { // L: 393
-						var4 = 1;
-					}
-
-					short var29;
-					int var31;
-					if (Login.loginIndex == 0) { // L: 394
-						boolean var33 = false; // L: 395
-
-						while (WorldMapElement.isKeyDown()) { // L: 396
-							if (class12.field55 == 84) { // L: 397
-								var33 = true; // L: 398
-							}
-						}
-
-						var31 = Login.loginBoxCenter - 80; // L: 401
-						var29 = 291; // L: 402
-						if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 403
-							class91.openURL(HealthBar.method2246("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 404
-						}
-
-						var31 = Login.loginBoxCenter + 80; // L: 406
-						if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20 || var33) { // L: 407
-							if ((Client.worldProperties & 33554432) != 0) { // L: 408
-								Login.Login_response0 = ""; // L: 409
-								Login.Login_response1 = "This is a <col=00ffff>Beta<col=ffffff> world."; // L: 410
-								Login.Login_response2 = "Your normal account will not be affected."; // L: 411
-								Login.Login_response3 = ""; // L: 412
-								class275.method5201(1); // L: 413
-								ParamComposition.method3216(); // L: 414
-							} else if ((Client.worldProperties & 4) != 0) { // L: 416
-								if ((Client.worldProperties & 1024) != 0) { // L: 417
-									Login.Login_response1 = "This is a <col=ffff00>High Risk <col=ff0000>PvP<col=ffffff> world."; // L: 418
-									Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 419
-									Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 420
-								} else {
-									Login.Login_response1 = "This is a <col=ff0000>PvP<col=ffffff> world."; // L: 423
-									Login.Login_response2 = "Players can attack each other"; // L: 424
-									Login.Login_response3 = "almost everywhere."; // L: 425
-								}
-
-								Login.Login_response0 = "Warning!"; // L: 427
-								class275.method5201(1); // L: 428
-								ParamComposition.method3216(); // L: 429
-							} else if ((Client.worldProperties & 1024) != 0) { // L: 431
-								Login.Login_response1 = "This is a <col=ffff00>High Risk<col=ffffff> world."; // L: 432
-								Login.Login_response2 = "The Protect Item prayer will"; // L: 433
-								Login.Login_response3 = "not work on this world."; // L: 434
-								Login.Login_response0 = "Warning!"; // L: 435
-								class275.method5201(1); // L: 436
-								ParamComposition.method3216(); // L: 437
-							} else {
-								class1.Login_promptCredentials(false); // L: 440
-							}
-						}
-					} else {
-						short var8;
-						int var27;
-						if (Login.loginIndex == 1) { // L: 444
-							while (true) {
-								if (!WorldMapElement.isKeyDown()) { // L: 445
-									var27 = Login.loginBoxCenter - 80; // L: 453
-									var8 = 321; // L: 454
-									if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 455
-										class1.Login_promptCredentials(false); // L: 456
-									}
-
-									var27 = Login.loginBoxCenter + 80; // L: 458
-									if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 459
-										class275.method5201(0); // L: 460
-									}
-									break;
-								}
-
-								if (class12.field55 == 84) { // L: 446
-									class1.Login_promptCredentials(false); // L: 447
-								} else if (class12.field55 == 13) { // L: 449
-									class275.method5201(0); // L: 450
-								}
-							}
-						} else {
-							int var11;
-							short var28;
-							if (Login.loginIndex == 2) { // L: 463
-								var28 = 201; // L: 464
-								var27 = var28 + 52; // L: 465
-								if (var4 == 1 && var26 >= var27 - 12 && var26 < var27 + 2) { // L: 466
-									Login.currentLoginField = 0;
-								}
-
-								var27 += 15; // L: 467
-								if (var4 == 1 && var26 >= var27 - 12 && var26 < var27 + 2) { // L: 468
-									Login.currentLoginField = 1;
-								}
-
-								var27 += 15; // L: 469
-								var28 = 361; // L: 470
-								if (class114.field1359 != null) { // L: 471
-									var31 = class114.field1359.highX / 2; // L: 472
-									if (var4 == 1 && var25 >= class114.field1359.lowX - var31 && var25 <= var31 + class114.field1359.lowX && var26 >= var28 - 15 && var26 < var28) { // L: 473
-										switch(Login.field865) { // L: 474
-										case 1:
-											class1.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 482
-											class275.method5201(5); // L: 483
-											return; // L: 484
-										case 2:
-											class91.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 477
-										}
-									}
-								}
-
-								var31 = Login.loginBoxCenter - 80; // L: 489
-								var29 = 321; // L: 490
-								if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 491
-									Login.Login_username = Login.Login_username.trim(); // L: 492
-									if (Login.Login_username.length() == 0) { // L: 493
-										class1.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 494
-										return; // L: 495
-									}
-
-									if (Login.Login_password.length() == 0) { // L: 497
-										class1.setLoginResponseString("", "Please enter your password.", ""); // L: 498
-										return; // L: 499
-									}
-
-									class1.setLoginResponseString("", "Connecting to server...", ""); // L: 501
-									WorldMapSection2.method3584(false); // L: 502
-									WorldMapData_1.updateGameState(20); // L: 503
-									return; // L: 504
-								}
-
-								var31 = Login.loginBoxX + 180 + 80; // L: 506
-								if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 507
-									class275.method5201(0); // L: 508
-									Login.Login_username = ""; // L: 509
-									Login.Login_password = ""; // L: 510
-									ReflectionCheck.field429 = 0; // L: 511
-									Tiles.otp = ""; // L: 512
-									Login.field875 = true; // L: 513
-								}
-
-								var31 = Login.loginBoxCenter + -117; // L: 515
-								var29 = 277; // L: 516
-								Login.field873 = var25 >= var31 && var25 < var31 + class327.field3908 && var26 >= var29 && var26 < var29 + UserComparator9.field1326; // L: 517
-								if (var4 == 1 && Login.field873) { // L: 518
-									Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 519
-									if (!Client.Login_isUsernameRemembered && class408.clientPreferences.rememberedUsername != null) { // L: 520
-										class408.clientPreferences.rememberedUsername = null; // L: 521
-										Login.savePreferences(); // L: 522
-									}
-								}
-
-								var31 = Login.loginBoxCenter + 24; // L: 525
-								var29 = 277; // L: 526
-								Login.field860 = var25 >= var31 && var25 < var31 + class327.field3908 && var26 >= var29 && var26 < var29 + UserComparator9.field1326; // L: 527
-								if (var4 == 1 && Login.field860) { // L: 528
-									class408.clientPreferences.hideUsername = !class408.clientPreferences.hideUsername; // L: 529
-									if (!class408.clientPreferences.hideUsername) { // L: 530
-										Login.Login_username = ""; // L: 531
-										class408.clientPreferences.rememberedUsername = null; // L: 532
-										ParamComposition.method3216(); // L: 533
-									}
-
-									Login.savePreferences(); // L: 535
-								}
-
-								while (true) {
-									int var12;
-									Transferable var35;
-									do {
-										while (true) {
-											label1030:
-											do {
-												while (true) {
-													while (WorldMapElement.isKeyDown()) { // L: 537
-														if (class12.field55 != 13) { // L: 538
-															if (Login.currentLoginField != 0) { // L: 547
-																continue label1030;
-															}
-
-															char var32 = class319.field3858; // L: 548
-
-															for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var32 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 550 551
-															}
-
-															if (class12.field55 == 85 && Login.Login_username.length() > 0) { // L: 554
-																Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
-															}
-
-															if (class12.field55 == 84 || class12.field55 == 80) { // L: 555
-																Login.currentLoginField = 1;
-															}
-
-															if (DynamicObject.method2001(class319.field3858) && Login.Login_username.length() < 320) { // L: 556
-																Login.Login_username = Login.Login_username + class319.field3858;
-															}
-														} else {
-															class275.method5201(0); // L: 539
-															Login.Login_username = ""; // L: 540
-															Login.Login_password = ""; // L: 541
-															ReflectionCheck.field429 = 0; // L: 542
-															Tiles.otp = ""; // L: 543
-															Login.field875 = true; // L: 544
-														}
-													}
-
-													return; // L: 854
-												}
-											} while(Login.currentLoginField != 1); // L: 558
-
-											if (class12.field55 == 85 && Login.Login_password.length() > 0) { // L: 559
-												Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 560
-											} else if (class12.field55 == 84 || class12.field55 == 80) { // L: 562
-												Login.currentLoginField = 0; // L: 563
-												if (class12.field55 == 84) { // L: 564
-													Login.Login_username = Login.Login_username.trim(); // L: 565
-													if (Login.Login_username.length() == 0) { // L: 566
-														class1.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 567
-														return; // L: 568
-													}
-
-													if (Login.Login_password.length() == 0) { // L: 570
-														class1.setLoginResponseString("", "Please enter your password.", ""); // L: 571
-														return; // L: 572
-													}
-
-													class1.setLoginResponseString("", "Connecting to server...", ""); // L: 574
-													WorldMapSection2.method3584(false); // L: 575
-													WorldMapData_1.updateGameState(20); // L: 576
-													return; // L: 577
-												}
-											}
-
-											if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class12.field55 == 67) { // L: 580
-												Clipboard var34 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 581
-												var35 = var34.getContents(ArchiveLoader.client); // L: 582
-												var12 = 20 - Login.Login_password.length(); // L: 583
-												break;
-											}
-
-											if (GrandExchangeOffer.method5473(class319.field3858) && DynamicObject.method2001(class319.field3858) && Login.Login_password.length() < 20) { // L: 600
-												Login.Login_password = Login.Login_password + class319.field3858; // L: 601
-											}
-										}
-									} while(var12 <= 0); // L: 584
-
-									try {
-										String var13 = (String)var35.getTransferData(DataFlavor.stringFlavor); // L: 586
-										int var14 = Math.min(var12, var13.length()); // L: 587
-
-										for (int var15 = 0; var15 < var14; ++var15) { // L: 588
-											if (!GrandExchangeOffer.method5473(var13.charAt(var15)) || !DynamicObject.method2001(var13.charAt(var15))) { // L: 589
-												class275.method5201(3); // L: 590
-												return; // L: 591
-											}
-										}
-
-										Login.Login_password = Login.Login_password + var13.substring(0, var14); // L: 594
-									} catch (UnsupportedFlavorException var23) { // L: 596
-									} catch (IOException var24) { // L: 597
-									}
-								}
-							} else if (Login.loginIndex == 3) { // L: 607
-								var27 = Login.loginBoxX + 180; // L: 608
-								var8 = 276; // L: 609
-								if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 610
-									EnumComposition.method3097(false); // L: 611
-								}
-
-								var27 = Login.loginBoxX + 180; // L: 613
-								var8 = 326; // L: 614
-								if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 615
-									class1.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 616
-									class275.method5201(5); // L: 617
-									return; // L: 618
-								}
-							} else {
-								int var10;
-								if (Login.loginIndex == 4) { // L: 621
-									var27 = Login.loginBoxX + 180 - 80; // L: 622
-									var8 = 321; // L: 623
-									if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 624
-										Tiles.otp.trim(); // L: 625
-										if (Tiles.otp.length() != 6) { // L: 626
-											class1.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 627
-											return; // L: 628
-										}
-
-										ReflectionCheck.field429 = Integer.parseInt(Tiles.otp); // L: 630
-										Tiles.otp = ""; // L: 631
-										WorldMapSection2.method3584(true); // L: 632
-										class1.setLoginResponseString("", "Connecting to server...", ""); // L: 633
-										WorldMapData_1.updateGameState(20); // L: 634
-										return; // L: 635
-									}
-
-									if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 9 && var25 <= Login.loginBoxX + 180 + 130 && var26 >= 263 && var26 <= 296) { // L: 637
-										Login.field875 = !Login.field875; // L: 638
-									}
-
-									if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 34 && var25 <= Login.loginBoxX + 34 + 180 && var26 >= 351 && var26 <= 363) { // L: 640
-										class91.openURL(HealthBar.method2246("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 641
-									}
-
-									var27 = Login.loginBoxX + 180 + 80; // L: 643
-									if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 644
-										class275.method5201(0); // L: 645
-										Login.Login_username = ""; // L: 646
-										Login.Login_password = ""; // L: 647
-										ReflectionCheck.field429 = 0; // L: 648
-										Tiles.otp = ""; // L: 649
-									}
-
-									while (WorldMapElement.isKeyDown()) { // L: 651
-										boolean var9 = false; // L: 652
-
-										for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 653
-											if (class319.field3858 == "1234567890".charAt(var10)) { // L: 654
-												var9 = true; // L: 655
-												break; // L: 656
-											}
-										}
-
-										if (class12.field55 == 13) { // L: 659
-											class275.method5201(0); // L: 660
-											Login.Login_username = ""; // L: 661
-											Login.Login_password = ""; // L: 662
-											ReflectionCheck.field429 = 0; // L: 663
-											Tiles.otp = ""; // L: 664
-										} else {
-											if (class12.field55 == 85 && Tiles.otp.length() > 0) { // L: 667
-												Tiles.otp = Tiles.otp.substring(0, Tiles.otp.length() - 1);
-											}
-
-											if (class12.field55 == 84) { // L: 668
-												Tiles.otp.trim(); // L: 669
-												if (Tiles.otp.length() != 6) { // L: 670
-													class1.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 671
-													return; // L: 672
-												}
-
-												ReflectionCheck.field429 = Integer.parseInt(Tiles.otp); // L: 674
-												Tiles.otp = ""; // L: 675
-												WorldMapSection2.method3584(true); // L: 676
-												class1.setLoginResponseString("", "Connecting to server...", ""); // L: 677
-												WorldMapData_1.updateGameState(20); // L: 678
-												return; // L: 679
-											}
-
-											if (var9 && Tiles.otp.length() < 6) { // L: 681
-												Tiles.otp = Tiles.otp + class319.field3858;
-											}
-										}
-									}
-								} else if (Login.loginIndex == 5) { // L: 685
-									var27 = Login.loginBoxX + 180 - 80; // L: 686
-									var8 = 321; // L: 687
-									if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 688
-										Occluder.method4482(); // L: 689
-										return; // L: 690
-									}
-
-									var27 = Login.loginBoxX + 180 + 80; // L: 692
-									if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 693
-										class1.Login_promptCredentials(true); // L: 694
-									}
-
-									var29 = 361; // L: 696
-									if (ItemContainer.field998 != null) { // L: 697
-										var10 = ItemContainer.field998.highX / 2; // L: 698
-										if (var4 == 1 && var25 >= ItemContainer.field998.lowX - var10 && var25 <= var10 + ItemContainer.field998.lowX && var26 >= var29 - 15 && var26 < var29) { // L: 699
-											class91.openURL(HealthBar.method2246("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 700
-										}
-									}
-
-									while (WorldMapElement.isKeyDown()) { // L: 703
-										boolean var30 = false; // L: 704
-
-										for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 705
-											if (class319.field3858 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"�$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 706
-												var30 = true; // L: 707
-												break; // L: 708
-											}
-										}
-
-										if (class12.field55 == 13) { // L: 711
-											class1.Login_promptCredentials(true); // L: 712
-										} else {
-											if (class12.field55 == 85 && Login.Login_username.length() > 0) { // L: 715
-												Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
-											}
-
-											if (class12.field55 == 84) { // L: 716
-												Occluder.method4482(); // L: 717
-												return; // L: 718
-											}
-
-											if (var30 && Login.Login_username.length() < 320) { // L: 720
-												Login.Login_username = Login.Login_username + class319.field3858;
-											}
-										}
-									}
-								} else if (Login.loginIndex != 6) { // L: 724
-									if (Login.loginIndex == 7) { // L: 735
-										var27 = Login.loginBoxX + 180 - 80; // L: 736
-										var8 = 321; // L: 737
-										if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 738
-											class91.openURL(HealthBar.method2246("secure", true) + "m=dob/set_dob.ws", true, false); // L: 739
-											class1.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 740
-											class275.method5201(6); // L: 741
-											return; // L: 742
-										}
-
-										var27 = Login.loginBoxX + 180 + 80; // L: 744
-										if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 745
-											class1.Login_promptCredentials(true); // L: 746
-										}
-									} else if (Login.loginIndex == 8) { // L: 749
-										var27 = Login.loginBoxX + 180 - 80; // L: 750
-										var8 = 321; // L: 751
-										if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 752
-											class91.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 753
-											class1.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 754
-											class275.method5201(6); // L: 755
-											return; // L: 756
-										}
-
-										var27 = Login.loginBoxX + 180 + 80; // L: 758
-										if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 759
-											class1.Login_promptCredentials(true); // L: 760
-										}
-									} else if (Login.loginIndex == 9) { // L: 763
-										var27 = Login.loginBoxX + 180; // L: 764
-										var8 = 311; // L: 765
-										if (class12.field55 == 84 || class12.field55 == 13 || var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 766
-											EnumComposition.method3097(false); // L: 767
-										}
-									} else if (Login.loginIndex == 10) { // L: 770
-										var27 = Login.loginBoxX + 180; // L: 771
-										var8 = 209; // L: 772
-										if (class12.field55 == 84 || var4 == 1 && var25 >= var27 - 109 && var25 <= var27 + 109 && var26 >= var8 && var26 <= var8 + 68) { // L: 773
-											class1.setLoginResponseString("", "Connecting to server...", ""); // L: 774
-											Client.field500 = class404.field4352; // L: 775
-											WorldMapSection2.method3584(false); // L: 776
-											WorldMapData_1.updateGameState(20); // L: 777
-										}
-									} else if (Login.loginIndex == 12) { // L: 780
-										var27 = Login.loginBoxCenter; // L: 781
-										var8 = 233; // L: 782
-										Bounds var20 = var1.method5745(0, 30, "<col=ffd200>terms of use</col>, <col=ffd200>privacy policy</col>, and <col=ffd200>end user licence</col>", var27, var8); // L: 783
-										Bounds var18 = var1.method5745(32, 32, "<col=ffd200>terms of use</col>, <col=ffd200>privacy policy</col>, and <col=ffd200>end user licence</col>", var27, var8); // L: 784
-										Bounds var19 = var1.method5745(70, 34, "<col=ffd200>terms of use</col>, <col=ffd200>privacy policy</col>, and <col=ffd200>end user licence</col>", var27, var8); // L: 785
-										var31 = var8 + 17; // L: 786
-										Bounds var21 = var1.method5745(0, 34, "<col=ffd200>agreement (EULA)</col>.", var27, var31); // L: 787
-										if (var4 == 1) { // L: 788
-											if (var20.method6341(var25, var26)) { // L: 789
-												class91.openURL("https://www.jagex.com/terms", true, false); // L: 790
-											} else if (var18.method6341(var25, var26)) { // L: 792
-												class91.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 793
-											} else if (var19.method6341(var25, var26) || var21.method6341(var25, var26)) { // L: 795
-												class91.openURL("https://www.jagex.com/en-GB/legal/eula-runescape-oldschool", true, false); // L: 796
-											}
-										}
-
-										var27 = Login.loginBoxCenter - 80; // L: 799
-										var8 = 311; // L: 800
-										if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 801
-											class408.clientPreferences.field1182 = Client.field467; // L: 803
-											Login.savePreferences(); // L: 804
-											EnumComposition.method3097(true); // L: 806
-										}
-
-										var27 = Login.loginBoxCenter + 80; // L: 808
-										if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 809
-											Login.loginIndex = 13; // L: 810
-										}
-									} else if (Login.loginIndex == 13) { // L: 813
-										var27 = Login.loginBoxCenter; // L: 814
-										var8 = 321; // L: 815
-										if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 816
-											EnumComposition.method3097(true); // L: 817
-										}
-									} else if (Login.loginIndex == 14) { // L: 820
-										String var22 = ""; // L: 821
-										switch(Login.field866) { // L: 822
-										case 0:
-											var22 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 827
-											break; // L: 828
-										case 1:
-											var22 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 830
-											break;
-										default:
-											class1.Login_promptCredentials(false); // L: 824
-										}
-
-										var31 = Login.loginBoxX + 180; // L: 833
-										var29 = 276; // L: 834
-										if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 835
-											class91.openURL(var22, true, false); // L: 836
-											class1.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 837
-											class275.method5201(6); // L: 838
-											return; // L: 839
-										}
-
-										var31 = Login.loginBoxX + 180; // L: 841
-										var29 = 326; // L: 842
-										if (var4 == 1 && var25 >= var31 - 75 && var25 <= var31 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 843
-											class1.Login_promptCredentials(false); // L: 844
-										}
-									} else if (Login.loginIndex == 24) { // L: 847
-										var27 = Login.loginBoxX + 180; // L: 848
-										var8 = 301; // L: 849
-										if (var4 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 850
-											EnumComposition.method3097(false); // L: 851
-										}
-									}
-								} else {
-									while (true) {
-										do {
-											if (!WorldMapElement.isKeyDown()) { // L: 725
-												var28 = 321; // L: 730
-												if (var4 == 1 && var26 >= var28 - 20 && var26 <= var28 + 20) { // L: 731
-													class1.Login_promptCredentials(true); // L: 732
-												}
-
-												return;
-											}
-										} while(class12.field55 != 84 && class12.field55 != 13); // L: 726
-
-										class1.Login_promptCredentials(true); // L: 727
-									}
-								}
-							}
-						}
-					}
-
-				}
-			}
-		}
-	} // L: 324
-}
diff --git a/runescape-client/src/main/java/class273.java b/runescape-client/src/main/java/class273.java
new file mode 100644
index 0000000000..18dbe58cc6
--- /dev/null
+++ b/runescape-client/src/main/java/class273.java
@@ -0,0 +1,182 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("jj")
+public class class273 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(IB)I",
+		garbageValue = "-9"
+	)
+	@Export("getVarbit")
+	public static int getVarbit(int var0) {
+		VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 26
+		VarbitComposition var1;
+		if (var2 != null) { // L: 27
+			var1 = var2; // L: 28
+		} else {
+			byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 31
+			var2 = new VarbitComposition(); // L: 32
+			if (var3 != null) { // L: 33
+				var2.decode(new Buffer(var3));
+			}
+
+			VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); // L: 34
+			var1 = var2; // L: 35
+		}
+
+		int var7 = var1.baseVar; // L: 38
+		int var4 = var1.startBit; // L: 39
+		int var5 = var1.endBit; // L: 40
+		int var6 = Varps.Varps_masks[var5 - var4]; // L: 41
+		return Varps.Varps_main[var7] >> var4 & var6; // L: 42
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-2100883024"
+	)
+	static int method5332(int var0, Script var1, boolean var2) {
+		int var4;
+		int var9;
+		if (var0 == ScriptOpcodes.CC_CREATE) { // L: 480
+			IsaacCipher.Interpreter_intStackSize -= 3; // L: 481
+			var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 482
+			var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 483
+			int var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 484
+			if (var4 == 0) { // L: 485
+				throw new RuntimeException(); // L: 486
+			} else {
+				Widget var6 = ChatChannel.getWidget(var9); // L: 488
+				if (var6.children == null) { // L: 489
+					var6.children = new Widget[var11 + 1];
+				}
+
+				if (var6.children.length <= var11) { // L: 490
+					Widget[] var7 = new Widget[var11 + 1]; // L: 491
+
+					for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 492
+						var7[var8] = var6.children[var8];
+					}
+
+					var6.children = var7; // L: 493
+				}
+
+				if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 495
+					throw new RuntimeException("" + (var11 - 1));
+				} else {
+					Widget var12 = new Widget(); // L: 496
+					var12.type = var4; // L: 497
+					var12.parentId = var12.id = var6.id; // L: 498
+					var12.childIndex = var11; // L: 499
+					var12.isIf3 = true; // L: 500
+					var6.children[var11] = var12; // L: 501
+					if (var2) { // L: 502
+						WorldMapArea.scriptDotWidget = var12;
+					} else {
+						Messages.scriptActiveWidget = var12; // L: 503
+					}
+
+					SecureRandomCallable.invalidateWidget(var6); // L: 504
+					return 1; // L: 505
+				}
+			}
+		} else {
+			Widget var3;
+			if (var0 == ScriptOpcodes.CC_DELETE) { // L: 507
+				var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 508
+				Widget var10 = ChatChannel.getWidget(var3.id); // L: 509
+				var10.children[var3.childIndex] = null; // L: 510
+				SecureRandomCallable.invalidateWidget(var10); // L: 511
+				return 1; // L: 512
+			} else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 514
+				var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 515
+				var3.children = null; // L: 516
+				SecureRandomCallable.invalidateWidget(var3); // L: 517
+				return 1; // L: 518
+			} else if (var0 == 103) { // L: 520
+				IsaacCipher.Interpreter_intStackSize -= 3; // L: 521
+				return 1; // L: 522
+			} else if (var0 == 104) { // L: 524
+				--IsaacCipher.Interpreter_intStackSize; // L: 525
+				return 1; // L: 526
+			} else if (var0 != ScriptOpcodes.CC_FIND) { // L: 528
+				if (var0 == ScriptOpcodes.IF_FIND) { // L: 541
+					var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 542
+					if (var3 != null) { // L: 543
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 544
+						if (var2) { // L: 545
+							WorldMapArea.scriptDotWidget = var3;
+						} else {
+							Messages.scriptActiveWidget = var3; // L: 546
+						}
+					} else {
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 548
+					}
+
+					return 1; // L: 549
+				} else if (var0 == 202) { // L: 551
+					Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] = 0; // L: 552
+					return 1; // L: 553
+				} else if (var0 == 203) { // L: 555
+					Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize + 1] = 0; // L: 556
+					return 1; // L: 557
+				} else {
+					return 2; // L: 559
+				}
+			} else {
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 529
+				var9 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 530
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 531
+				Widget var5 = class126.getWidgetChild(var9, var4); // L: 532
+				if (var5 != null && var4 != -1) { // L: 533
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 534
+					if (var2) { // L: 535
+						WorldMapArea.scriptDotWidget = var5;
+					} else {
+						Messages.scriptActiveWidget = var5; // L: 536
+					}
+				} else {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 538
+				}
+
+				return 1; // L: 539
+			}
+		}
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(IS)V",
+		garbageValue = "-11359"
+	)
+	public static void method5333(int var0) {
+		if (var0 != -1) { // L: 240
+			if (Widget.Widget_loadedInterfaces[var0]) { // L: 241
+				CollisionMap.Widget_archive.clearFilesGroup(var0); // L: 242
+				if (MouseRecorder.Widget_interfaceComponents[var0] != null) { // L: 243
+					boolean var1 = true; // L: 244
+
+					for (int var2 = 0; var2 < MouseRecorder.Widget_interfaceComponents[var0].length; ++var2) { // L: 245
+						if (MouseRecorder.Widget_interfaceComponents[var0][var2] != null) { // L: 246
+							if (MouseRecorder.Widget_interfaceComponents[var0][var2].type != 2) { // L: 247
+								MouseRecorder.Widget_interfaceComponents[var0][var2] = null;
+							} else {
+								var1 = false; // L: 248
+							}
+						}
+					}
+
+					if (var1) {
+						MouseRecorder.Widget_interfaceComponents[var0] = null; // L: 251
+					}
+
+					Widget.Widget_loadedInterfaces[var0] = false; // L: 252
+				}
+			}
+		}
+	} // L: 253
+}
diff --git a/runescape-client/src/main/java/class274.java b/runescape-client/src/main/java/class274.java
deleted file mode 100644
index dc30f12c80..0000000000
--- a/runescape-client/src/main/java/class274.java
+++ /dev/null
@@ -1,59 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jg")
-public final class class274 {
-	@ObfuscatedName("kp")
-	@ObfuscatedSignature(
-		descriptor = "Ljf;"
-	)
-	@Export("hoveredItemContainer")
-	static Widget hoveredItemContainer;
-	@ObfuscatedName("my")
-	@ObfuscatedSignature(
-		descriptor = "Lbu;"
-	)
-	@Export("tempMenuAction")
-	static MenuAction tempMenuAction;
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(BI)C",
-		garbageValue = "-1659224646"
-	)
-	public static char method5199(byte var0) {
-		int var1 = var0 & 255; // L: 63
-		if (var1 == 0) { // L: 64
-			throw new IllegalArgumentException("" + Integer.toString(var1, 16));
-		} else {
-			if (var1 >= 128 && var1 < 160) { // L: 65
-				char var2 = class316.cp1252AsciiExtension[var1 - 128]; // L: 66
-				if (var2 == 0) { // L: 67
-					var2 = '?';
-				}
-
-				var1 = var2; // L: 68
-			}
-
-			return (char)var1; // L: 70
-		}
-	}
-
-	@ObfuscatedName("lx")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "2095914687"
-	)
-	static void method5198(Buffer var0, int var1) {
-		MilliClock.method2954(var0.array, var1); // L: 11985
-		if (JagexCache.JagexCache_randomDat != null) { // L: 11987
-			try {
-				JagexCache.JagexCache_randomDat.seek(0L); // L: 11989
-				JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11990
-			} catch (Exception var3) { // L: 11992
-			}
-		}
-
-	} // L: 11995
-}
diff --git a/runescape-client/src/main/java/class275.java b/runescape-client/src/main/java/class275.java
deleted file mode 100644
index 0e09a78d8c..0000000000
--- a/runescape-client/src/main/java/class275.java
+++ /dev/null
@@ -1,44 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jm")
-public class class275 {
-	static {
-		Math.sqrt(8192.0D); // L: 9
-	} // L: 10
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lft;",
-		garbageValue = "814359480"
-	)
-	@Export("StructDefinition_getStructDefinition")
-	public static StructComposition StructDefinition_getStructDefinition(int var0) {
-		StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23
-		if (var1 != null) { // L: 24
-			return var1;
-		} else {
-			byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25
-			var1 = new StructComposition(); // L: 26
-			if (var2 != null) { // L: 27
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode(); // L: 28
-			StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29
-			return var1; // L: 30
-		}
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1060488561"
-	)
-	static void method5201(int var0) {
-		if (var0 != Login.loginIndex) { // L: 1621
-			Login.loginIndex = var0; // L: 1622
-		}
-	} // L: 1623
-}
diff --git a/runescape-client/src/main/java/class276.java b/runescape-client/src/main/java/class276.java
deleted file mode 100644
index e9cd054286..0000000000
--- a/runescape-client/src/main/java/class276.java
+++ /dev/null
@@ -1,37 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jp")
-public class class276 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	static final class276 field3282;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	static final class276 field3280;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1562097245
-	)
-	final int field3279;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 427612801
-	)
-	final int field3281;
-
-	static {
-		field3282 = new class276(51, 27, 800, 0, 16, 16); // L: 33
-		field3280 = new class276(25, 28, 800, 656, 40, 40); // L: 34
-	}
-
-	class276(int var1, int var2, int var3, int var4, int var5, int var6) {
-		this.field3279 = var5; // L: 39
-		this.field3281 = var6; // L: 40
-	} // L: 41
-}
diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java
new file mode 100644
index 0000000000..05af3c58b2
--- /dev/null
+++ b/runescape-client/src/main/java/class277.java
@@ -0,0 +1,16 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("jn")
+public class class277 {
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(CS)Z",
+		garbageValue = "4096"
+	)
+	@Export("isDigit")
+	public static boolean isDigit(char var0) {
+		return var0 >= '0' && var0 <= '9'; // L: 148
+	}
+}
diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java
index 62ff724bd2..017eb61519 100644
--- a/runescape-client/src/main/java/class279.java
+++ b/runescape-client/src/main/java/class279.java
@@ -1,38 +1,113 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("jo")
+@ObfuscatedName("jb")
 public class class279 {
+	@ObfuscatedName("c")
+	public static final short[] field3209;
 	@ObfuscatedName("b")
+	public static final short[][] field3208;
+	@ObfuscatedName("p")
+	public static final short[] field3211;
+	@ObfuscatedName("m")
+	public static final short[][] field3210;
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "228808320"
+		descriptor = "Lkx;"
 	)
-	static final void method5217(String var0) {
-		StringBuilder var10000 = new StringBuilder();
-		Object var10001 = null; // L: 121
-		var10000 = var10000.append("Please remove ").append(var0);
-		var10001 = null;
-		String var1 = var10000.append(" from your ignore list first").toString();
-		class397.addGameMessage(30, "", var1); // L: 123
-	} // L: 125
-
-	@ObfuscatedName("lj")
+	@Export("NetCache_currentResponse")
+	public static NetFileRequest NetCache_currentResponse;
+
+	static {
+		field3209 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4
+		field3208 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5
+		field3211 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12
+		field3210 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13
+	}
+
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1977280908"
+		descriptor = "(BI)C",
+		garbageValue = "1285186796"
 	)
-	static void method5216() {
-		if (ClanSettings.field1440 != null) { // L: 12045
-			Client.field742 = Client.cycle; // L: 12046
-			ClanSettings.field1440.method5490(); // L: 12047
-
-			for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 12048
-				if (Client.players[var0] != null) { // L: 12049
-					ClanSettings.field1440.method5498((Client.players[var0].x >> 7) + class19.baseX, (Client.players[var0].y >> 7) + DefaultsGroup.baseY); // L: 12050
+	public static char method5406(byte var0) {
+		int var1 = var0 & 255; // L: 66
+		if (var1 == 0) { // L: 67
+			throw new IllegalArgumentException("" + Integer.toString(var1, 16));
+		} else {
+			if (var1 >= 128 && var1 < 160) { // L: 68
+				char var2 = class328.cp1252AsciiExtension[var1 - 128]; // L: 69
+				if (var2 == 0) { // L: 70
+					var2 = '?';
 				}
+
+				var1 = var2; // L: 71
 			}
+
+			return (char)var1; // L: 73
+		}
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "-19"
+	)
+	static int method5405(int var0, Script var1, boolean var2) {
+		int var3 = -1; // L: 563
+		Widget var4;
+		if (var0 >= 2000) { // L: 565
+			var0 -= 1000; // L: 566
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 567
+			var4 = ChatChannel.getWidget(var3); // L: 568
+		} else {
+			var4 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 570
 		}
 
-	} // L: 12054
+		if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 571
+			IsaacCipher.Interpreter_intStackSize -= 4; // L: 572
+			var4.rawX = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 573
+			var4.rawY = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 574
+			var4.xAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 575
+			var4.yAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 576
+			SecureRandomCallable.invalidateWidget(var4); // L: 577
+			class295.client.alignWidget(var4); // L: 578
+			if (var3 != -1 && var4.type == 0) { // L: 579
+				class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var3 >> 16], var4, false);
+			}
+
+			return 1; // L: 580
+		} else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 582
+			IsaacCipher.Interpreter_intStackSize -= 4; // L: 583
+			var4.rawWidth = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 584
+			var4.rawHeight = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 585
+			var4.widthAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 586
+			var4.heightAlignment = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 587
+			SecureRandomCallable.invalidateWidget(var4); // L: 588
+			class295.client.alignWidget(var4); // L: 589
+			if (var3 != -1 && var4.type == 0) { // L: 590
+				class115.revalidateWidgetScroll(MouseRecorder.Widget_interfaceComponents[var3 >> 16], var4, false);
+			}
+
+			return 1; // L: 591
+		} else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 593
+			boolean var5 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 594
+			if (var5 != var4.isHidden) { // L: 595
+				var4.isHidden = var5; // L: 596
+				SecureRandomCallable.invalidateWidget(var4); // L: 597
+			}
+
+			return 1; // L: 599
+		} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 601
+			var4.noClickThrough = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 602
+			return 1; // L: 603
+		} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 605
+			var4.noScrollThrough = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 606
+			return 1; // L: 607
+		} else {
+			return 2; // L: 609
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java
index 66687ec998..d67047968f 100644
--- a/runescape-client/src/main/java/class28.java
+++ b/runescape-client/src/main/java/class28.java
@@ -1,914 +1,362 @@
-import java.awt.FontMetrics;
-import java.util.Date;
 import javax.imageio.ImageIO;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("aq")
+@ObfuscatedName("ab")
 public class class28 {
-	@ObfuscatedName("g")
-	@Export("Interpreter_intLocals")
-	static int[] Interpreter_intLocals;
-	@ObfuscatedName("am")
-	@Export("loginScreenFontMetrics")
-	static FontMetrics loginScreenFontMetrics;
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		intValue = 1911791095
+	)
+	static int field168;
 
 	static {
 		ImageIO.setUseCache(false); // L: 12
 	} // L: 13
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;B)V",
-		garbageValue = "-86"
-	)
-	public static void method405(AbstractArchive var0) {
-		StructComposition.StructDefinition_archive = var0; // L: 19
-	} // L: 20
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;I)V",
-		garbageValue = "1798732043"
-	)
-	public static void method400(AbstractArchive var0) {
-		ParamComposition.ParamDefinition_archive = var0; // L: 21
-	} // L: 22
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(CI)C",
-		garbageValue = "-1720106594"
-	)
-	static char method399(char var0) {
-		if (var0 == 198) { // L: 95
-			return 'E';
-		} else if (var0 == 230) { // L: 96
-			return 'e';
-		} else if (var0 == 223) {
-			return 's'; // L: 97
-		} else if (var0 == 338) { // L: 98
-			return 'E';
-		} else {
-			return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100
-		}
-	}
-
-	@ObfuscatedName("ai")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "765864146"
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "-76"
 	)
-	static int method401(int var0, Script var1, boolean var2) {
-		String var3;
-		int var9;
-		if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 3059
-			var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3060
-			var9 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3061
-			Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3 + var9; // L: 3062
-			return 1; // L: 3063
+	static int method443(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2681
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2682
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2683
+			return 1; // L: 2684
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2686
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2687
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2688
+			return 1; // L: 2689
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2691
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2692
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2693
+			return 1; // L: 2694
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2696
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2697
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2698
+			return 1; // L: 2699
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2701
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2702
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2703
+			return 1; // L: 2704
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2706
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2707
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2708
+			return 1; // L: 2709
 		} else {
-			String var4;
-			if (var0 == ScriptOpcodes.APPEND) { // L: 3065
-				class295.Interpreter_stringStackSize -= 2; // L: 3066
-				var3 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3067
-				var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3068
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3069
-				return 1; // L: 3070
-			} else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3072
-				var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3073
-				var9 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3074
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3 + MusicPatchNode2.intToString(var9, true); // L: 3075
-				return 1; // L: 3076
-			} else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3078
-				var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3079
-				Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3080
-				return 1; // L: 3081
+			int var13;
+			if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2711
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2712
+				var13 = Client.grandExchangeOffers[var3].status(); // L: 2713
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2714
+				return 1; // L: 2715
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2717
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2718
+				var13 = Client.grandExchangeOffers[var3].status(); // L: 2719
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2720
+				return 1; // L: 2721
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2723
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2724
+				var13 = Client.grandExchangeOffers[var3].status(); // L: 2725
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2726
+				return 1; // L: 2727
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2729
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2730
+				var13 = Client.grandExchangeOffers[var3].status(); // L: 2731
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2732
+				return 1; // L: 2733
 			} else {
-				int var6;
-				int var10;
-				if (var0 == ScriptOpcodes.FROMDATE) { // L: 3083
-					var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3084
-					long var13 = (11745L + (long)var10) * 86400000L; // L: 3085
-					Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3086
-					var6 = Interpreter.Interpreter_calendar.get(5); // L: 3087
-					int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3088
-					int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3089
-					Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3090
-					return 1; // L: 3091
-				} else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3093
-					if (var0 == ScriptOpcodes.TOSTRING) { // L: 3101
-						var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3102
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3103
-						return 1; // L: 3104
-					} else if (var0 == ScriptOpcodes.COMPARE) { // L: 3106
-						class295.Interpreter_stringStackSize -= 2; // L: 3107
-						Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SecureRandomCallable.method2047(AttackOption.compareStrings(Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1], MouseHandler.clientLanguage)); // L: 3108
-						return 1; // L: 3109
-					} else {
-						int var5;
-						byte[] var11;
-						Font var12;
-						if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3111
-							var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3112
-							class14.Interpreter_intStackSize -= 2; // L: 3113
-							var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3114
-							var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3115
-							var11 = LoginScreenAnimation.archive13.takeFile(var5, 0); // L: 3116
-							var12 = new Font(var11); // L: 3117
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3118
-							return 1; // L: 3119
-						} else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3121
-							var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3122
-							class14.Interpreter_intStackSize -= 2; // L: 3123
-							var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3124
-							var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3125
-							var11 = LoginScreenAnimation.archive13.takeFile(var5, 0); // L: 3126
-							var12 = new Font(var11); // L: 3127
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3128
-							return 1; // L: 3129
-						} else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3131
-							class295.Interpreter_stringStackSize -= 2; // L: 3132
-							var3 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3133
-							var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3134
-							if (Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize] == 1) { // L: 3135
-								Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3;
-							} else {
-								Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4; // L: 3136
-							}
+				boolean var12;
+				if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2735
+					var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2736
+					if (Client.grandExchangeEvents != null) { // L: 2737
+						Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2738
+					}
 
-							return 1; // L: 3137
-						} else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3139
-							var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3140
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3141
-							return 1; // L: 3142
-						} else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3144
-							var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3145
-							var9 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3146
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3147
-							return 1; // L: 3148
-						} else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3150
-							var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3151
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Skills.isCharPrintable((char)var10) ? 1 : 0; // L: 3152
-							return 1; // L: 3153
-						} else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3155
-							var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3156
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = ObjectComposition.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3157
-							return 1; // L: 3158
-						} else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3160
-							var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3161
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = SpriteMask.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3162
-							return 1; // L: 3163
-						} else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3165
-							var10 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3166
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class117.isDigit((char)var10) ? 1 : 0; // L: 3167
-							return 1; // L: 3168
-						} else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3170
-							var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3171
-							if (var3 != null) { // L: 3172
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.length();
-							} else {
-								Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 3173
-							}
+					return 1; // L: 2740
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2742
+					var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2743
+					if (Client.grandExchangeEvents != null) { // L: 2744
+						Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2745
+					}
 
-							return 1; // L: 3174
-						} else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3176
-							var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3177
-							class14.Interpreter_intStackSize -= 2; // L: 3178
-							var9 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize]; // L: 3179
-							var5 = Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize + 1]; // L: 3180
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3181
-							return 1; // L: 3182
-						} else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3184
-							var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3185
-							StringBuilder var15 = new StringBuilder(var3.length()); // L: 3186
-							boolean var16 = false; // L: 3187
-
-							for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3188
-								char var7 = var3.charAt(var6); // L: 3189
-								if (var7 == '<') { // L: 3190
-									var16 = true;
-								} else if (var7 == '>') { // L: 3191
-									var16 = false;
-								} else if (!var16) { // L: 3192
-									var15.append(var7);
-								}
-							}
+					return 1; // L: 2747
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2749
+					IsaacCipher.Interpreter_intStackSize -= 2; // L: 2750
+					var12 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize] == 1; // L: 2751
+					boolean var11 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 2752
+					if (Client.grandExchangeEvents != null) { // L: 2753
+						Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2754
+						Client.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2755
+					}
 
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3194
-							return 1; // L: 3195
-						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3197
-							var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3198
-							var9 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3199
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3200
-							return 1; // L: 3201
-						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3203
-							class295.Interpreter_stringStackSize -= 2; // L: 3204
-							var3 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3205
-							var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3206
-							var5 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3207
-							Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3208
-							return 1; // L: 3209
-						} else if (var0 == 4122) { // L: 3211
-							var3 = Interpreter.Interpreter_stringStack[--class295.Interpreter_stringStackSize]; // L: 3212
-							Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3213
-							return 1; // L: 3214
-						} else {
-							return 2; // L: 3216
-						}
+					return 1; // L: 2757
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2759
+					var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2760
+					if (Client.grandExchangeEvents != null) { // L: 2761
+						Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2762
+					}
+
+					return 1; // L: 2764
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2766
+					var12 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize] == 1; // L: 2767
+					if (Client.grandExchangeEvents != null) { // L: 2768
+						Client.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2769
 					}
+
+					return 1; // L: 2771
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2773
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Client.grandExchangeEvents == null ? 0 : Client.grandExchangeEvents.events.size(); // L: 2774
+					return 1; // L: 2775
 				} else {
-					class295.Interpreter_stringStackSize -= 2; // L: 3094
-					var3 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize]; // L: 3095
-					var4 = Interpreter.Interpreter_stringStack[class295.Interpreter_stringStackSize + 1]; // L: 3096
-					if (HealthBarDefinition.localPlayer.appearance != null && HealthBarDefinition.localPlayer.appearance.isFemale) { // L: 3097
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var4;
+					GrandExchangeEvent var4;
+					if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2777
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2778
+						var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2779
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.world; // L: 2780
+						return 1; // L: 2781
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2783
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2784
+						var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2785
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2786
+						return 1; // L: 2787
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2789
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2790
+						var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2791
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2792
+						return 1; // L: 2793
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2795
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2796
+						var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2797
+						long var5 = Ignored.method6459() - WorldMapSprite.field2727 - var4.age; // L: 2798
+						int var7 = (int)(var5 / 3600000L); // L: 2799
+						int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2800
+						int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2801
+						String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2802
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = var10; // L: 2803
+						return 1; // L: 2804
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2806
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2807
+						var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2808
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2809
+						return 1; // L: 2810
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2812
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2813
+						var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2814
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2815
+						return 1; // L: 2816
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2818
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2819
+						var4 = (GrandExchangeEvent)Client.grandExchangeEvents.events.get(var3); // L: 2820
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2821
+						return 1; // L: 2822
 					} else {
-						Interpreter.Interpreter_stringStack[++class295.Interpreter_stringStackSize - 1] = var3; // L: 3098
+						return 2; // L: 2824
 					}
-
-					return 1; // L: 3099
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("ju")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-320587085"
+		descriptor = "(Ljm;I)Z",
+		garbageValue = "-1842164438"
 	)
-	static int method402(int var0, Script var1, boolean var2) {
-		if (var0 >= 7200 && var0 < 7204) { // L: 4432
-			class14.Interpreter_intStackSize -= 5; // L: 4433
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4434
-			return 1; // L: 4435
-		} else if (var0 == 7204) { // L: 4437
-			class14.Interpreter_intStackSize -= 6; // L: 4438
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4439
-			return 1; // L: 4440
-		} else if (var0 >= 7205 && var0 < 7209) { // L: 4442
-			Interpreter.Interpreter_intStack[class14.Interpreter_intStackSize - 1] = -1; // L: 4443
-			return 1; // L: 4444
-		} else if (var0 == 7209) { // L: 4446
-			class14.Interpreter_intStackSize -= 2; // L: 4447
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4448
-			return 1; // L: 4449
-		} else if (var0 >= 7210 && var0 < 7214) { // L: 4451
-			--class14.Interpreter_intStackSize; // L: 4452
-			return 1; // L: 4453
-		} else if (var0 == 7214) { // L: 4455
-			class14.Interpreter_intStackSize -= 2; // L: 4456
-			return 1; // L: 4457
+	@Export("runCs1")
+	static final boolean runCs1(Widget var0) {
+		if (var0.cs1Comparisons == null) { // L: 11045
+			return false;
 		} else {
-			return 2; // L: 4459
-		}
-	}
+			for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 11046
+				int var2 = method442(var0, var1); // L: 11047
+				int var3 = var0.cs1ComparisonValues[var1]; // L: 11048
+				if (var0.cs1Comparisons[var1] == 2) { // L: 11049
+					if (var2 >= var3) { // L: 11050
+						return false;
+					}
+				} else if (var0.cs1Comparisons[var1] == 3) { // L: 11052
+					if (var2 <= var3) { // L: 11053
+						return false;
+					}
+				} else if (var0.cs1Comparisons[var1] == 4) { // L: 11055
+					if (var3 == var2) { // L: 11056
+						return false;
+					}
+				} else if (var3 != var2) { // L: 11058
+					return false;
+				}
+			}
 
-	@ObfuscatedName("ge")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "644552433"
-	)
-	static final int method404() {
-		if (class408.clientPreferences.roofsHidden) { // L: 5121
-			return GrandExchangeOfferTotalQuantityComparator.Client_plane;
-		} else {
-			int var0 = class392.getTileHeight(WorldMapSectionType.cameraX, class65.cameraZ, GrandExchangeOfferTotalQuantityComparator.Client_plane); // L: 5122
-			return var0 - class174.cameraY < 800 && (Tiles.Tiles_renderFlags[GrandExchangeOfferTotalQuantityComparator.Client_plane][WorldMapSectionType.cameraX >> 7][class65.cameraZ >> 7] & 4) != 0 ? GrandExchangeOfferTotalQuantityComparator.Client_plane : 3; // L: 5123 5124
+			return true; // L: 11060
 		}
 	}
 
-	@ObfuscatedName("ij")
+	@ObfuscatedName("jn")
 	@ObfuscatedSignature(
-		descriptor = "([Ljf;IIIIIIIII)V",
-		garbageValue = "-973397916"
+		descriptor = "(Ljm;II)I",
+		garbageValue = "-2117288569"
 	)
-	@Export("drawInterface")
-	static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9693
-		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9694
-
-		for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9695
-			Widget var10 = var0[var9]; // L: 9696
-			if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9697 9698
-				int var11;
-				if (var8 == -1) { // L: 9700
-					Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9701
-					Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9702
-					Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9703
-					Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9704
-					var11 = ++Client.rootWidgetCount - 1; // L: 9705
-				} else {
-					var11 = var8; // L: 9707
-				}
-
-				var10.rootIndex = var11; // L: 9708
-				var10.cycle = Client.cycle; // L: 9709
-				if (!var10.isIf3 || !Varcs.isComponentHidden(var10)) { // L: 9710
-					if (var10.contentType > 0) { // L: 9711
-						class137.method2826(var10);
+	static final int method442(Widget var0, int var1) {
+		if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 11064
+			try {
+				int[] var2 = var0.cs1Instructions[var1]; // L: 11066
+				int var3 = 0; // L: 11067
+				int var4 = 0; // L: 11068
+				byte var5 = 0; // L: 11069
+
+				while (true) {
+					int var6 = var2[var4++]; // L: 11071
+					int var7 = 0; // L: 11072
+					byte var8 = 0; // L: 11073
+					if (var6 == 0) { // L: 11074
+						return var3;
 					}
 
-					int var12 = var10.x + var6; // L: 9712
-					int var13 = var7 + var10.y; // L: 9713
-					int var14 = var10.transparencyTop; // L: 9714
-					int var15;
-					int var16;
-					if (var10 == Client.clickedWidget) { // L: 9715
-						if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9716
-							NPC.field1207 = var0; // L: 9717
-							Varcs.field1263 = var6; // L: 9718
-							class150.field1604 = var7; // L: 9719
-							continue; // L: 9720
-						}
+					if (var6 == 1) { // L: 11075
+						var7 = Client.currentLevels[var2[var4++]];
+					}
 
-						if (Client.isDraggingWidget && Client.field648) { // L: 9722
-							var15 = MouseHandler.MouseHandler_x; // L: 9723
-							var16 = MouseHandler.MouseHandler_y; // L: 9724
-							var15 -= Client.widgetClickX; // L: 9725
-							var16 -= Client.widgetClickY; // L: 9726
-							if (var15 < Client.field649) { // L: 9727
-								var15 = Client.field649;
-							}
+					if (var6 == 2) { // L: 11076
+						var7 = Client.levels[var2[var4++]];
+					}
 
-							if (var15 + var10.width > Client.field649 + Client.clickedWidgetParent.width) { // L: 9728
-								var15 = Client.field649 + Client.clickedWidgetParent.width - var10.width;
-							}
+					if (var6 == 3) { // L: 11077
+						var7 = Client.experience[var2[var4++]];
+					}
 
-							if (var16 < Client.field650) { // L: 9729
-								var16 = Client.field650;
+					int var9;
+					Widget var10;
+					int var11;
+					int var12;
+					if (var6 == 4) { // L: 11078
+						var9 = var2[var4++] << 16; // L: 11079
+						var9 += var2[var4++]; // L: 11080
+						var10 = ChatChannel.getWidget(var9); // L: 11081
+						var11 = var2[var4++]; // L: 11082
+						if (var11 != -1 && (!UserComparator6.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 11083
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 11084
+								if (var11 + 1 == var10.itemIds[var12]) { // L: 11085
+									var7 += var10.itemQuantities[var12];
+								}
 							}
+						}
+					}
 
-							if (var16 + var10.height > Client.field650 + Client.clickedWidgetParent.height) { // L: 9730
-								var16 = Client.field650 + Client.clickedWidgetParent.height - var10.height;
-							}
+					if (var6 == 5) { // L: 11089
+						var7 = Varps.Varps_main[var2[var4++]];
+					}
 
-							var12 = var15; // L: 9731
-							var13 = var16; // L: 9732
-						}
+					if (var6 == 6) { // L: 11090
+						var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
+					}
 
-						if (!var10.isScrollBar) { // L: 9734
-							var14 = 128;
-						}
+					if (var6 == 7) { // L: 11091
+						var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
 					}
 
-					int var17;
-					int var18;
-					int var19;
-					int var20;
-					int var21;
-					int var22;
-					if (var10.type == 2) { // L: 9740
-						var15 = var2; // L: 9741
-						var16 = var3; // L: 9742
-						var17 = var4; // L: 9743
-						var18 = var5; // L: 9744
-					} else if (var10.type == 9) { // L: 9746
-						var19 = var12; // L: 9747
-						var20 = var13; // L: 9748
-						var21 = var12 + var10.width; // L: 9749
-						var22 = var13 + var10.height; // L: 9750
-						if (var21 < var12) { // L: 9751
-							var19 = var21; // L: 9753
-							var21 = var12; // L: 9754
-						}
+					if (var6 == 8) { // L: 11092
+						var7 = class340.localPlayer.combatLevel;
+					}
 
-						if (var22 < var13) { // L: 9756
-							var20 = var22; // L: 9758
-							var22 = var13; // L: 9759
+					if (var6 == 9) { // L: 11093
+						for (var9 = 0; var9 < 25; ++var9) { // L: 11094
+							if (Skills.Skills_enabled[var9]) { // L: 11095
+								var7 += Client.levels[var9];
+							}
 						}
-
-						++var21; // L: 9761
-						++var22; // L: 9762
-						var15 = var19 > var2 ? var19 : var2; // L: 9763
-						var16 = var20 > var3 ? var20 : var3; // L: 9764
-						var17 = var21 < var4 ? var21 : var4; // L: 9765
-						var18 = var22 < var5 ? var22 : var5; // L: 9766
-					} else {
-						var19 = var12 + var10.width; // L: 9769
-						var20 = var13 + var10.height; // L: 9770
-						var15 = var12 > var2 ? var12 : var2; // L: 9771
-						var16 = var13 > var3 ? var13 : var3; // L: 9772
-						var17 = var19 < var4 ? var19 : var4; // L: 9773
-						var18 = var20 < var5 ? var20 : var5; // L: 9774
 					}
 
-					if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9776
-						if (var10.contentType != 0) { // L: 9777
-							if (var10.contentType == 1336) { // L: 9778
-								if (Client.displayFps) { // L: 9779
-									var13 += 15; // L: 9780
-									class6.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9781
-									var13 += 15; // L: 9782
-									Runtime var42 = Runtime.getRuntime(); // L: 9783
-									var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9784
-									var21 = 16776960; // L: 9785
-									if (var20 > 327680 && !Client.isLowDetail) { // L: 9786
-										var21 = 16711680;
-									}
-
-									class6.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9787
-									var13 += 15; // L: 9788
+					if (var6 == 10) { // L: 11098
+						var9 = var2[var4++] << 16; // L: 11099
+						var9 += var2[var4++]; // L: 11100
+						var10 = ChatChannel.getWidget(var9); // L: 11101
+						var11 = var2[var4++]; // L: 11102
+						if (var11 != -1 && (!UserComparator6.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 11103
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 11104
+								if (var11 + 1 == var10.itemIds[var12]) { // L: 11105
+									var7 = 999999999; // L: 11106
+									break; // L: 11107
 								}
-								continue;
 							}
+						}
+					}
 
-							if (var10.contentType == 1337) { // L: 9792
-								Client.viewportX = var12; // L: 9793
-								Client.viewportY = var13; // L: 9794
-								Projectile.drawEntities(var12, var13, var10.width, var10.height); // L: 9795
-								Client.field594[var10.rootIndex] = true; // L: 9796
-								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9797
-								continue; // L: 9798
-							}
+					if (var6 == 11) { // L: 11112
+						var7 = Client.runEnergy;
+					}
 
-							if (var10.contentType == 1338) { // L: 9800
-								WallDecoration.drawMinimap(var10, var12, var13, var11); // L: 9801
-								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9802
-								continue; // L: 9803
-							}
+					if (var6 == 12) { // L: 11113
+						var7 = Client.weight;
+					}
 
-							if (var10.contentType == 1339) { // L: 9805
-								GameObject.drawCompass(var10, var12, var13, var11); // L: 9806
-								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9807
-								continue; // L: 9808
-							}
+					if (var6 == 13) { // L: 11114
+						var9 = Varps.Varps_main[var2[var4++]]; // L: 11115
+						int var13 = var2[var4++]; // L: 11116
+						var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 11117
+					}
 
-							if (var10.contentType == 1400) { // L: 9810
-								class133.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9811
-							}
+					if (var6 == 14) { // L: 11119
+						var9 = var2[var4++]; // L: 11120
+						var7 = class273.getVarbit(var9); // L: 11121
+					}
 
-							if (var10.contentType == 1401) { // L: 9813
-								class133.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9814
-							}
+					if (var6 == 15) { // L: 11123
+						var8 = 1;
+					}
 
-							if (var10.contentType == 1402) { // L: 9816
-								Login.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9817
-							}
-						}
+					if (var6 == 16) { // L: 11124
+						var8 = 2;
+					}
 
-						if (var10.type == 0) { // L: 9820
-							if (!var10.isIf3 && Varcs.isComponentHidden(var10) && var10 != WorldMapData_0.mousedOverWidgetIf1) { // L: 9821
-								continue;
-							}
+					if (var6 == 17) { // L: 11125
+						var8 = 3;
+					}
 
-							if (!var10.isIf3) { // L: 9822
-								if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9823
-									var10.scrollY = var10.scrollHeight - var10.height;
-								}
+					if (var6 == 18) { // L: 11126
+						var7 = (class340.localPlayer.x >> 7) + class131.baseX;
+					}
 
-								if (var10.scrollY < 0) { // L: 9824
-									var10.scrollY = 0;
-								}
-							}
+					if (var6 == 19) { // L: 11127
+						var7 = (class340.localPlayer.y >> 7) + TileItem.baseY;
+					}
 
-							drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9826
-							if (var10.children != null) { // L: 9827
-								drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
-							}
+					if (var6 == 20) { // L: 11128
+						var7 = var2[var4++];
+					}
 
-							InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 9828
-							if (var30 != null) { // L: 9829
-								HorizontalAlignment.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9830
-							}
+					if (var8 == 0) { // L: 11129
+						if (var5 == 0) { // L: 11130
+							var3 += var7;
+						}
 
-							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9832
-							Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9833
+						if (var5 == 1) { // L: 11131
+							var3 -= var7;
 						}
 
-						if (Client.isResizable || Client.field651[var11] || Client.gameDrawingMode > 1) { // L: 9835
-							if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9836 9837
-								class92.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
-							}
+						if (var5 == 2 && var7 != 0) { // L: 11132
+							var3 /= var7;
+						}
 
-							if (var10.type != 1) { // L: 9839
-								int var23;
-								int var24;
-								int var25;
-								int var26;
-								if (var10.type == 2) { // L: 9842
-									var19 = 0; // L: 9843
-
-									for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9844
-										for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9845
-											var22 = var12 + var21 * (var10.paddingX + 32); // L: 9846
-											var23 = var13 + var20 * (var10.paddingY + 32); // L: 9847
-											if (var19 < 20) { // L: 9848
-												var22 += var10.inventoryXOffsets[var19]; // L: 9849
-												var23 += var10.inventoryYOffsets[var19]; // L: 9850
-											}
-
-											if (var10.itemIds[var19] <= 0) { // L: 9852
-												if (var10.inventorySprites != null && var19 < 20) { // L: 9897
-													SpritePixels var46 = var10.getInventorySprite(var19); // L: 9898
-													if (var46 != null) { // L: 9899
-														var46.drawTransBgAt(var22, var23);
-													} else if (Widget.field3049) { // L: 9900
-														class184.invalidateWidget(var10);
-													}
-												}
-											} else {
-												boolean var37 = false; // L: 9853
-												boolean var38 = false; // L: 9854
-												var26 = var10.itemIds[var19] - 1; // L: 9855
-												if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class247.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9856
-													SpritePixels var35;
-													if (Client.isItemSelected == 1 && var19 == ReflectionCheck.selectedItemSlot && var10.id == MouseHandler.selectedItemWidget) { // L: 9858
-														var35 = class117.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false);
-													} else {
-														var35 = class117.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9859
-													}
-
-													if (var35 != null) { // L: 9860
-														if (var10 == class247.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9861
-															var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9862
-															var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9863
-															if (var24 < 5 && var24 > -5) { // L: 9864
-																var24 = 0;
-															}
-
-															if (var25 < 5 && var25 > -5) { // L: 9865
-																var25 = 0;
-															}
-
-															if (Client.itemDragDuration < 5) { // L: 9866
-																var24 = 0; // L: 9867
-																var25 = 0; // L: 9868
-															}
-
-															var35.drawTransAt(var24 + var22, var25 + var23, 128); // L: 9870
-															if (var1 != -1) { // L: 9871
-																Widget var28 = var0[var1 & 65535]; // L: 9872
-																int var29;
-																if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9873
-																	var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field531 / 3; // L: 9874
-																	if (var29 > Client.field531 * 10) { // L: 9875
-																		var29 = Client.field531 * 10;
-																	}
-
-																	if (var29 > var28.scrollY) { // L: 9876
-																		var29 = var28.scrollY;
-																	}
-
-																	var28.scrollY -= var29; // L: 9877
-																	Client.draggedWidgetY += var29; // L: 9878
-																	class184.invalidateWidget(var28); // L: 9879
-																}
-
-																if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9881
-																	var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field531 / 3; // L: 9882
-																	if (var29 > Client.field531 * 10) { // L: 9883
-																		var29 = Client.field531 * 10;
-																	}
-
-																	if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9884
-																		var29 = var28.scrollHeight - var28.height - var28.scrollY;
-																	}
-
-																	var28.scrollY += var29; // L: 9885
-																	Client.draggedWidgetY -= var29; // L: 9886
-																	class184.invalidateWidget(var28); // L: 9887
-																}
-															}
-														} else if (var10 == WorldMapSection2.field2037 && var19 == Client.field577) { // L: 9891
-															var35.drawTransAt(var22, var23, 128);
-														} else {
-															var35.drawTransBgAt(var22, var23); // L: 9892
-														}
-													} else {
-														class184.invalidateWidget(var10); // L: 9894
-													}
-												}
-											}
-
-											++var19; // L: 9902
-										}
-									}
-								} else if (var10.type == 3) { // L: 9907
-									if (class128.runCs1(var10)) { // L: 9909
-										var19 = var10.color2; // L: 9910
-										if (var10 == WorldMapData_0.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9911
-											var19 = var10.mouseOverColor2;
-										}
-									} else {
-										var19 = var10.color; // L: 9914
-										if (var10 == WorldMapData_0.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9915
-											var19 = var10.mouseOverColor;
-										}
-									}
-
-									if (var10.fill) { // L: 9917
-										switch(var10.fillMode.field4379) { // L: 9918
-										case 1:
-											Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9920
-											break; // L: 9921
-										case 2:
-											Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9923
-											break; // L: 9924
-										default:
-											if (var14 == 0) { // L: 9926
-												Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19);
-											} else {
-												Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9927
-											}
-										}
-									} else if (var14 == 0) { // L: 9932
-										Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19);
-									} else {
-										Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9933
-									}
-								} else {
-									Font var39;
-									if (var10.type == 4) { // L: 9937
-										var39 = var10.getFont(); // L: 9938
-										if (var39 == null) { // L: 9939
-											if (Widget.field3049) { // L: 9940
-												class184.invalidateWidget(var10);
-											}
-										} else {
-											String var44 = var10.text; // L: 9944
-											if (class128.runCs1(var10)) { // L: 9945
-												var20 = var10.color2; // L: 9946
-												if (var10 == WorldMapData_0.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9947
-													var20 = var10.mouseOverColor2;
-												}
-
-												if (var10.text2.length() > 0) { // L: 9948
-													var44 = var10.text2;
-												}
-											} else {
-												var20 = var10.color; // L: 9951
-												if (var10 == WorldMapData_0.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9952
-													var20 = var10.mouseOverColor;
-												}
-											}
-
-											if (var10.isIf3 && var10.itemId != -1) { // L: 9954
-												ItemComposition var45 = TaskHandler.ItemDefinition_get(var10.itemId); // L: 9955
-												var44 = var45.name; // L: 9956
-												if (var44 == null) { // L: 9957
-													var44 = "null";
-												}
-
-												if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9958
-													var44 = MouseHandler.colorStartTag(16748608) + var44 + "</col>" + " " + 'x' + Tiles.formatItemStacks(var10.itemQuantity);
-												}
-											}
-
-											if (var10 == Client.meslayerContinueWidget) { // L: 9960
-												var44 = "Please wait..."; // L: 9961
-												var20 = var10.color; // L: 9962
-											}
-
-											if (!var10.isIf3) { // L: 9964
-												var44 = GrandExchangeEvent.method5449(var44, var10);
-											}
-
-											var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9965
-										}
-									} else if (var10.type == 5) { // L: 9968
-										SpritePixels var40;
-										if (!var10.isIf3) { // L: 9969
-											var40 = var10.getSprite(class128.runCs1(var10)); // L: 9970
-											if (var40 != null) { // L: 9971
-												var40.drawTransBgAt(var12, var13);
-											} else if (Widget.field3049) { // L: 9972
-												class184.invalidateWidget(var10);
-											}
-										} else {
-											if (var10.itemId != -1) { // L: 9976
-												var40 = class117.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
-											} else {
-												var40 = var10.getSprite(false); // L: 9977
-											}
-
-											if (var40 == null) { // L: 9978
-												if (Widget.field3049) { // L: 10002
-													class184.invalidateWidget(var10);
-												}
-											} else {
-												var20 = var40.width; // L: 9979
-												var21 = var40.height; // L: 9980
-												if (!var10.spriteTiling) { // L: 9981
-													var22 = var10.width * 4096 / var20; // L: 9995
-													if (var10.spriteAngle != 0) { // L: 9996
-														var40.method7445(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
-													} else if (var14 != 0) { // L: 9997
-														var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
-													} else if (var20 == var10.width && var21 == var10.height) { // L: 9998
-														var40.drawTransBgAt(var12, var13); // L: 9999
-													} else {
-														var40.drawScaledAt(var12, var13, var10.width, var10.height);
-													}
-												} else {
-													Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9982
-													var22 = (var20 - 1 + var10.width) / var20; // L: 9983
-													var23 = (var21 - 1 + var10.height) / var21; // L: 9984
-
-													for (var24 = 0; var24 < var22; ++var24) { // L: 9985
-														for (var25 = 0; var25 < var23; ++var25) { // L: 9986
-															if (var10.spriteAngle != 0) { // L: 9987
-																var40.method7445(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096);
-															} else if (var14 != 0) { // L: 9988
-																var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255));
-															} else {
-																var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); // L: 9989
-															}
-														}
-													}
-
-													Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9992
-												}
-											}
-										}
-									} else {
-										ItemComposition var33;
-										if (var10.type == 6) { // L: 10006
-											boolean var36 = class128.runCs1(var10); // L: 10007
-											if (var36) { // L: 10009
-												var20 = var10.sequenceId2;
-											} else {
-												var20 = var10.sequenceId; // L: 10010
-											}
-
-											Model var41 = null; // L: 10011
-											var22 = 0; // L: 10012
-											if (var10.itemId != -1) { // L: 10013
-												var33 = TaskHandler.ItemDefinition_get(var10.itemId); // L: 10014
-												if (var33 != null) { // L: 10015
-													var33 = var33.getCountObj(var10.itemQuantity); // L: 10016
-													var41 = var33.getModel(1); // L: 10017
-													if (var41 != null) { // L: 10018
-														var41.calculateBoundsCylinder(); // L: 10019
-														var22 = var41.height / 2; // L: 10020
-													} else {
-														class184.invalidateWidget(var10); // L: 10022
-													}
-												}
-											} else if (var10.modelType == 5) { // L: 10025
-												if (var10.modelId == 0) { // L: 10026
-													var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
-												} else {
-													var41 = HealthBarDefinition.localPlayer.getModel(); // L: 10027
-												}
-											} else if (var20 == -1) { // L: 10029
-												var41 = var10.getModel((SequenceDefinition)null, -1, var36, HealthBarDefinition.localPlayer.appearance); // L: 10030
-												if (var41 == null && Widget.field3049) { // L: 10031
-													class184.invalidateWidget(var10);
-												}
-											} else {
-												SequenceDefinition var47 = MouseHandler.SequenceDefinition_get(var20); // L: 10034
-												var41 = var10.getModel(var47, var10.modelFrame, var36, HealthBarDefinition.localPlayer.appearance); // L: 10035
-												if (var41 == null && Widget.field3049) { // L: 10036
-													class184.invalidateWidget(var10);
-												}
-											}
-
-											Rasterizer3D.method4205(var10.width / 2 + var12, var10.height / 2 + var13); // L: 10038
-											var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10039
-											var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 10040
-											if (var41 != null) { // L: 10041
-												if (!var10.isIf3) { // L: 10042
-													var41.method4539(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
-												} else {
-													var41.calculateBoundsCylinder(); // L: 10044
-													if (var10.modelOrthog) { // L: 10045
-														var41.method4525(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
-													} else {
-														var41.method4539(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 10046
-													}
-												}
-											}
-
-											Rasterizer3D.Rasterizer3D_method3(); // L: 10049
-										} else {
-											if (var10.type == 7) { // L: 10052
-												var39 = var10.getFont(); // L: 10053
-												if (var39 == null) { // L: 10054
-													if (Widget.field3049) { // L: 10055
-														class184.invalidateWidget(var10);
-													}
-													continue;
-												}
-
-												var20 = 0; // L: 10058
-
-												for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 10059
-													for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 10060
-														if (var10.itemIds[var20] > 0) { // L: 10061
-															var33 = TaskHandler.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 10062
-															String var34;
-															if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 10064
-																var34 = MouseHandler.colorStartTag(16748608) + var33.name + "</col>"; // L: 10065
-															} else {
-																var34 = MouseHandler.colorStartTag(16748608) + var33.name + "</col>" + " " + 'x' + Tiles.formatItemStacks(var10.itemQuantities[var20]);
-															}
-
-															var25 = var12 + var22 * (var10.paddingX + 115); // L: 10066
-															var26 = var13 + (var10.paddingY + 12) * var21; // L: 10067
-															if (var10.textXAlignment == 0) { // L: 10068
-																var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
-															} else if (var10.textXAlignment == 1) { // L: 10069
-																var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
-															} else {
-																var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 10070
-															}
-														}
-
-														++var20; // L: 10072
-													}
-												}
-											}
-
-											if (var10.type == 8 && var10 == Skills.field3247 && Client.field621 == Client.field714) { // L: 10076 10077
-												var19 = 0; // L: 10078
-												var20 = 0; // L: 10079
-												Font var31 = class6.fontPlain12; // L: 10080
-												String var32 = var10.text; // L: 10081
-
-												String var43;
-												for (var32 = GrandExchangeEvent.method5449(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 10083 10084 10096
-													var24 = var32.indexOf("<br>"); // L: 10085
-													if (var24 != -1) { // L: 10086
-														var43 = var32.substring(0, var24); // L: 10087
-														var32 = var32.substring(var24 + 4); // L: 10088
-													} else {
-														var43 = var32; // L: 10091
-														var32 = ""; // L: 10092
-													}
-
-													var25 = var31.stringWidth(var43); // L: 10094
-													if (var25 > var19) { // L: 10095
-														var19 = var25;
-													}
-												}
-
-												var19 += 6; // L: 10098
-												var20 += 7; // L: 10099
-												var24 = var12 + var10.width - 5 - var19; // L: 10100
-												var25 = var13 + var10.height + 5; // L: 10101
-												if (var24 < var12 + 5) { // L: 10102
-													var24 = var12 + 5;
-												}
-
-												if (var24 + var19 > var4) { // L: 10103
-													var24 = var4 - var19;
-												}
-
-												if (var25 + var20 > var5) { // L: 10104
-													var25 = var5 - var20;
-												}
-
-												Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 10105
-												Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 10106
-												var32 = var10.text; // L: 10107
-												var26 = var25 + var31.ascent + 2; // L: 10108
-
-												for (var32 = GrandExchangeEvent.method5449(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 10109 10110 10121
-													int var27 = var32.indexOf("<br>"); // L: 10111
-													if (var27 != -1) { // L: 10112
-														var43 = var32.substring(0, var27); // L: 10113
-														var32 = var32.substring(var27 + 4); // L: 10114
-													} else {
-														var43 = var32; // L: 10117
-														var32 = ""; // L: 10118
-													}
-
-													var31.draw(var43, var24 + 3, var26, 0, -1); // L: 10120
-												}
-											}
-
-											if (var10.type == 9) { // L: 10125
-												if (var10.field3085) { // L: 10130
-													var19 = var12; // L: 10131
-													var20 = var13 + var10.height; // L: 10132
-													var21 = var12 + var10.width; // L: 10133
-													var22 = var13; // L: 10134
-												} else {
-													var19 = var12; // L: 10137
-													var20 = var13; // L: 10138
-													var21 = var12 + var10.width; // L: 10139
-													var22 = var13 + var10.height; // L: 10140
-												}
-
-												if (var10.lineWid == 1) { // L: 10142
-													Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 10143
-												} else {
-													class392.method6872(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 10146
-												}
-											}
-										}
-									}
-								}
-							}
+						if (var5 == 3) { // L: 11133
+							var3 *= var7;
 						}
+
+						var5 = 0; // L: 11134
+					} else {
+						var5 = var8; // L: 11136
 					}
 				}
+			} catch (Exception var14) { // L: 11139
+				return -1; // L: 11140
 			}
+		} else {
+			return -2;
 		}
-
-	} // L: 10151
+	}
 }
diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java
deleted file mode 100644
index 87a4e535fc..0000000000
--- a/runescape-client/src/main/java/class280.java
+++ /dev/null
@@ -1,81 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jq")
-public class class280 {
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;II[BII)I",
-		garbageValue = "-16158109"
-	)
-	@Export("encodeStringCp1252")
-	public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
-		int var5 = var2 - var1; // L: 74
-
-		for (int var6 = 0; var6 < var5; ++var6) { // L: 75
-			char var7 = var0.charAt(var6 + var1); // L: 76
-			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 77
-				var3[var6 + var4] = (byte)var7;
-			} else if (var7 == 8364) { // L: 78
-				var3[var6 + var4] = -128;
-			} else if (var7 == 8218) { // L: 79
-				var3[var6 + var4] = -126;
-			} else if (var7 == 402) { // L: 80
-				var3[var6 + var4] = -125;
-			} else if (var7 == 8222) { // L: 81
-				var3[var6 + var4] = -124;
-			} else if (var7 == 8230) { // L: 82
-				var3[var6 + var4] = -123;
-			} else if (var7 == 8224) { // L: 83
-				var3[var6 + var4] = -122;
-			} else if (var7 == 8225) { // L: 84
-				var3[var6 + var4] = -121;
-			} else if (var7 == 710) { // L: 85
-				var3[var6 + var4] = -120;
-			} else if (var7 == 8240) { // L: 86
-				var3[var6 + var4] = -119;
-			} else if (var7 == 352) { // L: 87
-				var3[var6 + var4] = -118;
-			} else if (var7 == 8249) { // L: 88
-				var3[var6 + var4] = -117;
-			} else if (var7 == 338) { // L: 89
-				var3[var6 + var4] = -116;
-			} else if (var7 == 381) { // L: 90
-				var3[var6 + var4] = -114;
-			} else if (var7 == 8216) { // L: 91
-				var3[var6 + var4] = -111;
-			} else if (var7 == 8217) { // L: 92
-				var3[var6 + var4] = -110;
-			} else if (var7 == 8220) { // L: 93
-				var3[var6 + var4] = -109;
-			} else if (var7 == 8221) { // L: 94
-				var3[var6 + var4] = -108;
-			} else if (var7 == 8226) { // L: 95
-				var3[var6 + var4] = -107;
-			} else if (var7 == 8211) { // L: 96
-				var3[var6 + var4] = -106;
-			} else if (var7 == 8212) {
-				var3[var6 + var4] = -105; // L: 97
-			} else if (var7 == 732) { // L: 98
-				var3[var6 + var4] = -104;
-			} else if (var7 == 8482) { // L: 99
-				var3[var6 + var4] = -103;
-			} else if (var7 == 353) { // L: 100
-				var3[var6 + var4] = -102;
-			} else if (var7 == 8250) { // L: 101
-				var3[var6 + var4] = -101;
-			} else if (var7 == 339) { // L: 102
-				var3[var6 + var4] = -100;
-			} else if (var7 == 382) { // L: 103
-				var3[var6 + var4] = -98;
-			} else if (var7 == 376) { // L: 104
-				var3[var6 + var4] = -97;
-			} else {
-				var3[var6 + var4] = 63; // L: 105
-			}
-		}
-
-		return var5; // L: 107
-	}
-}
diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java
index 74b84b59ef..ec18b333e6 100644
--- a/runescape-client/src/main/java/class281.java
+++ b/runescape-client/src/main/java/class281.java
@@ -1,23 +1,155 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ja")
+@ObfuscatedName("je")
 public class class281 {
-	static {
-		int var0 = 0; // L: 9
-		int var1 = 0; // L: 10
-		class276[] var2 = new class276[]{class276.field3282, class276.field3280}; // L: 14
-		class276[] var3 = var2; // L: 16
+	@ObfuscatedName("rq")
+	@ObfuscatedSignature(
+		descriptor = "Lap;"
+	)
+	@Export("pcmStreamMixer")
+	static PcmStreamMixer pcmStreamMixer;
+	@ObfuscatedName("mj")
+	@ObfuscatedSignature(
+		descriptor = "Ljm;"
+	)
+	static Widget field3375;
 
-		for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17
-			class276 var5 = var3[var4]; // L: 18
-			if (var5.field3279 > var0) { // L: 20
-				var0 = var5.field3279;
+	@ObfuscatedName("kx")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "1649545590"
+	)
+	@Export("changeGameOptions")
+	static final void changeGameOptions(int var0) {
+		UserComparator6.method2551(); // L: 12161
+		ObjectComposition.method3540(); // L: 12162
+		int var1 = SecureRandomCallable.VarpDefinition_get(var0).type; // L: 12163
+		if (var1 != 0) { // L: 12164
+			int var2 = Varps.Varps_main[var0]; // L: 12165
+			if (var1 == 1) { // L: 12166
+				if (var2 == 1) { // L: 12167
+					InterfaceParent.method2142(0.9D);
+				}
+
+				if (var2 == 2) { // L: 12168
+					InterfaceParent.method2142(0.8D);
+				}
+
+				if (var2 == 3) { // L: 12169
+					InterfaceParent.method2142(0.7D);
+				}
+
+				if (var2 == 4) { // L: 12170
+					InterfaceParent.method2142(0.6D);
+				}
 			}
 
-			if (var5.field3281 > var1) { // L: 21
-				var1 = var5.field3281;
+			if (var1 == 3) { // L: 12172
+				if (var2 == 0) { // L: 12173
+					Varcs.method2426(255);
+				}
+
+				if (var2 == 1) { // L: 12174
+					Varcs.method2426(192);
+				}
+
+				if (var2 == 2) { // L: 12175
+					Varcs.method2426(128);
+				}
+
+				if (var2 == 3) { // L: 12176
+					Varcs.method2426(64);
+				}
+
+				if (var2 == 4) { // L: 12177
+					Varcs.method2426(0);
+				}
+			}
+
+			if (var1 == 4) { // L: 12179
+				if (var2 == 0) { // L: 12180
+					class20.updateSoundEffectVolume(127);
+				}
+
+				if (var2 == 1) { // L: 12181
+					class20.updateSoundEffectVolume(96);
+				}
+
+				if (var2 == 2) { // L: 12182
+					class20.updateSoundEffectVolume(64);
+				}
+
+				if (var2 == 3) { // L: 12183
+					class20.updateSoundEffectVolume(32);
+				}
+
+				if (var2 == 4) { // L: 12184
+					class20.updateSoundEffectVolume(0);
+				}
+			}
+
+			if (var1 == 5) { // L: 12186
+				Client.leftClickOpensMenu = var2;
+			}
+
+			if (var1 == 6) { // L: 12187
+				Client.chatEffects = var2;
 			}
-		}
 
-	} // L: 25
+			if (var1 == 9) { // L: 12188
+				Client.field641 = var2;
+			}
+
+			if (var1 == 10) { // L: 12189
+				if (var2 == 0) { // L: 12190
+					Players.method2383(127);
+				}
+
+				if (var2 == 1) { // L: 12191
+					Players.method2383(96);
+				}
+
+				if (var2 == 2) { // L: 12192
+					Players.method2383(64);
+				}
+
+				if (var2 == 3) { // L: 12193
+					Players.method2383(32);
+				}
+
+				if (var2 == 4) { // L: 12194
+					Players.method2383(0);
+				}
+			}
+
+			if (var1 == 17) { // L: 12196
+				Client.followerIndex = var2 & 65535; // L: 12197
+			}
+
+			if (var1 == 18) { // L: 12199
+				Client.playerAttackOption = (AttackOption)class130.findEnumerated(FloorUnderlayDefinition.method3376(), var2); // L: 12200
+				if (Client.playerAttackOption == null) { // L: 12201
+					Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+				}
+			}
+
+			if (var1 == 19) { // L: 12203
+				if (var2 == -1) { // L: 12204
+					Client.combatTargetPlayerIndex = -1;
+				} else {
+					Client.combatTargetPlayerIndex = var2 & 2047; // L: 12205
+				}
+			}
+
+			if (var1 == 22) { // L: 12207
+				Client.npcAttackOption = (AttackOption)class130.findEnumerated(FloorUnderlayDefinition.method3376(), var2); // L: 12208
+				if (Client.npcAttackOption == null) { // L: 12209
+					Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+				}
+			}
+
+		}
+	} // L: 12211
 }
diff --git a/runescape-client/src/main/java/class282.java b/runescape-client/src/main/java/class282.java
new file mode 100644
index 0000000000..48a13ff6e6
--- /dev/null
+++ b/runescape-client/src/main/java/class282.java
@@ -0,0 +1,64 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ja")
+public enum class282 implements MouseWheel {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lja;"
+	)
+	field3377(0),
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lja;"
+	)
+	field3376(1),
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lja;"
+	)
+	field3378(2),
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lja;"
+	)
+	field3379(3),
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Lja;"
+	)
+	field3380(4);
+
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = 1590225627
+	)
+	final int field3381;
+
+	class282(int var3) {
+		this.field3381 = var3; // L: 14
+	} // L: 15
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "48"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field3381; // L: 19
+	}
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(B)Lbw;",
+		garbageValue = "-51"
+	)
+	@Export("worldListStart")
+	static World worldListStart() {
+		World.World_listCount = 0; // L: 237
+		return Canvas.getNextWorldListWorld(); // L: 238
+	}
+}
diff --git a/runescape-client/src/main/java/class283.java b/runescape-client/src/main/java/class283.java
deleted file mode 100644
index 7e6b24a7b4..0000000000
--- a/runescape-client/src/main/java/class283.java
+++ /dev/null
@@ -1,83 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ju")
-public enum class283 implements MouseWheel {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lju;"
-	)
-	field3638(-1),
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lju;"
-	)
-	field3640(0),
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lju;"
-	)
-	field3639(1),
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lju;"
-	)
-	field3637(2);
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("Widget_archive")
-	public static AbstractArchive Widget_archive;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = 534862973
-	)
-	final int field3636;
-
-	class283(int var3) {
-		this.field3636 = var3; // L: 19
-	} // L: 20
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
-	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field3636; // L: 23
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Low;",
-		garbageValue = "113976049"
-	)
-	static SpritePixels[] method5221() {
-		SpritePixels[] var0 = new SpritePixels[class414.SpriteBuffer_spriteCount]; // L: 173
-
-		for (int var1 = 0; var1 < class414.SpriteBuffer_spriteCount; ++var1) { // L: 174
-			SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 175
-			var2.width = class414.SpriteBuffer_spriteWidth; // L: 176
-			var2.height = class414.SpriteBuffer_spriteHeight; // L: 177
-			var2.xOffset = class414.SpriteBuffer_xOffsets[var1]; // L: 178
-			var2.yOffset = class414.SpriteBuffer_yOffsets[var1]; // L: 179
-			var2.subWidth = UrlRequester.SpriteBuffer_spriteWidths[var1]; // L: 180
-			var2.subHeight = class414.SpriteBuffer_spriteHeights[var1]; // L: 181
-			int var3 = var2.subHeight * var2.subWidth; // L: 182
-			byte[] var4 = class295.SpriteBuffer_pixels[var1]; // L: 183
-			var2.pixels = new int[var3]; // L: 184
-
-			for (int var5 = 0; var5 < var3; ++var5) { // L: 185
-				var2.pixels[var5] = HitSplatDefinition.SpriteBuffer_spritePalette[var4[var5] & 255];
-			}
-		}
-
-		PacketBuffer.method6913(); // L: 187
-		return var0; // L: 188
-	}
-}
diff --git a/runescape-client/src/main/java/class285.java b/runescape-client/src/main/java/class285.java
new file mode 100644
index 0000000000..0a3af45ea8
--- /dev/null
+++ b/runescape-client/src/main/java/class285.java
@@ -0,0 +1,26 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("js")
+public class class285 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lcp;I)V",
+		garbageValue = "1760908657"
+	)
+	@Export("runScriptEvent")
+	public static void runScriptEvent(ScriptEvent var0) {
+		ScriptFrame.runScript(var0, 500000, 475000); // L: 110
+	} // L: 111
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(II)[B",
+		garbageValue = "581875220"
+	)
+	@Export("ByteArrayPool_getArray")
+	public static synchronized byte[] ByteArrayPool_getArray(int var0) {
+		return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 92
+	}
+}
diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java
new file mode 100644
index 0000000000..b7fb349753
--- /dev/null
+++ b/runescape-client/src/main/java/class286.java
@@ -0,0 +1,44 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@Deprecated
+@ObfuscatedName("kf")
+public final class class286 {
+	@ObfuscatedName("hm")
+	@ObfuscatedSignature(
+		descriptor = "[Lpl;"
+	)
+	@Export("headIconPkSprites")
+	static SpritePixels[] headIconPkSprites;
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(IIIZIZI)V",
+		garbageValue = "2058183094"
+	)
+	@Export("doWorldSorting")
+	static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
+		if (var0 < var1) { // L: 177
+			int var6 = (var0 + var1) / 2; // L: 178
+			int var7 = var0; // L: 179
+			World var8 = class334.World_worlds[var6]; // L: 180
+			class334.World_worlds[var6] = class334.World_worlds[var1]; // L: 181
+			class334.World_worlds[var1] = var8; // L: 182
+
+			for (int var9 = var0; var9 < var1; ++var9) { // L: 183
+				if (UserComparator4.method2506(class334.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184
+					World var10 = class334.World_worlds[var9]; // L: 185
+					class334.World_worlds[var9] = class334.World_worlds[var7]; // L: 186
+					class334.World_worlds[var7++] = var10; // L: 187
+				}
+			}
+
+			class334.World_worlds[var1] = class334.World_worlds[var7]; // L: 191
+			class334.World_worlds[var7] = var8; // L: 192
+			doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193
+			doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194
+		}
+
+	} // L: 196
+}
diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java
new file mode 100644
index 0000000000..d9b1ded89f
--- /dev/null
+++ b/runescape-client/src/main/java/class287.java
@@ -0,0 +1,8 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ks")
+public class class287 {
+	static {
+		Math.sqrt(8192.0D); // L: 9
+	} // L: 10
+}
diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java
new file mode 100644
index 0000000000..411f1b1996
--- /dev/null
+++ b/runescape-client/src/main/java/class288.java
@@ -0,0 +1,51 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kt")
+public class class288 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lkt;"
+	)
+	static final class288 field3436;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lkt;"
+	)
+	static final class288 field3438;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 1235911729
+	)
+	final int field3435;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -901346455
+	)
+	final int field3437;
+
+	static {
+		field3436 = new class288(51, 27, 800, 0, 16, 16); // L: 29
+		field3438 = new class288(25, 28, 800, 656, 40, 40); // L: 30
+	}
+
+	class288(int var1, int var2, int var3, int var4, int var5, int var6) {
+		this.field3435 = var5; // L: 39
+		this.field3437 = var6; // L: 40
+	} // L: 41
+
+	@ObfuscatedName("is")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "1635698499"
+	)
+	@Export("resumePauseWidget")
+	static void resumePauseWidget(int var0, int var1) {
+		PacketBufferNode var2 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2873, Client.packetWriter.isaacCipher); // L: 9896
+		var2.packetBuffer.method7349(var1); // L: 9897
+		var2.packetBuffer.method7407(var0); // L: 9898
+		Client.packetWriter.addNode(var2); // L: 9899
+	} // L: 9900
+}
diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java
index e5788c9e6a..70fc092b38 100644
--- a/runescape-client/src/main/java/class29.java
+++ b/runescape-client/src/main/java/class29.java
@@ -1,74 +1,228 @@
 import java.applet.Applet;
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("al")
+@ObfuscatedName("an")
 public class class29 {
-	@ObfuscatedName("rp")
-	static boolean field162;
-	@ObfuscatedName("i")
-	static Applet field157;
-	@ObfuscatedName("w")
-	static String field158;
-	@ObfuscatedName("p")
+	@ObfuscatedName("rs")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
+		descriptor = "Lpl;"
 	)
-	static IndexedSprite field159;
+	@Export("sceneMinimapSprite")
+	static SpritePixels sceneMinimapSprite;
+	@ObfuscatedName("c")
+	public static Applet field172;
+	@ObfuscatedName("b")
+	public static String field177;
 
 	static {
-		field157 = null; // L: 10
-		field158 = ""; // L: 11
+		field172 = null; // L: 10
+		field177 = ""; // L: 11
 	}
 
-	@ObfuscatedName("ia")
+	@ObfuscatedName("fd")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-2136894012"
+		descriptor = "(II)V",
+		garbageValue = "534236872"
 	)
-	static final void method414() {
-		boolean var0 = false; // L: 9261
-
-		while (!var0) { // L: 9262
-			var0 = true; // L: 9263
-
-			for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9264
-				if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 9265
-					String var2 = Client.menuTargets[var1]; // L: 9266
-					Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9267
-					Client.menuTargets[var1 + 1] = var2; // L: 9268
-					String var3 = Client.menuActions[var1]; // L: 9269
-					Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9270
-					Client.menuActions[var1 + 1] = var3; // L: 9271
-					int var4 = Client.menuOpcodes[var1]; // L: 9272
-					Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9273
-					Client.menuOpcodes[var1 + 1] = var4; // L: 9274
-					var4 = Client.menuArguments1[var1]; // L: 9275
-					Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9276
-					Client.menuArguments1[var1 + 1] = var4; // L: 9277
-					var4 = Client.menuArguments2[var1]; // L: 9278
-					Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9279
-					Client.menuArguments2[var1 + 1] = var4; // L: 9280
-					var4 = Client.menuIdentifiers[var1]; // L: 9281
-					Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9282
-					Client.menuIdentifiers[var1 + 1] = var4; // L: 9283
-					boolean var5 = Client.menuShiftClick[var1]; // L: 9284
-					Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9285
-					Client.menuShiftClick[var1 + 1] = var5; // L: 9286
-					var0 = false; // L: 9287
+	@Export("getLoginError")
+	static void getLoginError(int var0) {
+		if (var0 == -3) { // L: 3454
+			class19.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
+		} else if (var0 == -2) { // L: 3455
+			class19.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
+		} else if (var0 == -1) { // L: 3456
+			class19.setLoginResponseString("No response from server.", "Please try using a different world.", "");
+		} else if (var0 == 3) { // L: 3457
+			PlayerType.method5521(3); // L: 3458
+			Login.field872 = 1; // L: 3459
+		} else if (var0 == 4) { // L: 3461
+			PlayerType.method5521(14); // L: 3463
+			Login.field871 = 0; // L: 3464
+		} else if (var0 == 5) { // L: 3467
+			Login.field872 = 2; // L: 3468
+			class19.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 3469
+		} else if (var0 == 68 || !Client.onMobile && var0 == 6) { // L: 3471
+			class19.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 3472
+		} else if (var0 == 7) { // L: 3474
+			class19.setLoginResponseString("This world is full.", "Please use a different world.", "");
+		} else if (var0 == 8) { // L: 3475
+			class19.setLoginResponseString("Unable to connect.", "Login server offline.", "");
+		} else if (var0 == 9) { // L: 3476
+			class19.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
+		} else if (var0 == 10) { // L: 3477
+			class19.setLoginResponseString("Unable to connect.", "Bad session id.", "");
+		} else if (var0 == 11) { // L: 3478
+			class19.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
+		} else if (var0 == 12) { // L: 3479
+			class19.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
+		} else if (var0 == 13) { // L: 3480
+			class19.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
+		} else if (var0 == 14) { // L: 3481
+			class19.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
+		} else if (var0 == 16) { // L: 3482
+			class19.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
+		} else if (var0 == 17) { // L: 3483
+			class19.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
+		} else if (var0 == 18) { // L: 3484
+			PlayerType.method5521(14); // L: 3486
+			Login.field871 = 1; // L: 3487
+		} else if (var0 == 19) { // L: 3490
+			class19.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
+		} else if (var0 == 20) { // L: 3491
+			class19.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
+		} else if (var0 == 22) { // L: 3492
+			class19.setLoginResponseString("Malformed login packet.", "Please try again.", "");
+		} else if (var0 == 23) { // L: 3493
+			class19.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
+		} else if (var0 == 24) { // L: 3494
+			class19.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
+		} else if (var0 == 25) { // L: 3495
+			class19.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
+		} else if (var0 == 26) { // L: 3496
+			class19.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
+		} else if (var0 == 27) { // L: 3497
+			class19.setLoginResponseString("", "Service unavailable.", "");
+		} else if (var0 == 31) { // L: 3498
+			class19.setLoginResponseString("Your account must have a displayname set", "in order to play the game.  Please set it", "via the website, or the main game.");
+		} else if (var0 == 32) {
+			class19.setLoginResponseString("Your attempt to log into your account was", "unsuccessful.  Don't worry, you can sort", "this out by visiting the billing system."); // L: 3499
+		} else if (var0 == 37) { // L: 3500
+			class19.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
+		} else if (var0 == 38) { // L: 3501
+			class19.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
+		} else if (var0 == 55) { // L: 3502
+			PlayerType.method5521(8); // L: 3503
+		} else {
+			if (var0 == 56) { // L: 3505
+				class19.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 3506
+				VertexNormal.updateGameState(11); // L: 3507
+				return; // L: 3508
+			}
+
+			if (var0 == 57) { // L: 3510
+				class19.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 3511
+				VertexNormal.updateGameState(11); // L: 3512
+				return; // L: 3513
+			}
+
+			if (var0 == 61) { // L: 3515
+				PlayerType.method5521(7); // L: 3516
+			} else {
+				if (var0 == 62) { // L: 3518
+					VertexNormal.updateGameState(10); // L: 3519
+					PlayerType.method5521(9); // L: 3520
+					class19.setLoginResponseString("Login attempt timed out.", "Please try again.", ""); // L: 3521
+					return; // L: 3522
 				}
+
+				if (var0 == 63) { // L: 3524
+					VertexNormal.updateGameState(10); // L: 3525
+					PlayerType.method5521(9); // L: 3526
+					class19.setLoginResponseString("You were signed out.", "Please sign in again.", ""); // L: 3527
+					return; // L: 3528
+				}
+
+				if (var0 == 65 || var0 == 67) { // L: 3530
+					VertexNormal.updateGameState(10); // L: 3531
+					PlayerType.method5521(9); // L: 3532
+					class19.setLoginResponseString("Failed to login.", "Please try again.", ""); // L: 3533
+					return; // L: 3534
+				}
+
+				class19.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 3536
 			}
 		}
 
-	} // L: 9291
+		VertexNormal.updateGameState(10); // L: 3537
+		if (Client.field508.method7605()) { // L: 3538
+			PlayerType.method5521(9); // L: 3539
+		}
+
+	} // L: 3541
+
+	@ObfuscatedName("jf")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;IIZI)V",
+		garbageValue = "-1480983977"
+	)
+	@Export("alignWidgetSize")
+	static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
+		int var4 = var0.width; // L: 10955
+		int var5 = var0.height; // L: 10956
+		if (var0.widthAlignment == 0) { // L: 10957
+			var0.width = var0.rawWidth;
+		} else if (var0.widthAlignment == 1) { // L: 10958
+			var0.width = var1 - var0.rawWidth;
+		} else if (var0.widthAlignment == 2) { // L: 10959
+			var0.width = var0.rawWidth * var1 >> 14;
+		}
+
+		if (var0.heightAlignment == 0) { // L: 10960
+			var0.height = var0.rawHeight;
+		} else if (var0.heightAlignment == 1) { // L: 10961
+			var0.height = var2 - var0.rawHeight;
+		} else if (var0.heightAlignment == 2) { // L: 10962
+			var0.height = var2 * var0.rawHeight >> 14;
+		}
+
+		if (var0.widthAlignment == 4) { // L: 10963
+			var0.width = var0.height * var0.field3242 / var0.field3243;
+		}
+
+		if (var0.heightAlignment == 4) { // L: 10964
+			var0.height = var0.field3243 * var0.width / var0.field3242;
+		}
+
+		if (var0.contentType == 1337) { // L: 10965
+			Client.viewportWidget = var0;
+		}
+
+		if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10966
+			ScriptEvent var6 = new ScriptEvent(); // L: 10967
+			var6.widget = var0; // L: 10968
+			var6.args = var0.onResize; // L: 10969
+			Client.scriptEvents.addFirst(var6); // L: 10970
+		}
+
+	} // L: 10972
 
-	@ObfuscatedName("lu")
+	@ObfuscatedName("kt")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1998570042"
+		descriptor = "(Ljm;III)V",
+		garbageValue = "83568708"
 	)
-	static void method413() {
-		Client.packetWriter.addNode(AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2742, Client.packetWriter.isaacCipher)); // L: 12016
-		Client.oculusOrbState = 0; // L: 12017
-	} // L: 12018
+	@Export("clickWidget")
+	static final void clickWidget(Widget var0, int var1, int var2) {
+		if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 11914
+			if (var0 != null) { // L: 11916
+				Widget var4 = SpotAnimationDefinition.method3340(var0); // L: 11919
+				if (var4 == null) { // L: 11920
+					var4 = var0.parent;
+				}
+
+				if (var4 != null) { // L: 11923
+					Client.clickedWidget = var0; // L: 11927
+					var4 = SpotAnimationDefinition.method3340(var0); // L: 11930
+					if (var4 == null) { // L: 11931
+						var4 = var0.parent;
+					}
+
+					Client.clickedWidgetParent = var4; // L: 11934
+					Client.widgetClickX = var1; // L: 11935
+					Client.widgetClickY = var2; // L: 11936
+					class87.widgetDragDuration = 0; // L: 11937
+					Client.isDraggingWidget = false; // L: 11938
+					int var6 = Client.menuOptionsCount - 1; // L: 11941
+					if (var6 != -1) { // L: 11944
+						class16.method239(var6);
+					}
+
+					return; // L: 11945
+				}
+			}
+
+		}
+	} // L: 11925
 }
diff --git a/runescape-client/src/main/java/class291.java b/runescape-client/src/main/java/class291.java
new file mode 100644
index 0000000000..1d9d5405b2
--- /dev/null
+++ b/runescape-client/src/main/java/class291.java
@@ -0,0 +1,341 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ky")
+public class class291 {
+	@ObfuscatedName("gr")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIB)V",
+		garbageValue = "-109"
+	)
+	@Export("drawEntities")
+	static final void drawEntities(int var0, int var1, int var2, int var3) {
+		++Client.viewportDrawCount; // L: 5147
+		ReflectionCheck.method664(); // L: 5148
+		class9.method88(); // L: 5149
+		if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 5151
+			Buddy.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 5152
+		}
+
+		MouseHandler.addNpcsToScene(true); // L: 5155
+		int var4 = Players.Players_count; // L: 5157
+		int[] var5 = Players.Players_indices; // L: 5158
+
+		int var6;
+		for (var6 = 0; var6 < var4; ++var6) { // L: 5159
+			if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 5160
+				Buddy.addPlayerToScene(Client.players[var5[var6]], true); // L: 5161
+			}
+		}
+
+		MouseHandler.addNpcsToScene(false); // L: 5164
+
+		for (Projectile var30 = (Projectile)Client.projectiles.last(); var30 != null; var30 = (Projectile)Client.projectiles.previous()) { // L: 5166 5167 5184
+			if (var30.plane == class20.Client_plane && Client.cycle <= var30.cycleEnd) { // L: 5168
+				if (Client.cycle >= var30.cycleStart) { // L: 5169
+					if (var30.targetIndex > 0) { // L: 5170
+						NPC var34 = Client.npcs[var30.targetIndex - 1]; // L: 5171
+						if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { // L: 5172
+							var30.setDestination(var34.x, var34.y, FaceNormal.getTileHeight(var34.x, var34.y, var30.plane) - var30.endHeight, Client.cycle);
+						}
+					}
+
+					if (var30.targetIndex < 0) { // L: 5174
+						var6 = -var30.targetIndex - 1; // L: 5176
+						Player var35;
+						if (var6 == Client.localPlayerIndex) { // L: 5177
+							var35 = class340.localPlayer;
+						} else {
+							var35 = Client.players[var6]; // L: 5178
+						}
+
+						if (var35 != null && var35.x >= 0 && var35.x < 13312 && var35.y >= 0 && var35.y < 13312) { // L: 5179
+							var30.setDestination(var35.x, var35.y, FaceNormal.getTileHeight(var35.x, var35.y, var30.plane) - var30.endHeight, Client.cycle);
+						}
+					}
+
+					var30.advance(Client.field538); // L: 5181
+					class7.scene.drawEntity(class20.Client_plane, (int)var30.x, (int)var30.y, (int)var30.z, 60, var30, var30.yaw, -1L, false); // L: 5182
+				}
+			} else {
+				var30.remove();
+			}
+		}
+
+		class33.method656(); // L: 5187
+		WorldMapDecoration.setViewportShape(var0, var1, var2, var3, true); // L: 5188
+		var0 = Client.viewportOffsetX; // L: 5189
+		var1 = Client.viewportOffsetY; // L: 5190
+		var2 = Client.viewportWidth; // L: 5191
+		var3 = Client.viewportHeight; // L: 5192
+		Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5193
+		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 5194
+		var4 = Client.camAngleX; // L: 5195
+		if (Client.field562 / 256 > var4) { // L: 5196
+			var4 = Client.field562 / 256;
+		}
+
+		if (Client.field725[4] && Client.field679[4] + 128 > var4) { // L: 5197
+			var4 = Client.field679[4] + 128;
+		}
+
+		int var31 = Client.camAngleY & 2047; // L: 5198
+		class6.method50(class7.oculusOrbFocalPointX, MouseHandler.field231, Actor.oculusOrbFocalPointY, var4, var31, class142.method2958(var4), var3); // L: 5199
+		if (!Client.isCameraLocked) { // L: 5201
+			var6 = AbstractWorldMapIcon.method4862();
+		} else {
+			var6 = UserComparator7.method2518(); // L: 5202
+		}
+
+		int var7 = UserComparator7.cameraX; // L: 5203
+		int var8 = AbstractByteArrayCopier.cameraY; // L: 5204
+		int var9 = UserComparator10.cameraZ; // L: 5205
+		int var10 = UserComparator7.cameraPitch; // L: 5206
+		int var11 = class379.cameraYaw; // L: 5207
+
+		int var12;
+		int var13;
+		for (var12 = 0; var12 < 5; ++var12) { // L: 5208
+			if (Client.field725[var12]) { // L: 5209
+				var13 = (int)(Math.random() * (double)(Client.field726[var12] * 2 + 1) - (double)Client.field726[var12] + Math.sin((double)Client.field618[var12] / 100.0D * (double)Client.field729[var12]) * (double)Client.field679[var12]); // L: 5210
+				if (var12 == 0) { // L: 5211
+					UserComparator7.cameraX += var13;
+				}
+
+				if (var12 == 1) { // L: 5212
+					AbstractByteArrayCopier.cameraY += var13;
+				}
+
+				if (var12 == 2) { // L: 5213
+					UserComparator10.cameraZ += var13;
+				}
+
+				if (var12 == 3) { // L: 5214
+					class379.cameraYaw = var13 + class379.cameraYaw & 2047;
+				}
+
+				if (var12 == 4) { // L: 5215
+					UserComparator7.cameraPitch += var13; // L: 5216
+					if (UserComparator7.cameraPitch < 128) { // L: 5217
+						UserComparator7.cameraPitch = 128;
+					}
+
+					if (UserComparator7.cameraPitch > 383) { // L: 5218
+						UserComparator7.cameraPitch = 383;
+					}
+				}
+			}
+		}
+
+		var12 = MouseHandler.MouseHandler_x; // L: 5222
+		var13 = MouseHandler.MouseHandler_y; // L: 5223
+		if (MouseHandler.MouseHandler_lastButton != 0) { // L: 5224
+			var12 = MouseHandler.MouseHandler_lastPressedX; // L: 5225
+			var13 = MouseHandler.MouseHandler_lastPressedY; // L: 5226
+		}
+
+		int var14;
+		if (var12 >= var0 && var12 < var0 + var2 && var13 >= var1 && var13 < var3 + var1) { // L: 5228
+			var14 = var12 - var0; // L: 5229
+			int var15 = var13 - var1; // L: 5230
+			ViewportMouse.ViewportMouse_x = var14; // L: 5232
+			ViewportMouse.ViewportMouse_y = var15; // L: 5233
+			ViewportMouse.ViewportMouse_isInViewport = true; // L: 5234
+			ViewportMouse.ViewportMouse_entityCount = 0; // L: 5235
+			ViewportMouse.ViewportMouse_false0 = false; // L: 5236
+		} else {
+			class135.method2832(); // L: 5240
+		}
+
+		class148.playPcmPlayers(); // L: 5242
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 5243
+		class148.playPcmPlayers(); // L: 5244
+		var14 = Rasterizer3D.Rasterizer3D_zoom; // L: 5245
+		Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 5246
+		class7.scene.draw(UserComparator7.cameraX, AbstractByteArrayCopier.cameraY, UserComparator10.cameraZ, UserComparator7.cameraPitch, class379.cameraYaw, var6); // L: 5247
+		Rasterizer3D.Rasterizer3D_zoom = var14; // L: 5248
+		class148.playPcmPlayers(); // L: 5249
+		class7.scene.clearTempGameObjects(); // L: 5250
+		Client.overheadTextCount = 0; // L: 5252
+		boolean var36 = false; // L: 5253
+		int var16 = -1; // L: 5254
+		int var17 = -1; // L: 5255
+		int var18 = Players.Players_count; // L: 5256
+		int[] var19 = Players.Players_indices; // L: 5257
+
+		int var20;
+		for (var20 = 0; var20 < var18 + Client.npcCount; ++var20) { // L: 5258
+			Object var33;
+			if (var20 < var18) { // L: 5260
+				var33 = Client.players[var19[var20]]; // L: 5261
+				if (var19[var20] == Client.combatTargetPlayerIndex) { // L: 5262
+					var36 = true; // L: 5263
+					var16 = var20; // L: 5264
+					continue;
+				}
+
+				if (var33 == class340.localPlayer) { // L: 5267
+					var17 = var20; // L: 5268
+					continue; // L: 5269
+				}
+			} else {
+				var33 = Client.npcs[Client.npcIndices[var20 - var18]]; // L: 5272
+			}
+
+			class148.drawActor2d((Actor)var33, var20, var0, var1, var2, var3); // L: 5273
+		}
+
+		if (Client.renderSelf && var17 != -1) { // L: 5275
+			class148.drawActor2d(class340.localPlayer, var17, var0, var1, var2, var3); // L: 5276
+		}
+
+		if (var36) { // L: 5278
+			class148.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var16, var0, var1, var2, var3); // L: 5279
+		}
+
+		for (var20 = 0; var20 < Client.overheadTextCount; ++var20) { // L: 5281
+			int var21 = Client.overheadTextXs[var20]; // L: 5282
+			int var22 = Client.overheadTextYs[var20]; // L: 5283
+			int var23 = Client.overheadTextXOffsets[var20]; // L: 5284
+			int var24 = Client.overheadTextAscents[var20]; // L: 5285
+			boolean var25 = true; // L: 5286
+
+			while (var25) {
+				var25 = false; // L: 5288
+
+				for (int var32 = 0; var32 < var20; ++var32) { // L: 5289
+					if (var22 + 2 > Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] && var22 - var24 < Client.overheadTextYs[var32] + 2 && var21 - var23 < Client.overheadTextXOffsets[var32] + Client.overheadTextXs[var32] && var23 + var21 > Client.overheadTextXs[var32] - Client.overheadTextXOffsets[var32] && Client.overheadTextYs[var32] - Client.overheadTextAscents[var32] < var22) { // L: 5290 5291
+						var22 = Client.overheadTextYs[var32] - Client.overheadTextAscents[var32]; // L: 5292
+						var25 = true; // L: 5293
+					}
+				}
+			}
+
+			Client.viewportTempX = Client.overheadTextXs[var20]; // L: 5298
+			Client.viewportTempY = Client.overheadTextYs[var20] = var22; // L: 5299
+			String var26 = Client.overheadText[var20]; // L: 5300
+			if (Client.chatEffects == 0) { // L: 5301
+				int var27 = 16776960; // L: 5302
+				if (Client.overheadTextColors[var20] < 6) { // L: 5303
+					var27 = Client.field749[Client.overheadTextColors[var20]];
+				}
+
+				if (Client.overheadTextColors[var20] == 6) { // L: 5304
+					var27 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
+				}
+
+				if (Client.overheadTextColors[var20] == 7) { // L: 5305
+					var27 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
+				}
+
+				if (Client.overheadTextColors[var20] == 8) { // L: 5306
+					var27 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
+				}
+
+				int var28;
+				if (Client.overheadTextColors[var20] == 9) { // L: 5307
+					var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 5308
+					if (var28 < 50) { // L: 5309
+						var27 = var28 * 1280 + 16711680;
+					} else if (var28 < 100) { // L: 5310
+						var27 = 16776960 - (var28 - 50) * 327680;
+					} else if (var28 < 150) { // L: 5311
+						var27 = (var28 - 100) * 5 + 65280;
+					}
+				}
+
+				if (Client.overheadTextColors[var20] == 10) { // L: 5313
+					var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 5314
+					if (var28 < 50) { // L: 5315
+						var27 = var28 * 5 + 16711680;
+					} else if (var28 < 100) { // L: 5316
+						var27 = 16711935 - (var28 - 50) * 327680;
+					} else if (var28 < 150) { // L: 5317
+						var27 = (var28 - 100) * 327680 + 255 - (var28 - 100) * 5;
+					}
+				}
+
+				if (Client.overheadTextColors[var20] == 11) { // L: 5319
+					var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 5320
+					if (var28 < 50) { // L: 5321
+						var27 = 16777215 - var28 * 327685;
+					} else if (var28 < 100) { // L: 5322
+						var27 = (var28 - 50) * 327685 + 65280;
+					} else if (var28 < 150) { // L: 5323
+						var27 = 16777215 - (var28 - 100) * 327680;
+					}
+				}
+
+				if (Client.overheadTextEffects[var20] == 0) { // L: 5325
+					class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0);
+				}
+
+				if (Client.overheadTextEffects[var20] == 1) { // L: 5326
+					class136.fontBold12.drawCenteredWave(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount);
+				}
+
+				if (Client.overheadTextEffects[var20] == 2) { // L: 5327
+					class136.fontBold12.drawCenteredWave2(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount);
+				}
+
+				if (Client.overheadTextEffects[var20] == 3) { // L: 5328
+					class136.fontBold12.drawCenteredShake(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, var27, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var20]);
+				}
+
+				if (Client.overheadTextEffects[var20] == 4) { // L: 5329
+					var28 = (150 - Client.overheadTextCyclesRemaining[var20]) * (class136.fontBold12.stringWidth(var26) + 100) / 150; // L: 5330
+					Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 5331
+					class136.fontBold12.draw(var26, var0 + Client.viewportTempX + 50 - var28, Client.viewportTempY + var1, var27, 0); // L: 5332
+					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5333
+				}
+
+				if (Client.overheadTextEffects[var20] == 5) { // L: 5335
+					var28 = 150 - Client.overheadTextCyclesRemaining[var20]; // L: 5336
+					int var29 = 0; // L: 5337
+					if (var28 < 25) { // L: 5338
+						var29 = var28 - 25;
+					} else if (var28 > 125) { // L: 5339
+						var29 = var28 - 125;
+					}
+
+					Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class136.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 5340
+					class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, var29 + Client.viewportTempY + var1, var27, 0); // L: 5341
+					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5342
+				}
+			} else {
+				class136.fontBold12.drawCentered(var26, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 5346
+			}
+		}
+
+		ArchiveDiskAction.method5527(var0, var1); // L: 5350
+		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field538); // L: 5351
+		class336.method6228(var0, var1, var2, var3); // L: 5352
+		UserComparator7.cameraX = var7; // L: 5353
+		AbstractByteArrayCopier.cameraY = var8; // L: 5354
+		UserComparator10.cameraZ = var9; // L: 5355
+		UserComparator7.cameraPitch = var10; // L: 5356
+		class379.cameraYaw = var11; // L: 5357
+		if (Client.isLoading && class14.method214(true, false) == 0) { // L: 5358
+			Client.isLoading = false;
+		}
+
+		if (Client.isLoading) { // L: 5359
+			Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 5360
+			ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); // L: 5361
+		}
+
+	} // L: 5363
+
+	@ObfuscatedName("lb")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "94"
+	)
+	static void method5502() {
+		if (Client.oculusOrbState == 1) { // L: 12688
+			Client.field612 = true; // L: 12689
+		}
+
+	} // L: 12691
+}
diff --git a/runescape-client/src/main/java/class292.java b/runescape-client/src/main/java/class292.java
new file mode 100644
index 0000000000..2c188e9bbc
--- /dev/null
+++ b/runescape-client/src/main/java/class292.java
@@ -0,0 +1,60 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kp")
+public class class292 {
+	static {
+		int var0 = 0; // L: 9
+		int var1 = 0; // L: 10
+		class288[] var2 = class213.method4355(); // L: 12
+
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13
+			class288 var4 = var2[var3]; // L: 14
+			if (var4.field3435 > var0) {
+				var0 = var4.field3435; // L: 16
+			}
+
+			if (var4.field3437 > var1) { // L: 17
+				var1 = var4.field3437;
+			}
+		}
+
+	} // L: 21
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "([Ljava/lang/String;[IIII)V",
+		garbageValue = "-862238795"
+	)
+	public static void method5504(String[] var0, int[] var1, int var2, int var3) {
+		if (var2 < var3) { // L: 43
+			int var4 = (var3 + var2) / 2; // L: 44
+			int var5 = var2; // L: 45
+			String var6 = var0[var4]; // L: 46
+			var0[var4] = var0[var3]; // L: 47
+			var0[var3] = var6; // L: 48
+			int var7 = var1[var4]; // L: 49
+			var1[var4] = var1[var3]; // L: 50
+			var1[var3] = var7; // L: 51
+
+			for (int var8 = var2; var8 < var3; ++var8) { // L: 52
+				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 53
+					String var9 = var0[var8]; // L: 54
+					var0[var8] = var0[var5]; // L: 55
+					var0[var5] = var9; // L: 56
+					int var10 = var1[var8]; // L: 57
+					var1[var8] = var1[var5]; // L: 58
+					var1[var5++] = var10; // L: 59
+				}
+			}
+
+			var0[var3] = var0[var5]; // L: 63
+			var0[var5] = var6; // L: 64
+			var1[var3] = var1[var5]; // L: 65
+			var1[var5] = var7; // L: 66
+			method5504(var0, var1, var2, var5 - 1); // L: 67
+			method5504(var0, var1, var5 + 1, var3); // L: 68
+		}
+
+	} // L: 70
+}
diff --git a/runescape-client/src/main/java/class295.java b/runescape-client/src/main/java/class295.java
index 03fd4c9bf2..3040def82e 100644
--- a/runescape-client/src/main/java/class295.java
+++ b/runescape-client/src/main/java/class295.java
@@ -1,16 +1,274 @@
+import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kb")
-public class class295 {
-	@ObfuscatedName("j")
-	@Export("SpriteBuffer_pixels")
-	public static byte[][] SpriteBuffer_pixels;
-	@ObfuscatedName("k")
+@ObfuscatedName("kr")
+public enum class295 implements MouseWheel {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lkr;"
+	)
+	field3790(-1),
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lkr;"
+	)
+	field3789(0),
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lkr;"
+	)
+	field3793(1),
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lkr;"
+	)
+	field3791(2);
+
+	@ObfuscatedName("ak")
+	@Export("client")
+	@ObfuscatedSignature(
+		descriptor = "Lclient;"
+	)
+	static Client client;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 2057880945
+		intValue = 1445944371
+	)
+	final int field3792;
+
+	class295(int var3) {
+		this.field3792 = var3; // L: 15
+	} // L: 16
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
-	@Export("Interpreter_stringStackSize")
-	static int Interpreter_stringStackSize;
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field3792; // L: 20
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "1999955592"
+	)
+	public static boolean method5515() {
+		long var0 = Ignored.method6459(); // L: 42
+		int var2 = (int)(var0 - UserComparator7.field1319); // L: 43
+		UserComparator7.field1319 = var0; // L: 44
+		if (var2 > 200) { // L: 45
+			var2 = 200;
+		}
+
+		NetCache.NetCache_loadTime += var2; // L: 46
+		if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47
+			return true;
+		} else if (NetCache.NetCache_socket == null) { // L: 48
+			return false;
+		} else {
+			try {
+				if (NetCache.NetCache_loadTime > 30000) { // L: 50
+					throw new IOException();
+				} else {
+					NetFileRequest var3;
+					Buffer var4;
+					while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51
+						var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52
+						var4 = new Buffer(4); // L: 53
+						var4.writeByte(1); // L: 54
+						var4.writeMedium((int)var3.key); // L: 55
+						NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 56
+						NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57
+						--NetCache.NetCache_pendingPriorityWritesCount; // L: 58
+						++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59
+					}
+
+					while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61
+						var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62
+						var4 = new Buffer(4); // L: 63
+						var4.writeByte(0); // L: 64
+						var4.writeMedium((int)var3.key); // L: 65
+						NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 66
+						var3.removeDual(); // L: 67
+						NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68
+						--NetCache.NetCache_pendingWritesCount; // L: 69
+						++NetCache.NetCache_pendingResponsesCount; // L: 70
+					}
+
+					for (int var15 = 0; var15 < 100; ++var15) { // L: 72
+						int var16 = NetCache.NetCache_socket.available(); // L: 73
+						if (var16 < 0) { // L: 74
+							throw new IOException();
+						}
+
+						if (var16 == 0) { // L: 75
+							break;
+						}
+
+						NetCache.NetCache_loadTime = 0; // L: 76
+						byte var5 = 0; // L: 77
+						if (class279.NetCache_currentResponse == null) { // L: 78
+							var5 = 8;
+						} else if (NetCache.field3863 == 0) { // L: 79
+							var5 = 1;
+						}
+
+						int var6;
+						int var7;
+						int var8;
+						int var10;
+						byte[] var10000;
+						int var10001;
+						Buffer var22;
+						if (var5 > 0) { // L: 80
+							var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81
+							if (var6 > var16) { // L: 82
+								var6 = var16;
+							}
+
+							NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83
+							if (NetCache.field3866 != 0) { // L: 84
+								for (var7 = 0; var7 < var6; ++var7) { // L: 85
+									var10000 = NetCache.NetCache_responseHeaderBuffer.array;
+									var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset;
+									var10000[var10001] ^= NetCache.field3866;
+								}
+							}
+
+							var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87
+							var22.offset += var6;
+							if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88
+								break;
+							}
+
+							if (class279.NetCache_currentResponse == null) { // L: 89
+								NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90
+								var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91
+								var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92
+								int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93
+								var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94
+								long var11 = (long)(var8 + (var7 << 16)); // L: 95
+								NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96
+								class21.field116 = true; // L: 97
+								if (var13 == null) { // L: 98
+									var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99
+									class21.field116 = false; // L: 100
+								}
+
+								if (var13 == null) { // L: 102
+									throw new IOException(); // L: 103
+								}
+
+								int var14 = var9 == 0 ? 5 : 9; // L: 105
+								class279.NetCache_currentResponse = var13; // L: 106
+								class149.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class279.NetCache_currentResponse.padding); // L: 107
+								class149.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108
+								class149.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109
+								NetCache.field3863 = 8; // L: 110
+								NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111
+							} else if (NetCache.field3863 == 0) { // L: 114
+								if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115
+									NetCache.field3863 = 1; // L: 116
+									NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117
+								} else {
+									class279.NetCache_currentResponse = null; // L: 121
+								}
+							}
+						} else {
+							var6 = class149.NetCache_responseArchiveBuffer.array.length - class279.NetCache_currentResponse.padding; // L: 127
+							var7 = 512 - NetCache.field3863; // L: 128
+							if (var7 > var6 - class149.NetCache_responseArchiveBuffer.offset) { // L: 129
+								var7 = var6 - class149.NetCache_responseArchiveBuffer.offset;
+							}
+
+							if (var7 > var16) { // L: 130
+								var7 = var16;
+							}
+
+							NetCache.NetCache_socket.read(class149.NetCache_responseArchiveBuffer.array, class149.NetCache_responseArchiveBuffer.offset, var7); // L: 131
+							if (NetCache.field3866 != 0) { // L: 132
+								for (var8 = 0; var8 < var7; ++var8) { // L: 133
+									var10000 = class149.NetCache_responseArchiveBuffer.array;
+									var10001 = class149.NetCache_responseArchiveBuffer.offset + var8;
+									var10000[var10001] ^= NetCache.field3866;
+								}
+							}
+
+							var22 = class149.NetCache_responseArchiveBuffer; // L: 135
+							var22.offset += var7;
+							NetCache.field3863 += var7; // L: 136
+							if (var6 == class149.NetCache_responseArchiveBuffer.offset) { // L: 137
+								if (16711935L == class279.NetCache_currentResponse.key) { // L: 138
+									WorldMapLabel.NetCache_reference = class149.NetCache_responseArchiveBuffer; // L: 139
+
+									for (var8 = 0; var8 < 256; ++var8) { // L: 140
+										Archive var17 = NetCache.NetCache_archives[var8]; // L: 141
+										if (var17 != null) { // L: 142
+											WorldMapLabel.NetCache_reference.offset = var8 * 8 + 5; // L: 143
+											var10 = WorldMapLabel.NetCache_reference.readInt(); // L: 144
+											int var18 = WorldMapLabel.NetCache_reference.readInt(); // L: 145
+											var17.loadIndex(var10, var18); // L: 146
+										}
+									}
+								} else {
+									NetCache.NetCache_crc.reset(); // L: 151
+									NetCache.NetCache_crc.update(class149.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152
+									var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153
+									if (var8 != class279.NetCache_currentResponse.crc) { // L: 154
+										try {
+											NetCache.NetCache_socket.close(); // L: 156
+										} catch (Exception var20) { // L: 158
+										}
+
+										++NetCache.NetCache_crcMismatches; // L: 159
+										NetCache.NetCache_socket = null; // L: 160
+										NetCache.field3866 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161
+										return false; // L: 162
+									}
+
+									NetCache.NetCache_crcMismatches = 0; // L: 164
+									NetCache.NetCache_ioExceptions = 0; // L: 165
+									class279.NetCache_currentResponse.archive.write((int)(class279.NetCache_currentResponse.key & 65535L), class149.NetCache_responseArchiveBuffer.array, 16711680L == (class279.NetCache_currentResponse.key & 16711680L), class21.field116); // L: 166
+								}
+
+								class279.NetCache_currentResponse.remove(); // L: 168
+								if (class21.field116) { // L: 169
+									--NetCache.NetCache_pendingPriorityResponsesCount;
+								} else {
+									--NetCache.NetCache_pendingResponsesCount; // L: 170
+								}
+
+								NetCache.field3863 = 0; // L: 171
+								class279.NetCache_currentResponse = null; // L: 172
+								class149.NetCache_responseArchiveBuffer = null; // L: 173
+							} else {
+								if (NetCache.field3863 != 512) { // L: 175
+									break;
+								}
+
+								NetCache.field3863 = 0;
+							}
+						}
+					}
+
+					return true; // L: 179
+				}
+			} catch (IOException var21) {
+				try {
+					NetCache.NetCache_socket.close(); // L: 183
+				} catch (Exception var19) { // L: 185
+				}
+
+				++NetCache.NetCache_ioExceptions; // L: 186
+				NetCache.NetCache_socket = null; // L: 187
+				return false; // L: 188
+			}
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java
index f725669eb3..23e18bfff3 100644
--- a/runescape-client/src/main/java/class3.java
+++ b/runescape-client/src/main/java/class3.java
@@ -1,11 +1,11 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("a")
+@ObfuscatedName("m")
 public interface class3 {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)Lop;"
+		descriptor = "(Lpi;)Lpi;"
 	)
-	Buffer vmethod18(Buffer var1);
+	Buffer vmethod15(Buffer var1);
 }
diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java
deleted file mode 100644
index a25f03a6b5..0000000000
--- a/runescape-client/src/main/java/class300.java
+++ /dev/null
@@ -1,389 +0,0 @@
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("kv")
-public class class300 {
-	@ObfuscatedName("j")
-	static int[] field3765;
-	@ObfuscatedName("h")
-	@Export("BZip2Decompressor_block")
-	static int[] BZip2Decompressor_block;
-	@ObfuscatedName("i")
-	@Export("spriteMap")
-	final HashMap spriteMap;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lmo;"
-	)
-	@Export("bounds")
-	Bounds bounds;
-	@ObfuscatedName("s")
-	int[] field3761;
-	@ObfuscatedName("a")
-	int[] field3760;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = -204507217
-	)
-	int field3762;
-
-	public class300() {
-		this.spriteMap = new HashMap(); // L: 10
-		this.bounds = new Bounds(0, 0); // L: 11
-		this.field3761 = new int[2048]; // L: 12
-		this.field3760 = new int[2048]; // L: 13
-		this.field3762 = 0; // L: 14
-		UserComparator6.method2513(); // L: 21
-	} // L: 22
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1928494539"
-	)
-	void method5487(int var1) {
-		int var2 = var1 * 2 + 1;
-		double var4 = (double)((float)var1 / 3.0F);
-		int var6 = var1 * 2 + 1;
-		double[] var7 = new double[var6];
-		int var8 = -var1;
-
-		for (int var9 = 0; var8 <= var1; ++var9) {
-			var7[var9] = PacketWriter.method2425((double)var8, 0.0D, var4);
-			++var8; // L: 52
-		}
-
-		double[] var14 = var7; // L: 57
-		double var15 = var7[var1] * var7[var1]; // L: 58
-		int[] var17 = new int[var2 * var2];
-		boolean var10 = false; // L: 60
-
-		for (int var11 = 0; var11 < var2; ++var11) {
-			for (int var12 = 0; var12 < var2; ++var12) { // L: 62
-				int var13 = var17[var12 + var2 * var11] = (int)(var14[var12] * var14[var11] / var15 * 256.0D);
-				if (!var10 && var13 > 0) {
-					var10 = true;
-				}
-			}
-		}
-
-		SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 69
-		this.spriteMap.put(var1, var18);
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(II)Low;",
-		garbageValue = "-975153988"
-	)
-	SpritePixels method5488(int var1) {
-		if (!this.spriteMap.containsKey(var1)) {
-			this.method5487(var1);
-		}
-
-		return (SpritePixels)this.spriteMap.get(var1); // L: 77
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "262729"
-	)
-	public final void method5498(int var1, int var2) {
-		if (this.field3762 < this.field3761.length) {
-			this.field3761[this.field3762] = var1;
-			this.field3760[this.field3762] = var2;
-			++this.field3762; // L: 84
-		}
-	}
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1224368993"
-	)
-	public final void method5490() {
-		this.field3762 = 0;
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(IILow;FB)V",
-		garbageValue = "-58"
-	)
-	public final void method5491(int var1, int var2, SpritePixels var3, float var4) {
-		int var5 = (int)(18.0F * var4);
-		SpritePixels var6 = this.method5488(var5); // L: 93
-		int var7 = var5 * 2 + 1; // L: 94
-		Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight);
-		Bounds var9 = new Bounds(0, 0);
-		this.bounds.setHigh(var7, var7); // L: 97
-		System.nanoTime();
-
-		int var10;
-		int var11;
-		int var12;
-		for (var10 = 0; var10 < this.field3762; ++var10) { // L: 99
-			var11 = this.field3761[var10];
-			var12 = this.field3760[var10];
-			int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 102
-			int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5;
-			this.bounds.setLow(var13, var14);
-			this.bounds.method6353(var8, var9);
-			this.method5494(var6, var3, var9);
-		}
-
-		System.nanoTime(); // L: 108
-		System.nanoTime();
-
-		for (var10 = 0; var10 < var3.pixels.length; ++var10) {
-			if (var3.pixels[var10] == 0) {
-				var3.pixels[var10] = -16777216;
-			} else {
-				var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 115
-				if (var11 <= 0) {
-					var3.pixels[var10] = -16777216;
-				} else {
-					if (var11 > field3765.length) {
-						var11 = field3765.length;
-					}
-
-					var12 = field3765[var11 - 1];
-					var3.pixels[var10] = -16777216 | var12;
-				}
-			}
-		}
-
-		System.nanoTime();
-	} // L: 125
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(Low;Low;Lmo;B)V",
-		garbageValue = "-61"
-	)
-	void method5494(SpritePixels var1, SpritePixels var2, Bounds var3) {
-		if (var3.highX != 0 && var3.highY != 0) { // L: 128
-			int var4 = 0; // L: 129
-			int var5 = 0;
-			if (var3.lowX == 0) {
-				var4 = var1.subWidth - var3.highX;
-			}
-
-			if (var3.lowY == 0) {
-				var5 = var1.subHeight - var3.highY;
-			}
-
-			int var6 = var4 + var5 * var1.subWidth; // L: 133
-			int var7 = var2.subWidth * var3.lowY + var3.lowX;
-
-			for (int var8 = 0; var8 < var3.highY; ++var8) {
-				for (int var9 = 0; var9 < var3.highX; ++var9) {
-					int[] var10000 = var2.pixels; // L: 137
-					int var10001 = var7++;
-					var10000[var10001] += var1.pixels[var6++];
-				}
-
-				var6 += var1.subWidth - var3.highX; // L: 139
-				var7 += var2.subWidth - var3.highX;
-			}
-
-		}
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V",
-		garbageValue = "-2012491010"
-	)
-	public static void method5507(String var0, String var1, int var2, int var3) throws IOException {
-		ItemContainer.idxCount = var3; // L: 40
-		JagexCache.cacheGamebuild = var2; // L: 41
-
-		try {
-			JagexCache.operatingSystemName = System.getProperty("os.name"); // L: 43
-		} catch (Exception var27) { // L: 45
-			JagexCache.operatingSystemName = "Unknown"; // L: 46
-		}
-
-		class176.formattedOperatingSystemName = JagexCache.operatingSystemName.toLowerCase(); // L: 48
-
-		try {
-			TriBool.userHomeDirectory = System.getProperty("user.home"); // L: 50
-			if (TriBool.userHomeDirectory != null) { // L: 51
-				TriBool.userHomeDirectory = TriBool.userHomeDirectory + "/";
-			}
-		} catch (Exception var26) { // L: 53
-		}
-
-		try {
-			if (class176.formattedOperatingSystemName.startsWith("win")) { // L: 55
-				if (TriBool.userHomeDirectory == null) { // L: 56
-					TriBool.userHomeDirectory = System.getenv("USERPROFILE");
-				}
-			} else if (TriBool.userHomeDirectory == null) { // L: 59
-				TriBool.userHomeDirectory = System.getenv("HOME");
-			}
-
-			if (TriBool.userHomeDirectory != null) { // L: 61
-				TriBool.userHomeDirectory = TriBool.userHomeDirectory + "/";
-			}
-		} catch (Exception var25) { // L: 63
-		}
-
-		if (TriBool.userHomeDirectory == null) { // L: 64
-			TriBool.userHomeDirectory = "~/";
-		}
-
-		NPC.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", TriBool.userHomeDirectory, "/tmp/", ""}; // L: 65
-		AbstractRasterProvider.cacheSubPaths = new String[]{".jagex_cache_" + JagexCache.cacheGamebuild, ".file_store_" + JagexCache.cacheGamebuild}; // L: 66
-		int var18 = 0;
-
-		label232:
-		while (var18 < 4) {
-			String var6 = var18 == 0 ? "" : "" + var18; // L: 70
-			class351.JagexCache_locationFile = new File(TriBool.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71
-			String var7 = null; // L: 72
-			String var8 = null; // L: 73
-			boolean var9 = false; // L: 74
-			File var32;
-			if (class351.JagexCache_locationFile.exists()) { // L: 75
-				try {
-					AccessFile var10 = new AccessFile(class351.JagexCache_locationFile, "rw", 10000L); // L: 78
-
-					Buffer var11;
-					int var12;
-					for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { // L: 79 80 83
-						var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); // L: 81
-						if (var12 == -1) { // L: 82
-							throw new IOException();
-						}
-					}
-
-					var11.offset = 0; // L: 85
-					var12 = var11.readUnsignedByte(); // L: 86
-					if (var12 < 1 || var12 > 3) { // L: 87
-						throw new IOException("" + var12);
-					}
-
-					int var13 = 0; // L: 88
-					if (var12 > 1) { // L: 89
-						var13 = var11.readUnsignedByte();
-					}
-
-					if (var12 <= 2) { // L: 90
-						var7 = var11.readStringCp1252NullCircumfixed(); // L: 91
-						if (var13 == 1) { // L: 92
-							var8 = var11.readStringCp1252NullCircumfixed();
-						}
-					} else {
-						var7 = var11.readCESU8(); // L: 95
-						if (var13 == 1) { // L: 96
-							var8 = var11.readCESU8();
-						}
-					}
-
-					var10.close(); // L: 98
-				} catch (IOException var29) { // L: 100
-					var29.printStackTrace(); // L: 101
-				}
-
-				if (var7 != null) { // L: 103
-					var32 = new File(var7); // L: 104
-					if (!var32.exists()) { // L: 105
-						var7 = null; // L: 106
-					}
-				}
-
-				if (var7 != null) { // L: 109
-					var32 = new File(var7, "test.dat"); // L: 110
-					if (!Varcs.method2359(var32, true)) { // L: 111
-						var7 = null; // L: 112
-					}
-				}
-			}
-
-			if (var7 == null && var18 == 0) { // L: 116
-				label207:
-				for (int var19 = 0; var19 < AbstractRasterProvider.cacheSubPaths.length; ++var19) { // L: 117
-					for (int var20 = 0; var20 < NPC.cacheParentPaths.length; ++var20) { // L: 118
-						File var21 = new File(NPC.cacheParentPaths[var20] + AbstractRasterProvider.cacheSubPaths[var19] + File.separatorChar + var0 + File.separatorChar); // L: 119
-						if (var21.exists() && Varcs.method2359(new File(var21, "test.dat"), true)) { // L: 120 121
-							var7 = var21.toString(); // L: 122
-							var9 = true; // L: 123
-							break label207; // L: 124
-						}
-					}
-				}
-			}
-
-			if (var7 == null) { // L: 130
-				var7 = TriBool.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 131
-				var9 = true; // L: 132
-			}
-
-			if (var8 != null) { // L: 134
-				File var31 = new File(var8); // L: 135
-				var32 = new File(var7); // L: 136
-
-				try {
-					File[] var34 = var31.listFiles(); // L: 138
-					File[] var22 = var34; // L: 140
-
-					for (int var14 = 0; var14 < var22.length; ++var14) { // L: 141
-						File var15 = var22[var14]; // L: 142
-						File var16 = new File(var32, var15.getName()); // L: 144
-						boolean var17 = var15.renameTo(var16); // L: 145
-						if (!var17) { // L: 146
-							throw new IOException();
-						}
-					}
-				} catch (Exception var28) { // L: 151
-					var28.printStackTrace(); // L: 152
-				}
-
-				var9 = true; // L: 154
-			}
-
-			if (var9) { // L: 156
-				UserComparator7.method2470(new File(var7), (File)null);
-			}
-
-			File var5 = new File(var7); // L: 157
-			JagexCache.cacheDir = var5; // L: 159
-			if (!JagexCache.cacheDir.exists()) { // L: 160
-				JagexCache.cacheDir.mkdirs();
-			}
-
-			File[] var30 = JagexCache.cacheDir.listFiles(); // L: 161
-			if (var30 != null) { // L: 162
-				File[] var33 = var30; // L: 164
-
-				for (int var23 = 0; var23 < var33.length; ++var23) { // L: 165
-					File var24 = var33[var23]; // L: 166
-					if (!Varcs.method2359(var24, false)) { // L: 168
-						++var18; // L: 67
-						continue label232;
-					}
-				}
-			}
-			break;
-		}
-
-		UserComparator6.method2508(JagexCache.cacheDir); // L: 175
-		WorldMapData_1.method3844(); // L: 176
-		JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(TriBool.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 177
-		JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(TriBool.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 178
-		WorldMapID.JagexCache_idxFiles = new BufferedFile[ItemContainer.idxCount]; // L: 179
-
-		for (var18 = 0; var18 < ItemContainer.idxCount; ++var18) { // L: 180
-			WorldMapID.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(TriBool.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); // L: 181
-		}
-
-	} // L: 183
-}
diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java
deleted file mode 100644
index 0a7fd86935..0000000000
--- a/runescape-client/src/main/java/class301.java
+++ /dev/null
@@ -1,43 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("kq")
-public class class301 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lkq;"
-	)
-	static final class301 field3767;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lkq;"
-	)
-	static final class301 field3770;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lkq;"
-	)
-	static final class301 field3769;
-
-	static {
-		field3767 = new class301(); // L: 4
-		field3770 = new class301(); // L: 5
-		field3769 = new class301(); // L: 6
-	}
-
-	class301() {
-	} // L: 8
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1299258099"
-	)
-	static void method5508() {
-		ByteArrayPool.field3890.clear(); // L: 61
-		ByteArrayPool.field3890.add(100); // L: 62
-		ByteArrayPool.field3890.add(5000); // L: 63
-		ByteArrayPool.field3890.add(10000); // L: 64
-		ByteArrayPool.field3890.add(30000); // L: 65
-	} // L: 66
-}
diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java
deleted file mode 100644
index 273ad405db..0000000000
--- a/runescape-client/src/main/java/class303.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import java.util.HashMap;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("ke")
-public class class303 {
-	static {
-		new HashMap();
-	} // L: 9
-}
diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java
new file mode 100644
index 0000000000..5f98e276d5
--- /dev/null
+++ b/runescape-client/src/main/java/class307.java
@@ -0,0 +1,13 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kq")
+public class class307 {
+	@ObfuscatedName("gg")
+	@ObfuscatedSignature(
+		descriptor = "Llx;"
+	)
+	@Export("fontPlain11")
+	static Font fontPlain11;
+}
diff --git a/runescape-client/src/main/java/class312.java b/runescape-client/src/main/java/class312.java
new file mode 100644
index 0000000000..9af0b10715
--- /dev/null
+++ b/runescape-client/src/main/java/class312.java
@@ -0,0 +1,279 @@
+import java.util.HashMap;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("lw")
+public class class312 {
+	@ObfuscatedName("c")
+	@Export("spriteMap")
+	final HashMap spriteMap;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lme;"
+	)
+	@Export("bounds")
+	Bounds bounds;
+	@ObfuscatedName("p")
+	int[] field3909;
+	@ObfuscatedName("m")
+	int[] field3910;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -895131131
+	)
+	int field3911;
+
+	public class312() {
+		this.spriteMap = new HashMap(); // L: 10
+		this.bounds = new Bounds(0, 0); // L: 11
+		this.field3909 = new int[2048]; // L: 12
+		this.field3910 = new int[2048]; // L: 13
+		this.field3911 = 0; // L: 14
+		class111.field1348 = new int[2000]; // L: 22
+		int var1 = 0; // L: 23
+		int var2 = 240; // L: 24
+
+		int var4;
+		for (byte var3 = 12; var1 < 16; var2 -= var3) { // L: 25
+			var4 = class338.method6256((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)((float)var1 * 0.425F / 16.0F + 0.075F)); // L: 27
+			class111.field1348[var1] = var4; // L: 28
+			++var1; // L: 26
+		}
+
+		var2 = 48; // L: 30
+
+		for (int var6 = var2 / 6; var1 < class111.field1348.length; var2 -= var6) { // L: 31 32 38
+			var4 = var1 * 2; // L: 33
+
+			for (int var5 = class338.method6256((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class111.field1348.length; ++var1) { // L: 34 35
+				class111.field1348[var1] = var5; // L: 36
+			}
+		}
+
+	} // L: 41
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "78"
+	)
+	void method5803(int var1) {
+		int var2 = var1 * 2 + 1; // L: 44
+		double var4 = (double)((float)var1 / 3.0F); // L: 46
+		int var6 = var1 * 2 + 1; // L: 48
+		double[] var7 = new double[var6]; // L: 49
+		int var8 = -var1;
+
+		for (int var9 = 0; var8 <= var1; ++var9) {
+			double var20 = Canvas.method408((double)(var8 - 0) / var4) / var4; // L: 55
+			var7[var9] = var20; // L: 57
+			++var8; // L: 50
+		}
+
+		double[] var14 = var7; // L: 61
+		double var15 = var7[var1] * var7[var1]; // L: 62
+		int[] var17 = new int[var2 * var2]; // L: 63
+		boolean var10 = false; // L: 64
+
+		for (int var11 = 0; var11 < var2; ++var11) { // L: 65
+			for (int var12 = 0; var12 < var2; ++var12) { // L: 66
+				int var13 = var17[var12 + var2 * var11] = (int)(256.0D * (var14[var11] * var14[var12] / var15)); // L: 67
+				if (!var10 && var13 > 0) { // L: 68
+					var10 = true; // L: 69
+				}
+			}
+		}
+
+		SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 73
+		this.spriteMap.put(var1, var18); // L: 74
+	} // L: 75
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lpl;",
+		garbageValue = "-904544036"
+	)
+	SpritePixels method5797(int var1) {
+		if (!this.spriteMap.containsKey(var1)) { // L: 78
+			this.method5803(var1); // L: 79
+		}
+
+		return (SpritePixels)this.spriteMap.get(var1); // L: 81
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)V",
+		garbageValue = "1"
+	)
+	public final void method5806(int var1, int var2) {
+		if (this.field3911 < this.field3909.length) { // L: 85
+			this.field3909[this.field3911] = var1; // L: 86
+			this.field3910[this.field3911] = var2; // L: 87
+			++this.field3911; // L: 88
+		}
+	} // L: 89
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-82"
+	)
+	public final void method5795() {
+		this.field3911 = 0; // L: 92
+	} // L: 93
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(IILpl;FB)V",
+		garbageValue = "-56"
+	)
+	public final void method5800(int var1, int var2, SpritePixels var3, float var4) {
+		int var5 = (int)(18.0F * var4); // L: 96
+		SpritePixels var6 = this.method5797(var5); // L: 97
+		int var7 = var5 * 2 + 1; // L: 98
+		Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 99
+		Bounds var9 = new Bounds(0, 0); // L: 100
+		this.bounds.setHigh(var7, var7); // L: 101
+		System.nanoTime(); // L: 102
+
+		int var10;
+		int var11;
+		int var12;
+		for (var10 = 0; var10 < this.field3911; ++var10) { // L: 103
+			var11 = this.field3909[var10]; // L: 104
+			var12 = this.field3910[var10]; // L: 105
+			int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 106
+			int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 107
+			this.bounds.setLow(var13, var14); // L: 108
+			this.bounds.method6578(var8, var9); // L: 109
+			this.method5801(var6, var3, var9); // L: 110
+		}
+
+		System.nanoTime(); // L: 112
+		System.nanoTime(); // L: 113
+
+		for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 114
+			if (var3.pixels[var10] == 0) { // L: 115
+				var3.pixels[var10] = -16777216; // L: 116
+			} else {
+				var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 119
+				if (var11 <= 0) { // L: 120
+					var3.pixels[var10] = -16777216; // L: 121
+				} else {
+					if (var11 > class111.field1348.length) { // L: 124
+						var11 = class111.field1348.length;
+					}
+
+					var12 = class111.field1348[var11 - 1]; // L: 125
+					var3.pixels[var10] = -16777216 | var12; // L: 126
+				}
+			}
+		}
+
+		System.nanoTime(); // L: 128
+	} // L: 129
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Lpl;Lpl;Lme;I)V",
+		garbageValue = "-1046616793"
+	)
+	void method5801(SpritePixels var1, SpritePixels var2, Bounds var3) {
+		if (var3.highX != 0 && var3.highY != 0) { // L: 132
+			int var4 = 0; // L: 133
+			int var5 = 0; // L: 134
+			if (var3.lowX == 0) { // L: 135
+				var4 = var1.subWidth - var3.highX;
+			}
+
+			if (var3.lowY == 0) { // L: 136
+				var5 = var1.subHeight - var3.highY;
+			}
+
+			int var6 = var4 + var5 * var1.subWidth; // L: 137
+			int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 138
+
+			for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 139
+				for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 140
+					int[] var10000 = var2.pixels; // L: 141
+					int var10001 = var7++;
+					var10000[var10001] += var1.pixels[var6++];
+				}
+
+				var6 += var1.subWidth - var3.highX; // L: 143
+				var7 += var2.subWidth - var3.highX; // L: 144
+			}
+
+		}
+	} // L: 146
+
+	@ObfuscatedName("at")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "586952329"
+	)
+	static int method5810(int var0, Script var1, boolean var2) {
+		if (var0 == 6900) { // L: 4325
+			Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ""; // L: 4326
+			return 1; // L: 4327
+		} else if (var0 == 6950) { // L: 4329
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = -1; // L: 4330
+			return 1; // L: 4331
+		} else {
+			return 2; // L: 4333
+		}
+	}
+
+	@ObfuscatedName("gf")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;IIS)V",
+		garbageValue = "-25379"
+	)
+	@Export("checkIfMinimapClicked")
+	static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
+		if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 4444
+			if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class150.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 4445
+				SpriteMask var3 = var0.getSpriteMask(true); // L: 4446
+				if (var3 == null) { // L: 4447
+					return;
+				}
+
+				int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 4448
+				int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 4449
+				if (var3.contains(var4, var5)) { // L: 4450
+					var4 -= var3.width / 2; // L: 4451
+					var5 -= var3.height / 2; // L: 4452
+					int var6 = Client.camAngleY & 2047; // L: 4453
+					int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 4454
+					int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 4455
+					int var9 = var8 * var4 + var5 * var7 >> 11; // L: 4456
+					int var10 = var8 * var5 - var7 * var4 >> 11; // L: 4457
+					int var11 = var9 + class340.localPlayer.x >> 7; // L: 4458
+					int var12 = class340.localPlayer.y - var10 >> 7; // L: 4459
+					PacketBufferNode var13 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2860, Client.packetWriter.isaacCipher); // L: 4461
+					var13.packetBuffer.writeByte(18); // L: 4462
+					var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 4463
+					var13.packetBuffer.method7493(var12 + TileItem.baseY); // L: 4464
+					var13.packetBuffer.method7349(var11 + class131.baseX); // L: 4465
+					var13.packetBuffer.writeByte(var4); // L: 4466
+					var13.packetBuffer.writeByte(var5); // L: 4467
+					var13.packetBuffer.writeShort(Client.camAngleY); // L: 4468
+					var13.packetBuffer.writeByte(57); // L: 4469
+					var13.packetBuffer.writeByte(0); // L: 4470
+					var13.packetBuffer.writeByte(0); // L: 4471
+					var13.packetBuffer.writeByte(89); // L: 4472
+					var13.packetBuffer.writeShort(class340.localPlayer.x); // L: 4473
+					var13.packetBuffer.writeShort(class340.localPlayer.y); // L: 4474
+					var13.packetBuffer.writeByte(63); // L: 4475
+					Client.packetWriter.addNode(var13); // L: 4476
+					Client.destinationX = var11; // L: 4477
+					Client.destinationY = var12; // L: 4478
+				}
+			}
+
+		}
+	} // L: 4481
+}
diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java
new file mode 100644
index 0000000000..582d9769ca
--- /dev/null
+++ b/runescape-client/src/main/java/class313.java
@@ -0,0 +1,30 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("lp")
+public class class313 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Llp;"
+	)
+	static final class313 field3916;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Llp;"
+	)
+	static final class313 field3917;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Llp;"
+	)
+	static final class313 field3915;
+
+	static {
+		field3916 = new class313(); // L: 4
+		field3917 = new class313(); // L: 5
+		field3915 = new class313(); // L: 6
+	}
+
+	class313() {
+	} // L: 8
+}
diff --git a/runescape-client/src/main/java/class315.java b/runescape-client/src/main/java/class315.java
new file mode 100644
index 0000000000..01fb710194
--- /dev/null
+++ b/runescape-client/src/main/java/class315.java
@@ -0,0 +1,51 @@
+import java.util.HashMap;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("li")
+public class class315 {
+	@ObfuscatedName("bw")
+	@ObfuscatedGetter(
+		intValue = -1285712925
+	)
+	static int field3918;
+
+	static {
+		new HashMap();
+	} // L: 9
+
+	@ObfuscatedName("fr")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)V",
+		garbageValue = "-2066183341"
+	)
+	static void method5816(int var0, int var1, int var2) {
+		if (var0 != 0) { // L: 4315
+			int var3 = var0 >> 8; // L: 4316
+			int var4 = var0 >> 4 & 7; // L: 4317
+			int var5 = var0 & 15; // L: 4318
+			Client.soundEffectIds[Client.soundEffectCount] = var3; // L: 4319
+			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 4320
+			Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 4321
+			Client.soundEffects[Client.soundEffectCount] = null; // L: 4322
+			int var6 = (var1 - 64) / 128; // L: 4323
+			int var7 = (var2 - 64) / 128; // L: 4324
+			Client.soundLocations[Client.soundEffectCount] = var5 + (var7 << 8) + (var6 << 16); // L: 4325
+			++Client.soundEffectCount; // L: 4326
+		}
+	} // L: 4327
+
+	@ObfuscatedName("fm")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-1161739111"
+	)
+	static void method5822(int var0, int var1) {
+		if (SecureRandomFuture.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 4361
+			NetSocket.method3118(Players.archive11, var0, 0, SecureRandomFuture.clientPreferences.musicVolume, false); // L: 4362
+			Client.field743 = true; // L: 4363
+		}
+
+	} // L: 4365
+}
diff --git a/runescape-client/src/main/java/class316.java b/runescape-client/src/main/java/class316.java
deleted file mode 100644
index 1437c4af22..0000000000
--- a/runescape-client/src/main/java/class316.java
+++ /dev/null
@@ -1,28 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("lf")
-public class class316 {
-	@ObfuscatedName("i")
-	@Export("cp1252AsciiExtension")
-	public static final char[] cp1252AsciiExtension;
-
-	static {
-		cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4
-	}
-
-	@ObfuscatedName("ld")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-2019378433"
-	)
-	static void method5839(int var0) {
-		for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11871
-			if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 11872
-				var1.remove(); // L: 11873
-			}
-		}
-
-	} // L: 11876
-}
diff --git a/runescape-client/src/main/java/class317.java b/runescape-client/src/main/java/class317.java
deleted file mode 100644
index fabbf49475..0000000000
--- a/runescape-client/src/main/java/class317.java
+++ /dev/null
@@ -1,199 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ly")
-public class class317 {
-	@ObfuscatedName("i")
-	static char[] field3854;
-	@ObfuscatedName("w")
-	static char[] field3852;
-	@ObfuscatedName("s")
-	static char[] field3851;
-	@ObfuscatedName("a")
-	static int[] field3853;
-
-	static {
-		field3854 = new char[64]; // L: 7
-
-		int var0;
-		for (var0 = 0; var0 < 26; ++var0) { // L: 8
-			field3854[var0] = (char)(var0 + 65);
-		}
-
-		for (var0 = 26; var0 < 52; ++var0) { // L: 9
-			field3854[var0] = (char)(var0 + 97 - 26);
-		}
-
-		for (var0 = 52; var0 < 62; ++var0) { // L: 10
-			field3854[var0] = (char)(var0 + 48 - 52);
-		}
-
-		field3854[62] = '+'; // L: 11
-		field3854[63] = '/'; // L: 12
-		field3852 = new char[64]; // L: 18
-
-		for (var0 = 0; var0 < 26; ++var0) { // L: 19
-			field3852[var0] = (char)(var0 + 65);
-		}
-
-		for (var0 = 26; var0 < 52; ++var0) { // L: 20
-			field3852[var0] = (char)(var0 + 97 - 26);
-		}
-
-		for (var0 = 52; var0 < 62; ++var0) { // L: 21
-			field3852[var0] = (char)(var0 + 48 - 52);
-		}
-
-		field3852[62] = '*'; // L: 22
-		field3852[63] = '-'; // L: 23
-		field3851 = new char[64]; // L: 29
-
-		for (var0 = 0; var0 < 26; ++var0) {
-			field3851[var0] = (char)(var0 + 65);
-		}
-
-		for (var0 = 26; var0 < 52; ++var0) {
-			field3851[var0] = (char)(var0 + 97 - 26);
-		}
-
-		for (var0 = 52; var0 < 62; ++var0) { // L: 32
-			field3851[var0] = (char)(var0 + 48 - 52);
-		}
-
-		field3851[62] = '-'; // L: 33
-		field3851[63] = '_'; // L: 34
-		field3853 = new int[128]; // L: 40
-
-		for (var0 = 0; var0 < field3853.length; ++var0) { // L: 41
-			field3853[var0] = -1;
-		}
-
-		for (var0 = 65; var0 <= 90; ++var0) { // L: 42
-			field3853[var0] = var0 - 65;
-		}
-
-		for (var0 = 97; var0 <= 122; ++var0) { // L: 43
-			field3853[var0] = var0 - 97 + 26;
-		}
-
-		for (var0 = 48; var0 <= 57; ++var0) { // L: 44
-			field3853[var0] = var0 - 48 + 52;
-		}
-
-		int[] var2 = field3853; // L: 45
-		field3853[43] = 62; // L: 46
-		var2[42] = 62; // L: 47
-		int[] var1 = field3853; // L: 48
-		field3853[47] = 63; // L: 49
-		var1[45] = 63; // L: 50
-	} // L: 51
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "1157640581"
-	)
-	public static int method5852(int var0, int var1) {
-		int var2;
-		for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28
-			if ((var1 & 1) != 0) {
-				var2 = var0 * var2; // L: 26
-			}
-
-			var0 *= var0; // L: 27
-		}
-
-		if (var1 == 1) { // L: 30
-			return var0 * var2;
-		} else {
-			return var2; // L: 31
-		}
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(CLkz;I)C",
-		garbageValue = "-307782821"
-	)
-	@Export("standardizeChar")
-	static char standardizeChar(char var0, Language var1) {
-		if (var0 >= 192 && var0 <= 255) { // L: 69
-			if (var0 >= 192 && var0 <= 198) { // L: 70
-				return 'A';
-			}
-
-			if (var0 == 199) { // L: 71
-				return 'C';
-			}
-
-			if (var0 >= 200 && var0 <= 203) { // L: 72
-				return 'E';
-			}
-
-			if (var0 >= 204 && var0 <= 207) { // L: 73
-				return 'I';
-			}
-
-			if (var0 == 209 && var1 != Language.Language_ES) { // L: 74
-				return 'N';
-			}
-
-			if (var0 >= 210 && var0 <= 214) { // L: 75
-				return 'O';
-			}
-
-			if (var0 >= 217 && var0 <= 220) { // L: 76
-				return 'U';
-			}
-
-			if (var0 == 221) { // L: 77
-				return 'Y';
-			}
-
-			if (var0 == 223) { // L: 78
-				return 's';
-			}
-
-			if (var0 >= 224 && var0 <= 230) { // L: 79
-				return 'a';
-			}
-
-			if (var0 == 231) { // L: 80
-				return 'c';
-			}
-
-			if (var0 >= 232 && var0 <= 235) { // L: 81
-				return 'e';
-			}
-
-			if (var0 >= 236 && var0 <= 239) { // L: 82
-				return 'i';
-			}
-
-			if (var0 == 241 && var1 != Language.Language_ES) { // L: 83
-				return 'n';
-			}
-
-			if (var0 >= 242 && var0 <= 246) { // L: 84
-				return 'o';
-			}
-
-			if (var0 >= 249 && var0 <= 252) { // L: 85
-				return 'u';
-			}
-
-			if (var0 == 253 || var0 == 255) { // L: 86
-				return 'y';
-			}
-		}
-
-		if (var0 == 338) { // L: 88
-			return 'O';
-		} else if (var0 == 339) { // L: 89
-			return 'o';
-		} else {
-			return var0 == 376 ? 'Y' : var0; // L: 90
-		}
-	}
-}
diff --git a/runescape-client/src/main/java/class318.java b/runescape-client/src/main/java/class318.java
deleted file mode 100644
index 13d9da54b6..0000000000
--- a/runescape-client/src/main/java/class318.java
+++ /dev/null
@@ -1,243 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("lq")
-public final class class318 {
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(ILmr;Lkd;I)V",
-		garbageValue = "-2060859184"
-	)
-	static void method5887(int var0, ArchiveDisk var1, Archive var2) {
-		byte[] var3 = null; // L: 30
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 31
-			for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 32
-				if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) { // L: 33
-					var3 = var5.data; // L: 34
-					break; // L: 35
-				}
-			}
-		}
-
-		if (var3 != null) { // L: 39
-			var2.load(var1, var0, var3, true); // L: 40
-		} else {
-			byte[] var4 = var1.read(var0); // L: 43
-			var2.load(var1, var0, var4, true); // L: 44
-		}
-	} // L: 41 45
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(IIILfc;Lfq;S)Z",
-		garbageValue = "14344"
-	)
-	public static final boolean method5874(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) {
-		int var5 = var0; // L: 137
-		int var6 = var1; // L: 138
-		byte var7 = 64; // L: 139
-		byte var8 = 64; // L: 140
-		int var9 = var0 - var7; // L: 141
-		int var10 = var1 - var8; // L: 142
-		class174.directions[var7][var8] = 99; // L: 143
-		class174.distances[var7][var8] = 0; // L: 144
-		byte var11 = 0; // L: 145
-		int var12 = 0; // L: 146
-		class174.bufferX[var11] = var0; // L: 147
-		int var20 = var11 + 1;
-		class174.bufferY[var11] = var1; // L: 148
-		int[][] var13 = var4.flags; // L: 149
-
-		while (true) {
-			label303:
-			while (true) {
-				int var14;
-				int var15;
-				int var16;
-				int var17;
-				int var18;
-				int var19;
-				do {
-					do {
-						do {
-							label280:
-							do {
-								if (var20 == var12) { // L: 150
-									RouteStrategy.field1979 = var5; // L: 269
-									class67.field845 = var6; // L: 270
-									return false; // L: 271
-								}
-
-								var5 = class174.bufferX[var12]; // L: 151
-								var6 = class174.bufferY[var12]; // L: 152
-								var12 = var12 + 1 & 4095; // L: 153
-								var18 = var5 - var9; // L: 154
-								var19 = var6 - var10; // L: 155
-								var14 = var5 - var4.xInset; // L: 156
-								var15 = var6 - var4.yInset; // L: 157
-								if (var3.hasArrived(var2, var5, var6, var4)) { // L: 158
-									RouteStrategy.field1979 = var5; // L: 159
-									class67.field845 = var6; // L: 160
-									return true; // L: 161
-								}
-
-								var16 = class174.distances[var18][var19] + 1; // L: 163
-								if (var18 > 0 && class174.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 164 165 166 167
-									var17 = 1;
-
-									while (true) {
-										if (var17 >= var2 - 1) {
-											class174.bufferX[var20] = var5 - 1; // L: 171
-											class174.bufferY[var20] = var6; // L: 172
-											var20 = var20 + 1 & 4095; // L: 173
-											class174.directions[var18 - 1][var19] = 2; // L: 174
-											class174.distances[var18 - 1][var19] = var16; // L: 175
-											break;
-										}
-
-										if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { // L: 169
-											break;
-										}
-
-										++var17; // L: 168
-									}
-								}
-
-								if (var18 < 128 - var2 && class174.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 177 178 179 180
-									var17 = 1;
-
-									while (true) {
-										if (var17 >= var2 - 1) {
-											class174.bufferX[var20] = var5 + 1; // L: 184
-											class174.bufferY[var20] = var6; // L: 185
-											var20 = var20 + 1 & 4095; // L: 186
-											class174.directions[var18 + 1][var19] = 8; // L: 187
-											class174.distances[var18 + 1][var19] = var16; // L: 188
-											break;
-										}
-
-										if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 182
-											break;
-										}
-
-										++var17; // L: 181
-									}
-								}
-
-								if (var19 > 0 && class174.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 190 191 192 193
-									var17 = 1;
-
-									while (true) {
-										if (var17 >= var2 - 1) {
-											class174.bufferX[var20] = var5; // L: 197
-											class174.bufferY[var20] = var6 - 1; // L: 198
-											var20 = var20 + 1 & 4095; // L: 199
-											class174.directions[var18][var19 - 1] = 1; // L: 200
-											class174.distances[var18][var19 - 1] = var16; // L: 201
-											break;
-										}
-
-										if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 195
-											break;
-										}
-
-										++var17; // L: 194
-									}
-								}
-
-								if (var19 < 128 - var2 && class174.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 203 204 205 206
-									var17 = 1;
-
-									while (true) {
-										if (var17 >= var2 - 1) {
-											class174.bufferX[var20] = var5; // L: 210
-											class174.bufferY[var20] = var6 + 1; // L: 211
-											var20 = var20 + 1 & 4095; // L: 212
-											class174.directions[var18][var19 + 1] = 4; // L: 213
-											class174.distances[var18][var19 + 1] = var16; // L: 214
-											break;
-										}
-
-										if ((var13[var17 + var14][var15 + var2] & 19137016) != 0) { // L: 208
-											break;
-										}
-
-										++var17; // L: 207
-									}
-								}
-
-								if (var18 > 0 && var19 > 0 && class174.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 216 217 218
-									var17 = 1;
-
-									while (true) {
-										if (var17 >= var2) {
-											class174.bufferX[var20] = var5 - 1; // L: 223
-											class174.bufferY[var20] = var6 - 1; // L: 224
-											var20 = var20 + 1 & 4095; // L: 225
-											class174.directions[var18 - 1][var19 - 1] = 3; // L: 226
-											class174.distances[var18 - 1][var19 - 1] = var16; // L: 227
-											break;
-										}
-
-										if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 220 221
-											break;
-										}
-
-										++var17; // L: 219
-									}
-								}
-
-								if (var18 < 128 - var2 && var19 > 0 && class174.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 229 230 231
-									var17 = 1;
-
-									while (true) {
-										if (var17 >= var2) {
-											class174.bufferX[var20] = var5 + 1; // L: 236
-											class174.bufferY[var20] = var6 - 1; // L: 237
-											var20 = var20 + 1 & 4095; // L: 238
-											class174.directions[var18 + 1][var19 - 1] = 9; // L: 239
-											class174.distances[var18 + 1][var19 - 1] = var16; // L: 240
-											break;
-										}
-
-										if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 233 234
-											break;
-										}
-
-										++var17; // L: 232
-									}
-								}
-
-								if (var18 > 0 && var19 < 128 - var2 && class174.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 242 243 244
-									for (var17 = 1; var17 < var2; ++var17) { // L: 245
-										if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 246 247
-											continue label280;
-										}
-									}
-
-									class174.bufferX[var20] = var5 - 1; // L: 249
-									class174.bufferY[var20] = var6 + 1; // L: 250
-									var20 = var20 + 1 & 4095; // L: 251
-									class174.directions[var18 - 1][var19 + 1] = 6; // L: 252
-									class174.distances[var18 - 1][var19 + 1] = var16; // L: 253
-								}
-							} while(var18 >= 128 - var2); // L: 255
-						} while(var19 >= 128 - var2);
-					} while(class174.directions[var18 + 1][var19 + 1] != 0); // L: 256
-				} while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 257
-
-				for (var17 = 1; var17 < var2; ++var17) { // L: 258
-					if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var15 + var17] & 19136995) != 0) { // L: 259 260
-						continue label303;
-					}
-				}
-
-				class174.bufferX[var20] = var5 + 1; // L: 262
-				class174.bufferY[var20] = var6 + 1; // L: 263
-				var20 = var20 + 1 & 4095; // L: 264
-				class174.directions[var18 + 1][var19 + 1] = 12; // L: 265
-				class174.distances[var18 + 1][var19 + 1] = var16; // L: 266
-			}
-		}
-	}
-}
diff --git a/runescape-client/src/main/java/class319.java b/runescape-client/src/main/java/class319.java
deleted file mode 100644
index a0c0e1aebb..0000000000
--- a/runescape-client/src/main/java/class319.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("ll")
-public class class319 {
-	@ObfuscatedName("cp")
-	public static char field3858;
-}
diff --git a/runescape-client/src/main/java/class320.java b/runescape-client/src/main/java/class320.java
deleted file mode 100644
index ccc8524ea2..0000000000
--- a/runescape-client/src/main/java/class320.java
+++ /dev/null
@@ -1,40 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("lk")
-public final class class320 {
-	@ObfuscatedName("i")
-	@Export("base37Table")
-	public static final char[] base37Table;
-	@ObfuscatedName("w")
-	static long[] field3860;
-	@ObfuscatedName("fy")
-	@ObfuscatedGetter(
-		intValue = -433173711
-	)
-	static int field3868;
-	@ObfuscatedName("gf")
-	@ObfuscatedSignature(
-		descriptor = "Lcf;"
-	)
-	@Export("urlRequester")
-	static UrlRequester urlRequester;
-	@ObfuscatedName("jl")
-	@ObfuscatedGetter(
-		intValue = -1325335001
-	)
-	@Export("oculusOrbFocalPointX")
-	static int oculusOrbFocalPointX;
-
-	static {
-		base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4
-		field3860 = new long[12]; // L: 5
-
-		for (int var0 = 0; var0 < field3860.length; ++var0) { // L: 8
-			field3860[var0] = (long)Math.pow(37.0D, (double)var0);
-		}
-
-	} // L: 9
-}
diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java
deleted file mode 100644
index b3945e7fbf..0000000000
--- a/runescape-client/src/main/java/class322.java
+++ /dev/null
@@ -1,36 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("lx")
-public class class322 {
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -902702553
-	)
-	int field3872;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -1387523435
-	)
-	int field3874;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1669438009
-	)
-	int field3870;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 1408638013
-	)
-	int field3871;
-
-	public String toString() {
-		int var2 = 10 - Integer.toString(this.field3872).length(); // L: 15
-		int var3 = 10 - Integer.toString(this.field3870).length(); // L: 16
-		int var4 = 10 - Integer.toString(this.field3874).length(); // L: 17
-		String var5 = "          ".substring(10 - var2); // L: 18
-		String var6 = "          ".substring(10 - var3); // L: 19
-		String var7 = "          ".substring(10 - var4); // L: 20
-		return "    Size: " + this.field3872 + var5 + "Created: " + this.field3874 + var7 + "Total used: " + this.field3870 + var6 + "Max-In-Use: " + this.field3871; // L: 21
-	}
-}
diff --git a/runescape-client/src/main/java/class327.java b/runescape-client/src/main/java/class327.java
deleted file mode 100644
index 9c59915985..0000000000
--- a/runescape-client/src/main/java/class327.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("lh")
-public class class327 {
-	@ObfuscatedName("bw")
-	@ObfuscatedGetter(
-		intValue = 675929595
-	)
-	static int field3908;
-}
diff --git a/runescape-client/src/main/java/class328.java b/runescape-client/src/main/java/class328.java
new file mode 100644
index 0000000000..677b3868fe
--- /dev/null
+++ b/runescape-client/src/main/java/class328.java
@@ -0,0 +1,81 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("lv")
+public class class328 {
+	@ObfuscatedName("c")
+	@Export("cp1252AsciiExtension")
+	public static final char[] cp1252AsciiExtension;
+
+	static {
+		cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4
+	}
+
+	@ObfuscatedName("kr")
+	@ObfuscatedSignature(
+		descriptor = "([Ljm;IB)V",
+		garbageValue = "1"
+	)
+	@Export("drawModelComponents")
+	static final void drawModelComponents(Widget[] var0, int var1) {
+		for (int var2 = 0; var2 < var0.length; ++var2) { // L: 12075
+			Widget var3 = var0[var2]; // L: 12076
+			if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !StudioGame.isComponentHidden(var3))) { // L: 12077 12078 12079
+				if (var3.type == 0) { // L: 12080
+					if (!var3.isIf3 && StudioGame.isComponentHidden(var3) && var3 != class4.mousedOverWidgetIf1) { // L: 12081
+						continue;
+					}
+
+					drawModelComponents(var0, var3.id); // L: 12082
+					if (var3.children != null) { // L: 12083
+						drawModelComponents(var3.children, var3.id);
+					}
+
+					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 12084
+					if (var4 != null) { // L: 12085
+						GraphicsObject.method1955(var4.group);
+					}
+				}
+
+				if (var3.type == 6) { // L: 12087
+					int var5;
+					if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 12088
+						boolean var7 = class28.runCs1(var3); // L: 12089
+						if (var7) { // L: 12091
+							var5 = var3.sequenceId2;
+						} else {
+							var5 = var3.sequenceId; // L: 12092
+						}
+
+						if (var5 != -1) { // L: 12093
+							SequenceDefinition var6 = UserComparator5.SequenceDefinition_get(var5); // L: 12094
+
+							for (var3.modelFrameCycle += Client.field538; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; SecureRandomCallable.invalidateWidget(var3)) { // L: 12095 12096 12103
+								var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 12097
+								++var3.modelFrame; // L: 12098
+								if (var3.modelFrame >= var6.frameIds.length) { // L: 12099
+									var3.modelFrame -= var6.frameCount; // L: 12100
+									if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 12101
+										var3.modelFrame = 0;
+									}
+								}
+							}
+						}
+					}
+
+					if (var3.field3260 != 0 && !var3.isIf3) { // L: 12107
+						int var8 = var3.field3260 >> 16; // L: 12108
+						var5 = var3.field3260 << 16 >> 16; // L: 12109
+						var8 *= Client.field538; // L: 12110
+						var5 *= Client.field538; // L: 12111
+						var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 12112
+						var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 12113
+						SecureRandomCallable.invalidateWidget(var3); // L: 12114
+					}
+				}
+			}
+		}
+
+	} // L: 12118
+}
diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java
new file mode 100644
index 0000000000..c8b0764f7c
--- /dev/null
+++ b/runescape-client/src/main/java/class329.java
@@ -0,0 +1,109 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("lt")
+public class class329 {
+	@ObfuscatedName("c")
+	static char[] field4005;
+	@ObfuscatedName("b")
+	static char[] field4003;
+	@ObfuscatedName("p")
+	static char[] field4002;
+	@ObfuscatedName("m")
+	static int[] field4004;
+
+	static {
+		field4005 = new char[64]; // L: 7
+
+		int var0;
+		for (var0 = 0; var0 < 26; ++var0) { // L: 8
+			field4005[var0] = (char)(var0 + 65);
+		}
+
+		for (var0 = 26; var0 < 52; ++var0) { // L: 9
+			field4005[var0] = (char)(var0 + 97 - 26);
+		}
+
+		for (var0 = 52; var0 < 62; ++var0) { // L: 10
+			field4005[var0] = (char)(var0 + 48 - 52);
+		}
+
+		field4005[62] = '+'; // L: 11
+		field4005[63] = '/'; // L: 12
+		field4003 = new char[64]; // L: 18
+
+		for (var0 = 0; var0 < 26; ++var0) { // L: 19
+			field4003[var0] = (char)(var0 + 65);
+		}
+
+		for (var0 = 26; var0 < 52; ++var0) { // L: 20
+			field4003[var0] = (char)(var0 + 97 - 26);
+		}
+
+		for (var0 = 52; var0 < 62; ++var0) { // L: 21
+			field4003[var0] = (char)(var0 + 48 - 52);
+		}
+
+		field4003[62] = '*'; // L: 22
+		field4003[63] = '-'; // L: 23
+		field4002 = new char[64]; // L: 29
+
+		for (var0 = 0; var0 < 26; ++var0) { // L: 30
+			field4002[var0] = (char)(var0 + 65);
+		}
+
+		for (var0 = 26; var0 < 52; ++var0) { // L: 31
+			field4002[var0] = (char)(var0 + 97 - 26);
+		}
+
+		for (var0 = 52; var0 < 62; ++var0) { // L: 32
+			field4002[var0] = (char)(var0 + 48 - 52);
+		}
+
+		field4002[62] = '-'; // L: 33
+		field4002[63] = '_'; // L: 34
+		field4004 = new int[128]; // L: 40
+
+		for (var0 = 0; var0 < field4004.length; ++var0) { // L: 41
+			field4004[var0] = -1;
+		}
+
+		for (var0 = 65; var0 <= 90; ++var0) { // L: 42
+			field4004[var0] = var0 - 65;
+		}
+
+		for (var0 = 97; var0 <= 122; ++var0) { // L: 43
+			field4004[var0] = var0 - 97 + 26;
+		}
+
+		for (var0 = 48; var0 <= 57; ++var0) { // L: 44
+			field4004[var0] = var0 - 48 + 52;
+		}
+
+		int[] var2 = field4004; // L: 45
+		field4004[43] = 62; // L: 46
+		var2[42] = 62; // L: 47
+		int[] var1 = field4004; // L: 48
+		field4004[47] = 63; // L: 49
+		var1[45] = 63; // L: 50
+	} // L: 51
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(II)F",
+		garbageValue = "-119080424"
+	)
+	public static float method6135(int var0) {
+		var0 &= 16383; // L: 24
+		return (float)(6.283185307179586D * (double)((float)var0 / 16384.0F)); // L: 25
+	}
+
+	@ObfuscatedName("hn")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "113"
+	)
+	static boolean method6133() {
+		return (Client.drawPlayerNames & 8) != 0; // L: 5588
+	}
+}
diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java
new file mode 100644
index 0000000000..0fe85231a1
--- /dev/null
+++ b/runescape-client/src/main/java/class33.java
@@ -0,0 +1,221 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("au")
+public class class33 {
+	@ObfuscatedName("sa")
+	@ObfuscatedGetter(
+		intValue = -395666535
+	)
+	static int field243;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Llr;"
+	)
+	@Export("reflectionChecks")
+	public static IterableNodeDeque reflectionChecks;
+
+	static {
+		reflectionChecks = new IterableNodeDeque(); // L: 17
+	}
+
+	@ObfuscatedName("ae")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "1774695568"
+	)
+	@Export("runWidgetOnLoadListener")
+	static void runWidgetOnLoadListener(int var0) {
+		if (var0 != -1) { // L: 4512
+			if (class242.loadInterface(var0)) { // L: 4513
+				Widget[] var1 = MouseRecorder.Widget_interfaceComponents[var0]; // L: 4514
+
+				for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4515
+					Widget var3 = var1[var2]; // L: 4516
+					if (var3.onLoad != null) { // L: 4517
+						ScriptEvent var4 = new ScriptEvent(); // L: 4518
+						var4.widget = var3; // L: 4519
+						var4.args = var3.onLoad; // L: 4520
+						ScriptFrame.runScript(var4, 5000000, 0); // L: 4521
+					}
+				}
+
+			}
+		}
+	} // L: 4524
+
+	@ObfuscatedName("gd")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1059461480"
+	)
+	static final void method656() {
+		for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 5495 5496 5503
+			if (var0.plane == class20.Client_plane && !var0.isFinished) { // L: 5497
+				if (Client.cycle >= var0.cycleStart) { // L: 5498
+					var0.advance(Client.field538); // L: 5499
+					if (var0.isFinished) {
+						var0.remove(); // L: 5500
+					} else {
+						class7.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 5501
+					}
+				}
+			} else {
+				var0.remove();
+			}
+		}
+
+	} // L: 5505
+
+	@ObfuscatedName("hc")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIB)V",
+		garbageValue = "79"
+	)
+	@Export("drawObject")
+	static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
+		long var5 = class7.scene.getBoundaryObjectTag(var0, var1, var2); // L: 6341
+		int var7;
+		int var8;
+		int var9;
+		int var10;
+		int var12;
+		int var13;
+		if (var5 != 0L) { // L: 6342
+			var7 = class7.scene.getObjectFlags(var0, var1, var2, var5); // L: 6343
+			var8 = var7 >> 6 & 3; // L: 6344
+			var9 = var7 & 31; // L: 6345
+			var10 = var3; // L: 6346
+			if (class116.method2671(var5)) { // L: 6347
+				var10 = var4;
+			}
+
+			int[] var11 = class29.sceneMinimapSprite.pixels; // L: 6348
+			var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 6349
+			var13 = PacketWriter.Entity_unpackID(var5); // L: 6350
+			ObjectComposition var14 = class148.getObjectDefinition(var13); // L: 6351
+			if (var14.mapSceneId != -1) { // L: 6352
+				IndexedSprite var15 = AbstractWorldMapData.mapSceneSprites[var14.mapSceneId]; // L: 6353
+				if (var15 != null) { // L: 6354
+					int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 6355
+					int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 6356
+					var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48); // L: 6357
+				}
+			} else {
+				if (var9 == 0 || var9 == 2) { // L: 6361
+					if (var8 == 0) { // L: 6362
+						var11[var12] = var10; // L: 6363
+						var11[var12 + 512] = var10; // L: 6364
+						var11[var12 + 1024] = var10; // L: 6365
+						var11[var12 + 1536] = var10; // L: 6366
+					} else if (var8 == 1) { // L: 6368
+						var11[var12] = var10; // L: 6369
+						var11[var12 + 1] = var10; // L: 6370
+						var11[var12 + 2] = var10; // L: 6371
+						var11[var12 + 3] = var10; // L: 6372
+					} else if (var8 == 2) { // L: 6374
+						var11[var12 + 3] = var10; // L: 6375
+						var11[var12 + 512 + 3] = var10; // L: 6376
+						var11[var12 + 1024 + 3] = var10; // L: 6377
+						var11[var12 + 1536 + 3] = var10; // L: 6378
+					} else if (var8 == 3) { // L: 6380
+						var11[var12 + 1536] = var10; // L: 6381
+						var11[var12 + 1536 + 1] = var10; // L: 6382
+						var11[var12 + 1536 + 2] = var10; // L: 6383
+						var11[var12 + 1536 + 3] = var10; // L: 6384
+					}
+				}
+
+				if (var9 == 3) { // L: 6387
+					if (var8 == 0) { // L: 6388
+						var11[var12] = var10;
+					} else if (var8 == 1) { // L: 6389
+						var11[var12 + 3] = var10;
+					} else if (var8 == 2) { // L: 6390
+						var11[var12 + 1536 + 3] = var10;
+					} else if (var8 == 3) { // L: 6391
+						var11[var12 + 1536] = var10;
+					}
+				}
+
+				if (var9 == 2) { // L: 6393
+					if (var8 == 3) { // L: 6394
+						var11[var12] = var10; // L: 6395
+						var11[var12 + 512] = var10; // L: 6396
+						var11[var12 + 1024] = var10; // L: 6397
+						var11[var12 + 1536] = var10; // L: 6398
+					} else if (var8 == 0) { // L: 6400
+						var11[var12] = var10; // L: 6401
+						var11[var12 + 1] = var10; // L: 6402
+						var11[var12 + 2] = var10; // L: 6403
+						var11[var12 + 3] = var10; // L: 6404
+					} else if (var8 == 1) { // L: 6406
+						var11[var12 + 3] = var10; // L: 6407
+						var11[var12 + 512 + 3] = var10; // L: 6408
+						var11[var12 + 1024 + 3] = var10; // L: 6409
+						var11[var12 + 1536 + 3] = var10; // L: 6410
+					} else if (var8 == 2) { // L: 6412
+						var11[var12 + 1536] = var10; // L: 6413
+						var11[var12 + 1536 + 1] = var10; // L: 6414
+						var11[var12 + 1536 + 2] = var10; // L: 6415
+						var11[var12 + 1536 + 3] = var10; // L: 6416
+					}
+				}
+			}
+		}
+
+		var5 = class7.scene.getGameObjectTag(var0, var1, var2); // L: 6421
+		if (var5 != 0L) { // L: 6422
+			var7 = class7.scene.getObjectFlags(var0, var1, var2, var5); // L: 6423
+			var8 = var7 >> 6 & 3; // L: 6424
+			var9 = var7 & 31; // L: 6425
+			var10 = PacketWriter.Entity_unpackID(var5); // L: 6426
+			ObjectComposition var24 = class148.getObjectDefinition(var10); // L: 6427
+			int var19;
+			if (var24.mapSceneId != -1) { // L: 6428
+				IndexedSprite var20 = AbstractWorldMapData.mapSceneSprites[var24.mapSceneId]; // L: 6429
+				if (var20 != null) { // L: 6430
+					var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 6431
+					var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 6432
+					var20.drawAt(var13 + var1 * 4 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48); // L: 6433
+				}
+			} else if (var9 == 9) { // L: 6436
+				var12 = 15658734; // L: 6437
+				if (class116.method2671(var5)) { // L: 6438
+					var12 = 15597568;
+				}
+
+				int[] var18 = class29.sceneMinimapSprite.pixels; // L: 6439
+				var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 6440
+				if (var8 != 0 && var8 != 2) { // L: 6441
+					var18[var19] = var12; // L: 6448
+					var18[var19 + 1 + 512] = var12; // L: 6449
+					var18[var19 + 1024 + 2] = var12; // L: 6450
+					var18[var19 + 1536 + 3] = var12; // L: 6451
+				} else {
+					var18[var19 + 1536] = var12; // L: 6442
+					var18[var19 + 1 + 1024] = var12; // L: 6443
+					var18[var19 + 512 + 2] = var12; // L: 6444
+					var18[var19 + 3] = var12; // L: 6445
+				}
+			}
+		}
+
+		var5 = class7.scene.getFloorDecorationTag(var0, var1, var2); // L: 6455
+		if (0L != var5) { // L: 6456
+			var7 = PacketWriter.Entity_unpackID(var5); // L: 6457
+			ObjectComposition var21 = class148.getObjectDefinition(var7); // L: 6458
+			if (var21.mapSceneId != -1) { // L: 6459
+				IndexedSprite var22 = AbstractWorldMapData.mapSceneSprites[var21.mapSceneId]; // L: 6460
+				if (var22 != null) { // L: 6461
+					var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 6462
+					int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 6463
+					var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); // L: 6464
+				}
+			}
+		}
+
+	} // L: 6468
+}
diff --git a/runescape-client/src/main/java/class330.java b/runescape-client/src/main/java/class330.java
new file mode 100644
index 0000000000..7f867d710e
--- /dev/null
+++ b/runescape-client/src/main/java/class330.java
@@ -0,0 +1,9 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ly")
+public final class class330 {
+	@ObfuscatedName("j")
+	@Export("SpriteBuffer_spriteHeights")
+	public static int[] SpriteBuffer_spriteHeights;
+}
diff --git a/runescape-client/src/main/java/class331.java b/runescape-client/src/main/java/class331.java
new file mode 100644
index 0000000000..35328012ad
--- /dev/null
+++ b/runescape-client/src/main/java/class331.java
@@ -0,0 +1,24 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("lu")
+public class class331 {
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lku;"
+	)
+	@Export("musicSamplesArchive")
+	public static AbstractArchive musicSamplesArchive;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lku;Lku;Lku;B)V",
+		garbageValue = "0"
+	)
+	public static void method6174(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
+		HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46
+		HitSplatDefinition.field1939 = var1; // L: 47
+		HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; // L: 48
+	} // L: 49
+}
diff --git a/runescape-client/src/main/java/class332.java b/runescape-client/src/main/java/class332.java
new file mode 100644
index 0000000000..5dfa7b2e78
--- /dev/null
+++ b/runescape-client/src/main/java/class332.java
@@ -0,0 +1,196 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("ld")
+public final class class332 {
+	@ObfuscatedName("c")
+	@Export("base37Table")
+	static final char[] base37Table;
+	@ObfuscatedName("b")
+	static long[] field4013;
+
+	static {
+		base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4
+		field4013 = new long[12]; // L: 5
+
+		for (int var0 = 0; var0 < field4013.length; ++var0) { // L: 8
+			field4013[var0] = (long)Math.pow(37.0D, (double)var0);
+		}
+
+	} // L: 9
+
+	@ObfuscatedName("ab")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZS)I",
+		garbageValue = "7484"
+	)
+	static int method6184(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2499
+			if (class222.guestClanSettings != null) { // L: 2500
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2501
+				Friend.field4084 = class222.guestClanSettings; // L: 2502
+			} else {
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2504
+			}
+
+			return 1; // L: 2505
+		} else {
+			int var3;
+			if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2507
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2508
+				if (Client.currentClanSettings[var3] != null) { // L: 2509
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2510
+					Friend.field4084 = Client.currentClanSettings[var3]; // L: 2511
+				} else {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2513
+				}
+
+				return 1; // L: 2514
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2516
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.name; // L: 2517
+				return 1; // L: 2518
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2520
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.allowGuests ? 1 : 0; // L: 2521
+				return 1; // L: 2522
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2524
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1567; // L: 2525
+				return 1; // L: 2526
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2528
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1568; // L: 2529
+				return 1; // L: 2530
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2532
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1569; // L: 2533
+				return 1; // L: 2534
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2536
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1570; // L: 2537
+				return 1; // L: 2538
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2540
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.memberCount; // L: 2541
+				return 1; // L: 2542
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2544
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2545
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.memberNames[var3]; // L: 2546
+				return 1; // L: 2547
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2549
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2550
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.memberRanks[var3]; // L: 2551
+				return 1; // L: 2552
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2554
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.bannedMemberCount; // L: 2555
+				return 1; // L: 2556
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2558
+				var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2559
+				Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = Friend.field4084.bannedMemberNames[var3]; // L: 2560
+				return 1; // L: 2561
+			} else {
+				int var5;
+				int var6;
+				if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2563
+					IsaacCipher.Interpreter_intStackSize -= 3; // L: 2564
+					var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2565
+					var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2566
+					var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2567
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.method2847(var3, var6, var5); // L: 2568
+					return 1; // L: 2569
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2571
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.currentOwner; // L: 2572
+					return 1; // L: 2573
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2575
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1579; // L: 2576
+					return 1; // L: 2577
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2579
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.method2881(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 2580
+					return 1; // L: 2581
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2583
+					Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.getSortedMembers()[Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]]; // L: 2584
+					return 1; // L: 2585
+				} else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2587
+					IsaacCipher.Interpreter_intStackSize -= 2; // L: 2588
+					var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2589
+					var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2590
+					class113.method2617(var6, var3); // L: 2591
+					return 1; // L: 2592
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2594
+					var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2595
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1582[var3]; // L: 2596
+					return 1; // L: 2597
+				} else {
+					if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2599
+						IsaacCipher.Interpreter_intStackSize -= 3; // L: 2600
+						var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2601
+						boolean var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1] == 1; // L: 2602
+						var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2603
+						class6.method48(var5, var3, var4); // L: 2604
+					}
+
+					if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2606
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2607
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Friend.field4084.field1577[var3] ? 1 : 0; // L: 2608
+						return 1; // L: 2609
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2611
+						if (UserComparator5.guestClanChannel != null) { // L: 2612
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2613
+							class1.field0 = UserComparator5.guestClanChannel; // L: 2614
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2616
+						}
+
+						return 1; // L: 2617
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2619
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2620
+						if (Client.currentClanChannels[var3] != null) { // L: 2621
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 1; // L: 2622
+							class1.field0 = Client.currentClanChannels[var3]; // L: 2623
+							Interpreter.field812 = var3; // L: 2624
+						} else {
+							Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2626
+						}
+
+						return 1; // L: 2627
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2629
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = class1.field0.name; // L: 2630
+						return 1; // L: 2631
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2633
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.field1643; // L: 2634
+						return 1; // L: 2635
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2637
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.field1636; // L: 2638
+						return 1; // L: 2639
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2641
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.method2990(); // L: 2642
+						return 1; // L: 2643
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2645
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2646
+						Interpreter.Interpreter_stringStack[++class13.Interpreter_stringStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).username.getName(); // L: 2647
+						return 1; // L: 2648
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2650
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2651
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).rank; // L: 2652
+						return 1; // L: 2653
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2655
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2656
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = ((ClanChannelMember)class1.field0.members.get(var3)).world; // L: 2657
+						return 1; // L: 2658
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2660
+						var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2661
+						class135.method2831(Interpreter.field812, var3); // L: 2662
+						return 1; // L: 2663
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2665
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.method2991(Interpreter.Interpreter_stringStack[--class13.Interpreter_stringStackSize]); // L: 2666
+						return 1; // L: 2667
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2669
+						Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = class1.field0.getSortedMembers()[Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]]; // L: 2670
+						return 1; // L: 2671
+					} else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2673
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = BuddyRankComparator.field1342 != null ? 1 : 0; // L: 2674
+						return 1; // L: 2675
+					} else {
+						return 2; // L: 2677
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class321.java b/runescape-client/src/main/java/class333.java
similarity index 95%
rename from runescape-client/src/main/java/class321.java
rename to runescape-client/src/main/java/class333.java
index 5d5f0a7707..c09ce209ee 100644
--- a/runescape-client/src/main/java/class321.java
+++ b/runescape-client/src/main/java/class333.java
@@ -1,9 +1,9 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("li")
-public class class321 {
-	@ObfuscatedName("i")
+@ObfuscatedName("le")
+public class class333 {
+	@ObfuscatedName("c")
 	@Export("writeRandomDat")
 	public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) {
 		if (var2 == var0) { // L: 12
@@ -51,7 +51,7 @@ public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3,
 
 	} // L: 49
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("clearIntArray")
 	public static void clearIntArray(int[] var0, int var1, int var2) {
 		for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373
diff --git a/runescape-client/src/main/java/class334.java b/runescape-client/src/main/java/class334.java
new file mode 100644
index 0000000000..bfd1afa1c2
--- /dev/null
+++ b/runescape-client/src/main/java/class334.java
@@ -0,0 +1,61 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("lb")
+public class class334 {
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "[Lbw;"
+	)
+	@Export("World_worlds")
+	static World[] World_worlds;
+	@ObfuscatedName("gx")
+	@ObfuscatedSignature(
+		descriptor = "Lfk;"
+	)
+	@Export("socketTask")
+	static Task socketTask;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -745121595
+	)
+	int field4015;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -1091400175
+	)
+	int field4014;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 1334767653
+	)
+	int field4016;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -2057835859
+	)
+	int field4017;
+
+	public String toString() {
+		boolean var1 = true; // L: 15
+		int var2 = 10 - Integer.toString(this.field4015).length(); // L: 16
+		int var3 = 10 - Integer.toString(this.field4016).length(); // L: 17
+		int var4 = 10 - Integer.toString(this.field4014).length(); // L: 18
+		String var5 = "          ".substring(10 - var2); // L: 19
+		String var6 = "          ".substring(10 - var3); // L: 20
+		String var7 = "          ".substring(10 - var4); // L: 21
+		return "    Size: " + this.field4015 + var5 + "Created: " + this.field4014 + var7 + "Total used: " + this.field4016 + var6 + "Max-In-Use: " + this.field4017; // L: 22
+	}
+
+	@ObfuscatedName("lp")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "0"
+	)
+	static final void method6216() {
+		Client.field672 = Client.cycleCntr; // L: 12476
+		SoundSystem.ClanChat_inClanChat = true; // L: 12477
+	} // L: 12478
+}
diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java
new file mode 100644
index 0000000000..0103ae501b
--- /dev/null
+++ b/runescape-client/src/main/java/class336.java
@@ -0,0 +1,37 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ln")
+public class class336 {
+	@ObfuscatedName("ud")
+	@ObfuscatedGetter(
+		intValue = 1525311123
+	)
+	@Export("foundItemIndex")
+	static int foundItemIndex;
+
+	@ObfuscatedName("hh")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "80446087"
+	)
+	static final void method6228(int var0, int var1, int var2, int var3) {
+		Client.field590 = 0; // L: 6035
+		int var4 = (class340.localPlayer.x >> 7) + class131.baseX; // L: 6036
+		int var5 = (class340.localPlayer.y >> 7) + TileItem.baseY; // L: 6037
+		if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { // L: 6038
+			Client.field590 = 1;
+		}
+
+		if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { // L: 6039
+			Client.field590 = 1;
+		}
+
+		if (Client.field590 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { // L: 6040
+			Client.field590 = 0;
+		}
+
+	} // L: 6042
+}
diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java
new file mode 100644
index 0000000000..411c781799
--- /dev/null
+++ b/runescape-client/src/main/java/class338.java
@@ -0,0 +1,79 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ms")
+public class class338 {
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = 382463389
+	)
+	static int field4055;
+	@ObfuscatedName("bg")
+	@ObfuscatedSignature(
+		descriptor = "Lko;"
+	)
+	static StudioGame field4054;
+
+	@ObfuscatedName("c")
+	public static final int method6256(double var0, double var2, double var4) {
+		double var6 = var4; // L: 9
+		double var8 = var4; // L: 10
+		double var10 = var4; // L: 11
+		if (var2 != 0.0D) { // L: 12
+			double var12;
+			if (var4 < 0.5D) { // L: 14
+				var12 = (1.0D + var2) * var4;
+			} else {
+				var12 = var4 + var2 - var2 * var4; // L: 15
+			}
+
+			double var14 = 2.0D * var4 - var12; // L: 16
+			double var16 = var0 + 0.3333333333333333D; // L: 17
+			if (var16 > 1.0D) { // L: 18
+				--var16;
+			}
+
+			double var20 = var0 - 0.3333333333333333D; // L: 20
+			if (var20 < 0.0D) { // L: 21
+				++var20;
+			}
+
+			if (var16 * 6.0D < 1.0D) { // L: 22
+				var6 = (var12 - var14) * 6.0D * var16 + var14;
+			} else if (var16 * 2.0D < 1.0D) { // L: 23
+				var6 = var12;
+			} else if (3.0D * var16 < 2.0D) { // L: 24
+				var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14;
+			} else {
+				var6 = var14; // L: 25
+			}
+
+			if (6.0D * var0 < 1.0D) { // L: 26
+				var8 = (var12 - var14) * 6.0D * var0 + var14;
+			} else if (var0 * 2.0D < 1.0D) { // L: 27
+				var8 = var12;
+			} else if (var0 * 3.0D < 2.0D) {
+				var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; // L: 28
+			} else {
+				var8 = var14; // L: 29
+			}
+
+			if (var20 * 6.0D < 1.0D) { // L: 30
+				var10 = var14 + var20 * 6.0D * (var12 - var14);
+			} else if (var20 * 2.0D < 1.0D) { // L: 31
+				var10 = var12;
+			} else if (var20 * 3.0D < 2.0D) { // L: 32
+				var10 = var14 + (0.6666666666666666D - var20) * (var12 - var14) * 6.0D;
+			} else {
+				var10 = var14; // L: 33
+			}
+		}
+
+		int var22 = (int)(var6 * 256.0D); // L: 35
+		int var13 = (int)(var8 * 256.0D); // L: 36
+		int var23 = (int)(var10 * 256.0D); // L: 37
+		int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38
+		return var15; // L: 39
+	}
+}
diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java
new file mode 100644
index 0000000000..1ae2d9f425
--- /dev/null
+++ b/runescape-client/src/main/java/class339.java
@@ -0,0 +1,19 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("mk")
+public class class339 {
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -1317409183
+	)
+	public static int field4058;
+	@ObfuscatedName("pr")
+	@ObfuscatedSignature(
+		descriptor = "Lct;"
+	)
+	@Export("varcs")
+	static Varcs varcs;
+}
diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java
new file mode 100644
index 0000000000..ba5397a646
--- /dev/null
+++ b/runescape-client/src/main/java/class340.java
@@ -0,0 +1,13 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ma")
+public class class340 {
+	@ObfuscatedName("ll")
+	@ObfuscatedSignature(
+		descriptor = "Lck;"
+	)
+	@Export("localPlayer")
+	static Player localPlayer;
+}
diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java
new file mode 100644
index 0000000000..f192e650e8
--- /dev/null
+++ b/runescape-client/src/main/java/class341.java
@@ -0,0 +1,235 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("mf")
+public class class341 {
+	@ObfuscatedName("ax")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZB)I",
+		garbageValue = "6"
+	)
+	static int method6258(int var0, Script var1, boolean var2) {
+		int var3;
+		int var4;
+		if (var0 == ScriptOpcodes.ADD) { // L: 2828
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 2829
+			var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2830
+			var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2831
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var4 + var3; // L: 2832
+			return 1; // L: 2833
+		} else if (var0 == ScriptOpcodes.SUB) { // L: 2835
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 2836
+			var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2837
+			var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2838
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 - var4; // L: 2839
+			return 1; // L: 2840
+		} else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2842
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 2843
+			var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2844
+			var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2845
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 * var4; // L: 2846
+			return 1; // L: 2847
+		} else if (var0 == ScriptOpcodes.DIV) { // L: 2849
+			IsaacCipher.Interpreter_intStackSize -= 2; // L: 2850
+			var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2851
+			var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2852
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 / var4; // L: 2853
+			return 1; // L: 2854
+		} else if (var0 == ScriptOpcodes.RANDOM) { // L: 2856
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2857
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2858
+			return 1; // L: 2859
+		} else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2861
+			var3 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]; // L: 2862
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2863
+			return 1; // L: 2864
+		} else {
+			int var5;
+			int var6;
+			int var7;
+			if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2866
+				IsaacCipher.Interpreter_intStackSize -= 5; // L: 2867
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2868
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2869
+				var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2870
+				var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 2871
+				var7 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 4]; // L: 2872
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 2873
+				return 1; // L: 2874
+			} else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2876
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2877
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2878
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2879
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; // L: 2880
+				return 1; // L: 2881
+			} else if (var0 == ScriptOpcodes.SETBIT) { // L: 2883
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2884
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2885
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2886
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2887
+				return 1; // L: 2888
+			} else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2890
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2891
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2892
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2893
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2894
+				return 1; // L: 2895
+			} else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2897
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2898
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2899
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2900
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2901
+				return 1; // L: 2902
+			} else if (var0 == ScriptOpcodes.MOD) { // L: 2904
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2905
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2906
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2907
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 % var4; // L: 2908
+				return 1; // L: 2909
+			} else if (var0 == ScriptOpcodes.POW) { // L: 2911
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2912
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2913
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2914
+				if (var3 == 0) { // L: 2915
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0;
+				} else {
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2916
+				}
+
+				return 1; // L: 2917
+			} else if (var0 == ScriptOpcodes.INVPOW) { // L: 2919
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2920
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2921
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2922
+				if (var3 == 0) { // L: 2923
+					Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 2924
+					return 1; // L: 2925
+				} else {
+					switch(var4) { // L: 2927
+					case 0:
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2935
+						break; // L: 2936
+					case 1:
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 2950
+						break; // L: 2951
+					case 2:
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2945
+						break; // L: 2946
+					case 3:
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2930
+						break;
+					case 4:
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2955
+						break;
+					default:
+						Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2940
+					}
+
+					return 1; // L: 2959
+				}
+			} else if (var0 == ScriptOpcodes.AND) { // L: 2961
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2962
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2963
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2964
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 & var4; // L: 2965
+				return 1; // L: 2966
+			} else if (var0 == ScriptOpcodes.OR) { // L: 2968
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2969
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2970
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2971
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | var4; // L: 2972
+				return 1; // L: 2973
+			} else if (var0 == ScriptOpcodes.SCALE) { // L: 2975
+				IsaacCipher.Interpreter_intStackSize -= 3; // L: 2976
+				long var9 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2977
+				long var11 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2978
+				long var13 = (long)Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2979
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); // L: 2980
+				return 1; // L: 2981
+			} else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 2983
+				var3 = Language.method5825(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 2984
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3; // L: 2985
+				return 1; // L: 2986
+			} else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 2988
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 2989
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2990
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2991
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2992
+				return 1; // L: 2993
+			} else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 2995
+				IsaacCipher.Interpreter_intStackSize -= 3; // L: 2996
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 2997
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 2998
+				var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 2999
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = FloorOverlayDefinition.method3636(var3, var4, var5); // L: 3000
+				return 1; // L: 3001
+			} else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 3003
+				IsaacCipher.Interpreter_intStackSize -= 3; // L: 3004
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3005
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3006
+				var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3007
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = class123.method2737(var3, var4, var5); // L: 3008
+				return 1; // L: 3009
+			} else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 3011
+				IsaacCipher.Interpreter_intStackSize -= 3; // L: 3012
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3013
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3014
+				var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3015
+				var6 = 31 - var5; // L: 3016
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 3017
+				return 1; // L: 3018
+			} else if (var0 == 4030) { // L: 3020
+				IsaacCipher.Interpreter_intStackSize -= 4; // L: 3021
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3022
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3023
+				var5 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 2]; // L: 3024
+				var6 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 3]; // L: 3025
+				var3 = class123.method2737(var3, var5, var6); // L: 3026
+				var7 = WorldMapEvent.method4942(var6 - var5 + 1); // L: 3027
+				if (var4 > var7) { // L: 3028
+					var4 = var7;
+				}
+
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 3029
+				return 1; // L: 3030
+			} else if (var0 == 4032) { // L: 3032
+				Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = SoundCache.method833(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); // L: 3033
+				return 1; // L: 3034
+			} else if (var0 == 4033) { // L: 3036
+				Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = GrandExchangeOfferNameComparator.method5727(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); // L: 3037
+				return 1; // L: 3038
+			} else if (var0 == 4034) { // L: 3040
+				IsaacCipher.Interpreter_intStackSize -= 2; // L: 3041
+				var3 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize]; // L: 3042
+				var4 = Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize + 1]; // L: 3043
+				var5 = class123.method2744(var3, var4); // L: 3044
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var5; // L: 3045
+				return 1; // L: 3046
+			} else if (var0 == 4035) { // L: 3048
+				Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1] = Math.abs(Interpreter.Interpreter_intStack[IsaacCipher.Interpreter_intStackSize - 1]); // L: 3049
+				return 1; // L: 3050
+			} else {
+				return 2; // L: 3052
+			}
+		}
+	}
+
+	@ObfuscatedName("gx")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1492532048"
+	)
+	static final void method6257() {
+		int var0 = Players.Players_count; // L: 4603
+		int[] var1 = Players.Players_indices; // L: 4604
+
+		for (int var2 = 0; var2 < var0; ++var2) { // L: 4605
+			Player var3 = Client.players[var1[var2]]; // L: 4606
+			if (var3 != null) { // L: 4607
+				ItemLayer.updateActorSequence(var3, 1); // L: 4608
+			}
+		}
+
+	} // L: 4611
+}
diff --git a/runescape-client/src/main/java/class351.java b/runescape-client/src/main/java/class351.java
deleted file mode 100644
index c211809a21..0000000000
--- a/runescape-client/src/main/java/class351.java
+++ /dev/null
@@ -1,10 +0,0 @@
-import java.io.File;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("mc")
-public class class351 {
-	@ObfuscatedName("a")
-	@Export("JagexCache_locationFile")
-	static File JagexCache_locationFile;
-}
diff --git a/runescape-client/src/main/java/class352.java b/runescape-client/src/main/java/class352.java
deleted file mode 100644
index 6c32f7fbd0..0000000000
--- a/runescape-client/src/main/java/class352.java
+++ /dev/null
@@ -1,54 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mh")
-public enum class352 implements MouseWheel {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lmh;"
-	)
-	field4027(0, 1),
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lmh;"
-	)
-	field4029(3, 2),
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lmh;"
-	)
-	field4032(1, 3),
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lmh;"
-	)
-	field4030(2, 10);
-
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = 1892879833
-	)
-	final int field4031;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 1388944807
-	)
-	final int field4028;
-
-	class352(int var3, int var4) {
-		this.field4031 = var3; // L: 16
-		this.field4028 = var4; // L: 17
-	} // L: 18
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
-	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field4028; // L: 21
-	}
-}
diff --git a/runescape-client/src/main/java/class353.java b/runescape-client/src/main/java/class353.java
deleted file mode 100644
index 805db844f9..0000000000
--- a/runescape-client/src/main/java/class353.java
+++ /dev/null
@@ -1,34 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("md")
-public class class353 implements class358 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lnz;"
-	)
-	public final class380 field4033;
-
-	@ObfuscatedSignature(
-		descriptor = "(Lnx;)V"
-	)
-	class353(class381 var1) {
-		this.field4033 = var1; // L: 14
-	} // L: 15
-
-	@ObfuscatedSignature(
-		descriptor = "(Lml;)V"
-	)
-	public class353(class354 var1) {
-		this(new class381(var1)); // L: 10
-	} // L: 11
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "65280"
-	)
-	public int method6379(int var1) {
-		return this.field4033.vmethod6739(var1); // L: 18
-	}
-}
diff --git a/runescape-client/src/main/java/class354.java b/runescape-client/src/main/java/class354.java
deleted file mode 100644
index 9630e506d5..0000000000
--- a/runescape-client/src/main/java/class354.java
+++ /dev/null
@@ -1,80 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ml")
-public abstract class class354 extends class229 implements class407 {
-	@ObfuscatedSignature(
-		descriptor = "(Ljd;Lkz;I)V"
-	)
-	protected class354(StudioGame var1, Language var2, int var3) {
-		super(var1, var2, var3); // L: 15
-	} // L: 16
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lmn;",
-		garbageValue = "20"
-	)
-	protected abstract class356 vmethod6814(int var1);
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "846699714"
-	)
-	public int method6384() {
-		return super.field2647; // L: 19
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/Object;",
-		garbageValue = "-738928947"
-	)
-	public Object vmethod7243(int var1) {
-		class356 var2 = this.vmethod6814(var1); // L: 23
-		return var2 != null && var2.method6407() ? var2.method6408() : null; // L: 24 25
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;B)Lov;",
-		garbageValue = "-56"
-	)
-	public class408 method6391(Buffer var1) {
-		int var2 = var1.readUnsignedShort(); // L: 29
-		class356 var3 = this.vmethod6814(var2); // L: 30
-		class408 var4 = new class408(var2); // L: 31
-		Class var5 = var3.field4040.field4274; // L: 32
-		if (var5 == Integer.class) { // L: 33
-			var4.field4361 = var1.readInt();
-		} else if (var5 == Long.class) {
-			var4.field4361 = var1.readLong(); // L: 34
-		} else if (var5 == String.class) { // L: 35
-			var4.field4361 = var1.readStringCp1252NullCircumfixed();
-		} else {
-			if (!class403.class.isAssignableFrom(var5)) { // L: 36
-				throw new IllegalStateException(); // L: 45
-			}
-
-			try {
-				class403 var6 = (class403)var5.newInstance(); // L: 38
-				var6.method7216(var1); // L: 39
-				var4.field4361 = var6; // L: 40
-			} catch (InstantiationException var7) { // L: 42
-			} catch (IllegalAccessException var8) { // L: 43
-			}
-		}
-
-		return var4; // L: 46
-	}
-
-	@ObfuscatedName("jc")
-	static final void method6396(double var0) {
-		Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11366
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11367
-		ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 11369
-		class408.clientPreferences.brightness = var0; // L: 11371
-		Login.savePreferences(); // L: 11372
-	} // L: 11373
-}
diff --git a/runescape-client/src/main/java/class355.java b/runescape-client/src/main/java/class355.java
deleted file mode 100644
index 9fc8aa75d0..0000000000
--- a/runescape-client/src/main/java/class355.java
+++ /dev/null
@@ -1,56 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mf")
-public class class355 extends class356 {
-	public class355(int var1) {
-		super(var1); // L: 7
-	} // L: 8
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "-1876316576"
-	)
-	void vmethod6406(Buffer var1, int var2) {
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "65536"
-	)
-	public static String method6403(CharSequence var0) {
-		int var1 = var0.length(); // L: 11
-		StringBuilder var2 = new StringBuilder(var1); // L: 12
-
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 13
-			char var4 = var0.charAt(var3); // L: 14
-			if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15
-				if (var4 == ' ') { // L: 16
-					var2.append('+');
-				} else {
-					byte var5 = AbstractSocket.charToByteCp1252(var4); // L: 18
-					var2.append('%'); // L: 19
-					int var6 = var5 >> 4 & 15; // L: 20
-					if (var6 >= 10) { // L: 21
-						var2.append((char)(var6 + 55));
-					} else {
-						var2.append((char)(var6 + 48)); // L: 22
-					}
-
-					var6 = var5 & 15; // L: 23
-					if (var6 >= 10) { // L: 24
-						var2.append((char)(var6 + 55));
-					} else {
-						var2.append((char)(var6 + 48));
-					}
-				}
-			} else {
-				var2.append(var4); // L: 25
-			}
-		}
-
-		return var2.toString(); // L: 28
-	}
-}
diff --git a/runescape-client/src/main/java/class356.java b/runescape-client/src/main/java/class356.java
deleted file mode 100644
index 2d324cca52..0000000000
--- a/runescape-client/src/main/java/class356.java
+++ /dev/null
@@ -1,84 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mn")
-public abstract class class356 implements class228 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Log;"
-	)
-	class392 field4040;
-
-	class356(int var1) {
-	} // L: 13
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;II)V",
-		garbageValue = "-1876316576"
-	)
-	abstract void vmethod6406(Buffer var1, int var2);
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V",
-		garbageValue = "772115588"
-	)
-	public void method6405(Buffer var1) {
-		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 17
-			if (var2 == 0) { // L: 18
-				return; // L: 43
-			}
-
-			class352[] var3 = new class352[]{class352.field4027, class352.field4029, class352.field4030, class352.field4032}; // L: 21
-			class352 var4 = (class352)UserComparator4.findEnumerated(var3, var2); // L: 23
-			if (var4 != null) { // L: 24
-				switch(var4.field4031) { // L: 25
-				case 0:
-					int var5 = var1.readUnsignedByte(); // L: 27
-					this.field4040 = NetFileRequest.method5300(var5); // L: 28
-					if (this.field4040 != null) {
-						break;
-					}
-
-					throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); // L: 29
-				case 1:
-				default:
-					throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 35
-				case 2:
-					var1.readStringCp1252NullCircumfixed(); // L: 32
-					break; // L: 33
-				case 3:
-					UserComparator4.findEnumerated(Occluder.method4483(), var1.readUnsignedByte()); // L: 37
-				}
-			} else {
-				this.vmethod6406(var1, var2); // L: 41
-			}
-		}
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "1"
-	)
-	boolean method6407() {
-		return this.field4040 != null; // L: 48
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/Object;",
-		garbageValue = "-1684206943"
-	)
-	Object method6408() {
-		if (this.field4040 == class392.field4276) { // L: 52
-			return 0; // L: 53
-		} else if (this.field4040 == class392.field4270) { // L: 55
-			return -1L; // L: 56
-		} else {
-			return this.field4040 == class392.field4271 ? "" : null; // L: 58 59 61
-		}
-	}
-}
diff --git a/runescape-client/src/main/java/class357.java b/runescape-client/src/main/java/class357.java
deleted file mode 100644
index ad447a6224..0000000000
--- a/runescape-client/src/main/java/class357.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("mi")
-public interface class357 {
-}
diff --git a/runescape-client/src/main/java/class358.java b/runescape-client/src/main/java/class358.java
deleted file mode 100644
index 8264479706..0000000000
--- a/runescape-client/src/main/java/class358.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("my")
-public interface class358 extends class357 {
-}
diff --git a/runescape-client/src/main/java/class359.java b/runescape-client/src/main/java/class359.java
deleted file mode 100644
index d345460c42..0000000000
--- a/runescape-client/src/main/java/class359.java
+++ /dev/null
@@ -1,36 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mu")
-public class class359 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lmu;"
-	)
-	static final class359 field4043;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lmu;"
-	)
-	static final class359 field4042;
-	@ObfuscatedName("s")
-	String field4044;
-
-	static {
-		field4043 = new class359("application/json"); // L: 4
-		field4042 = new class359("text/plain"); // L: 5
-	}
-
-	class359(String var1) {
-		this.field4044 = var1; // L: 9
-	} // L: 10
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "33"
-	)
-	public String method6418() {
-		return this.field4044; // L: 13
-	}
-}
diff --git a/runescape-client/src/main/java/class360.java b/runescape-client/src/main/java/class360.java
deleted file mode 100644
index 94fd9c7434..0000000000
--- a/runescape-client/src/main/java/class360.java
+++ /dev/null
@@ -1,8 +0,0 @@
-import java.io.UnsupportedEncodingException;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("mg")
-public interface class360 {
-	@ObfuscatedName("i")
-	byte[] method6423(int var1) throws UnsupportedEncodingException;
-}
diff --git a/runescape-client/src/main/java/class361.java b/runescape-client/src/main/java/class361.java
deleted file mode 100644
index b2bc7ff943..0000000000
--- a/runescape-client/src/main/java/class361.java
+++ /dev/null
@@ -1,37 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mz")
-public class class361 {
-	@ObfuscatedName("o")
-	static final int[] field4051;
-	@ObfuscatedName("g")
-	static final int[] field4047;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -1081832115
-	)
-	static int field4050;
-
-	static {
-		field4051 = new int[16384]; // L: 8
-		field4047 = new int[16384];
-		double var0 = 3.834951969714103E-4D; // L: 12
-
-		for (int var2 = 0; var2 < 16384; ++var2) { // L: 13
-			field4051[var2] = (int)(16384.0D * Math.sin((double)var2 * var0)); // L: 14
-			field4047[var2] = (int)(16384.0D * Math.cos(var0 * (double)var2)); // L: 15
-		}
-
-	} // L: 17
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/String;[SI)V",
-		garbageValue = "-1789357355"
-	)
-	public static void method6427(String[] var0, short[] var1) {
-		class132.sortItemsByName(var0, var1, 0, var0.length - 1); // L: 9
-	} // L: 10
-}
diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java
deleted file mode 100644
index f1d22c836c..0000000000
--- a/runescape-client/src/main/java/class362.java
+++ /dev/null
@@ -1,27 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("mj")
-public class class362 {
-	@ObfuscatedName("b")
-	static final int[] field4061;
-	@ObfuscatedName("x")
-	static final int[] field4062;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -1568159649
-	)
-	static int field4057;
-
-	static {
-		field4061 = new int[2048]; // L: 13
-		field4062 = new int[2048]; // L: 14
-		double var0 = 0.0030679615757712823D; // L: 17
-
-		for (int var2 = 0; var2 < 2048; ++var2) { // L: 18
-			field4061[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19
-			field4062[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20
-		}
-
-	} // L: 22
-}
diff --git a/runescape-client/src/main/java/class363.java b/runescape-client/src/main/java/class363.java
new file mode 100644
index 0000000000..0429d2aeee
--- /dev/null
+++ b/runescape-client/src/main/java/class363.java
@@ -0,0 +1,157 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("mt")
+public class class363 {
+	@ObfuscatedName("gp")
+	@ObfuscatedSignature(
+		descriptor = "(Lcy;I)V",
+		garbageValue = "499018335"
+	)
+	static final void method6612(Actor var0) {
+		var0.isWalking = false; // L: 4826
+		SequenceDefinition var1;
+		int var2;
+		if (var0.movementSequence != -1) { // L: 4827
+			var1 = UserComparator5.SequenceDefinition_get(var0.movementSequence); // L: 4828
+			if (var1 != null) { // L: 4829
+				if (!var1.method3690() && var1.frameIds != null) { // L: 4830
+					++var0.movementFrameCycle; // L: 4831
+					if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4832
+						var0.movementFrameCycle = 1; // L: 4833
+						++var0.movementFrame; // L: 4834
+						class409.method7269(var1, var0.movementFrame, var0.x, var0.y); // L: 4835
+					}
+
+					if (var0.movementFrame >= var1.frameIds.length) { // L: 4837
+						var0.movementFrameCycle = 0; // L: 4838
+						var0.movementFrame = 0; // L: 4839
+						class409.method7269(var1, var0.movementFrame, var0.x, var0.y); // L: 4840
+					}
+				} else if (var1.method3690()) { // L: 4843
+					++var0.movementFrame; // L: 4844
+					var2 = var1.method3647(); // L: 4845
+					if (var0.movementFrame < var2) { // L: 4846
+						Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y); // L: 4847
+					} else {
+						var0.movementFrameCycle = 0; // L: 4850
+						var0.movementFrame = 0; // L: 4851
+						Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y); // L: 4852
+					}
+				} else {
+					var0.movementSequence = -1; // L: 4855
+				}
+			} else {
+				var0.movementSequence = -1; // L: 4857
+			}
+		}
+
+		if (var0.spotAnimation != -1 && Client.cycle >= var0.field1130) { // L: 4859
+			if (var0.spotAnimationFrame < 0) { // L: 4860
+				var0.spotAnimationFrame = 0;
+			}
+
+			int var4 = AccessFile.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4861
+			if (var4 != -1) { // L: 4862
+				SequenceDefinition var5 = UserComparator5.SequenceDefinition_get(var4); // L: 4863
+				if (var5 != null && var5.frameIds != null) { // L: 4864
+					++var0.spotAnimationFrameCycle; // L: 4865
+					if (var0.spotAnimationFrame < var5.frameIds.length && var0.spotAnimationFrameCycle > var5.frameLengths[var0.spotAnimationFrame]) { // L: 4866
+						var0.spotAnimationFrameCycle = 1; // L: 4867
+						++var0.spotAnimationFrame; // L: 4868
+						class409.method7269(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4869
+					}
+
+					if (var0.spotAnimationFrame >= var5.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var5.frameIds.length)) { // L: 4871 4872
+						var0.spotAnimation = -1;
+					}
+				} else if (var5.method3690()) { // L: 4875
+					++var0.spotAnimationFrame; // L: 4876
+					int var3 = var5.method3647(); // L: 4877
+					if (var0.spotAnimationFrame < var3) { // L: 4878
+						Varcs.method2427(var5, var0.spotAnimationFrame, var0.x, var0.y); // L: 4879
+					} else if (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3) { // L: 4882
+						var0.spotAnimation = -1;
+					}
+				} else {
+					var0.spotAnimation = -1; // L: 4885
+				}
+			} else {
+				var0.spotAnimation = -1; // L: 4887
+			}
+		}
+
+		if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4889
+			var1 = UserComparator5.SequenceDefinition_get(var0.sequence); // L: 4890
+			if (var1.field2096 == 1 && var0.field1098 > 0 && var0.field1136 <= Client.cycle && var0.field1157 < Client.cycle) { // L: 4891 4892
+				var0.sequenceDelay = 1; // L: 4893
+				return; // L: 4894
+			}
+		}
+
+		if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4898
+			var1 = UserComparator5.SequenceDefinition_get(var0.sequence); // L: 4899
+			if (var1 != null) { // L: 4900
+				if (!var1.method3690() && var1.frameIds != null) { // L: 4901
+					++var0.sequenceFrameCycle; // L: 4902
+					if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4903
+						var0.sequenceFrameCycle = 1; // L: 4904
+						++var0.sequenceFrame; // L: 4905
+						class409.method7269(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4906
+					}
+
+					if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4908
+						var0.sequenceFrame -= var1.frameCount; // L: 4909
+						++var0.field1126; // L: 4910
+						if (var0.field1126 >= var1.field2095) { // L: 4911
+							var0.sequence = -1;
+						} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4912
+							class409.method7269(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4913
+						} else {
+							var0.sequence = -1;
+						}
+					}
+
+					var0.isWalking = var1.field2091; // L: 4915
+				} else if (var1.method3690()) { // L: 4917
+					++var0.sequenceFrame; // L: 4918
+					var2 = var1.method3648().method2691(); // L: 4919
+					if (var0.sequenceFrame < var2) { // L: 4920
+						Varcs.method2427(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4921
+					} else {
+						var0.sequenceFrame -= var1.frameCount; // L: 4924
+						++var0.field1126; // L: 4925
+						if (var0.field1126 >= var1.field2095) { // L: 4926
+							var0.sequence = -1;
+						} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2) { // L: 4927
+							Varcs.method2427(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4928
+						} else {
+							var0.sequence = -1;
+						}
+					}
+				} else {
+					var0.sequence = -1; // L: 4931
+				}
+			} else {
+				var0.sequence = -1; // L: 4933
+			}
+		}
+
+		if (var0.sequenceDelay > 0) { // L: 4935
+			--var0.sequenceDelay;
+		}
+
+	} // L: 4936
+
+	@ObfuscatedName("lr")
+	@ObfuscatedSignature(
+		descriptor = "(Ljm;I)I",
+		garbageValue = "1020849345"
+	)
+	@Export("getWidgetFlags")
+	static int getWidgetFlags(Widget var0) {
+		IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 12561
+		return var1 != null ? var1.integer : var0.flags; // L: 12562 12563
+	}
+}
diff --git a/runescape-client/src/main/java/class364.java b/runescape-client/src/main/java/class364.java
new file mode 100644
index 0000000000..6aa1fcb561
--- /dev/null
+++ b/runescape-client/src/main/java/class364.java
@@ -0,0 +1,49 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ne")
+public class class364 {
+	@ObfuscatedName("c")
+	float field4181;
+	@ObfuscatedName("b")
+	float field4180;
+	@ObfuscatedName("p")
+	float field4182;
+
+	static {
+		new class364(0.0F, 0.0F, 0.0F); // L: 5
+		new class364(1.0F, 1.0F, 1.0F); // L: 9
+		new class364(1.0F, 0.0F, 0.0F); // L: 13
+		new class364(0.0F, 1.0F, 0.0F); // L: 17
+		new class364(0.0F, 0.0F, 1.0F); // L: 21
+		Decimator.method1073(100); // L: 25
+	} // L: 26
+
+	class364(float var1, float var2, float var3) {
+		this.field4181 = var1; // L: 35
+		this.field4180 = var2; // L: 36
+		this.field4182 = var3; // L: 37
+	} // L: 38
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(I)F",
+		garbageValue = "-893321960"
+	)
+	final float method6618() {
+		return (float)Math.sqrt((double)(this.field4182 * this.field4182 + this.field4181 * this.field4181 + this.field4180 * this.field4180)); // L: 41
+	}
+
+	public String toString() {
+		return this.field4181 + ", " + this.field4180 + ", " + this.field4182; // L: 46
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-247001185"
+	)
+	public static void method6623() {
+		FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 94
+	} // L: 95
+}
diff --git a/runescape-client/src/main/java/class365.java b/runescape-client/src/main/java/class365.java
new file mode 100644
index 0000000000..dbf004dfa5
--- /dev/null
+++ b/runescape-client/src/main/java/class365.java
@@ -0,0 +1,126 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ns")
+public final class class365 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "[Lns;"
+	)
+	static class365[] field4189;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -1235127287
+	)
+	static int field4184;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -68098279
+	)
+	static int field4185;
+	@ObfuscatedName("m")
+	float field4186;
+	@ObfuscatedName("t")
+	float field4188;
+	@ObfuscatedName("s")
+	float field4187;
+	@ObfuscatedName("j")
+	float field4183;
+
+	static {
+		field4189 = new class365[0]; // L: 4
+		field4184 = 100; // L: 10
+		field4189 = new class365[100]; // L: 11
+		field4185 = 0; // L: 12
+		new class365();
+	} // L: 18
+
+	class365() {
+		this.method6627(); // L: 42
+	} // L: 43
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-330094120"
+	)
+	public void method6646() {
+		synchronized(field4189) { // L: 36
+			if (field4185 < field4184 - 1) { // L: 37
+				field4189[++field4185 - 1] = this;
+			}
+
+		}
+	} // L: 39
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(FFFFI)V",
+		garbageValue = "545169306"
+	)
+	void method6625(float var1, float var2, float var3, float var4) {
+		this.field4186 = var1; // L: 46
+		this.field4188 = var2; // L: 47
+		this.field4187 = var3; // L: 48
+		this.field4183 = var4; // L: 49
+	} // L: 50
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(FFFFI)V",
+		garbageValue = "917970306"
+	)
+	public void method6630(float var1, float var2, float var3, float var4) {
+		float var5 = (float)Math.sin((double)(var4 * 0.5F)); // L: 53
+		float var6 = (float)Math.cos((double)(0.5F * var4)); // L: 54
+		this.field4186 = var5 * var1; // L: 55
+		this.field4188 = var5 * var2; // L: 56
+		this.field4187 = var5 * var3; // L: 57
+		this.field4183 = var6; // L: 58
+	} // L: 59
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-24"
+	)
+	final void method6627() {
+		this.field4187 = 0.0F; // L: 62
+		this.field4188 = 0.0F; // L: 63
+		this.field4186 = 0.0F; // L: 64
+		this.field4183 = 1.0F; // L: 65
+	} // L: 66
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Lns;B)V",
+		garbageValue = "-13"
+	)
+	public final void method6628(class365 var1) {
+		this.method6625(var1.field4183 * this.field4186 + var1.field4186 * this.field4183 + this.field4187 * var1.field4188 - this.field4188 * var1.field4187, var1.field4187 * this.field4186 + var1.field4188 * this.field4183 + (var1.field4183 * this.field4188 - var1.field4186 * this.field4187), this.field4188 * var1.field4186 + this.field4187 * var1.field4183 - this.field4186 * var1.field4188 + this.field4183 * var1.field4187, this.field4183 * var1.field4183 - var1.field4186 * this.field4186 - this.field4188 * var1.field4188 - var1.field4187 * this.field4187); // L: 69
+	} // L: 70
+
+	public boolean equals(Object var1) {
+		if (!(var1 instanceof class365)) { // L: 74
+			return false; // L: 78
+		} else {
+			class365 var2 = (class365)var1; // L: 75
+			return this.field4186 == var2.field4186 && var2.field4188 == this.field4188 && var2.field4187 == this.field4187 && var2.field4183 == this.field4183; // L: 76
+		}
+	}
+
+	public String toString() {
+		return this.field4186 + "," + this.field4188 + "," + this.field4187 + "," + this.field4183; // L: 94
+	}
+
+	public int hashCode() {
+		boolean var1 = true; // L: 83
+		float var2 = 1.0F; // L: 84
+		var2 = 31.0F * var2 + this.field4186; // L: 85
+		var2 = var2 * 31.0F + this.field4188; // L: 86
+		var2 = 31.0F * var2 + this.field4187; // L: 87
+		var2 = var2 * 31.0F + this.field4183; // L: 88
+		return (int)var2; // L: 89
+	}
+}
diff --git a/runescape-client/src/main/java/class366.java b/runescape-client/src/main/java/class366.java
new file mode 100644
index 0000000000..f586c26213
--- /dev/null
+++ b/runescape-client/src/main/java/class366.java
@@ -0,0 +1,436 @@
+import java.util.Arrays;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("no")
+public final class class366 {
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "[Lno;"
+	)
+	public static class366[] field4191;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -1036924523
+	)
+	static int field4192;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lno;"
+	)
+	public static final class366 field4194;
+	@ObfuscatedName("t")
+	public float[] field4196;
+
+	static {
+		field4191 = new class366[0]; // L: 9
+		Client.method1623(100); // L: 14
+		field4194 = new class366(); // L: 18
+	}
+
+	public class366() {
+		this.field4196 = new float[16];
+		this.method6652(); // L: 33
+	} // L: 34
+
+	@ObfuscatedSignature(
+		descriptor = "(Lno;)V"
+	)
+	public class366(class366 var1) {
+		this.field4196 = new float[16];
+		this.method6654(var1); // L: 37
+	} // L: 38
+
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;Z)V"
+	)
+	public class366(Buffer var1, boolean var2) {
+		this.field4196 = new float[16]; // L: 17
+		this.method6649(var1, var2); // L: 41
+	} // L: 42
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "340941633"
+	)
+	public void method6656() {
+		synchronized(field4191) { // L: 27
+			if (class149.field1663 < field4192 - 1) { // L: 28
+				field4191[++class149.field1663 - 1] = this;
+			}
+
+		}
+	} // L: 30
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;ZI)V",
+		garbageValue = "-1222867877"
+	)
+	void method6649(Buffer var1, boolean var2) {
+		if (var2) { // L: 45
+			class367 var4 = new class367(); // L: 46
+			var4.method6732(class329.method6135(var1.readShort())); // L: 47
+			var4.method6717(class329.method6135(var1.readShort())); // L: 48
+			var4.method6718(class329.method6135(var1.readShort())); // L: 49
+			var4.method6719((float)var1.readShort(), (float)var1.readShort(), (float)var1.readShort()); // L: 50
+			this.method6713(var4); // L: 51
+		} else {
+			for (int var3 = 0; var3 < 16; ++var3) { // L: 54
+				this.field4196[var3] = var1.method7369(); // L: 55
+			}
+		}
+
+	} // L: 58
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(B)[F",
+		garbageValue = "42"
+	)
+	float[] method6650() {
+		float[] var1 = new float[3]; // L: 61
+		if ((double)this.field4196[2] < 0.999D && (double)this.field4196[2] > -0.999D) { // L: 62
+			var1[1] = (float)(-Math.asin((double)this.field4196[2])); // L: 63
+			double var2 = Math.cos((double)var1[1]); // L: 64
+			var1[0] = (float)Math.atan2((double)this.field4196[6] / var2, (double)this.field4196[10] / var2); // L: 65
+			var1[2] = (float)Math.atan2((double)this.field4196[1] / var2, (double)this.field4196[0] / var2); // L: 66
+		} else {
+			var1[0] = 0.0F; // L: 69
+			var1[1] = (float)Math.atan2((double)this.field4196[2], 0.0D); // L: 70
+			var1[2] = (float)Math.atan2((double)(-this.field4196[9]), (double)this.field4196[5]); // L: 71
+		}
+
+		return var1; // L: 73
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(I)[F",
+		garbageValue = "-1676317150"
+	)
+	public float[] method6651() {
+		float[] var1 = new float[]{(float)(-Math.asin((double)this.field4196[6])), 0.0F, 0.0F}; // L: 77 78
+		double var2 = Math.cos((double)var1[0]); // L: 79
+		double var4;
+		double var6;
+		if (Math.abs(var2) > 0.005D) { // L: 80
+			var4 = (double)this.field4196[2]; // L: 81
+			var6 = (double)this.field4196[10]; // L: 82
+			double var8 = (double)this.field4196[4]; // L: 83
+			double var10 = (double)this.field4196[5]; // L: 84
+			var1[1] = (float)Math.atan2(var4, var6); // L: 85
+			var1[2] = (float)Math.atan2(var8, var10); // L: 86
+		} else {
+			var4 = (double)this.field4196[1]; // L: 89
+			var6 = (double)this.field4196[0]; // L: 90
+			if (this.field4196[6] < 0.0F) { // L: 91
+				var1[1] = (float)Math.atan2(var4, var6); // L: 92
+			} else {
+				var1[1] = (float)(-Math.atan2(var4, var6)); // L: 95
+			}
+
+			var1[2] = 0.0F; // L: 97
+		}
+
+		return var1; // L: 99
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "525334950"
+	)
+	public void method6652() {
+		this.field4196[0] = 1.0F; // L: 103
+		this.field4196[1] = 0.0F; // L: 104
+		this.field4196[2] = 0.0F; // L: 105
+		this.field4196[3] = 0.0F; // L: 106
+		this.field4196[4] = 0.0F; // L: 107
+		this.field4196[5] = 1.0F; // L: 108
+		this.field4196[6] = 0.0F; // L: 109
+		this.field4196[7] = 0.0F; // L: 110
+		this.field4196[8] = 0.0F; // L: 111
+		this.field4196[9] = 0.0F; // L: 112
+		this.field4196[10] = 1.0F; // L: 113
+		this.field4196[11] = 0.0F; // L: 114
+		this.field4196[12] = 0.0F; // L: 115
+		this.field4196[13] = 0.0F; // L: 116
+		this.field4196[14] = 0.0F; // L: 117
+		this.field4196[15] = 1.0F; // L: 118
+	} // L: 119
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1795899803"
+	)
+	public void method6708() {
+		this.field4196[0] = 0.0F; // L: 122
+		this.field4196[1] = 0.0F; // L: 123
+		this.field4196[2] = 0.0F; // L: 124
+		this.field4196[3] = 0.0F; // L: 125
+		this.field4196[4] = 0.0F; // L: 126
+		this.field4196[5] = 0.0F; // L: 127
+		this.field4196[6] = 0.0F; // L: 128
+		this.field4196[7] = 0.0F; // L: 129
+		this.field4196[8] = 0.0F; // L: 130
+		this.field4196[9] = 0.0F; // L: 131
+		this.field4196[10] = 0.0F; // L: 132
+		this.field4196[11] = 0.0F; // L: 133
+		this.field4196[12] = 0.0F; // L: 134
+		this.field4196[13] = 0.0F; // L: 135
+		this.field4196[14] = 0.0F; // L: 136
+		this.field4196[15] = 0.0F; // L: 137
+	} // L: 138
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(Lno;I)V",
+		garbageValue = "-1679840989"
+	)
+	public void method6654(class366 var1) {
+		System.arraycopy(var1.field4196, 0, this.field4196, 0, 16); // L: 141
+	} // L: 142
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(FB)V",
+		garbageValue = "-31"
+	)
+	public void method6655(float var1) {
+		this.method6667(var1, var1, var1); // L: 145
+	} // L: 146
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(FFFI)V",
+		garbageValue = "1410403960"
+	)
+	public void method6667(float var1, float var2, float var3) {
+		this.method6652(); // L: 149
+		this.field4196[0] = var1; // L: 150
+		this.field4196[5] = var2; // L: 151
+		this.field4196[10] = var3; // L: 152
+	} // L: 153
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Lno;S)V",
+		garbageValue = "-15383"
+	)
+	public void method6657(class366 var1) {
+		for (int var2 = 0; var2 < this.field4196.length; ++var2) { // L: 156
+			float[] var10000 = this.field4196; // L: 157
+			var10000[var2] += var1.field4196[var2];
+		}
+
+	} // L: 159
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Lno;I)V",
+		garbageValue = "1087473268"
+	)
+	public void method6670(class366 var1) {
+		float var2 = this.field4196[1] * var1.field4196[4] + var1.field4196[0] * this.field4196[0] + this.field4196[2] * var1.field4196[8] + var1.field4196[12] * this.field4196[3]; // L: 162
+		float var3 = var1.field4196[5] * this.field4196[1] + var1.field4196[1] * this.field4196[0] + this.field4196[2] * var1.field4196[9] + var1.field4196[13] * this.field4196[3]; // L: 163
+		float var4 = var1.field4196[6] * this.field4196[1] + this.field4196[0] * var1.field4196[2] + var1.field4196[10] * this.field4196[2] + var1.field4196[14] * this.field4196[3]; // L: 164
+		float var5 = var1.field4196[15] * this.field4196[3] + this.field4196[2] * var1.field4196[11] + this.field4196[1] * var1.field4196[7] + var1.field4196[3] * this.field4196[0]; // L: 165
+		float var6 = this.field4196[4] * var1.field4196[0] + var1.field4196[4] * this.field4196[5] + this.field4196[6] * var1.field4196[8] + this.field4196[7] * var1.field4196[12]; // L: 166
+		float var7 = var1.field4196[9] * this.field4196[6] + var1.field4196[5] * this.field4196[5] + this.field4196[4] * var1.field4196[1] + this.field4196[7] * var1.field4196[13]; // L: 167
+		float var8 = this.field4196[7] * var1.field4196[14] + this.field4196[5] * var1.field4196[6] + var1.field4196[2] * this.field4196[4] + this.field4196[6] * var1.field4196[10]; // L: 168
+		float var9 = this.field4196[5] * var1.field4196[7] + this.field4196[4] * var1.field4196[3] + this.field4196[6] * var1.field4196[11] + this.field4196[7] * var1.field4196[15]; // L: 169
+		float var10 = var1.field4196[12] * this.field4196[11] + this.field4196[10] * var1.field4196[8] + var1.field4196[0] * this.field4196[8] + this.field4196[9] * var1.field4196[4]; // L: 170
+		float var11 = var1.field4196[5] * this.field4196[9] + this.field4196[8] * var1.field4196[1] + var1.field4196[9] * this.field4196[10] + this.field4196[11] * var1.field4196[13]; // L: 171
+		float var12 = var1.field4196[10] * this.field4196[10] + this.field4196[8] * var1.field4196[2] + this.field4196[9] * var1.field4196[6] + this.field4196[11] * var1.field4196[14]; // L: 172
+		float var13 = this.field4196[8] * var1.field4196[3] + this.field4196[9] * var1.field4196[7] + var1.field4196[11] * this.field4196[10] + this.field4196[11] * var1.field4196[15]; // L: 173
+		float var14 = var1.field4196[8] * this.field4196[14] + var1.field4196[4] * this.field4196[13] + this.field4196[12] * var1.field4196[0] + var1.field4196[12] * this.field4196[15]; // L: 174
+		float var15 = var1.field4196[13] * this.field4196[15] + this.field4196[12] * var1.field4196[1] + var1.field4196[5] * this.field4196[13] + this.field4196[14] * var1.field4196[9]; // L: 175
+		float var16 = this.field4196[14] * var1.field4196[10] + var1.field4196[6] * this.field4196[13] + this.field4196[12] * var1.field4196[2] + this.field4196[15] * var1.field4196[14]; // L: 176
+		float var17 = var1.field4196[15] * this.field4196[15] + var1.field4196[11] * this.field4196[14] + var1.field4196[7] * this.field4196[13] + this.field4196[12] * var1.field4196[3]; // L: 177
+		this.field4196[0] = var2; // L: 178
+		this.field4196[1] = var3; // L: 179
+		this.field4196[2] = var4; // L: 180
+		this.field4196[3] = var5; // L: 181
+		this.field4196[4] = var6; // L: 182
+		this.field4196[5] = var7; // L: 183
+		this.field4196[6] = var8; // L: 184
+		this.field4196[7] = var9; // L: 185
+		this.field4196[8] = var10; // L: 186
+		this.field4196[9] = var11; // L: 187
+		this.field4196[10] = var12; // L: 188
+		this.field4196[11] = var13; // L: 189
+		this.field4196[12] = var14; // L: 190
+		this.field4196[13] = var15; // L: 191
+		this.field4196[14] = var16; // L: 192
+		this.field4196[15] = var17; // L: 193
+	} // L: 194
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(Lns;B)V",
+		garbageValue = "-62"
+	)
+	public void method6711(class365 var1) {
+		float var2 = var1.field4183 * var1.field4183; // L: 197
+		float var3 = var1.field4183 * var1.field4186; // L: 198
+		float var4 = var1.field4188 * var1.field4183; // L: 199
+		float var5 = var1.field4183 * var1.field4187; // L: 200
+		float var6 = var1.field4186 * var1.field4186; // L: 201
+		float var7 = var1.field4188 * var1.field4186; // L: 202
+		float var8 = var1.field4186 * var1.field4187; // L: 203
+		float var9 = var1.field4188 * var1.field4188; // L: 204
+		float var10 = var1.field4188 * var1.field4187; // L: 205
+		float var11 = var1.field4187 * var1.field4187; // L: 206
+		this.field4196[0] = var6 + var2 - var11 - var9; // L: 207
+		this.field4196[1] = var7 + var7 + var5 + var5; // L: 208
+		this.field4196[2] = var8 - var4 - var4 + var8; // L: 209
+		this.field4196[4] = var7 + (var7 - var5 - var5); // L: 210
+		this.field4196[5] = var9 + var2 - var6 - var11; // L: 211
+		this.field4196[6] = var3 + var10 + var3 + var10; // L: 212
+		this.field4196[8] = var8 + var4 + var8 + var4; // L: 213
+		this.field4196[9] = var10 + (var10 - var3 - var3); // L: 214
+		this.field4196[10] = var11 + var2 - var9 - var6; // L: 215
+	} // L: 216
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(Lnu;B)V",
+		garbageValue = "-7"
+	)
+	void method6713(class367 var1) {
+		this.field4196[0] = var1.field4197; // L: 219
+		this.field4196[1] = var1.field4198; // L: 220
+		this.field4196[2] = var1.field4199; // L: 221
+		this.field4196[3] = 0.0F; // L: 222
+		this.field4196[4] = var1.field4200; // L: 223
+		this.field4196[5] = var1.field4201; // L: 224
+		this.field4196[6] = var1.field4202; // L: 225
+		this.field4196[7] = 0.0F; // L: 226
+		this.field4196[8] = var1.field4204; // L: 227
+		this.field4196[9] = var1.field4203; // L: 228
+		this.field4196[10] = var1.field4205; // L: 229
+		this.field4196[11] = 0.0F; // L: 230
+		this.field4196[12] = var1.field4206; // L: 231
+		this.field4196[13] = var1.field4207; // L: 232
+		this.field4196[14] = var1.field4208; // L: 233
+		this.field4196[15] = 1.0F; // L: 234
+	} // L: 235
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(B)F",
+		garbageValue = "115"
+	)
+	float method6679() {
+		return this.field4196[8] * this.field4196[3] * this.field4196[5] * this.field4196[14] + this.field4196[13] * this.field4196[8] * this.field4196[2] * this.field4196[7] + this.field4196[12] * this.field4196[2] * this.field4196[5] * this.field4196[11] + (this.field4196[15] * this.field4196[9] * this.field4196[2] * this.field4196[4] + this.field4196[6] * this.field4196[0] * this.field4196[11] * this.field4196[13] + (this.field4196[5] * this.field4196[0] * this.field4196[10] * this.field4196[15] - this.field4196[14] * this.field4196[5] * this.field4196[0] * this.field4196[11] - this.field4196[9] * this.field4196[0] * this.field4196[6] * this.field4196[15]) + this.field4196[14] * this.field4196[9] * this.field4196[7] * this.field4196[0] - this.field4196[13] * this.field4196[7] * this.field4196[0] * this.field4196[10] - this.field4196[15] * this.field4196[10] * this.field4196[4] * this.field4196[1] + this.field4196[14] * this.field4196[11] * this.field4196[1] * this.field4196[4] + this.field4196[15] * this.field4196[8] * this.field4196[6] * this.field4196[1] - this.field4196[11] * this.field4196[6] * this.field4196[1] * this.field4196[12] - this.field4196[7] * this.field4196[1] * this.field4196[8] * this.field4196[14] + this.field4196[12] * this.field4196[10] * this.field4196[1] * this.field4196[7] - this.field4196[11] * this.field4196[4] * this.field4196[2] * this.field4196[13] - this.field4196[15] * this.field4196[5] * this.field4196[2] * this.field4196[8]) - this.field4196[2] * this.field4196[7] * this.field4196[9] * this.field4196[12] - this.field4196[3] * this.field4196[4] * this.field4196[9] * this.field4196[14] + this.field4196[10] * this.field4196[3] * this.field4196[4] * this.field4196[13] - this.field4196[10] * this.field4196[5] * this.field4196[3] * this.field4196[12] - this.field4196[3] * this.field4196[6] * this.field4196[8] * this.field4196[13] + this.field4196[3] * this.field4196[6] * this.field4196[9] * this.field4196[12]; // L: 238
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "817560716"
+	)
+	public void method6678() {
+		float var1 = 1.0F / this.method6679(); // L: 242
+		float var2 = var1 * (this.field4196[15] * this.field4196[5] * this.field4196[10] - this.field4196[14] * this.field4196[5] * this.field4196[11] - this.field4196[6] * this.field4196[9] * this.field4196[15] + this.field4196[13] * this.field4196[6] * this.field4196[11] + this.field4196[9] * this.field4196[7] * this.field4196[14] - this.field4196[10] * this.field4196[7] * this.field4196[13]); // L: 243
+		float var3 = (this.field4196[9] * this.field4196[2] * this.field4196[15] + this.field4196[14] * this.field4196[11] * this.field4196[1] + -this.field4196[1] * this.field4196[10] * this.field4196[15] - this.field4196[13] * this.field4196[2] * this.field4196[11] - this.field4196[14] * this.field4196[9] * this.field4196[3] + this.field4196[13] * this.field4196[3] * this.field4196[10]) * var1; // L: 244
+		float var4 = var1 * (this.field4196[15] * this.field4196[1] * this.field4196[6] - this.field4196[7] * this.field4196[1] * this.field4196[14] - this.field4196[2] * this.field4196[5] * this.field4196[15] + this.field4196[13] * this.field4196[7] * this.field4196[2] + this.field4196[14] * this.field4196[5] * this.field4196[3] - this.field4196[3] * this.field4196[6] * this.field4196[13]); // L: 245
+		float var5 = (this.field4196[6] * this.field4196[3] * this.field4196[9] + (this.field4196[11] * this.field4196[2] * this.field4196[5] + this.field4196[10] * this.field4196[7] * this.field4196[1] + this.field4196[6] * -this.field4196[1] * this.field4196[11] - this.field4196[9] * this.field4196[7] * this.field4196[2] - this.field4196[5] * this.field4196[3] * this.field4196[10])) * var1; // L: 246
+		float var6 = var1 * (this.field4196[8] * this.field4196[6] * this.field4196[15] + this.field4196[11] * this.field4196[4] * this.field4196[14] + -this.field4196[4] * this.field4196[10] * this.field4196[15] - this.field4196[6] * this.field4196[11] * this.field4196[12] - this.field4196[8] * this.field4196[7] * this.field4196[14] + this.field4196[12] * this.field4196[10] * this.field4196[7]); // L: 247
+		float var7 = var1 * (this.field4196[15] * this.field4196[0] * this.field4196[10] - this.field4196[14] * this.field4196[11] * this.field4196[0] - this.field4196[15] * this.field4196[8] * this.field4196[2] + this.field4196[11] * this.field4196[2] * this.field4196[12] + this.field4196[14] * this.field4196[8] * this.field4196[3] - this.field4196[3] * this.field4196[10] * this.field4196[12]); // L: 248
+		float var8 = var1 * (this.field4196[15] * this.field4196[4] * this.field4196[2] + this.field4196[0] * this.field4196[7] * this.field4196[14] + this.field4196[6] * -this.field4196[0] * this.field4196[15] - this.field4196[7] * this.field4196[2] * this.field4196[12] - this.field4196[4] * this.field4196[3] * this.field4196[14] + this.field4196[12] * this.field4196[3] * this.field4196[6]); // L: 249
+		float var9 = (this.field4196[2] * this.field4196[7] * this.field4196[8] + (this.field4196[11] * this.field4196[0] * this.field4196[6] - this.field4196[10] * this.field4196[0] * this.field4196[7] - this.field4196[11] * this.field4196[2] * this.field4196[4]) + this.field4196[10] * this.field4196[4] * this.field4196[3] - this.field4196[3] * this.field4196[6] * this.field4196[8]) * var1; // L: 250
+		float var10 = var1 * (this.field4196[4] * this.field4196[9] * this.field4196[15] - this.field4196[13] * this.field4196[4] * this.field4196[11] - this.field4196[15] * this.field4196[5] * this.field4196[8] + this.field4196[12] * this.field4196[5] * this.field4196[11] + this.field4196[13] * this.field4196[7] * this.field4196[8] - this.field4196[7] * this.field4196[9] * this.field4196[12]); // L: 251
+		float var11 = var1 * (this.field4196[15] * this.field4196[1] * this.field4196[8] + this.field4196[13] * this.field4196[0] * this.field4196[11] + this.field4196[15] * this.field4196[9] * -this.field4196[0] - this.field4196[11] * this.field4196[1] * this.field4196[12] - this.field4196[3] * this.field4196[8] * this.field4196[13] + this.field4196[12] * this.field4196[9] * this.field4196[3]); // L: 252
+		float var12 = var1 * (this.field4196[13] * this.field4196[3] * this.field4196[4] + this.field4196[0] * this.field4196[5] * this.field4196[15] - this.field4196[0] * this.field4196[7] * this.field4196[13] - this.field4196[15] * this.field4196[4] * this.field4196[1] + this.field4196[7] * this.field4196[1] * this.field4196[12] - this.field4196[12] * this.field4196[3] * this.field4196[5]); // L: 253
+		float var13 = var1 * (this.field4196[11] * this.field4196[4] * this.field4196[1] + this.field4196[9] * this.field4196[0] * this.field4196[7] + this.field4196[11] * -this.field4196[0] * this.field4196[5] - this.field4196[8] * this.field4196[1] * this.field4196[7] - this.field4196[9] * this.field4196[3] * this.field4196[4] + this.field4196[8] * this.field4196[5] * this.field4196[3]); // L: 254
+		float var14 = (this.field4196[12] * this.field4196[9] * this.field4196[6] + (this.field4196[5] * this.field4196[8] * this.field4196[14] + this.field4196[10] * this.field4196[4] * this.field4196[13] + this.field4196[9] * -this.field4196[4] * this.field4196[14] - this.field4196[5] * this.field4196[10] * this.field4196[12] - this.field4196[6] * this.field4196[8] * this.field4196[13])) * var1; // L: 255
+		float var15 = (this.field4196[13] * this.field4196[8] * this.field4196[2] + this.field4196[12] * this.field4196[10] * this.field4196[1] + (this.field4196[9] * this.field4196[0] * this.field4196[14] - this.field4196[13] * this.field4196[0] * this.field4196[10] - this.field4196[8] * this.field4196[1] * this.field4196[14]) - this.field4196[12] * this.field4196[2] * this.field4196[9]) * var1; // L: 256
+		float var16 = var1 * (this.field4196[5] * this.field4196[2] * this.field4196[12] + (this.field4196[4] * this.field4196[1] * this.field4196[14] + this.field4196[0] * this.field4196[6] * this.field4196[13] + this.field4196[5] * -this.field4196[0] * this.field4196[14] - this.field4196[12] * this.field4196[1] * this.field4196[6] - this.field4196[13] * this.field4196[4] * this.field4196[2])); // L: 257
+		float var17 = (this.field4196[9] * this.field4196[2] * this.field4196[4] + this.field4196[8] * this.field4196[6] * this.field4196[1] + (this.field4196[0] * this.field4196[5] * this.field4196[10] - this.field4196[6] * this.field4196[0] * this.field4196[9] - this.field4196[10] * this.field4196[4] * this.field4196[1]) - this.field4196[8] * this.field4196[2] * this.field4196[5]) * var1; // L: 258
+		this.field4196[0] = var2; // L: 259
+		this.field4196[1] = var3; // L: 260
+		this.field4196[2] = var4; // L: 261
+		this.field4196[3] = var5; // L: 262
+		this.field4196[4] = var6; // L: 263
+		this.field4196[5] = var7; // L: 264
+		this.field4196[6] = var8; // L: 265
+		this.field4196[7] = var9; // L: 266
+		this.field4196[8] = var10; // L: 267
+		this.field4196[9] = var11; // L: 268
+		this.field4196[10] = var12; // L: 269
+		this.field4196[11] = var13; // L: 270
+		this.field4196[12] = var14; // L: 271
+		this.field4196[13] = var15; // L: 272
+		this.field4196[14] = var16; // L: 273
+		this.field4196[15] = var17; // L: 274
+	} // L: 275
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(S)[F",
+		garbageValue = "768"
+	)
+	public float[] method6663() {
+		float[] var1 = new float[3]; // L: 312
+		class364 var2 = new class364(this.field4196[0], this.field4196[1], this.field4196[2]); // L: 313
+		class364 var3 = new class364(this.field4196[4], this.field4196[5], this.field4196[6]); // L: 314
+		class364 var4 = new class364(this.field4196[8], this.field4196[9], this.field4196[10]); // L: 315
+		var1[0] = var2.method6618(); // L: 316
+		var1[1] = var3.method6618(); // L: 317
+		var1[2] = var4.method6618(); // L: 318
+		return var1; // L: 319
+	}
+
+	public int hashCode() {
+		boolean var1 = true; // L: 297
+		byte var2 = 1; // L: 298
+		int var3 = 31 * var2 + Arrays.hashCode(this.field4196); // L: 299
+		return var3; // L: 300
+	}
+
+	public boolean equals(Object var1) {
+		if (!(var1 instanceof class366)) { // L: 305
+			return false;
+		} else {
+			class366 var2 = (class366)var1; // L: 306
+
+			for (int var3 = 0; var3 < 16; ++var3) { // L: 307
+				if (this.field4196[var3] != var2.field4196[var3]) {
+					return false;
+				}
+			}
+
+			return true; // L: 308
+		}
+	}
+
+	public String toString() {
+		StringBuilder var1 = new StringBuilder(); // L: 280
+		this.method6651(); // L: 281
+		this.method6650(); // L: 282
+
+		for (int var2 = 0; var2 < 4; ++var2) { // L: 283
+			for (int var3 = 0; var3 < 4; ++var3) { // L: 284
+				if (var3 > 0) {
+					var1.append("\t"); // L: 285
+				}
+
+				float var4 = this.field4196[var3 + var2 * 4]; // L: 286
+				if (Math.sqrt((double)(var4 * var4)) < 9.999999747378752E-5D) { // L: 287
+					var4 = 0.0F;
+				}
+
+				var1.append(var4); // L: 288
+			}
+
+			var1.append("\n"); // L: 290
+		}
+
+		return var1.toString(); // L: 292
+	}
+}
diff --git a/runescape-client/src/main/java/class367.java b/runescape-client/src/main/java/class367.java
index 0e9087cdac..c3beadd00d 100644
--- a/runescape-client/src/main/java/class367.java
+++ b/runescape-client/src/main/java/class367.java
@@ -1,11 +1,139 @@
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("na")
-public class class367 extends Node {
-	@ObfuscatedName("i")
-	public long field4071;
+@ObfuscatedName("nu")
+public class class367 {
+	@ObfuscatedName("c")
+	float field4197;
+	@ObfuscatedName("b")
+	float field4198;
+	@ObfuscatedName("p")
+	float field4199;
+	@ObfuscatedName("m")
+	float field4200;
+	@ObfuscatedName("t")
+	float field4201;
+	@ObfuscatedName("s")
+	float field4202;
+	@ObfuscatedName("j")
+	float field4204;
+	@ObfuscatedName("w")
+	float field4203;
+	@ObfuscatedName("n")
+	float field4205;
+	@ObfuscatedName("r")
+	float field4206;
+	@ObfuscatedName("o")
+	float field4207;
+	@ObfuscatedName("v")
+	float field4208;
 
-	public class367(long var1) {
-		this.field4071 = var1; // L: 7
-	} // L: 8
+	static {
+		new class367();
+	} // L: 6
+
+	class367() {
+		this.method6739(); // L: 22
+	} // L: 23
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-597263666"
+	)
+	void method6739() {
+		this.field4208 = 0.0F; // L: 26
+		this.field4207 = 0.0F; // L: 27
+		this.field4206 = 0.0F; // L: 28
+		this.field4203 = 0.0F; // L: 29
+		this.field4204 = 0.0F; // L: 30
+		this.field4202 = 0.0F; // L: 31
+		this.field4200 = 0.0F; // L: 32
+		this.field4199 = 0.0F; // L: 33
+		this.field4198 = 0.0F; // L: 34
+		this.field4205 = 1.0F; // L: 35
+		this.field4201 = 1.0F; // L: 36
+		this.field4197 = 1.0F; // L: 37
+	} // L: 38
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(FI)V",
+		garbageValue = "-550408615"
+	)
+	void method6732(float var1) {
+		float var2 = (float)Math.cos((double)var1); // L: 41
+		float var3 = (float)Math.sin((double)var1); // L: 42
+		float var4 = this.field4198; // L: 43
+		float var5 = this.field4201; // L: 44
+		float var6 = this.field4203; // L: 45
+		float var7 = this.field4207; // L: 46
+		this.field4198 = var4 * var2 - var3 * this.field4199; // L: 47
+		this.field4199 = var4 * var3 + this.field4199 * var2; // L: 48
+		this.field4201 = var2 * var5 - this.field4202 * var3; // L: 49
+		this.field4202 = var5 * var3 + var2 * this.field4202; // L: 50
+		this.field4203 = var2 * var6 - var3 * this.field4205; // L: 51
+		this.field4205 = var2 * this.field4205 + var3 * var6; // L: 52
+		this.field4207 = var7 * var2 - var3 * this.field4208; // L: 53
+		this.field4208 = this.field4208 * var2 + var3 * var7; // L: 54
+	} // L: 55
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(FI)V",
+		garbageValue = "-452797463"
+	)
+	void method6717(float var1) {
+		float var2 = (float)Math.cos((double)var1); // L: 58
+		float var3 = (float)Math.sin((double)var1); // L: 59
+		float var4 = this.field4197; // L: 60
+		float var5 = this.field4200; // L: 61
+		float var6 = this.field4204; // L: 62
+		float var7 = this.field4206; // L: 63
+		this.field4197 = var3 * this.field4199 + var4 * var2; // L: 64
+		this.field4199 = this.field4199 * var2 - var4 * var3; // L: 65
+		this.field4200 = this.field4202 * var3 + var2 * var5; // L: 66
+		this.field4202 = this.field4202 * var2 - var5 * var3; // L: 67
+		this.field4204 = var2 * var6 + var3 * this.field4205; // L: 68
+		this.field4205 = var2 * this.field4205 - var3 * var6; // L: 69
+		this.field4206 = this.field4208 * var3 + var7 * var2; // L: 70
+		this.field4208 = var2 * this.field4208 - var7 * var3; // L: 71
+	} // L: 72
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(FI)V",
+		garbageValue = "1842275724"
+	)
+	void method6718(float var1) {
+		float var2 = (float)Math.cos((double)var1); // L: 75
+		float var3 = (float)Math.sin((double)var1); // L: 76
+		float var4 = this.field4197; // L: 77
+		float var5 = this.field4200; // L: 78
+		float var6 = this.field4204; // L: 79
+		float var7 = this.field4206; // L: 80
+		this.field4197 = var2 * var4 - var3 * this.field4198; // L: 81
+		this.field4198 = var3 * var4 + var2 * this.field4198; // L: 82
+		this.field4200 = var5 * var2 - this.field4201 * var3; // L: 83
+		this.field4201 = var2 * this.field4201 + var3 * var5; // L: 84
+		this.field4204 = var6 * var2 - this.field4203 * var3; // L: 85
+		this.field4203 = var3 * var6 + var2 * this.field4203; // L: 86
+		this.field4206 = var7 * var2 - var3 * this.field4207; // L: 87
+		this.field4207 = this.field4207 * var2 + var3 * var7; // L: 88
+	} // L: 89
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(FFFB)V",
+		garbageValue = "12"
+	)
+	void method6719(float var1, float var2, float var3) {
+		this.field4206 += var1; // L: 92
+		this.field4207 += var2; // L: 93
+		this.field4208 += var3; // L: 94
+	} // L: 95
+
+	public String toString() {
+		return this.field4197 + "," + this.field4200 + "," + this.field4204 + "," + this.field4206 + "\n" + this.field4198 + "," + this.field4201 + "," + this.field4203 + "," + this.field4207 + "\n" + this.field4199 + "," + this.field4202 + "," + this.field4205 + "," + this.field4208; // L: 99
+	}
 }
diff --git a/runescape-client/src/main/java/class368.java b/runescape-client/src/main/java/class368.java
new file mode 100644
index 0000000000..16dd68f58c
--- /dev/null
+++ b/runescape-client/src/main/java/class368.java
@@ -0,0 +1,60 @@
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("nr")
+public class class368 {
+	@ObfuscatedName("c")
+	float[] field4212;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -219137761
+	)
+	int field4211;
+
+	class368(float[] var1, int var2) {
+		this.field4212 = var1; // L: 10
+		this.field4211 = var2; // L: 11
+	} // L: 12
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-719426176"
+	)
+	public static void method6744() {
+		try {
+			File var0 = new File(class409.userHomeDirectory, "random.dat"); // L: 102
+			int var2;
+			if (var0.exists()) { // L: 103
+				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 104
+			} else {
+				label36:
+				for (int var1 = 0; var1 < BufferedSource.cacheSubPaths.length; ++var1) { // L: 107
+					for (var2 = 0; var2 < UserComparator3.cacheParentPaths.length; ++var2) { // L: 108
+						File var3 = new File(UserComparator3.cacheParentPaths[var2] + BufferedSource.cacheSubPaths[var1] + File.separatorChar + "random.dat"); // L: 109
+						if (var3.exists()) { // L: 110
+							JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 111
+							break label36; // L: 112
+						}
+					}
+				}
+			}
+
+			if (JagexCache.JagexCache_randomDat == null) { // L: 117
+				RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 118
+				var2 = var4.read(); // L: 119
+				var4.seek(0L); // L: 120
+				var4.write(var2); // L: 121
+				var4.seek(0L); // L: 122
+				var4.close(); // L: 123
+				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 124
+			}
+		} catch (IOException var5) { // L: 127
+		}
+
+	} // L: 128
+}
diff --git a/runescape-client/src/main/java/class369.java b/runescape-client/src/main/java/class369.java
new file mode 100644
index 0000000000..aad998685a
--- /dev/null
+++ b/runescape-client/src/main/java/class369.java
@@ -0,0 +1,57 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("nt")
+public enum class369 implements MouseWheel {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lnt;"
+	)
+	field4220(1, 1),
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lnt;"
+	)
+	field4215(2, 2),
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lnt;"
+	)
+	field4216(0, 3),
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lnt;"
+	)
+	field4214(3, 10);
+
+	@ObfuscatedName("n")
+	@Export("SpriteBuffer_pixels")
+	public static byte[][] SpriteBuffer_pixels;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = 705420457
+	)
+	final int field4218;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -1652306035
+	)
+	final int field4219;
+
+	class369(int var3, int var4) {
+		this.field4218 = var3; // L: 20
+		this.field4219 = var4; // L: 21
+	} // L: 22
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "48"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field4219; // L: 26
+	}
+}
diff --git a/runescape-client/src/main/java/class370.java b/runescape-client/src/main/java/class370.java
new file mode 100644
index 0000000000..ff6f738ada
--- /dev/null
+++ b/runescape-client/src/main/java/class370.java
@@ -0,0 +1,47 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("nq")
+public class class370 implements class375 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Loc;"
+	)
+	public final class397 field4221;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lom;)V"
+	)
+	class370(class398 var1) {
+		this.field4221 = var1;
+	}
+
+	@ObfuscatedSignature(
+		descriptor = "(Lnl;)V"
+	)
+	public class370(class371 var1) {
+		this(new class398(var1)); // L: 10
+	} // L: 11
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "2038166552"
+	)
+	public int method6757(int var1) {
+		return this.field4221.vmethod7128(var1);
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;Ljava/lang/String;S)I",
+		garbageValue = "267"
+	)
+	public static int method6755(Buffer var0, String var1) {
+		int var2 = var0.offset; // L: 14
+		byte[] var3 = class194.method3933(var1); // L: 15
+		var0.writeSmartByteShort(var3.length); // L: 16
+		var0.offset += class410.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 17
+		return var0.offset - var2; // L: 18
+	}
+}
diff --git a/runescape-client/src/main/java/class371.java b/runescape-client/src/main/java/class371.java
new file mode 100644
index 0000000000..df77c4ae14
--- /dev/null
+++ b/runescape-client/src/main/java/class371.java
@@ -0,0 +1,71 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("nl")
+public abstract class class371 extends class242 implements class425 {
+	@ObfuscatedSignature(
+		descriptor = "(Lko;Llf;I)V"
+	)
+	protected class371(StudioGame var1, Language var2, int var3) {
+		super(var1, var2, var3); // L: 15
+	} // L: 16
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lnp;",
+		garbageValue = "1453466959"
+	)
+	protected abstract class373 vmethod7209(int var1);
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "-70"
+	)
+	public int method6759() {
+		return super.field2787; // L: 19
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Ljava/lang/Object;",
+		garbageValue = "-78"
+	)
+	public Object vmethod7625(int var1) {
+		class373 var2 = this.vmethod7209(var1); // L: 24
+		return var2 != null && var2.method6780() ? var2.method6781() : null; // L: 25 26
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)Lpz;",
+		garbageValue = "-2120093804"
+	)
+	public class426 method6761(Buffer var1) {
+		int var2 = var1.readUnsignedShort(); // L: 30
+		class373 var3 = this.vmethod7209(var2); // L: 31
+		class426 var4 = new class426(var2); // L: 32
+		Class var5 = var3.field4226.field4446; // L: 33
+		if (var5 == Integer.class) { // L: 34
+			var4.field4537 = var1.readInt();
+		} else if (var5 == Long.class) {
+			var4.field4537 = var1.readLong(); // L: 35
+		} else if (var5 == String.class) { // L: 36
+			var4.field4537 = var1.readStringCp1252NullCircumfixed();
+		} else {
+			if (!class421.class.isAssignableFrom(var5)) { // L: 37
+				throw new IllegalStateException(); // L: 46
+			}
+
+			try {
+				class421 var6 = (class421)var5.newInstance(); // L: 39
+				var6.method7596(var1); // L: 40
+				var4.field4537 = var6; // L: 41
+			} catch (InstantiationException var7) { // L: 43
+			} catch (IllegalAccessException var8) { // L: 44
+			}
+		}
+
+		return var4; // L: 47
+	}
+}
diff --git a/runescape-client/src/main/java/class372.java b/runescape-client/src/main/java/class372.java
new file mode 100644
index 0000000000..2646dfb4e4
--- /dev/null
+++ b/runescape-client/src/main/java/class372.java
@@ -0,0 +1,89 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("nv")
+public class class372 extends class373 {
+	public class372(int var1) {
+		super(var1); // L: 7
+	} // L: 8
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;II)V",
+		garbageValue = "1616764501"
+	)
+	void vmethod6785(Buffer var1, int var2) {
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(CI)B",
+		garbageValue = "1890752943"
+	)
+	@Export("charToByteCp1252")
+	public static byte charToByteCp1252(char var0) {
+		byte var1;
+		if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12
+			var1 = (byte)var0;
+		} else if (var0 == 8364) { // L: 13
+			var1 = -128;
+		} else if (var0 == 8218) { // L: 14
+			var1 = -126;
+		} else if (var0 == 402) { // L: 15
+			var1 = -125;
+		} else if (var0 == 8222) { // L: 16
+			var1 = -124;
+		} else if (var0 == 8230) { // L: 17
+			var1 = -123;
+		} else if (var0 == 8224) { // L: 18
+			var1 = -122;
+		} else if (var0 == 8225) { // L: 19
+			var1 = -121;
+		} else if (var0 == 710) { // L: 20
+			var1 = -120;
+		} else if (var0 == 8240) { // L: 21
+			var1 = -119;
+		} else if (var0 == 352) { // L: 22
+			var1 = -118;
+		} else if (var0 == 8249) { // L: 23
+			var1 = -117;
+		} else if (var0 == 338) { // L: 24
+			var1 = -116;
+		} else if (var0 == 381) { // L: 25
+			var1 = -114;
+		} else if (var0 == 8216) {
+			var1 = -111; // L: 26
+		} else if (var0 == 8217) { // L: 27
+			var1 = -110;
+		} else if (var0 == 8220) { // L: 28
+			var1 = -109;
+		} else if (var0 == 8221) { // L: 29
+			var1 = -108;
+		} else if (var0 == 8226) { // L: 30
+			var1 = -107;
+		} else if (var0 == 8211) { // L: 31
+			var1 = -106;
+		} else if (var0 == 8212) { // L: 32
+			var1 = -105;
+		} else if (var0 == 732) { // L: 33
+			var1 = -104;
+		} else if (var0 == 8482) { // L: 34
+			var1 = -103;
+		} else if (var0 == 353) { // L: 35
+			var1 = -102;
+		} else if (var0 == 8250) { // L: 36
+			var1 = -101;
+		} else if (var0 == 339) { // L: 37
+			var1 = -100;
+		} else if (var0 == 382) { // L: 38
+			var1 = -98;
+		} else if (var0 == 376) { // L: 39
+			var1 = -97;
+		} else {
+			var1 = 63; // L: 40
+		}
+
+		return var1; // L: 41
+	}
+}
diff --git a/runescape-client/src/main/java/class373.java b/runescape-client/src/main/java/class373.java
new file mode 100644
index 0000000000..15618bd0e6
--- /dev/null
+++ b/runescape-client/src/main/java/class373.java
@@ -0,0 +1,96 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("np")
+public abstract class class373 implements class241 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lod;"
+	)
+	class409 field4226;
+
+	class373(int var1) {
+	} // L: 13
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;II)V",
+		garbageValue = "1616764501"
+	)
+	abstract void vmethod6785(Buffer var1, int var2);
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V",
+		garbageValue = "-107064225"
+	)
+	public void method6778(Buffer var1) {
+		while (true) {
+			int var2 = var1.readUnsignedByte(); // L: 17
+			if (var2 == 0) { // L: 18
+				return; // L: 60
+			}
+
+			class369 var3 = (class369)class130.findEnumerated(Strings.method5508(), var2); // L: 19
+			if (var3 != null) { // L: 20
+				switch(var3.field4218) { // L: 21
+				case 1:
+					int var4 = var1.readUnsignedByte(); // L: 23
+					int var7 = class407.field4439[var4]; // L: 26
+					class409 var5;
+					if (var7 == 1) { // L: 27
+						var5 = class409.field4445; // L: 28
+					} else if (var7 == 2) { // L: 31
+						var5 = class409.field4449; // L: 32
+					} else if (var7 == 3) { // L: 35
+						var5 = class409.field4442; // L: 36
+					} else {
+						var5 = null; // L: 39
+					}
+
+					this.field4226 = var5; // L: 41
+					if (this.field4226 != null) { // L: 42
+						break;
+					}
+
+					throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4);
+				case 2:
+					class295[] var6 = new class295[]{class295.field3791, class295.field3790, class295.field3789, class295.field3793}; // L: 49
+					class130.findEnumerated(var6, var1.readUnsignedByte()); // L: 51
+					break; // L: 52
+				case 3:
+					var1.readStringCp1252NullCircumfixed(); // L: 54
+					break; // L: 55
+				default:
+					throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); // L: 45
+				}
+			} else {
+				this.vmethod6785(var1, var2); // L: 58
+			}
+		}
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(S)Z",
+		garbageValue = "255"
+	)
+	boolean method6780() {
+		return this.field4226 != null; // L: 65
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(B)Ljava/lang/Object;",
+		garbageValue = "-56"
+	)
+	Object method6781() {
+		if (this.field4226 == class409.field4445) { // L: 69
+			return 0; // L: 70
+		} else if (this.field4226 == class409.field4442) { // L: 72
+			return -1L; // L: 73
+		} else {
+			return this.field4226 == class409.field4449 ? "" : null; // L: 75 76 78
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class374.java b/runescape-client/src/main/java/class374.java
new file mode 100644
index 0000000000..31b2fa25a7
--- /dev/null
+++ b/runescape-client/src/main/java/class374.java
@@ -0,0 +1,5 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ny")
+public interface class374 {
+}
diff --git a/runescape-client/src/main/java/class375.java b/runescape-client/src/main/java/class375.java
new file mode 100644
index 0000000000..24e9048491
--- /dev/null
+++ b/runescape-client/src/main/java/class375.java
@@ -0,0 +1,5 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("nh")
+public interface class375 extends class374 {
+}
diff --git a/runescape-client/src/main/java/class376.java b/runescape-client/src/main/java/class376.java
new file mode 100644
index 0000000000..b843f0c1a1
--- /dev/null
+++ b/runescape-client/src/main/java/class376.java
@@ -0,0 +1,36 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ng")
+public class class376 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lng;"
+	)
+	static final class376 field4231;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lng;"
+	)
+	static final class376 field4227;
+	@ObfuscatedName("p")
+	String field4229;
+
+	static {
+		field4231 = new class376("application/json"); // L: 4
+		field4227 = new class376("text/plain"); // L: 5
+	}
+
+	class376(String var1) {
+		this.field4229 = var1; // L: 9
+	} // L: 10
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "511276144"
+	)
+	public String method6793() {
+		return this.field4229; // L: 13
+	}
+}
diff --git a/runescape-client/src/main/java/class377.java b/runescape-client/src/main/java/class377.java
new file mode 100644
index 0000000000..b211c8d0d9
--- /dev/null
+++ b/runescape-client/src/main/java/class377.java
@@ -0,0 +1,8 @@
+import java.io.UnsupportedEncodingException;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ni")
+public interface class377 {
+	@ObfuscatedName("c")
+	byte[] method6796(int var1) throws UnsupportedEncodingException;
+}
diff --git a/runescape-client/src/main/java/class378.java b/runescape-client/src/main/java/class378.java
new file mode 100644
index 0000000000..af31c85e70
--- /dev/null
+++ b/runescape-client/src/main/java/class378.java
@@ -0,0 +1,21 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("nf")
+public class class378 {
+	@ObfuscatedName("t")
+	static final int[] field4233;
+	@ObfuscatedName("s")
+	static final int[] field4237;
+
+	static {
+		field4233 = new int[16384]; // L: 8
+		field4237 = new int[16384]; // L: 9
+		double var0 = 3.834951969714103E-4D; // L: 12
+
+		for (int var2 = 0; var2 < 16384; ++var2) { // L: 13
+			field4233[var2] = (int)(16384.0D * Math.sin(var0 * (double)var2)); // L: 14
+			field4237[var2] = (int)(16384.0D * Math.cos((double)var2 * var0)); // L: 15
+		}
+
+	} // L: 17
+}
diff --git a/runescape-client/src/main/java/class379.java b/runescape-client/src/main/java/class379.java
new file mode 100644
index 0000000000..03cceff498
--- /dev/null
+++ b/runescape-client/src/main/java/class379.java
@@ -0,0 +1,29 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("nk")
+public class class379 {
+	@ObfuscatedName("r")
+	static final int[] field4238;
+	@ObfuscatedName("o")
+	static final int[] field4244;
+	@ObfuscatedName("iu")
+	@ObfuscatedGetter(
+		intValue = -1725466411
+	)
+	@Export("cameraYaw")
+	static int cameraYaw;
+
+	static {
+		field4238 = new int[2048]; // L: 13
+		field4244 = new int[2048]; // L: 14
+		double var0 = 0.0030679615757712823D; // L: 17
+
+		for (int var2 = 0; var2 < 2048; ++var2) { // L: 18
+			field4238[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19
+			field4244[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20
+		}
+
+	} // L: 22
+}
diff --git a/runescape-client/src/main/java/class380.java b/runescape-client/src/main/java/class380.java
deleted file mode 100644
index b1276ab7c1..0000000000
--- a/runescape-client/src/main/java/class380.java
+++ /dev/null
@@ -1,19 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("nz")
-public interface class380 extends Iterable {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "1882106502"
-	)
-	int vmethod6739(int var1);
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/Object;I)V",
-		garbageValue = "-84615039"
-	)
-	void vmethod6736(int var1, Object var2);
-}
diff --git a/runescape-client/src/main/java/class381.java b/runescape-client/src/main/java/class381.java
deleted file mode 100644
index 52b6e5b1b8..0000000000
--- a/runescape-client/src/main/java/class381.java
+++ /dev/null
@@ -1,69 +0,0 @@
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("nx")
-public class class381 implements class380 {
-	@ObfuscatedName("p")
-	@Export("soundSystemExecutor")
-	static ScheduledExecutorService soundSystemExecutor;
-	@ObfuscatedName("i")
-	Map field4222;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Loa;"
-	)
-	final class407 field4219;
-
-	@ObfuscatedSignature(
-		descriptor = "(Loa;)V"
-	)
-	public class381(class407 var1) {
-		this.field4219 = var1; // L: 15
-	} // L: 16
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "1882106502"
-	)
-	public int vmethod6739(int var1) {
-		if (this.field4222 != null) { // L: 19
-			class408 var2 = (class408)this.field4222.get(var1); // L: 20
-			if (var2 != null) {
-				return (Integer)var2.field4361; // L: 21
-			}
-		}
-
-		return (Integer)this.field4219.vmethod7243(var1); // L: 23
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/Object;I)V",
-		garbageValue = "-84615039"
-	)
-	public void vmethod6736(int var1, Object var2) {
-		if (this.field4222 == null) { // L: 27
-			this.field4222 = new HashMap(); // L: 28
-			this.field4222.put(var1, new class408(var1, var2)); // L: 29
-		} else {
-			class408 var3 = (class408)this.field4222.get(var1); // L: 32
-			if (var3 == null) {
-				this.field4222.put(var1, new class408(var1, var2)); // L: 33
-			} else {
-				var3.field4361 = var2; // L: 34
-			}
-		}
-
-	} // L: 36
-
-	public Iterator iterator() {
-		return this.field4222 == null ? Collections.emptyList().iterator() : this.field4222.values().iterator(); // L: 39 40
-	}
-}
diff --git a/runescape-client/src/main/java/class383.java b/runescape-client/src/main/java/class383.java
deleted file mode 100644
index 243d31898e..0000000000
--- a/runescape-client/src/main/java/class383.java
+++ /dev/null
@@ -1,177 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("nn")
-public class class383 {
-	@ObfuscatedName("s")
-	static final char[] field4236;
-	@ObfuscatedName("a")
-	static final char[] field4237;
-
-	static {
-		field4236 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8
-		field4237 = new char[]{'[', ']', '#'}; // L: 9
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Lkz;II)Lib;",
-		garbageValue = "287793212"
-	)
-	public static PacketBufferNode method6755(int var0, String var1, Language var2, int var3) {
-		PacketBufferNode var4 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2759, 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:")) { // 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
-		class132.method2769(var4.packetBuffer, var1); // L: 167
-		if (var0 == class269.field3220.rsOrdinal()) { // L: 168
-			var4.packetBuffer.writeByte(var3); // L: 169
-		}
-
-		var4.packetBuffer.method6963(var4.packetBuffer.offset - var5); // L: 171
-		return var4; // L: 172
-	}
-
-	@ObfuscatedName("kt")
-	@ObfuscatedSignature(
-		descriptor = "(IIIILow;Liw;I)V",
-		garbageValue = "-1849354153"
-	)
-	@Export("worldToMinimap")
-	static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
-		int var6 = var3 * var3 + var2 * var2; // L: 11720
-		if (var6 > 4225 && var6 < 90000) { // L: 11721
-			int var7 = Client.camAngleY & 2047; // L: 11722
-			int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11723
-			int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11724
-			int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11725
-			int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11726
-			double var12 = Math.atan2((double)var10, (double)var11); // L: 11727
-			int var14 = var5.width / 2 - 25; // L: 11728
-			int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11729
-			int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11730
-			byte var17 = 20; // L: 11731
-			BoundaryObject.redHintArrowSprite.method7384(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11732
-		} else {
-			WorldMapDecoration.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11734
-		}
-
-	} // L: 11735
-}
diff --git a/runescape-client/src/main/java/class384.java b/runescape-client/src/main/java/class384.java
new file mode 100644
index 0000000000..bfc9e21593
--- /dev/null
+++ b/runescape-client/src/main/java/class384.java
@@ -0,0 +1,11 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("nd")
+public class class384 extends Node {
+	@ObfuscatedName("c")
+	public long field4254;
+
+	public class384(long var1) {
+		this.field4254 = var1; // L: 7
+	} // L: 8
+}
diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java
deleted file mode 100644
index 01ec4ab47a..0000000000
--- a/runescape-client/src/main/java/class386.java
+++ /dev/null
@@ -1,39 +0,0 @@
-import java.util.Iterator;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("nk")
-class class386 implements Iterator {
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -1225612599
-	)
-	int field4256;
-	// $FF: synthetic field
-	@ObfuscatedSignature(
-		descriptor = "Lno;"
-	)
-	final class387 this$0;
-
-	@ObfuscatedSignature(
-		descriptor = "(Lno;)V"
-	)
-	class386(class387 var1) {
-		this.this$0 = var1; // L: 50
-	}
-
-	public boolean hasNext() {
-		return this.field4256 < this.this$0.method6384(); // L: 54
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException(); // L: 65
-	}
-
-	public Object next() {
-		int var1 = ++this.field4256 - 1; // L: 58
-		class355 var2 = (class355)this.this$0.field4260.get((long)var1); // L: 59
-		return var2 != null ? var2 : this.this$0.method6820(var1); // L: 60 61
-	}
-}
diff --git a/runescape-client/src/main/java/class387.java b/runescape-client/src/main/java/class387.java
deleted file mode 100644
index 46b08fb601..0000000000
--- a/runescape-client/src/main/java/class387.java
+++ /dev/null
@@ -1,80 +0,0 @@
-import java.util.Iterator;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("no")
-public class class387 extends class354 implements class231 {
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	final AbstractArchive field4262;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lhd;"
-	)
-	final DemotingHashTable field4260;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = -1336685485
-	)
-	final int field4259;
-
-	@ObfuscatedSignature(
-		descriptor = "(Ljd;ILkz;Lko;)V"
-	)
-	public class387(StudioGame var1, int var2, Language var3, AbstractArchive var4) {
-		super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19
-		this.field4260 = new DemotingHashTable(64); // L: 15
-		this.field4262 = var4; // L: 20
-		this.field4259 = var2; // L: 21
-	} // L: 22
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lmn;",
-		garbageValue = "20"
-	)
-	protected class356 vmethod6814(int var1) {
-		synchronized(this.field4260) { // L: 26
-			class355 var2 = (class355)this.field4260.get((long)var1); // L: 27
-			if (var2 == null) { // L: 28
-				var2 = this.method6820(var1); // L: 29
-				this.field4260.method4673(var2, (long)var1); // L: 30
-			}
-
-			return var2; // L: 33
-		}
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lmf;",
-		garbageValue = "67"
-	)
-	class355 method6820(int var1) {
-		byte[] var2 = this.field4262.takeFile(this.field4259, var1); // L: 37
-		class355 var3 = new class355(var1); // L: 38
-		if (var2 != null) {
-			var3.method6405(new Buffer(var2)); // L: 39
-		}
-
-		return var3; // L: 40
-	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1873863120"
-	)
-	public void method6811() {
-		synchronized(this.field4260) { // L: 44
-			this.field4260.clear(); // L: 45
-		}
-	} // L: 47
-
-	public Iterator iterator() {
-		return new class386(this); // L: 50
-	}
-}
diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java
deleted file mode 100644
index f04a49da28..0000000000
--- a/runescape-client/src/main/java/class388.java
+++ /dev/null
@@ -1,19 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("nd")
-public interface class388 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;Lop;B)V",
-		garbageValue = "59"
-	)
-	void vmethod6878(Object var1, Buffer var2);
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)Ljava/lang/Object;",
-		garbageValue = "-2140031619"
-	)
-	Object vmethod6883(Buffer var1);
-}
diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java
deleted file mode 100644
index 26bdfa5c2f..0000000000
--- a/runescape-client/src/main/java/class389.java
+++ /dev/null
@@ -1,40 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ne")
-final class class389 implements class388 {
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("SpotAnimationDefinition_modelArchive")
-	public static AbstractArchive SpotAnimationDefinition_modelArchive;
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;Lop;B)V",
-		garbageValue = "59"
-	)
-	public void vmethod6878(Object var1, Buffer var2) {
-		this.method6830((Integer)var1, var2); // L: 20
-	} // L: 21
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)Ljava/lang/Object;",
-		garbageValue = "-2140031619"
-	)
-	public Object vmethod6883(Buffer var1) {
-		return var1.readInt(); // L: 16
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Integer;Lop;I)V",
-		garbageValue = "1046823792"
-	)
-	void method6830(Integer var1, Buffer var2) {
-		var2.writeInt(var1); // L: 12
-	} // L: 13
-}
diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java
deleted file mode 100644
index bc4ef2ab7e..0000000000
--- a/runescape-client/src/main/java/class390.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("ok")
-public class class390 {
-	@ObfuscatedName("i")
-	static final int[] field4266;
-
-	static {
-		field4266 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4
-	}
-}
diff --git a/runescape-client/src/main/java/class391.java b/runescape-client/src/main/java/class391.java
deleted file mode 100644
index 6d88cb96db..0000000000
--- a/runescape-client/src/main/java/class391.java
+++ /dev/null
@@ -1,32 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ot")
-final class class391 implements class388 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;Lop;B)V",
-		garbageValue = "59"
-	)
-	public void vmethod6878(Object var1, Buffer var2) {
-		this.method6845((Long)var1, var2); // L: 33
-	} // L: 34
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)Ljava/lang/Object;",
-		garbageValue = "-2140031619"
-	)
-	public Object vmethod6883(Buffer var1) {
-		return var1.readLong(); // L: 29
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Long;Lop;I)V",
-		garbageValue = "-1424253261"
-	)
-	void method6845(Long var1, Buffer var2) {
-		var2.writeLong(var1); // L: 25
-	} // L: 26
-}
diff --git a/runescape-client/src/main/java/class392.java b/runescape-client/src/main/java/class392.java
deleted file mode 100644
index 2353e23cf9..0000000000
--- a/runescape-client/src/main/java/class392.java
+++ /dev/null
@@ -1,228 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("og")
-public class class392 implements MouseWheel {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Log;"
-	)
-	public static final class392 field4276;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Log;"
-	)
-	public static final class392 field4270;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Log;"
-	)
-	public static final class392 field4271;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 309429929
-	)
-	final int field4269;
-	@ObfuscatedName("o")
-	@ObfuscatedGetter(
-		intValue = -489911481
-	)
-	public final int field4273;
-	@ObfuscatedName("g")
-	public final Class field4274;
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "Lnd;"
-	)
-	public final class388 field4275;
-
-	static {
-		field4276 = new class392(2, 0, Integer.class, new class389()); // L: 10
-		field4270 = new class392(1, 1, Long.class, new class391()); // L: 23
-		field4271 = new class392(0, 2, String.class, new class393()); // L: 36
-	}
-
-	@ObfuscatedSignature(
-		descriptor = "(IILjava/lang/Class;Lnd;)V"
-	)
-	class392(int var1, int var2, Class var3, class388 var4) {
-		this.field4269 = var1; // L: 59
-		this.field4273 = var2; // L: 60
-		this.field4274 = var3; // L: 61
-		this.field4275 = var4; // L: 62
-	} // L: 63
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
-	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field4273; // L: 79
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)Ljava/lang/Object;",
-		garbageValue = "254534065"
-	)
-	public Object method6858(Buffer var1) {
-		return this.field4275.vmethod6883(var1); // L: 83
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(S)[Log;",
-		garbageValue = "-11950"
-	)
-	public static class392[] method6855() {
-		return new class392[]{field4276, field4270, field4271}; // L: 55
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Class;I)Log;",
-		garbageValue = "1132071847"
-	)
-	public static class392 method6856(Class var0) {
-		class392[] var1 = method6855(); // L: 67
-
-		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 68
-			class392 var3 = var1[var2]; // L: 69
-			if (var3.field4274 == var0) {
-				return var3; // L: 71
-			}
-		}
-
-		return null; // L: 75
-	}
-
-	@ObfuscatedName("he")
-	@ObfuscatedSignature(
-		descriptor = "(IIIB)I",
-		garbageValue = "1"
-	)
-	@Export("getTileHeight")
-	static final int getTileHeight(int var0, int var1, int var2) {
-		int var3 = var0 >> 7; // L: 5643
-		int var4 = var1 >> 7; // L: 5644
-		if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5645
-			int var5 = var2; // L: 5646
-			if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5647
-				var5 = var2 + 1;
-			}
-
-			int var6 = var0 & 127; // L: 5648
-			int var7 = var1 & 127; // L: 5649
-			int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5650
-			int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; // L: 5651
-			return var9 * var7 + var8 * (128 - var7) >> 7; // L: 5652
-		} else {
-			return 0;
-		}
-	}
-
-	@ObfuscatedName("hd")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "106"
-	)
-	static void method6871(int var0, int var1) {
-		int var2 = Login.fontBold12.stringWidth("Choose Option"); // L: 8231
-
-		int var3;
-		int var4;
-		for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 8232
-			var4 = Login.fontBold12.stringWidth(method6873(var3)); // L: 8233
-			if (var4 > var2) { // L: 8234
-				var2 = var4;
-			}
-		}
-
-		var2 += 8; // L: 8236
-		var3 = Client.menuOptionsCount * 15 + 22; // L: 8237
-		var4 = var0 - var2 / 2; // L: 8238
-		if (var2 + var4 > GameEngine.canvasWidth) { // L: 8239
-			var4 = GameEngine.canvasWidth - var2;
-		}
-
-		if (var4 < 0) { // L: 8240
-			var4 = 0;
-		}
-
-		int var5 = var1; // L: 8241
-		if (var3 + var1 > KeyHandler.canvasHeight) { // L: 8242
-			var5 = KeyHandler.canvasHeight - var3;
-		}
-
-		if (var5 < 0) { // L: 8243
-			var5 = 0;
-		}
-
-		SecureRandomCallable.menuX = var4; // L: 8244
-		Frames.menuY = var5; // L: 8245
-		ObjectComposition.menuWidth = var2; // L: 8246
-		StudioGame.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 8247
-	} // L: 8248
-
-	@ObfuscatedName("if")
-	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-2087598232"
-	)
-	static String method6873(int var0) {
-		if (var0 < 0) { // L: 9316
-			return "";
-		} else {
-			return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9317 9318
-		}
-	}
-
-	@ObfuscatedName("iv")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIII)V",
-		garbageValue = "-2121670407"
-	)
-	static final void method6872(int var0, int var1, int var2, int var3, int var4, int var5) {
-		int var6 = var2 - var0; // L: 10154
-		int var7 = var3 - var1; // L: 10155
-		int var8 = var6 >= 0 ? var6 : -var6; // L: 10156
-		int var9 = var7 >= 0 ? var7 : -var7; // L: 10157
-		int var10 = var8; // L: 10158
-		if (var8 < var9) { // L: 10159
-			var10 = var9;
-		}
-
-		if (var10 != 0) { // L: 10160
-			int var11 = (var6 << 16) / var10; // L: 10161
-			int var12 = (var7 << 16) / var10; // L: 10162
-			if (var12 <= var11) { // L: 10163
-				var11 = -var11;
-			} else {
-				var12 = -var12; // L: 10164
-			}
-
-			int var13 = var5 * var12 >> 17; // L: 10165
-			int var14 = var5 * var12 + 1 >> 17; // L: 10166
-			int var15 = var5 * var11 >> 17; // L: 10167
-			int var16 = var5 * var11 + 1 >> 17; // L: 10168
-			var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 10169
-			var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 10170
-			int var17 = var0 + var13; // L: 10171
-			int var18 = var0 - var14; // L: 10172
-			int var19 = var0 + var6 - var14; // L: 10173
-			int var20 = var0 + var6 + var13; // L: 10174
-			int var21 = var15 + var1; // L: 10175
-			int var22 = var1 - var16; // L: 10176
-			int var23 = var7 + var1 - var16; // L: 10177
-			int var24 = var15 + var7 + var1; // L: 10178
-			Rasterizer3D.method4210(var17, var18, var19); // L: 10179
-			Rasterizer3D.method4213(var21, var22, var23, var17, var18, var19, var4); // L: 10180
-			Rasterizer3D.method4210(var17, var19, var20); // L: 10181
-			Rasterizer3D.method4213(var21, var23, var24, var17, var19, var20, var4); // L: 10182
-		}
-	} // L: 10183
-}
diff --git a/runescape-client/src/main/java/class393.java b/runescape-client/src/main/java/class393.java
deleted file mode 100644
index 0dbda2d318..0000000000
--- a/runescape-client/src/main/java/class393.java
+++ /dev/null
@@ -1,52 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("on")
-final class class393 implements class388 {
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;Lop;B)V",
-		garbageValue = "59"
-	)
-	public void vmethod6878(Object var1, Buffer var2) {
-		this.method6876((String)var1, var2); // L: 46
-	} // L: 47
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(Lop;I)Ljava/lang/Object;",
-		garbageValue = "-2140031619"
-	)
-	public Object vmethod6883(Buffer var1) {
-		return var1.readStringCp1252NullTerminated(); // L: 42
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Lop;S)V",
-		garbageValue = "4140"
-	)
-	void method6876(String var1, Buffer var2) {
-		var2.writeStringCp1252NullTerminated(var1); // L: 38
-	} // L: 39
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(Lko;Ljava/lang/String;Ljava/lang/String;I)[Loe;",
-		garbageValue = "-910424433"
-	)
-	public static IndexedSprite[] method6882(AbstractArchive var0, String var1, String var2) {
-		int var3 = var0.getGroupId(var1); // L: 58
-		int var4 = var0.getFileId(var3, var2); // L: 59
-		return UserComparator5.method2478(var0, var3, var4); // L: 60
-	}
-
-	@ObfuscatedName("gq")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-496918873"
-	)
-	static final void method6885(int var0, int var1, int var2, int var3) {
-		class114.method2538(); // L: 5609
-	} // L: 5610
-}
diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java
index decebc0721..1a5c23ed2d 100644
--- a/runescape-client/src/main/java/class397.java
+++ b/runescape-client/src/main/java/class397.java
@@ -1,31 +1,19 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("oi")
-public final class class397 {
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		longValue = -4044727011412295925L
-	)
-	static long field4289;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		longValue = 99400153304744329L
+@ObfuscatedName("oc")
+public interface class397 extends Iterable {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "233631954"
 	)
-	static long field4288;
-	@ObfuscatedName("x")
-	@Export("Tiles_saturation")
-	static int[] Tiles_saturation;
+	int vmethod7128(int var1);
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "1663146092"
+		descriptor = "(ILjava/lang/Object;I)V",
+		garbageValue = "3016419"
 	)
-	@Export("addGameMessage")
-	static void addGameMessage(int var0, String var1, String var2) {
-		class269.addChatMessage(var0, var1, var2, (String)null); // L: 23
-	} // L: 24
+	void vmethod7129(int var1, Object var2);
 }
diff --git a/runescape-client/src/main/java/class398.java b/runescape-client/src/main/java/class398.java
new file mode 100644
index 0000000000..d3145f3e23
--- /dev/null
+++ b/runescape-client/src/main/java/class398.java
@@ -0,0 +1,72 @@
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("om")
+public class class398 implements class397 {
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1895021105
+	)
+	@Export("clientType")
+	public static int clientType;
+	@ObfuscatedName("c")
+	Map field4396;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lpq;"
+	)
+	final class425 field4394;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lpq;)V"
+	)
+	public class398(class425 var1) {
+		this.field4394 = var1; // L: 15
+	} // L: 16
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "233631954"
+	)
+	public int vmethod7128(int var1) {
+		if (this.field4396 != null) { // L: 20
+			class426 var2 = (class426)this.field4396.get(var1); // L: 21
+			if (var2 != null) {
+				return (Integer)var2.field4537; // L: 22
+			}
+		}
+
+		return (Integer)this.field4394.vmethod7625(var1); // L: 24
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/Object;I)V",
+		garbageValue = "3016419"
+	)
+	public void vmethod7129(int var1, Object var2) {
+		if (this.field4396 == null) { // L: 29
+			this.field4396 = new HashMap(); // L: 30
+			this.field4396.put(var1, new class426(var1, var2)); // L: 31
+		} else {
+			class426 var3 = (class426)this.field4396.get(var1); // L: 34
+			if (var3 == null) {
+				this.field4396.put(var1, new class426(var1, var2)); // L: 35
+			} else {
+				var3.field4537 = var2; // L: 36
+			}
+		}
+
+	} // L: 38
+
+	public Iterator iterator() {
+		return this.field4396 == null ? Collections.emptyList().iterator() : this.field4396.values().iterator(); // L: 42 43
+	}
+}
diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java
new file mode 100644
index 0000000000..388e1e54e3
--- /dev/null
+++ b/runescape-client/src/main/java/class4.java
@@ -0,0 +1,323 @@
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.Reflection;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("t")
+public final class class4 {
+	@ObfuscatedName("hg")
+	@ObfuscatedGetter(
+		intValue = -1796979241
+	)
+	static int field9;
+	@ObfuscatedName("my")
+	@ObfuscatedSignature(
+		descriptor = "Ljm;"
+	)
+	@Export("mousedOverWidgetIf1")
+	static Widget mousedOverWidgetIf1;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lku;IIB)Lpa;",
+		garbageValue = "96"
+	)
+	static IndexedSprite method22(AbstractArchive var0, int var1, int var2) {
+		if (!class147.method3009(var0, var1, var2)) { // L: 23
+			return null;
+		} else {
+			IndexedSprite var4 = new IndexedSprite(); // L: 26
+			var4.width = class432.SpriteBuffer_spriteWidth; // L: 27
+			var4.height = class432.SpriteBuffer_spriteHeight; // L: 28
+			var4.xOffset = class141.SpriteBuffer_xOffsets[0]; // L: 29
+			var4.yOffset = RouteStrategy.SpriteBuffer_yOffsets[0]; // L: 30
+			var4.subWidth = class432.SpriteBuffer_spriteWidths[0]; // L: 31
+			var4.subHeight = class330.SpriteBuffer_spriteHeights[0]; // L: 32
+			var4.palette = class432.SpriteBuffer_spritePalette; // L: 33
+			var4.pixels = class369.SpriteBuffer_pixels[0]; // L: 34
+			UserComparator3.method2529(); // L: 35
+			return var4; // L: 38
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;",
+		garbageValue = "1111873068"
+	)
+	@Export("loadClassFromDescriptor")
+	static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
+		if (var0.equals("B")) { // L: 212
+			return Byte.TYPE;
+		} else if (var0.equals("I")) { // L: 213
+			return Integer.TYPE;
+		} else if (var0.equals("S")) { // L: 214
+			return Short.TYPE;
+		} else if (var0.equals("J")) { // L: 215
+			return Long.TYPE;
+		} else if (var0.equals("Z")) {
+			return Boolean.TYPE; // L: 216
+		} else if (var0.equals("F")) { // L: 217
+			return Float.TYPE;
+		} else if (var0.equals("D")) { // L: 218
+			return Double.TYPE;
+		} else if (var0.equals("C")) { // L: 219
+			return Character.TYPE;
+		} else {
+			return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 220 221
+		}
+	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "1064743606"
+	)
+	static int method20(int var0, Script var1, boolean var2) {
+		Widget var3 = ChatChannel.getWidget(Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize]); // L: 1264
+		if (var0 == ScriptOpcodes.IF_GETX) { // L: 1265
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.x; // L: 1266
+			return 1; // L: 1267
+		} else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1269
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.y; // L: 1270
+			return 1; // L: 1271
+		} else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1273
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.width; // L: 1274
+			return 1; // L: 1275
+		} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1277
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.height; // L: 1278
+			return 1; // L: 1279
+		} else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1281
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1282
+			return 1; // L: 1283
+		} else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1285
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.parentId; // L: 1286
+			return 1; // L: 1287
+		} else {
+			return 2; // L: 1289
+		}
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(Leb;III)Lar;",
+		garbageValue = "863629415"
+	)
+	public static final PcmPlayer method29(TaskHandler var0, int var1, int var2) {
+		if (class339.field4058 == 0) { // L: 49
+			throw new IllegalStateException();
+		} else if (var1 >= 0 && var1 < 2) { // L: 50
+			if (var2 < 256) { // L: 51
+				var2 = 256;
+			}
+
+			try {
+				PcmPlayer var3 = class11.pcmPlayerProvider.player(); // L: 53
+				var3.samples = new int[256 * (SpriteMask.PcmPlayer_stereo ? 2 : 1)]; // L: 54
+				var3.field298 = var2; // L: 55
+				var3.init(); // L: 56
+				var3.capacity = (var2 & -1024) + 1024; // L: 57
+				if (var3.capacity > 16384) { // L: 58
+					var3.capacity = 16384;
+				}
+
+				var3.open(var3.capacity); // L: 59
+				if (UserComparator10.field1339 > 0 && PcmPlayer.soundSystem == null) { // L: 60
+					PcmPlayer.soundSystem = new SoundSystem(); // L: 61
+					PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 62
+					PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 63
+				}
+
+				if (PcmPlayer.soundSystem != null) { // L: 65
+					if (PcmPlayer.soundSystem.players[var1] != null) { // L: 66
+						throw new IllegalArgumentException();
+					}
+
+					PcmPlayer.soundSystem.players[var1] = var3; // L: 67
+				}
+
+				return var3; // L: 69
+			} catch (Throwable var4) { // L: 71
+				return new PcmPlayer(); // L: 72
+			}
+		} else {
+			throw new IllegalArgumentException();
+		}
+	}
+
+	@ObfuscatedName("ai")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-2142198504"
+	)
+	static int method27(int var0, Script var1, boolean var2) {
+		if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4337
+			if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4341
+				if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4345
+					if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4349
+						if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4353
+							if (var0 != 7031 && var0 != 7032) { // L: 4357
+								if (var0 == 7033) { // L: 4362
+									--class13.Interpreter_stringStackSize; // L: 4363
+									return 1; // L: 4364
+								} else if (var0 != 7036 && var0 != 7037) { // L: 4366
+									if (var0 == 7038) { // L: 4370
+										--IsaacCipher.Interpreter_intStackSize; // L: 4371
+										return 1; // L: 4372
+									} else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4374
+										return 2; // L: 4378
+									} else {
+										--IsaacCipher.Interpreter_intStackSize; // L: 4375
+										return 1; // L: 4376
+									}
+								} else {
+									IsaacCipher.Interpreter_intStackSize -= 2; // L: 4367
+									return 1; // L: 4368
+								}
+							} else {
+								--class13.Interpreter_stringStackSize; // L: 4358
+								--IsaacCipher.Interpreter_intStackSize; // L: 4359
+								return 1; // L: 4360
+							}
+						} else {
+							--IsaacCipher.Interpreter_intStackSize; // L: 4354
+							return 1; // L: 4355
+						}
+					} else {
+						IsaacCipher.Interpreter_intStackSize -= 2; // L: 4350
+						return 1; // L: 4351
+					}
+				} else {
+					IsaacCipher.Interpreter_intStackSize -= 2; // L: 4346
+					return 1; // L: 4347
+				}
+			} else {
+				IsaacCipher.Interpreter_intStackSize -= 3; // L: 4342
+				return 1; // L: 4343
+			}
+		} else {
+			IsaacCipher.Interpreter_intStackSize -= 5; // L: 4338
+			return 1; // L: 4339
+		}
+	}
+
+	@ObfuscatedName("hz")
+	@ObfuscatedSignature(
+		descriptor = "(Lcg;B)V",
+		garbageValue = "-85"
+	)
+	static final void method26(PendingSpawn var0) {
+		long var1 = 0L; // L: 7958
+		int var3 = -1; // L: 7959
+		int var4 = 0; // L: 7960
+		int var5 = 0; // L: 7961
+		if (var0.type == 0) { // L: 7962
+			var1 = class7.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 1) { // L: 7963
+			var1 = class7.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 2) { // L: 7964
+			var1 = class7.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 3) {
+			var1 = class7.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7965
+		}
+
+		if (0L != var1) { // L: 7966
+			int var6 = class7.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7967
+			var3 = PacketWriter.Entity_unpackID(var1); // L: 7968
+			var4 = var6 & 31; // L: 7969
+			var5 = var6 >> 6 & 3; // L: 7970
+		}
+
+		var0.objectId = var3; // L: 7972
+		var0.field1080 = var4; // L: 7973
+		var0.field1087 = var5; // L: 7974
+	} // L: 7975
+
+	@ObfuscatedName("ij")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "955034020"
+	)
+	static final void method25() {
+		int var0 = ModeWhere.menuX; // L: 8818
+		int var1 = BufferedSink.menuY; // L: 8819
+		int var2 = GameObject.menuWidth; // L: 8820
+		int var3 = UserComparator3.menuHeight; // L: 8821
+		int var4 = 6116423; // L: 8822
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 8823
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 8824
+		Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 8825
+		class136.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 8826
+		int var5 = MouseHandler.MouseHandler_x; // L: 8827
+		int var6 = MouseHandler.MouseHandler_y; // L: 8828
+
+		int var7;
+		int var8;
+		int var9;
+		for (var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 8829
+			var8 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; // L: 8830
+			var9 = 16777215; // L: 8831
+			if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 8832
+				var9 = 16776960;
+			}
+
+			Font var12 = class136.fontBold12; // L: 8833
+			String var13;
+			if (var7 < 0) { // L: 8836
+				var13 = ""; // L: 8837
+			} else if (Client.menuTargets[var7].length() > 0) { // L: 8840
+				var13 = Client.menuActions[var7] + " " + Client.menuTargets[var7];
+			} else {
+				var13 = Client.menuActions[var7]; // L: 8841
+			}
+
+			var12.draw(var13, var0 + 3, var8, var9, 0); // L: 8843
+		}
+
+		var7 = ModeWhere.menuX; // L: 8845
+		var8 = BufferedSink.menuY; // L: 8846
+		var9 = GameObject.menuWidth; // L: 8847
+		int var10 = UserComparator3.menuHeight; // L: 8848
+
+		for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 8850
+			if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 8851
+				Client.field686[var11] = true;
+			}
+		}
+
+	} // L: 8854
+
+	@ObfuscatedName("kg")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-5742457"
+	)
+	static final void method28() {
+		PacketBufferNode var0 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2898, Client.packetWriter.isaacCipher); // L: 12251
+		Client.packetWriter.addNode(var0); // L: 12252
+		Interpreter.field816 = true; // L: 12253
+
+		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 12254
+			if (var1.type == 0 || var1.type == 3) { // L: 12255
+				class10.closeInterface(var1, true);
+			}
+		}
+
+		if (Client.meslayerContinueWidget != null) { // L: 12257
+			SecureRandomCallable.invalidateWidget(Client.meslayerContinueWidget); // L: 12258
+			Client.meslayerContinueWidget = null; // L: 12259
+		}
+
+		Interpreter.field816 = false; // L: 12261
+	} // L: 12262
+}
diff --git a/runescape-client/src/main/java/class400.java b/runescape-client/src/main/java/class400.java
new file mode 100644
index 0000000000..8acbf7697b
--- /dev/null
+++ b/runescape-client/src/main/java/class400.java
@@ -0,0 +1,41 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ol")
+public class class400 {
+	@ObfuscatedName("p")
+	static final char[] field4411;
+	@ObfuscatedName("m")
+	static final char[] field4410;
+
+	static {
+		field4411 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8
+		field4410 = new char[]{'[', ']', '#'};
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "([BILjava/lang/CharSequence;I)I",
+		garbageValue = "980232052"
+	)
+	public static int method7147(byte[] var0, int var1, CharSequence var2) {
+		int var3 = var2.length(); // L: 9
+		int var4 = var1; // L: 10
+
+		for (int var5 = 0; var5 < var3; ++var5) { // L: 11
+			char var6 = var2.charAt(var5); // L: 12
+			if (var6 <= 127) { // L: 13
+				var0[var4++] = (byte)var6; // L: 14
+			} else if (var6 <= 2047) { // L: 16
+				var0[var4++] = (byte)(192 | var6 >> 6); // L: 17
+				var0[var4++] = (byte)(128 | var6 & '?'); // L: 18
+			} else {
+				var0[var4++] = (byte)(224 | var6 >> '\f'); // L: 21
+				var0[var4++] = (byte)(128 | var6 >> 6 & 63); // L: 22
+				var0[var4++] = (byte)(128 | var6 & '?'); // L: 23
+			}
+		}
+
+		return var4 - var1; // L: 26
+	}
+}
diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java
index f2755874c4..b1fa9995d4 100644
--- a/runescape-client/src/main/java/class403.java
+++ b/runescape-client/src/main/java/class403.java
@@ -1,11 +1,39 @@
+import java.util.Iterator;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("or")
-public interface class403 {
-	@ObfuscatedName("i")
+@ObfuscatedName("oe")
+class class403 implements Iterator {
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1460216939
+	)
+	int field4432;
+	// $FF: synthetic field
+	@ObfuscatedSignature(
+		descriptor = "Loo;"
+	)
+	final class404 this$0;
+
 	@ObfuscatedSignature(
-		descriptor = "(Lop;I)V"
+		descriptor = "(Loo;)V"
 	)
-	void method7216(Buffer var1);
+	class403(class404 var1) {
+		this.this$0 = var1; // L: 51
+	}
+
+	public void remove() {
+		throw new UnsupportedOperationException(); // L: 69
+	}
+
+	public Object next() {
+		int var1 = ++this.field4432 - 1; // L: 61
+		class372 var2 = (class372)this.this$0.field4436.get((long)var1); // L: 62
+		return var2 != null ? var2 : this.this$0.method7215(var1); // L: 63 64
+	}
+
+	public boolean hasNext() {
+		return this.field4432 < this.this$0.method6759(); // L: 56
+	}
 }
diff --git a/runescape-client/src/main/java/class404.java b/runescape-client/src/main/java/class404.java
index 21618fd5be..4118ae3689 100644
--- a/runescape-client/src/main/java/class404.java
+++ b/runescape-client/src/main/java/class404.java
@@ -1,81 +1,91 @@
+import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("os")
-public class class404 implements MouseWheel {
-	@ObfuscatedName("i")
+@ObfuscatedName("oo")
+public class class404 extends class371 implements class244 {
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Los;"
+		descriptor = "Lku;"
 	)
-	public static final class404 field4351;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Los;"
-	)
-	public static final class404 field4352;
-	@ObfuscatedName("s")
+	final AbstractArchive field4435;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Los;"
+		descriptor = "Lic;"
 	)
-	static final class404 field4350;
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Los;"
+	final DemotingHashTable field4436;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1252832733
 	)
-	static final class404 field4349;
-	@ObfuscatedName("o")
+	final int field4437;
+
 	@ObfuscatedSignature(
-		descriptor = "Los;"
+		descriptor = "(Lko;ILlf;Lku;)V"
 	)
-	static final class404 field4353;
-	@ObfuscatedName("g")
+	public class404(StudioGame var1, int var2, Language var3, AbstractArchive var4) {
+		super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19
+		this.field4436 = new DemotingHashTable(64); // L: 15
+		this.field4435 = var4; // L: 20
+		this.field4437 = var2; // L: 21
+	} // L: 22
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Los;"
+		descriptor = "(II)Lnp;",
+		garbageValue = "1453466959"
 	)
-	static final class404 field4354;
+	protected class373 vmethod7209(int var1) {
+		synchronized(this.field4436) { // L: 26
+			class372 var2 = (class372)this.field4436.get((long)var1); // L: 27
+			if (var2 == null) { // L: 28
+				var2 = this.method7215(var1); // L: 29
+				this.field4436.method4958(var2, (long)var1); // L: 30
+			}
+
+			return var2; // L: 33
+		}
+	}
+
 	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = -1390706717
-	)
-	final int field4355;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -611515957
+	@ObfuscatedSignature(
+		descriptor = "(II)Lnv;",
+		garbageValue = "277242473"
 	)
-	final int field4356;
+	class372 method7215(int var1) {
+		byte[] var2 = this.field4435.takeFile(this.field4437, var1); // L: 37
+		class372 var3 = new class372(var1); // L: 38
+		if (var2 != null) { // L: 39
+			var3.method6778(new Buffer(var2));
+		}
 
-	static {
-		field4351 = new class404(2, 0); // L: 8
-		field4352 = new class404(5, 2); // L: 9
-		field4350 = new class404(3, 5); // L: 10
-		field4349 = new class404(0, 6); // L: 11
-		field4353 = new class404(1, 7); // L: 12
-		field4354 = new class404(4, 8); // L: 13
+		return var3; // L: 40
 	}
 
-	class404(int var1, int var2) {
-		this.field4355 = var1; // L: 18
-		this.field4356 = var2; // L: 19
-	} // L: 20
-
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1832160876"
+		descriptor = "(I)V",
+		garbageValue = "-1968440370"
 	)
-	public boolean method7220() {
-		return this == field4352; // L: 27
+	public void method7216() {
+		synchronized(this.field4436) { // L: 44
+			this.field4436.clear(); // L: 45
+		}
+	} // L: 47
+
+	public Iterator iterator() {
+		return new class403(this); // L: 51
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(IS)I",
+		garbageValue = "15695"
 	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field4356; // L: 23
+	@Export("Widget_unpackTargetMask")
+	public static int Widget_unpackTargetMask(int var0) {
+		return var0 >> 11 & 63; // L: 17
 	}
 }
diff --git a/runescape-client/src/main/java/class405.java b/runescape-client/src/main/java/class405.java
new file mode 100644
index 0000000000..d861cbbdbc
--- /dev/null
+++ b/runescape-client/src/main/java/class405.java
@@ -0,0 +1,19 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("oq")
+public interface class405 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Object;Lpi;I)V",
+		garbageValue = "246575309"
+	)
+	void vmethod7273(Object var1, Buffer var2);
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;B)Ljava/lang/Object;",
+		garbageValue = "3"
+	)
+	Object vmethod7271(Buffer var1);
+}
diff --git a/runescape-client/src/main/java/class406.java b/runescape-client/src/main/java/class406.java
new file mode 100644
index 0000000000..08718dc63d
--- /dev/null
+++ b/runescape-client/src/main/java/class406.java
@@ -0,0 +1,32 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ou")
+final class class406 implements class405 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Object;Lpi;I)V",
+		garbageValue = "246575309"
+	)
+	public void vmethod7273(Object var1, Buffer var2) {
+		this.method7229((Integer)var1, var2); // L: 21
+	} // L: 22
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;B)Ljava/lang/Object;",
+		garbageValue = "3"
+	)
+	public Object vmethod7271(Buffer var1) {
+		return var1.readInt(); // L: 17
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Integer;Lpi;I)V",
+		garbageValue = "2131045712"
+	)
+	void method7229(Integer var1, Buffer var2) {
+		var2.writeInt(var1); // L: 12
+	} // L: 13
+}
diff --git a/runescape-client/src/main/java/class407.java b/runescape-client/src/main/java/class407.java
index b2a1a5f68f..12da001b8d 100644
--- a/runescape-client/src/main/java/class407.java
+++ b/runescape-client/src/main/java/class407.java
@@ -1,12 +1,11 @@
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("oa")
-public interface class407 {
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/Object;",
-		garbageValue = "-738928947"
-	)
-	Object vmethod7243(int var1);
+@ObfuscatedName("og")
+public class class407 {
+	@ObfuscatedName("c")
+	public static final int[] field4439;
+
+	static {
+		field4439 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4
+	}
 }
diff --git a/runescape-client/src/main/java/class408.java b/runescape-client/src/main/java/class408.java
index bb662ba18e..e4de978754 100644
--- a/runescape-client/src/main/java/class408.java
+++ b/runescape-client/src/main/java/class408.java
@@ -3,53 +3,39 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ov")
-public class class408 {
-	@ObfuscatedName("tb")
-	@ObfuscatedSignature(
-		descriptor = "Lcs;"
-	)
-	@Export("clientPreferences")
-	static ClientPreferences clientPreferences;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lko;"
-	)
-	@Export("soundEffectsArchive")
-	public static AbstractArchive soundEffectsArchive;
-	@ObfuscatedName("i")
+@ObfuscatedName("os")
+final class class408 implements class405 {
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -196401313
+		intValue = -271022059
 	)
-	public final int field4363;
-	@ObfuscatedName("w")
-	public Object field4361;
-
-	public class408(int var1) {
-		this.field4363 = var1; // L: 8
-	} // L: 9
+	@Export("WorldMapElement_count")
+	public static int WorldMapElement_count;
 
-	public class408(int var1, Object var2) {
-		this.field4363 = var1; // L: 12
-		this.field4361 = var2; // L: 13
-	} // L: 14
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Object;Lpi;I)V",
+		garbageValue = "246575309"
+	)
+	public void vmethod7273(Object var1, Buffer var2) {
+		this.method7238((Long)var1, var2); // L: 35
+	} // L: 36
 
-	public int hashCode() {
-		return super.hashCode(); // L: 17
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;B)Ljava/lang/Object;",
+		garbageValue = "3"
+	)
+	public Object vmethod7271(Buffer var1) {
+		return var1.readLong(); // L: 31
 	}
 
-	public boolean equals(Object var1) {
-		if (!(var1 instanceof class408)) { // L: 21
-			return false;
-		} else {
-			class408 var2 = (class408)var1; // L: 22
-			if (var2.field4361 == null && this.field4361 != null) { // L: 23
-				return false;
-			} else if (this.field4361 == null && var2.field4361 != null) { // L: 24
-				return false;
-			} else {
-				return var2.field4363 == this.field4363 && var2.field4361.equals(this.field4361); // L: 25
-			}
-		}
-	}
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Long;Lpi;I)V",
+		garbageValue = "-1540315910"
+	)
+	void method7238(Long var1, Buffer var2) {
+		var2.writeLong(var1); // L: 26
+	} // L: 27
 }
diff --git a/runescape-client/src/main/java/class409.java b/runescape-client/src/main/java/class409.java
new file mode 100644
index 0000000000..4b1d001a3a
--- /dev/null
+++ b/runescape-client/src/main/java/class409.java
@@ -0,0 +1,184 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("od")
+public class class409 implements MouseWheel {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lod;"
+	)
+	public static final class409 field4445;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lod;"
+	)
+	public static final class409 field4442;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lod;"
+	)
+	public static final class409 field4449;
+	@ObfuscatedName("x")
+	@Export("userHomeDirectory")
+	public static String userHomeDirectory;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1710692843
+	)
+	final int field4444;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -399344135
+	)
+	public final int field4452;
+	@ObfuscatedName("s")
+	public final Class field4446;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Loq;"
+	)
+	final class405 field4447;
+
+	static {
+		field4445 = new class409(1, 0, Integer.class, new class406()); // L: 10
+		field4442 = new class409(0, 1, Long.class, new class408()); // L: 24
+		field4449 = new class409(2, 2, String.class, new class410()); // L: 38
+	}
+
+	@ObfuscatedSignature(
+		descriptor = "(IILjava/lang/Class;Loq;)V"
+	)
+	class409(int var1, int var2, Class var3, class405 var4) {
+		this.field4444 = var1; // L: 58
+		this.field4452 = var2; // L: 59
+		this.field4446 = var3; // L: 60
+		this.field4447 = var4; // L: 61
+	} // L: 62
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "48"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field4452; // L: 96
+	}
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)Ljava/lang/Object;",
+		garbageValue = "2103066470"
+	)
+	public Object method7250(Buffer var1) {
+		return this.field4447.vmethod7271(var1); // L: 100
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Class;I)Lod;",
+		garbageValue = "85005333"
+	)
+	public static class409 method7247(Class var0) {
+		class409[] var1 = new class409[]{field4442, field4449, field4445}; // L: 68
+		class409[] var2 = var1; // L: 70
+
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 71
+			class409 var4 = var2[var3]; // L: 72
+			if (var4.field4446 == var0) { // L: 74
+				return var4;
+			}
+		}
+
+		return null; // L: 78
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Object;Lpi;I)V",
+		garbageValue = "-1411483047"
+	)
+	public static void method7255(Object var0, Buffer var1) {
+		class405 var2 = method7248(var0.getClass()); // L: 83
+		var2.vmethod7273(var0, var1); // L: 84
+	} // L: 85
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Class;I)Loq;",
+		garbageValue = "-693782319"
+	)
+	static class405 method7248(Class var0) {
+		class409 var1 = method7247(var0); // L: 89
+		if (var1 == null) {
+			throw new IllegalArgumentException(); // L: 90
+		} else {
+			return var1.field4447; // L: 91
+		}
+	}
+
+	@ObfuscatedName("fy")
+	@ObfuscatedSignature(
+		descriptor = "(Lgn;IIIB)V",
+		garbageValue = "10"
+	)
+	static void method7269(SequenceDefinition var0, int var1, int var2, int var3) {
+		if (Client.soundEffectCount < 50 && SecureRandomFuture.clientPreferences.areaSoundEffectsVolume != 0) { // L: 4303
+			if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 4304
+				class315.method5816(var0.soundEffects[var1], var2, var3); // L: 4305
+			}
+		}
+	} // L: 4306
+
+	@ObfuscatedName("kv")
+	@ObfuscatedSignature(
+		descriptor = "(IIIILpl;Ljr;B)V",
+		garbageValue = "88"
+	)
+	@Export("worldToMinimap")
+	static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
+		int var6 = var3 * var3 + var2 * var2; // L: 12416
+		if (var6 > 4225 && var6 < 90000) { // L: 12417
+			int var7 = Client.camAngleY & 2047; // L: 12418
+			int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 12419
+			int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 12420
+			int var10 = var9 * var2 + var3 * var8 >> 16; // L: 12421
+			int var11 = var3 * var9 - var8 * var2 >> 16; // L: 12422
+			double var12 = Math.atan2((double)var10, (double)var11); // L: 12423
+			int var14 = var5.width / 2 - 25; // L: 12424
+			int var15 = (int)(Math.sin(var12) * (double)var14); // L: 12425
+			int var16 = (int)(Math.cos(var12) * (double)var14); // L: 12426
+			byte var17 = 20; // L: 12427
+			PcmPlayer.redHintArrowSprite.method7807(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 12428
+		} else {
+			ArchiveDisk.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 12430
+		}
+
+	} // L: 12431
+
+	@ObfuscatedName("lw")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "968032727"
+	)
+	static final void method7267() {
+		Client.field671 = Client.cycleCntr; // L: 12472
+	} // L: 12473
+
+	@ObfuscatedName("li")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "2119395151"
+	)
+	@Export("clanKickUser")
+	static final void clanKickUser(String var0) {
+		if (Players.friendsChat != null) { // L: 12486
+			PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2828, Client.packetWriter.isaacCipher); // L: 12487
+			var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); // L: 12488
+			var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 12489
+			Client.packetWriter.addNode(var1); // L: 12490
+		}
+	} // L: 12491
+}
diff --git a/runescape-client/src/main/java/class410.java b/runescape-client/src/main/java/class410.java
new file mode 100644
index 0000000000..1445b1ed7d
--- /dev/null
+++ b/runescape-client/src/main/java/class410.java
@@ -0,0 +1,62 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("oi")
+final class class410 implements class405 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Ljv;"
+	)
+	@Export("huffman")
+	public static Huffman huffman;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Object;Lpi;I)V",
+		garbageValue = "246575309"
+	)
+	public void vmethod7273(Object var1, Buffer var2) {
+		this.method7275((String)var1, var2); // L: 49
+	} // L: 50
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;B)Ljava/lang/Object;",
+		garbageValue = "3"
+	)
+	public Object vmethod7271(Buffer var1) {
+		return var1.readStringCp1252NullTerminated(); // L: 45
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Lpi;I)V",
+		garbageValue = "1797008189"
+	)
+	void method7275(String var1, Buffer var2) {
+		var2.writeStringCp1252NullTerminated(var1); // L: 40
+	} // L: 41
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lbn;",
+		garbageValue = "-50"
+	)
+	@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 = TaskHandler.archive12.takeFile(var0, 0); // L: 28
+			if (var2 == null) { // L: 29
+				return null; // L: 30
+			} else {
+				var1 = class145.newScript(var2); // L: 32
+				Script.Script_cached.put(var1, (long)var0); // L: 33
+				return var1; // L: 34
+			}
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class411.java b/runescape-client/src/main/java/class411.java
new file mode 100644
index 0000000000..2113a363c1
--- /dev/null
+++ b/runescape-client/src/main/java/class411.java
@@ -0,0 +1,13 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("oj")
+public final class class411 {
+	@ObfuscatedName("b")
+	static final void method7280(long var0) {
+		try {
+			Thread.sleep(var0); // L: 20
+		} catch (InterruptedException var3) { // L: 22
+		}
+
+	} // L: 23
+}
diff --git a/runescape-client/src/main/java/class412.java b/runescape-client/src/main/java/class412.java
new file mode 100644
index 0000000000..76ffa5772c
--- /dev/null
+++ b/runescape-client/src/main/java/class412.java
@@ -0,0 +1,43 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ob")
+public class class412 {
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "103250498"
+	)
+	public static String method7287(String var0) {
+		int var1 = var0.length(); // L: 156
+		char[] var2 = new char[var1]; // L: 157
+		byte var3 = 2; // L: 158
+
+		for (int var4 = 0; var4 < var1; ++var4) { // L: 159
+			char var5 = var0.charAt(var4); // L: 160
+			if (var3 == 0) { // L: 161
+				var5 = Character.toLowerCase(var5);
+			} else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 162
+				var5 = HealthBar.method2313(var5);
+			}
+
+			if (Character.isLetter(var5)) { // L: 163
+				var3 = 0;
+			} else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 164
+				if (Character.isSpaceChar(var5)) { // L: 165
+					if (var3 != 2) { // L: 166
+						var3 = 1;
+					}
+				} else {
+					var3 = 1; // L: 168
+				}
+			} else {
+				var3 = 2;
+			}
+
+			var2[var4] = var5; // L: 169
+		}
+
+		return new String(var2); // L: 171
+	}
+}
diff --git a/runescape-client/src/main/java/class414.java b/runescape-client/src/main/java/class414.java
deleted file mode 100644
index 4e3aaa67cc..0000000000
--- a/runescape-client/src/main/java/class414.java
+++ /dev/null
@@ -1,34 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("ou")
-public class class414 {
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -1617488597
-	)
-	@Export("SpriteBuffer_spriteCount")
-	static int SpriteBuffer_spriteCount;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -34182123
-	)
-	@Export("SpriteBuffer_spriteWidth")
-	static int SpriteBuffer_spriteWidth;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 627658403
-	)
-	@Export("SpriteBuffer_spriteHeight")
-	static int SpriteBuffer_spriteHeight;
-	@ObfuscatedName("a")
-	@Export("SpriteBuffer_xOffsets")
-	public static int[] SpriteBuffer_xOffsets;
-	@ObfuscatedName("o")
-	@Export("SpriteBuffer_yOffsets")
-	public static int[] SpriteBuffer_yOffsets;
-	@ObfuscatedName("e")
-	@Export("SpriteBuffer_spriteHeights")
-	public static int[] SpriteBuffer_spriteHeights;
-}
diff --git a/runescape-client/src/main/java/class415.java b/runescape-client/src/main/java/class415.java
new file mode 100644
index 0000000000..ba2e0829df
--- /dev/null
+++ b/runescape-client/src/main/java/class415.java
@@ -0,0 +1,16 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("op")
+public final class class415 {
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		longValue = 3377328745590909343L
+	)
+	static long field4466;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		longValue = -6656511985320567105L
+	)
+	static long field4467;
+}
diff --git a/runescape-client/src/main/java/class421.java b/runescape-client/src/main/java/class421.java
new file mode 100644
index 0000000000..3aeef3008f
--- /dev/null
+++ b/runescape-client/src/main/java/class421.java
@@ -0,0 +1,11 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("pp")
+public interface class421 {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lpi;I)V"
+	)
+	void method7596(Buffer var1);
+}
diff --git a/runescape-client/src/main/java/class422.java b/runescape-client/src/main/java/class422.java
new file mode 100644
index 0000000000..112f9802f6
--- /dev/null
+++ b/runescape-client/src/main/java/class422.java
@@ -0,0 +1,81 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("pf")
+public class class422 implements MouseWheel {
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lpf;"
+	)
+	public static final class422 field4523;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lpf;"
+	)
+	public static final class422 field4524;
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lpf;"
+	)
+	static final class422 field4528;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lpf;"
+	)
+	static final class422 field4526;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Lpf;"
+	)
+	static final class422 field4525;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lpf;"
+	)
+	static final class422 field4527;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 2111165783
+	)
+	final int field4529;
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		intValue = -1059382247
+	)
+	final int field4530;
+
+	static {
+		field4523 = new class422(5, 0); // L: 8
+		field4524 = new class422(4, 2); // L: 9
+		field4528 = new class422(0, 5); // L: 10
+		field4526 = new class422(1, 6); // L: 11
+		field4525 = new class422(2, 7); // L: 12
+		field4527 = new class422(3, 8); // L: 13
+	}
+
+	class422(int var1, int var2) {
+		this.field4529 = var1; // L: 18
+		this.field4530 = var2; // L: 19
+	} // L: 20
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "3"
+	)
+	public boolean method7605() {
+		return this == field4524; // L: 28
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "48"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field4530; // L: 24
+	}
+}
diff --git a/runescape-client/src/main/java/class423.java b/runescape-client/src/main/java/class423.java
deleted file mode 100644
index 27865516a6..0000000000
--- a/runescape-client/src/main/java/class423.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("px")
-public class class423 {
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		longValue = -5266964682806439461L
-	)
-	public static long field4436;
-}
diff --git a/runescape-client/src/main/java/class425.java b/runescape-client/src/main/java/class425.java
new file mode 100644
index 0000000000..4f6cd06bda
--- /dev/null
+++ b/runescape-client/src/main/java/class425.java
@@ -0,0 +1,12 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("pq")
+public interface class425 {
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Ljava/lang/Object;",
+		garbageValue = "-78"
+	)
+	Object vmethod7625(int var1);
+}
diff --git a/runescape-client/src/main/java/class426.java b/runescape-client/src/main/java/class426.java
new file mode 100644
index 0000000000..b1a40ba881
--- /dev/null
+++ b/runescape-client/src/main/java/class426.java
@@ -0,0 +1,41 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("pz")
+public class class426 {
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1177110261
+	)
+	public final int field4539;
+	@ObfuscatedName("b")
+	public Object field4537;
+
+	public class426(int var1) {
+		this.field4539 = var1; // L: 8
+	} // L: 9
+
+	public class426(int var1, Object var2) {
+		this.field4539 = var1; // L: 12
+		this.field4537 = var2; // L: 13
+	} // L: 14
+
+	public int hashCode() {
+		return super.hashCode(); // L: 18
+	}
+
+	public boolean equals(Object var1) {
+		if (!(var1 instanceof class426)) { // L: 23
+			return false;
+		} else {
+			class426 var2 = (class426)var1; // L: 24
+			if (var2.field4537 == null && this.field4537 != null) { // L: 25
+				return false;
+			} else if (this.field4537 == null && var2.field4537 != null) { // L: 26
+				return false;
+			} else {
+				return this.field4539 == var2.field4539 && var2.field4537.equals(this.field4537); // L: 27
+			}
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class432.java b/runescape-client/src/main/java/class432.java
new file mode 100644
index 0000000000..b790836660
--- /dev/null
+++ b/runescape-client/src/main/java/class432.java
@@ -0,0 +1,25 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("px")
+public class class432 {
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -1165212437
+	)
+	@Export("SpriteBuffer_spriteWidth")
+	public static int SpriteBuffer_spriteWidth;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 1642868971
+	)
+	@Export("SpriteBuffer_spriteHeight")
+	public static int SpriteBuffer_spriteHeight;
+	@ObfuscatedName("s")
+	@Export("SpriteBuffer_spriteWidths")
+	public static int[] SpriteBuffer_spriteWidths;
+	@ObfuscatedName("w")
+	@Export("SpriteBuffer_spritePalette")
+	public static int[] SpriteBuffer_spritePalette;
+}
diff --git a/runescape-client/src/main/java/class433.java b/runescape-client/src/main/java/class433.java
new file mode 100644
index 0000000000..e56146ebbf
--- /dev/null
+++ b/runescape-client/src/main/java/class433.java
@@ -0,0 +1,13 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("pe")
+public class class433 {
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = 1653668331
+	)
+	@Export("VarpDefinition_fileCount")
+	public static int VarpDefinition_fileCount;
+}
diff --git a/runescape-client/src/main/java/class440.java b/runescape-client/src/main/java/class440.java
new file mode 100644
index 0000000000..554da35c51
--- /dev/null
+++ b/runescape-client/src/main/java/class440.java
@@ -0,0 +1,13 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("pm")
+public class class440 {
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = -1766948611
+	)
+	@Export("SpriteBuffer_spriteCount")
+	public static int SpriteBuffer_spriteCount;
+}
diff --git a/runescape-client/src/main/java/class45.java b/runescape-client/src/main/java/class47.java
similarity index 61%
rename from runescape-client/src/main/java/class45.java
rename to runescape-client/src/main/java/class47.java
index 15c1b6e638..6c23ae6d77 100644
--- a/runescape-client/src/main/java/class45.java
+++ b/runescape-client/src/main/java/class47.java
@@ -2,12 +2,12 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("au")
-public interface class45 {
-	@ObfuscatedName("i")
+@ObfuscatedName("aw")
+public interface class47 {
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(S)Lak;",
-		garbageValue = "6712"
+		descriptor = "(I)Lar;",
+		garbageValue = "826234570"
 	)
 	@Export("player")
 	PcmPlayer player();
diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java
index e699d63f2f..8317964147 100644
--- a/runescape-client/src/main/java/class5.java
+++ b/runescape-client/src/main/java/class5.java
@@ -4,41 +4,41 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("g")
+@ObfuscatedName("s")
 public class class5 implements class2 {
-	@ObfuscatedName("i")
-	final MessageDigest field9;
+	@ObfuscatedName("c")
+	final MessageDigest field14;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lj;)V"
+		descriptor = "(Ln;)V"
 	)
 	class5(class8 var1) {
-		this.field9 = this.method26(); // L: 14
+		this.field14 = this.method36(); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("i")
-	boolean method22(int var1, String var2, long var3) {
-		byte[] var5 = this.method23(var2, var3); // L: 18
-		return method25(var5) >= var1; // L: 19
+	@ObfuscatedName("c")
+	boolean method32(int var1, String var2, long var3) {
+		byte[] var5 = this.method35(var2, var3); // L: 18
+		return method40(var5) >= var1; // L: 19
 	}
 
-	@ObfuscatedName("a")
-	byte[] method23(String var1, long var2) {
+	@ObfuscatedName("m")
+	byte[] method35(String var1, long var2) {
 		StringBuilder var4 = new StringBuilder(); // L: 56
 		var4.append(var1).append(Long.toHexString(var2)); // L: 57
-		this.field9.reset(); // L: 58
+		this.field14.reset(); // L: 58
 
 		try {
-			this.field9.update(var4.toString().getBytes("UTF-8")); // L: 60
+			this.field14.update(var4.toString().getBytes("UTF-8")); // L: 60
 		} catch (UnsupportedEncodingException var6) { // L: 62
 			var6.printStackTrace(); // L: 63
 		}
 
-		return this.field9.digest(); // L: 65
+		return this.field14.digest(); // L: 65
 	}
 
-	@ObfuscatedName("o")
-	MessageDigest method26() {
+	@ObfuscatedName("t")
+	MessageDigest method36() {
 		try {
 			return MessageDigest.getInstance("SHA-256"); // L: 70
 		} catch (NoSuchAlgorithmException var2) { // L: 72
@@ -47,14 +47,14 @@ MessageDigest method26() {
 		}
 	}
 
-	@ObfuscatedName("w")
-	static int method25(byte[] var0) {
+	@ObfuscatedName("b")
+	static int method40(byte[] var0) {
 		int var1 = 0; // L: 23
 		byte[] var2 = var0; // L: 25
 
 		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26
 			byte var4 = var2[var3]; // L: 27
-			int var5 = method24(var4); // L: 29
+			int var5 = method33(var4); // L: 29
 			var1 += var5; // L: 30
 			if (var5 != 8) { // L: 31
 				break;
@@ -64,8 +64,8 @@ static int method25(byte[] var0) {
 		return var1; // L: 37
 	}
 
-	@ObfuscatedName("s")
-	static int method24(byte var0) {
+	@ObfuscatedName("p")
+	static int method33(byte var0) {
 		int var1 = 0; // L: 41
 		if (var0 == 0) { // L: 42
 			var1 = 8; // L: 43
diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java
deleted file mode 100644
index 008dbe6380..0000000000
--- a/runescape-client/src/main/java/class54.java
+++ /dev/null
@@ -1,113 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-
-@ObfuscatedName("bx")
-public class class54 {
-	@ObfuscatedName("tu")
-	@ObfuscatedSignature(
-		descriptor = "Lnp;"
-	)
-	@Export("platformInfo")
-	static PlatformInfo platformInfo;
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lkf;"
-	)
-	@Export("reflectionChecks")
-	public static IterableNodeDeque reflectionChecks;
-	@ObfuscatedName("p")
-	static byte[][][] field419;
-	@ObfuscatedName("bb")
-	@ObfuscatedSignature(
-		descriptor = "[Loe;"
-	)
-	@Export("worldSelectArrows")
-	static IndexedSprite[] worldSelectArrows;
-
-	static {
-		reflectionChecks = new IterableNodeDeque(); // L: 17
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-1254980557"
-	)
-	public static int method1111(int var0) {
-		return class138.method2827(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 60
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)Lbf;",
-		garbageValue = "108"
-	)
-	@Export("Messages_getByChannelAndID")
-	static Message Messages_getByChannelAndID(int var0, int var1) {
-		ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 39
-		return var2.getMessage(var1); // L: 40
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZB)I",
-		garbageValue = "-18"
-	)
-	static int method1101(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? class120.scriptDotWidget : Frames.scriptActiveWidget; // L: 1185
-		if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1186
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.itemId; // L: 1187
-			return 1; // L: 1188
-		} else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1190
-			if (var3.itemId != -1) { // L: 1191
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.itemQuantity;
-			} else {
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 1192
-			}
-
-			return 1; // L: 1193
-		} else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1195
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1196
-			return 1; // L: 1197
-		} else {
-			return 2; // L: 1199
-		}
-	}
-
-	@ObfuscatedName("aw")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "86"
-	)
-	@Export("runWidgetOnLoadListener")
-	static void runWidgetOnLoadListener(int var0) {
-		if (var0 != -1) { // L: 4463
-			if (class174.loadInterface(var0)) { // L: 4464
-				Widget[] var1 = WorldMapSection1.Widget_interfaceComponents[var0]; // L: 4465
-
-				for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4466
-					Widget var3 = var1[var2]; // L: 4467
-					if (var3.onLoad != null) { // L: 4468
-						ScriptEvent var4 = new ScriptEvent(); // L: 4469
-						var4.widget = var3; // L: 4470
-						var4.args = var3.onLoad; // L: 4471
-						SoundSystem.runScript(var4, 5000000, 0); // L: 4472
-					}
-				}
-
-			}
-		}
-	} // L: 4475
-
-	@ObfuscatedName("ef")
-	@ObfuscatedSignature(
-		descriptor = "(I)Lng;",
-		garbageValue = "-542542901"
-	)
-	@Export("getWorldMap")
-	static WorldMap getWorldMap() {
-		return class133.worldMap; // L: 648
-	}
-}
diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java
index 12a232cc43..fb3c85a3ac 100644
--- a/runescape-client/src/main/java/class6.java
+++ b/runescape-client/src/main/java/class6.java
@@ -2,57 +2,176 @@
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("e")
+@ObfuscatedName("j")
 public enum class6 implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Le;"
+		descriptor = "Lj;"
 	)
-	field14(0, 0);
+	field15(0, 0);
 
-	@ObfuscatedName("ql")
-	@Export("ClanChat_inClanChat")
-	static boolean ClanChat_inClanChat;
-	@ObfuscatedName("gx")
+	@ObfuscatedName("ec")
 	@ObfuscatedSignature(
-		descriptor = "Lle;"
+		descriptor = "Lmh;"
 	)
-	@Export("fontPlain12")
-	static Font fontPlain12;
-	@ObfuscatedName("w")
+	@Export("spriteIds")
+	static GraphicsDefaults spriteIds;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1812774783
+		intValue = 1871029833
 	)
-	public final int field12;
-	@ObfuscatedName("s")
+	final int field16;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 947219699
+		intValue = -1895798535
 	)
-	final int field13;
+	final int field17;
 
 	class6(int var3, int var4) {
-		this.field12 = var3; // L: 16
-		this.field13 = var4; // L: 17
+		this.field16 = var3; // L: 16
+		this.field17 = var4; // L: 17
 	} // L: 18
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.field13; // L: 21
+		return this.field17; // L: 22
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-1975834785"
+		descriptor = "(Lku;III)Lpl;",
+		garbageValue = "516089190"
 	)
-	@Export("isWorldMapEvent")
-	public static boolean isWorldMapEvent(int var0) {
-		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19
+	@Export("SpriteBuffer_getSprite")
+	public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
+		return !class147.method3009(var0, var1, var2) ? null : class124.method2754(); // L: 42 43
 	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-760591386"
+	)
+	static final void method55(String var0) {
+		PacketBufferNode var1 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2905, Client.packetWriter.isaacCipher); // L: 183
+		var1.packetBuffer.writeByte(class116.stringCp1252NullTerminatedByteSize(var0)); // L: 184
+		var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 185
+		Client.packetWriter.addNode(var1); // L: 186
+	} // L: 187
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(ILbn;ZI)I",
+		garbageValue = "-1352378176"
+	)
+	static int method56(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? WorldMapArea.scriptDotWidget : Messages.scriptActiveWidget; // L: 1182
+		if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1183
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.itemId; // L: 1184
+			return 1; // L: 1185
+		} else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1187
+			if (var3.itemId != -1) { // L: 1188
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.itemQuantity;
+			} else {
+				Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = 0; // L: 1189
+			}
+
+			return 1; // L: 1190
+		} else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1192
+			Interpreter.Interpreter_intStack[++IsaacCipher.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1193
+			return 1; // L: 1194
+		} else {
+			return 2; // L: 1196
+		}
+	}
+
+	@ObfuscatedName("hw")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIIB)V",
+		garbageValue = "124"
+	)
+	static final void method50(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		int var8 = var6 - 334; // L: 6094
+		if (var8 < 0) { // L: 6095
+			var8 = 0;
+		} else if (var8 > 100) { // L: 6096
+			var8 = 100;
+		}
+
+		int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 6097
+		int var7 = var5 * var9 / 256; // L: 6098
+		var8 = 2048 - var3 & 2047; // L: 6101
+		var9 = 2048 - var4 & 2047; // L: 6102
+		int var10 = 0; // L: 6103
+		int var11 = 0; // L: 6104
+		int var12 = var7; // L: 6105
+		int var13;
+		int var14;
+		int var15;
+		if (var8 != 0) { // L: 6106
+			var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 6107
+			var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 6108
+			var15 = var14 * var11 - var7 * var13 >> 16; // L: 6109
+			var12 = var7 * var14 + var13 * var11 >> 16; // L: 6110
+			var11 = var15; // L: 6111
+		}
+
+		if (var9 != 0) { // L: 6113
+			var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 6114
+			var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 6115
+			var15 = var10 * var14 + var12 * var13 >> 16; // L: 6116
+			var12 = var14 * var12 - var10 * var13 >> 16; // L: 6117
+			var10 = var15; // L: 6118
+		}
+
+		if (Client.isCameraLocked) { // L: 6120
+			class127.field1498 = var0 - var10; // L: 6121
+			class117.field1433 = var1 - var11; // L: 6122
+			class33.field243 = var2 - var12; // L: 6123
+			class142.field1615 = var3; // L: 6124
+			ApproximateRouteStrategy.field460 = var4; // L: 6125
+		} else {
+			UserComparator7.cameraX = var0 - var10; // L: 6128
+			AbstractByteArrayCopier.cameraY = var1 - var11; // L: 6129
+			UserComparator10.cameraZ = var2 - var12; // L: 6130
+			UserComparator7.cameraPitch = var3; // L: 6131
+			class379.cameraYaw = var4; // L: 6132
+		}
+
+		if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class7.oculusOrbFocalPointX >> 7 != class340.localPlayer.x >> 7 || Actor.oculusOrbFocalPointY >> 7 != class340.localPlayer.y >> 7)) { // L: 6134 6135
+			var13 = class340.localPlayer.plane; // L: 6136
+			var14 = (class7.oculusOrbFocalPointX >> 7) + class131.baseX; // L: 6137
+			var15 = (Actor.oculusOrbFocalPointY >> 7) + TileItem.baseY; // L: 6138
+			BuddyRankComparator.method2547(var14, var15, var13, true); // L: 6139
+		}
+
+	} // L: 6142
+
+	@ObfuscatedName("lh")
+	@ObfuscatedSignature(
+		descriptor = "(IIZI)V",
+		garbageValue = "-2023788755"
+	)
+	static final void method48(int var0, int var1, boolean var2) {
+		if (Client.currentClanChannels[var0] != null) { // L: 12539
+			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method2990()) { // L: 12540
+				ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 12541
+				PacketWriter var4 = Client.packetWriter; // L: 12542
+				PacketBufferNode var5 = HitSplatDefinition.getPacketBufferNode(ClientPacket.field2903, var4.isaacCipher); // L: 12543
+				var5.packetBuffer.writeByte(4 + class116.stringCp1252NullTerminatedByteSize(var3.username.getName())); // L: 12544
+				var5.packetBuffer.writeByte(var0); // L: 12545
+				var5.packetBuffer.writeShort(var1); // L: 12546
+				var5.packetBuffer.writeBoolean(var2); // L: 12547
+				var5.packetBuffer.writeStringCp1252NullTerminated(var3.username.getName()); // L: 12548
+				var4.addNode(var5); // L: 12549
+			}
+		}
+	} // L: 12550
 }
diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java
index e456f3b4b1..02a1e75f06 100644
--- a/runescape-client/src/main/java/class65.java
+++ b/runescape-client/src/main/java/class65.java
@@ -1,60 +1,266 @@
 import java.math.BigInteger;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("bv")
 public class class65 {
-	@ObfuscatedName("o")
-	static final BigInteger field822;
-	@ObfuscatedName("g")
-	static final BigInteger field823;
-	@ObfuscatedName("iy")
-	@ObfuscatedGetter(
-		intValue = -1036778265
-	)
-	@Export("cameraZ")
-	static int cameraZ;
+	@ObfuscatedName("t")
+	static final BigInteger field841;
+	@ObfuscatedName("s")
+	static final BigInteger field842;
 
 	static {
-		field822 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20
-		field823 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21
+		field841 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20
+		field842 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-2099438942"
+		descriptor = "(Lpj;ILck;II)V",
+		garbageValue = "-2002121485"
 	)
-	@Export("iLog")
-	public static int iLog(int var0) {
-		int var1 = 0; // L: 61
-		if (var0 < 0 || var0 >= 65536) { // L: 62
-			var0 >>>= 16; // L: 63
-			var1 += 16; // L: 64
+	static final void method1957(PacketBuffer var0, int var1, Player var2, int var3) {
+		byte var4 = class185.field2119.field2121; // L: 451
+		int var5;
+		int var6;
+		int var8;
+		int var9;
+		int var12;
+		if ((var3 & 4) != 0) { // L: 452
+			var5 = var0.readUnsignedByte(); // L: 453
+			int var7;
+			int var10;
+			int var16;
+			if (var5 > 0) { // L: 454
+				for (var6 = 0; var6 < var5; ++var6) { // L: 455
+					var8 = -1; // L: 457
+					var9 = -1; // L: 458
+					var10 = -1; // L: 459
+					var7 = var0.readUShortSmart(); // L: 460
+					if (var7 == 32767) { // L: 461
+						var7 = var0.readUShortSmart(); // L: 462
+						var9 = var0.readUShortSmart(); // L: 463
+						var8 = var0.readUShortSmart(); // L: 464
+						var10 = var0.readUShortSmart(); // L: 465
+					} else if (var7 != 32766) { // L: 467
+						var9 = var0.readUShortSmart(); // L: 468
+					} else {
+						var7 = -1; // L: 470
+					}
+
+					var16 = var0.readUShortSmart(); // L: 471
+					var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var16); // L: 472
+				}
+			}
+
+			var6 = var0.method7520(); // L: 475
+			if (var6 > 0) { // L: 476
+				for (var7 = 0; var7 < var6; ++var7) { // L: 477
+					var8 = var0.readUShortSmart(); // L: 478
+					var9 = var0.readUShortSmart(); // L: 479
+					if (var9 != 32767) { // L: 480
+						var10 = var0.readUShortSmart(); // L: 481
+						var16 = var0.method7392(); // L: 482
+						var12 = var9 > 0 ? var0.method7394() : var16; // L: 483
+						var2.addHealthBar(var8, Client.cycle, var9, var10, var16, var12); // L: 484
+					} else {
+						var2.removeHealthBar(var8); // L: 486
+					}
+				}
+			}
 		}
 
-		if (var0 >= 256) { // L: 66
-			var0 >>>= 8; // L: 67
-			var1 += 8; // L: 68
+		if ((var3 & 8192) != 0) { // L: 490
+			var4 = var0.readByte(); // L: 491
 		}
 
-		if (var0 >= 16) { // L: 70
-			var0 >>>= 4; // L: 71
-			var1 += 4; // L: 72
+		if ((var3 & 16384) != 0) { // L: 493
+			var2.field1132 = var0.method7396(); // L: 494
+			var2.field1134 = var0.method7396(); // L: 495
+			var2.field1133 = var0.method7397(); // L: 496
+			var2.field1135 = var0.method7397(); // L: 497
+			var2.field1136 = var0.method7403() + Client.cycle; // L: 498
+			var2.field1157 = var0.method7403() + Client.cycle; // L: 499
+			var2.field1138 = var0.method7499(); // L: 500
+			if (var2.field1055) { // L: 501
+				var2.field1132 += var2.tileX; // L: 502
+				var2.field1134 += var2.tileY; // L: 503
+				var2.field1133 += var2.tileX; // L: 504
+				var2.field1135 += var2.tileY; // L: 505
+				var2.pathLength = 0; // L: 506
+			} else {
+				var2.field1132 += var2.pathX[0]; // L: 509
+				var2.field1134 += var2.pathY[0]; // L: 510
+				var2.field1133 += var2.pathX[0]; // L: 511
+				var2.field1135 += var2.pathY[0]; // L: 512
+				var2.pathLength = 1; // L: 513
+			}
+
+			var2.field1098 = 0; // L: 515
 		}
 
-		if (var0 >= 4) { // L: 74
-			var0 >>>= 2; // L: 75
-			var1 += 2; // L: 76
+		if ((var3 & 128) != 0) { // L: 517
+			var2.targetIndex = var0.method7403(); // L: 518
+			if (var2.targetIndex == 65535) { // L: 519
+				var2.targetIndex = -1;
+			}
 		}
 
-		if (var0 >= 1) { // L: 78
-			var0 >>>= 1; // L: 79
-			++var1; // L: 80
+		if ((var3 & 1) != 0) { // L: 521
+			var5 = var0.readUnsignedByte(); // L: 522
+			byte[] var13 = new byte[var5]; // L: 523
+			Buffer var14 = new Buffer(var13); // L: 524
+			var0.method7413(var13, 0, var5); // L: 525
+			Players.field1248[var1] = var14; // L: 526
+			var2.read(var14); // L: 527
 		}
 
-		return var0 + var1; // L: 82
-	}
+		if ((var3 & 256) != 0) { // L: 529
+			for (var5 = 0; var5 < 3; ++var5) { // L: 530
+				var2.actions[var5] = var0.readStringCp1252NullTerminated();
+			}
+		}
+
+		if ((var3 & 32) != 0) { // L: 532
+			var5 = var0.readUnsignedShort(); // L: 533
+			PlayerType var19 = (PlayerType)class130.findEnumerated(SpotAnimationDefinition.PlayerType_values(), var0.method7520()); // L: 534
+			boolean var17 = var0.method7394() == 1; // L: 535
+			var8 = var0.readUnsignedByte(); // L: 536
+			var9 = var0.offset; // L: 537
+			if (var2.username != null && var2.appearance != null) { // L: 538
+				boolean var18 = false; // L: 539
+				if (var19.isUser && GameEngine.friendSystem.isIgnored(var2.username)) { // L: 540 541
+					var18 = true;
+				}
+
+				if (!var18 && Client.field590 == 0 && !var2.isHidden) { // L: 543
+					Players.field1257.offset = 0; // L: 544
+					var0.readBytes(Players.field1257.array, 0, var8); // L: 545
+					Players.field1257.offset = 0; // L: 546
+					String var11 = AbstractFont.escapeBrackets(class412.method7287(SequenceDefinition.method3689(Players.field1257))); // L: 547
+					var2.overheadText = var11.trim(); // L: 548
+					var2.overheadTextColor = var5 >> 8; // L: 549
+					var2.overheadTextEffect = var5 & 255; // L: 550
+					var2.overheadTextCyclesRemaining = 150; // L: 551
+					var2.isAutoChatting = var17; // L: 552
+					var2.field1114 = var2 != class340.localPlayer && var19.isUser && "" != Client.field645 && var11.toLowerCase().indexOf(Client.field645) == -1; // L: 553
+					if (var19.isPrivileged) { // L: 555
+						var12 = var17 ? 91 : 1;
+					} else {
+						var12 = var17 ? 90 : 2; // L: 556
+					}
+
+					if (var19.modIcon != -1) { // L: 557
+						class194.addGameMessage(var12, class221.method4705(var19.modIcon) + var2.username.getName(), var11);
+					} else {
+						class194.addGameMessage(var12, var2.username.getName(), var11); // L: 558
+					}
+				}
+			}
+
+			var0.offset = var9 + var8; // L: 561
+		}
+
+		if ((var3 & 2) != 0) { // L: 563
+			var5 = var0.method7499(); // L: 564
+			if (var5 == 65535) { // L: 565
+				var5 = -1;
+			}
+
+			var6 = var0.method7520(); // L: 566
+			class125.performPlayerAnimation(var2, var5, var6); // L: 567
+		}
+
+		if ((var3 & 1024) != 0) { // L: 569
+			class185[] var15 = Players.field1246; // L: 570
+			class185[] var21 = new class185[]{class185.field2120, class185.field2123, class185.field2122, class185.field2119}; // L: 574
+			var15[var1] = (class185)class130.findEnumerated(var21, var0.method7465()); // L: 576
+		}
+
+		if ((var3 & 2048) != 0) { // L: 578
+			var2.spotAnimation = var0.method7499(); // L: 579
+			var5 = var0.method7412(); // L: 580
+			var2.field1131 = var5 >> 16; // L: 581
+			var2.field1130 = (var5 & 65535) + Client.cycle; // L: 582
+			var2.spotAnimationFrame = 0; // L: 583
+			var2.spotAnimationFrameCycle = 0; // L: 584
+			if (var2.field1130 > Client.cycle) { // L: 585
+				var2.spotAnimationFrame = -1;
+			}
+
+			if (var2.spotAnimation == 65535) { // L: 586
+				var2.spotAnimation = -1;
+			}
+		}
+
+		if ((var3 & 512) != 0) { // L: 588
+			var2.field1141 = Client.cycle + var0.method7403(); // L: 589
+			var2.field1140 = Client.cycle + var0.method7499(); // L: 590
+			var2.field1143 = var0.readByte(); // L: 591
+			var2.field1144 = var0.method7397(); // L: 592
+			var2.field1095 = var0.readByte(); // L: 593
+			var2.field1146 = (byte)var0.readUnsignedByte(); // L: 594
+		}
+
+		if ((var3 & 64) != 0) { // L: 596
+			var2.field1122 = var0.method7401(); // L: 597
+			if (var2.pathLength == 0) { // L: 598
+				var2.orientation = var2.field1122; // L: 599
+				var2.field1122 = -1; // L: 600
+			}
+		}
+
+		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
+				class194.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 607
+			} else if (var2 == class340.localPlayer) { // L: 609
+				class194.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.field1055) { // L: 617
+			if (var4 == 127) { // L: 618
+				var2.resetPath(var2.tileX, var2.tileY);
+			} else {
+				class185 var22;
+				if (var4 != class185.field2119.field2121) { // L: 621
+					class185[] var20 = new class185[]{class185.field2120, class185.field2123, class185.field2122, class185.field2119}; // L: 624
+					var22 = (class185)class130.findEnumerated(var20, var4); // L: 626
+				} else {
+					var22 = Players.field1246[var1]; // L: 628
+				}
+
+				var2.method2175(var2.tileX, var2.tileY, var22); // L: 629
+			}
+		}
+
+	} // L: 633
+
+	@ObfuscatedName("fx")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "843672691"
+	)
+	static final void method1958() {
+		if (SoundSystem.ClanChat_inClanChat) { // L: 4368
+			if (Players.friendsChat != null) { // L: 4369
+				Players.friendsChat.sort(); // L: 4370
+			}
+
+			for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 4373
+				Player var1 = Client.players[Players.Players_indices[var0]]; // L: 4374
+				var1.clearIsInFriendsChat(); // L: 4375
+			}
+
+			SoundSystem.ClanChat_inClanChat = false; // L: 4378
+		}
+
+	} // L: 4380
 }
diff --git a/runescape-client/src/main/java/class67.java b/runescape-client/src/main/java/class67.java
index 5c0b80fa80..300400df60 100644
--- a/runescape-client/src/main/java/class67.java
+++ b/runescape-client/src/main/java/class67.java
@@ -1,98 +1,45 @@
 import java.math.BigInteger;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bz")
+@ObfuscatedName("bc")
 public class class67 {
-	@ObfuscatedName("ru")
-	@ObfuscatedSignature(
-		descriptor = "Ldm;"
-	)
-	@Export("guestClanSettings")
-	static ClanSettings guestClanSettings;
-	@ObfuscatedName("i")
-	static final BigInteger field840;
-	@ObfuscatedName("w")
-	static final BigInteger field843;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1442166637
-	)
-	@Export("KitDefinition_fileCount")
-	public static int KitDefinition_fileCount;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -1013200423
-	)
-	public static int field845;
+	@ObfuscatedName("c")
+	static final BigInteger field856;
+	@ObfuscatedName("b")
+	static final BigInteger field857;
 
 	static {
-		field840 = new BigInteger("10001", 16); // L: 6
-		field843 = new BigInteger("933e616091e0666f756e1cf08e3239d7a471aba3ebf0013b32d4a351ebb206e47fdbc3569683ebc86c76a55cceedfdbf0f28f0b42ec697e24c1f322aa60a9d9d013cd2d943b842db981f90c6def19c4d25c86b0e41ae6b731b56da6563244706ef5c098a398b7d43f386072a206378425d78e612b3fcbc4b4be5108da43a0745", 16); // L: 7
+		field856 = new BigInteger("10001", 16); // L: 6
+		field857 = new BigInteger("959194ea8a966b960e862427e497e246718ecc7e76f242845673d52b62df19f52fa6fb93c8d9c5129b95747f8ca61fb059fa44297c08c6f5cc6cca99e8d39fc8f0faa58e58d1ca99e861439d01158c14880260b09ace07d25862f6d14e2db785c3016567101e927e4b2513e0b8a0f275ccf60c6a689af387a64b2b82a313d8dd", 16); // L: 7
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-782668076"
+		descriptor = "(ZI)V",
+		garbageValue = "1654088160"
 	)
-	static int method1914(int var0, Script var1, boolean var2) {
-		if (var0 == 7100) { // L: 4385
-			++class14.Interpreter_intStackSize; // L: 4386
-			return 1; // L: 4387
-		} else if (var0 == 7101) { // L: 4389
-			class295.Interpreter_stringStackSize += 2; // L: 4390
-			return 1; // L: 4391
-		} else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4393
-			if (var0 == 7106) { // L: 4397
-				++class14.Interpreter_intStackSize; // L: 4398
-				return 1; // L: 4399
-			} else if (var0 == 7107) { // L: 4401
-				++class14.Interpreter_intStackSize; // L: 4402
-				return 1; // L: 4403
-			} else if (var0 == 7108) { // L: 4405
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = Language.method5521() ? 1 : 0; // L: 4406
-				return 1; // L: 4407
-			} else if (var0 == 7110) { // L: 4409
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4410
-				return 1; // L: 4411
-			} else if (var0 == 7120) { // L: 4413
-				--class14.Interpreter_intStackSize; // L: 4414
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4415
-				return 1; // L: 4416
-			} else if (var0 == 7121) { // L: 4418
-				class14.Interpreter_intStackSize -= 2; // L: 4419
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = -1; // L: 4420
-				return 1; // L: 4421
-			} else if (var0 == 7122) { // L: 4423
-				class14.Interpreter_intStackSize -= 2; // L: 4424
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = 0; // L: 4425
-				return 1; // L: 4426
-			} else {
-				return 2; // L: 4428
-			}
-		} else {
-			++class14.Interpreter_intStackSize; // L: 4394
-			return 1; // L: 4395
+	@Export("Login_promptCredentials")
+	static void Login_promptCredentials(boolean var0) {
+		Login.Login_response1 = ""; // L: 1037
+		Login.Login_response2 = "Enter your username/email & password."; // L: 1038
+		Login.Login_response3 = ""; // L: 1039
+		PlayerType.method5521(2); // L: 1040
+		if (var0) { // L: 1041
+			Login.Login_password = "";
 		}
-	}
 
-	@ObfuscatedName("ig")
+		HealthBar.method2311(); // L: 1042
+		WorldMapID.method4805(); // L: 1043
+	} // L: 1044
+
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "621915998"
+		descriptor = "(IB)I",
+		garbageValue = "-67"
 	)
-	static final void method1913(int var0) {
-		if (var0 >= 0) { // L: 8261
-			int var1 = Client.menuArguments1[var0]; // L: 8262
-			int var2 = Client.menuArguments2[var0]; // L: 8263
-			int var3 = Client.menuOpcodes[var0]; // L: 8264
-			int var4 = Client.menuIdentifiers[var0]; // L: 8265
-			String var5 = Client.menuActions[var0]; // L: 8266
-			String var6 = Client.menuTargets[var0]; // L: 8267
-			class14.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 8268
-		}
-	} // L: 8269
+	static int method1962(int var0) {
+		return (int)((Math.log((double)var0) / Interpreter.field814 - 7.0D) * 256.0D); // L: 3631
+	}
 }
diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java
index d62ee3dfe7..babd0b9a24 100644
--- a/runescape-client/src/main/java/class7.java
+++ b/runescape-client/src/main/java/class7.java
@@ -2,162 +2,118 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("p")
+@ObfuscatedName("w")
 public class class7 {
-	@ObfuscatedName("c")
+	@ObfuscatedName("hu")
 	@ObfuscatedSignature(
-		descriptor = "Lgw;"
+		descriptor = "Lgy;"
 	)
-	@Export("worldMapEvent")
-	static WorldMapEvent worldMapEvent;
-	@ObfuscatedName("ip")
-	@ObfuscatedSignature(
-		descriptor = "[Loe;"
+	@Export("scene")
+	static Scene scene;
+	@ObfuscatedName("jl")
+	@ObfuscatedGetter(
+		intValue = -1574043841
 	)
-	@Export("modIconSprites")
-	static IndexedSprite[] modIconSprites;
-	@ObfuscatedName("i")
-	ExecutorService field17;
-	@ObfuscatedName("w")
-	Future field20;
-	@ObfuscatedName("s")
+	@Export("oculusOrbFocalPointX")
+	static int oculusOrbFocalPointX;
+	@ObfuscatedName("c")
+	ExecutorService field30;
+	@ObfuscatedName("b")
+	Future field31;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lop;"
+		descriptor = "Lpi;"
 	)
-	final Buffer field18;
-	@ObfuscatedName("a")
+	final Buffer field25;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "La;"
+		descriptor = "Lm;"
 	)
-	final class3 field19;
+	final class3 field26;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;La;)V"
+		descriptor = "(Lpi;Lm;)V"
 	)
 	public class7(Buffer var1, class3 var2) {
-		this.field17 = Executors.newSingleThreadExecutor(); // L: 10
-		this.field18 = var1; // L: 16
-		this.field19 = var2; // L: 17
-		this.method49(); // L: 18
+		this.field30 = Executors.newSingleThreadExecutor(); // L: 10
+		this.field25 = var1; // L: 16
+		this.field26 = var2; // L: 17
+		this.method62(); // L: 18
 	} // L: 19
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "830393061"
+		garbageValue = "-1426679915"
 	)
-	public boolean method46() {
-		return this.field20.isDone(); // L: 22
+	public boolean method61() {
+		return this.field31.isDone(); // L: 22
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1036380916"
+		garbageValue = "-1411495708"
 	)
-	public void method47() {
-		this.field17.shutdown(); // L: 26
-		this.field17 = null; // L: 27
+	public void method65() {
+		this.field30.shutdown(); // L: 26
+		this.field30 = null; // L: 27
 	} // L: 28
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lop;",
-		garbageValue = "945217619"
+		descriptor = "(B)Lpi;",
+		garbageValue = "14"
 	)
-	public Buffer method48() {
+	public Buffer method75() {
 		try {
-			return (Buffer)this.field20.get(); // L: 32
+			return (Buffer)this.field31.get(); // L: 32
 		} catch (Exception var2) { // L: 34
 			return null; // L: 35
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1187826160"
+		garbageValue = "1868135636"
 	)
-	void method49() {
-		this.field20 = this.field17.submit(new class1(this, this.field18, this.field19)); // L: 40
+	void method62() {
+		this.field31 = this.field30.submit(new class1(this, this.field25, this.field26)); // L: 40
 	} // L: 41
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)[I",
-		garbageValue = "-1545852128"
+		descriptor = "(I)[Ldp;",
+		garbageValue = "1979711764"
 	)
-	public static int[] method57() {
-		int[] var0 = new int[KeyHandler.field110]; // L: 234
-
-		for (int var1 = 0; var1 < KeyHandler.field110; ++var1) { // L: 235
-			var0[var1] = KeyHandler.field125[var1]; // L: 236
-		}
-
-		return var0; // L: 238
+	static class117[] method74() {
+		return new class117[]{class117.field1425, class117.field1444, class117.field1430, class117.field1427, class117.field1428, class117.field1429, class117.field1442, class117.field1431, class117.field1432, class117.field1424, class117.field1434, class117.field1435, class117.field1436, class117.field1437, class117.field1438, class117.field1439, class117.field1440}; // L: 68
 	}
 
-	@ObfuscatedName("fb")
+	@ObfuscatedName("jw")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "77"
+		descriptor = "(Ljava/lang/String;Ljm;I)Ljava/lang/String;",
+		garbageValue = "1826034348"
 	)
-	@Export("doCheat")
-	static final void doCheat(String var0) {
-		if (var0.equalsIgnoreCase("toggleroof")) { // L: 4155
-			class408.clientPreferences.roofsHidden = !class408.clientPreferences.roofsHidden; // L: 4156
-			Login.savePreferences(); // L: 4157
-			if (class408.clientPreferences.roofsHidden) { // L: 4158
-				class397.addGameMessage(99, "", "Roofs are now all hidden");
-			} else {
-				class397.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 4159
-			}
-		}
-
-		if (var0.equalsIgnoreCase("displayfps")) { // L: 4161
-			Client.displayFps = !Client.displayFps;
-		}
-
-		if (var0.equalsIgnoreCase("renderself")) { // L: 4162
-			Client.renderSelf = !Client.renderSelf;
-		}
-
-		if (var0.equalsIgnoreCase("mouseovertext")) { // L: 4163
-			Client.showMouseOverText = !Client.showMouseOverText;
-		}
-
-		if (Client.staffModLevel >= 2) { // L: 4164
-			if (var0.equalsIgnoreCase("errortest")) { // L: 4165
-				throw new RuntimeException();
-			}
-
-			if (var0.equalsIgnoreCase("showcoord")) { // L: 4166
-				class133.worldMap.showCoord = !class133.worldMap.showCoord;
-			}
-
-			if (var0.equalsIgnoreCase("fpson")) { // L: 4167
-				Client.displayFps = true;
-			}
-
-			if (var0.equalsIgnoreCase("fpsoff")) { // L: 4168
-				Client.displayFps = false;
-			}
-
-			if (var0.equalsIgnoreCase("gc")) {
-				System.gc(); // L: 4169
-			}
-
-			if (var0.equalsIgnoreCase("clientdrop")) { // L: 4170
-				Clock.method2960();
+	static String method60(String var0, Widget var1) {
+		if (var0.indexOf("%") != -1) { // L: 10882
+			for (int var2 = 1; var2 <= 5; ++var2) { // L: 10883
+				while (true) {
+					int var3 = var0.indexOf("%" + var2); // L: 10885
+					if (var3 == -1) { // L: 10886
+						break;
+					}
+
+					var0 = var0.substring(0, var3) + class1.method11(class28.method442(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 10887
+				}
 			}
 		}
 
-		PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2721, Client.packetWriter.isaacCipher); // L: 4173
-		var1.packetBuffer.writeByte(var0.length() + 1); // L: 4174
-		var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 4175
-		Client.packetWriter.addNode(var1); // L: 4176
-	} // L: 4177
+		return var0; // L: 10891
+	}
 }
diff --git a/runescape-client/src/main/java/class78.java b/runescape-client/src/main/java/class78.java
index 48c62cb986..850330c247 100644
--- a/runescape-client/src/main/java/class78.java
+++ b/runescape-client/src/main/java/class78.java
@@ -1,15 +1,60 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ca")
+@ObfuscatedName("ce")
 public class class78 {
-	@ObfuscatedName("x")
+	@ObfuscatedName("oo")
+	@ObfuscatedGetter(
+		intValue = 603715761
+	)
+	static int field1000;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lfj;",
+		garbageValue = "-18"
+	)
+	@Export("WorldMapElement_get")
+	public static WorldMapElement WorldMapElement_get(int var0) {
+		return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 44 45
+	}
+
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1498173559"
+		descriptor = "(II)Lfu;",
+		garbageValue = "-1066482349"
 	)
-	public static void method2078() {
-		SequenceDefinition.SequenceDefinition_cached.clear(); // L: 218
-		SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 219
-	} // L: 220
+	@Export("getInvDefinition")
+	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
+		}
+	}
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(B)[I",
+		garbageValue = "21"
+	)
+	public static int[] method2140() {
+		int[] var0 = new int[KeyHandler.field140]; // L: 251
+
+		for (int var1 = 0; var1 < KeyHandler.field140; ++var1) { // L: 252
+			var0[var1] = KeyHandler.field139[var1]; // L: 253
+		}
+
+		return var0; // L: 255
+	}
 }
diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java
index 6124f0c8c6..dd5524db18 100644
--- a/runescape-client/src/main/java/class8.java
+++ b/runescape-client/src/main/java/class8.java
@@ -1,35 +1,35 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("j")
+@ObfuscatedName("n")
 public class class8 {
-	@ObfuscatedName("i")
-	final int field23;
-	@ObfuscatedName("w")
-	final int field24;
-	@ObfuscatedName("s")
-	final String field25;
+	@ObfuscatedName("c")
+	final int field33;
+	@ObfuscatedName("b")
+	final int field32;
+	@ObfuscatedName("p")
+	final String field34;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lop;)V"
+		descriptor = "(Lpi;)V"
 	)
 	class8(Buffer var1) {
 		this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19
 	} // L: 20
 
 	class8(int var1, int var2, String var3) {
-		this.field23 = var1; // L: 13
-		this.field24 = var2; // L: 14
-		this.field25 = var3; // L: 15
+		this.field33 = var1; // L: 13
+		this.field32 = var2; // L: 14
+		this.field34 = var3; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("i")
-	String method60() {
-		return Integer.toHexString(this.field23) + Integer.toHexString(this.field24) + this.field25; // L: 23
+	@ObfuscatedName("c")
+	String method76() {
+		return Integer.toHexString(this.field33) + Integer.toHexString(this.field32) + this.field34; // L: 23
 	}
 
-	@ObfuscatedName("w")
-	int method64() {
-		return this.field24; // L: 27
+	@ObfuscatedName("b")
+	int method78() {
+		return this.field32; // L: 27
 	}
 }
diff --git a/runescape-client/src/main/java/class87.java b/runescape-client/src/main/java/class87.java
index 12396802a3..f530f55fdf 100644
--- a/runescape-client/src/main/java/class87.java
+++ b/runescape-client/src/main/java/class87.java
@@ -1,106 +1,29 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cl")
+@ObfuscatedName("co")
 public class class87 {
-	@ObfuscatedName("s")
+	@ObfuscatedName("mb")
 	@ObfuscatedSignature(
-		descriptor = "([BI)Lbp;",
-		garbageValue = "-530191706"
+		descriptor = "Lbb;"
 	)
-	@Export("newScript")
-	static Script newScript(byte[] var0) {
-		Script var1 = new Script(); // L: 112
-		Buffer var2 = new Buffer(var0); // L: 113
-		var2.offset = var2.array.length - 2; // L: 114
-		int var3 = var2.readUnsignedShort(); // L: 115
-		int var4 = var2.array.length - 2 - var3 - 12; // L: 116
-		var2.offset = var4; // L: 117
-		int var5 = var2.readInt(); // L: 118
-		var1.localIntCount = var2.readUnsignedShort(); // L: 119
-		var1.localStringCount = var2.readUnsignedShort(); // L: 120
-		var1.intArgumentCount = var2.readUnsignedShort(); // L: 121
-		var1.stringArgumentCount = var2.readUnsignedShort(); // L: 122
-		int var6 = var2.readUnsignedByte(); // L: 123
-		int var7;
-		int var8;
-		if (var6 > 0) { // L: 124
-			var1.switches = var1.newIterableNodeHashTable(var6); // L: 125
-
-			for (var7 = 0; var7 < var6; ++var7) { // L: 126
-				var8 = var2.readUnsignedShort(); // L: 127
-				int var9;
-				int var11;
-				if (var8 > 0) { // L: 129
-					var11 = var8 - 1; // L: 133
-					var11 |= var11 >>> 1; // L: 134
-					var11 |= var11 >>> 2; // L: 135
-					var11 |= var11 >>> 4; // L: 136
-					var11 |= var11 >>> 8; // L: 137
-					var11 |= var11 >>> 16; // L: 138
-					int var10 = var11 + 1; // L: 139
-					var9 = var10; // L: 141
-				} else {
-					var9 = 1; // L: 143
-				}
-
-				IterableNodeHashTable var13 = new IterableNodeHashTable(var9); // L: 144
-				var1.switches[var7] = var13; // L: 145
-
-				while (var8-- > 0) { // L: 146
-					var11 = var2.readInt(); // L: 147
-					int var12 = var2.readInt(); // L: 148
-					var13.put(new IntegerNode(var12), (long)var11); // L: 149
-				}
-			}
-		}
-
-		var2.offset = 0; // L: 153
-		var1.field928 = var2.readStringCp1252NullTerminatedOrNull(); // L: 154
-		var1.opcodes = new int[var5]; // L: 155
-		var1.intOperands = new int[var5]; // L: 156
-		var1.stringOperands = new String[var5]; // L: 157
-
-		for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 158 159 164
-			var8 = var2.readUnsignedShort(); // L: 160
-			if (var8 == 3) { // L: 161
-				var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
-			} else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
-				var1.intOperands[var7] = var2.readInt(); // L: 162
-			} else {
-				var1.intOperands[var7] = var2.readUnsignedByte(); // L: 163
-			}
-		}
-
-		return var1; // L: 166
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-45"
+	@Export("tempMenuAction")
+	static MenuAction tempMenuAction;
+	@ObfuscatedName("oa")
+	@ObfuscatedGetter(
+		intValue = -902961865
 	)
-	public static void method2223() {
-		KitDefinition.KitDefinition_cached.clear(); // L: 130
-	} // L: 131
+	@Export("widgetDragDuration")
+	static int widgetDragDuration;
 
-	@ObfuscatedName("fh")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-278376430"
+		descriptor = "(I)[Ldj;",
+		garbageValue = "-2105253553"
 	)
-	static int method2224() {
-		if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1993
-			int var0 = 0; // L: 1994
-
-			for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1995
-				var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1996
-			}
-
-			return var0 * 10000 / Client.field745; // L: 1998
-		} else {
-			return 10000;
-		}
+	static class121[] method2281() {
+		return new class121[]{class121.field1465, class121.field1461, class121.field1459, class121.field1462, class121.field1463, class121.field1464, class121.field1469, class121.field1466, class121.field1467}; // L: 101
 	}
 }
diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java
index 9be7baac3f..67785f4cd1 100644
--- a/runescape-client/src/main/java/class9.java
+++ b/runescape-client/src/main/java/class9.java
@@ -3,179 +3,112 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("b")
+@ObfuscatedName("r")
 public class class9 implements MouseWheel {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lb;"
+		descriptor = "Lr;"
 	)
-	static final class9 field31;
-	@ObfuscatedName("w")
+	static final class9 field37;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lb;"
+		descriptor = "Lr;"
 	)
-	public static final class9 field27;
-	@ObfuscatedName("s")
+	public static final class9 field36;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lb;"
+		descriptor = "Lr;"
 	)
-	static final class9 field28;
-	@ObfuscatedName("a")
+	static final class9 field44;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lb;"
+		descriptor = "Lr;"
 	)
-	static final class9 field29;
-	@ObfuscatedName("o")
+	static final class9 field38;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lb;"
+		descriptor = "Lr;"
 	)
-	static final class9 field30;
-	@ObfuscatedName("l")
+	static final class9 field39;
+	@ObfuscatedName("eu")
 	@ObfuscatedSignature(
-		descriptor = "Loe;"
+		descriptor = "Lkz;"
 	)
-	@Export("options_buttons_2Sprite")
-	static IndexedSprite options_buttons_2Sprite;
-	@ObfuscatedName("g")
+	@Export("archive3")
+	static Archive archive3;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1141093005
+		intValue = -171712909
 	)
-	int field33;
-	@ObfuscatedName("e")
-	String field32;
-	@ObfuscatedName("p")
-	boolean field37;
+	int field45;
 	@ObfuscatedName("j")
-	boolean field34;
+	String field35;
+	@ObfuscatedName("w")
+	boolean field42;
+	@ObfuscatedName("n")
+	boolean field43;
 
 	static {
-		field31 = new class9(0, "POST", true, true); // L: 6
-		field27 = new class9(1, "GET", true, false); // L: 7
-		field28 = new class9(2, "PUT", false, true); // L: 8
-		field29 = new class9(3, "PATCH", false, true); // L: 9
-		field30 = new class9(4, "DELETE", false, true); // L: 10
+		field37 = new class9(0, "POST", true, true); // L: 6
+		field36 = new class9(1, "GET", true, false); // L: 7
+		field44 = new class9(2, "PUT", false, true); // L: 8
+		field38 = new class9(3, "PATCH", false, true); // L: 9
+		field39 = new class9(4, "DELETE", false, true); // L: 10
 	}
 
 	class9(int var1, String var2, boolean var3, boolean var4) {
-		this.field33 = var1; // L: 17
-		this.field32 = var2; // L: 18
-		this.field37 = var3; // L: 19
-		this.field34 = var4; // L: 20
+		this.field45 = var1; // L: 17
+		this.field35 = var2; // L: 18
+		this.field42 = var3; // L: 19
+		this.field43 = var4; // L: 20
 	} // L: 21
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "488070367"
+		descriptor = "(B)Z",
+		garbageValue = "17"
 	)
-	boolean method76() {
-		return this.field37; // L: 24
+	boolean method85() {
+		return this.field42; // L: 24
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "238732485"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.field33; // L: 36
+		return this.field45; // L: 37
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "1536909535"
+		garbageValue = "1278274271"
 	)
-	String method78() {
-		return this.field32; // L: 28
+	String method100() {
+		return this.field35; // L: 28
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "4"
+		descriptor = "(I)Z",
+		garbageValue = "-1849660708"
 	)
-	boolean method70() {
-		return this.field34; // L: 32
+	boolean method86() {
+		return this.field43; // L: 32
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("gz")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)Z",
-		garbageValue = "6"
+		descriptor = "(B)V",
+		garbageValue = "29"
 	)
-	static final boolean method69(byte[] var0, int var1, int var2) {
-		boolean var3 = true; // L: 218
-		Buffer var4 = new Buffer(var0); // L: 219
-		int var5 = -1; // L: 220
-
-		label71:
-		while (true) {
-			int var6 = var4.method6981(); // L: 222
-			if (var6 == 0) { // L: 223
-				return var3; // L: 254
-			}
-
-			var5 += var6; // L: 224
-			int var7 = 0; // L: 225
-			boolean var8 = false; // L: 226
-
-			while (true) {
-				int var9;
-				while (!var8) { // L: 228
-					var9 = var4.readUShortSmart(); // L: 234
-					if (var9 == 0) { // L: 235
-						continue label71;
-					}
-
-					var7 += var9 - 1; // L: 236
-					int var10 = var7 & 63; // L: 237
-					int var11 = var7 >> 6 & 63; // L: 238
-					int var12 = var4.readUnsignedByte() >> 2; // L: 239
-					int var13 = var11 + var1; // L: 240
-					int var14 = var10 + var2; // L: 241
-					if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 242
-						ObjectComposition var15 = KitDefinition.getObjectDefinition(var5); // L: 243
-						if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 244
-							if (!var15.needsModelFiles()) { // L: 245
-								++Client.field523; // L: 246
-								var3 = false; // L: 247
-							}
-
-							var8 = true; // L: 249
-						}
-					}
-				}
-
-				var9 = var4.readUShortSmart(); // L: 229
-				if (var9 == 0) { // L: 230
-					break;
-				}
-
-				var4.readUnsignedByte(); // L: 231
-			}
+	static void method88() {
+		if (Client.renderSelf) { // L: 5441
+			Buddy.addPlayerToScene(class340.localPlayer, false); // L: 5442
 		}
-	}
 
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "435591094"
-	)
-	static final void method82(String var0) {
-		PacketBufferNode var1 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2752, Client.packetWriter.isaacCipher); // L: 181
-		var1.packetBuffer.writeByte(Client.stringCp1252NullTerminatedByteSize(var0)); // L: 182
-		var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 183
-		Client.packetWriter.addNode(var1); // L: 184
-	} // L: 185
-
-	@ObfuscatedName("ak")
-	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "-79"
-	)
-	static int method83(int var0) {
-		return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3630
-	}
+	} // L: 5444
 }
diff --git a/runescape-client/src/main/java/class91.java b/runescape-client/src/main/java/class91.java
index fefe472646..7bb04d106e 100644
--- a/runescape-client/src/main/java/class91.java
+++ b/runescape-client/src/main/java/class91.java
@@ -1,138 +1,102 @@
-import java.awt.Desktop;
-import java.awt.Desktop.Action;
-import java.net.URI;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("cg")
+@ObfuscatedName("cb")
 public class class91 {
-	@ObfuscatedName("w")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ZZB)V",
-		garbageValue = "21"
+		descriptor = "Lfv;"
 	)
-	@Export("openURL")
-	public static void openURL(String var0, boolean var1, boolean var2) {
-		if (var1) { // L: 28
-			if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 29
-				try {
-					Desktop.getDesktop().browse(new URI(var0)); // L: 31
-					return; // L: 52
-				} catch (Exception var4) { // L: 34
-				}
-			}
-
-			if (class29.field158.startsWith("win")) { // L: 36
-				Message.method1143(var0, 0); // L: 38
-			} else if (class29.field158.startsWith("mac")) { // L: 42
-				Occluder.method4485(var0, 1, "openjs"); // L: 43
-			} else {
-				Message.method1143(var0, 2); // L: 46
-			}
-		} else {
-			Message.method1143(var0, 3); // L: 49
-		}
-
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(B)Lbw;",
-		garbageValue = "-50"
+	@Export("clock")
+	protected static Clock clock;
+	@ObfuscatedName("nt")
+	@ObfuscatedGetter(
+		intValue = -1294615365
 	)
-	@Export("getNextWorldListWorld")
-	static World getNextWorldListWorld() {
-		return World.World_listCount < World.World_count ? WorldMapEvent.World_worlds[++World.World_listCount - 1] : null; // L: 252 253
-	}
+	@Export("selectedSpellFlags")
+	static int selectedSpellFlags;
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(ILbp;ZI)I",
-		garbageValue = "-1496971599"
+		descriptor = "(B)V",
+		garbageValue = "70"
 	)
-	static int method2271(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3536
-			Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class134.getWindowedMode(); // L: 3537
-			return 1; // L: 3538
-		} else {
-			int var3;
-			if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3540
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3541
-				if (var3 == 1 || var3 == 2) { // L: 3542
-					HorizontalAlignment.setWindowedMode(var3);
+	public static void method2336() {
+		try {
+			if (class260.musicPlayerStatus == 1) { // L: 68
+				int var0 = class260.midiPcmStream.method5073(); // L: 69
+				if (var0 > 0 && class260.midiPcmStream.isReady()) { // L: 70
+					var0 -= class260.pcmSampleLength; // L: 71
+					if (var0 < 0) { // L: 72
+						var0 = 0;
+					}
+
+					class260.midiPcmStream.setPcmStreamVolume(var0); // L: 73
+					return; // L: 74
 				}
 
-				return 1; // L: 3543
-			} else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3545
-				Interpreter.Interpreter_intStack[++class14.Interpreter_intStackSize - 1] = class408.clientPreferences.windowMode; // L: 3546
-				return 1; // L: 3547
-			} else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3549
-				if (var0 == 5310) { // L: 3557
-					--class14.Interpreter_intStackSize; // L: 3558
-					return 1; // L: 3559
-				} else if (var0 == 5311) { // L: 3561
-					class14.Interpreter_intStackSize -= 2; // L: 3562
-					return 1; // L: 3563
-				} else if (var0 == 5312) { // L: 3565
-					--class14.Interpreter_intStackSize; // L: 3566
-					return 1; // L: 3567
-				} else if (var0 == 5350) { // L: 3569
-					class295.Interpreter_stringStackSize -= 2; // L: 3570
-					--class14.Interpreter_intStackSize; // L: 3571
-					return 1; // L: 3572
-				} else if (var0 == 5351) { // L: 3574
-					--class295.Interpreter_stringStackSize; // L: 3575
-					return 1; // L: 3576
+				class260.midiPcmStream.clear(); // L: 76
+				class260.midiPcmStream.removeAll(); // L: 77
+				if (class124.musicTrackArchive != null) { // L: 78
+					class260.musicPlayerStatus = 2;
 				} else {
-					return 2; // L: 3578
-				}
-			} else {
-				var3 = Interpreter.Interpreter_intStack[--class14.Interpreter_intStackSize]; // L: 3550
-				if (var3 == 1 || var3 == 2) { // L: 3551
-					class408.clientPreferences.windowMode = var3; // L: 3552
-					Login.savePreferences(); // L: 3553
+					class260.musicPlayerStatus = 0; // L: 79
 				}
 
-				return 1; // L: 3555
+				class21.musicTrack = null; // L: 80
+				class257.soundCache = null; // L: 81
 			}
+		} catch (Exception var2) { // L: 84
+			var2.printStackTrace(); // L: 85
+			class260.midiPcmStream.clear(); // L: 86
+			class260.musicPlayerStatus = 0; // L: 87
+			class21.musicTrack = null; // L: 88
+			class257.soundCache = null; // L: 89
+			class124.musicTrackArchive = null; // L: 90
 		}
+
+	} // L: 92
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "1433534225"
+	)
+	static final int method2332() {
+		return ViewportMouse.ViewportMouse_x; // L: 104
 	}
 
-	@ObfuscatedName("ga")
+	@ObfuscatedName("gv")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ZI)V",
-		garbageValue = "-1813589022"
+		descriptor = "(I)V",
+		garbageValue = "848366237"
 	)
-	@Export("drawLoadingMessage")
-	static final void drawLoadingMessage(String var0, boolean var1) {
-		if (Client.showLoadingMessages) { // L: 4639
-			byte var2 = 4; // L: 4640
-			int var3 = var2 + 6; // L: 4641
-			int var4 = var2 + 6; // L: 4642
-			int var5 = class6.fontPlain12.lineWidth(var0, 250); // L: 4643
-			int var6 = class6.fontPlain12.lineCount(var0, 250) * 13; // L: 4644
-			Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 0); // L: 4645
-			Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 16777215); // L: 4646
-			class6.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4647
-			int var7 = var3 - var2; // L: 4648
-			int var8 = var4 - var2; // L: 4649
-			int var9 = var2 + var5 + var2; // L: 4650
-			int var10 = var2 + var2 + var6; // L: 4651
+	static final void method2337() {
+		int[] var0 = Players.Players_indices; // L: 4484
 
-			for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4653
-				if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { // L: 4654
-					Client.field594[var11] = true;
+		int var1;
+		for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 4485
+			Player var4 = Client.players[var0[var1]]; // L: 4486
+			if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 4487
+				--var4.overheadTextCyclesRemaining; // L: 4488
+				if (var4.overheadTextCyclesRemaining == 0) { // L: 4489
+					var4.overheadText = null;
 				}
 			}
+		}
 
-			if (var1) { // L: 4657
-				Canvas.rasterProvider.drawFull(0, 0); // L: 4658
-			} else {
-				Language.method5516(var3, var4, var5, var6); // L: 4661
+		for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4492
+			int var2 = Client.npcIndices[var1]; // L: 4493
+			NPC var3 = Client.npcs[var2]; // L: 4494
+			if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 4495
+				--var3.overheadTextCyclesRemaining; // L: 4496
+				if (var3.overheadTextCyclesRemaining == 0) { // L: 4497
+					var3.overheadText = null;
+				}
 			}
-
 		}
-	} // L: 4663
+
+	} // L: 4500
 }
diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java
index dfb01ce2dd..6b032b70bd 100644
--- a/runescape-client/src/main/java/class92.java
+++ b/runescape-client/src/main/java/class92.java
@@ -3,482 +3,119 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cw")
+@ObfuscatedName("cj")
 public class class92 {
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1870975217
+		intValue = -1964830275
 	)
-	int field1221;
-	@ObfuscatedName("w")
+	int field1228;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -495972343
+		intValue = -519602209
 	)
-	int field1225;
-	@ObfuscatedName("s")
+	int field1226;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -291445799
+		intValue = 768953131
 	)
-	int field1222;
-	@ObfuscatedName("a")
+	int field1227;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1837112375
+		intValue = -1613900699
 	)
-	int field1223;
+	int field1225;
 
 	class92(int var1, int var2, int var3, int var4) {
-		this.field1221 = var1; // L: 10
-		this.field1225 = var2; // L: 11
-		this.field1222 = var3; // L: 12
-		this.field1223 = var4; // L: 13
+		this.field1228 = var1; // L: 10
+		this.field1226 = var2; // L: 11
+		this.field1227 = var3; // L: 12
+		this.field1225 = var4; // L: 13
 	} // L: 14
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-86"
+		descriptor = "(I)I",
+		garbageValue = "-1997278841"
 	)
-	int method2277() {
-		return this.field1221; // L: 17
+	int method2340() {
+		return this.field1228; // L: 17
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "505053484"
+		garbageValue = "953113161"
 	)
-	int method2279() {
-		return this.field1225; // L: 21
+	int method2339() {
+		return this.field1226; // L: 21
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-72606993"
+		descriptor = "(B)I",
+		garbageValue = "100"
 	)
-	int method2278() {
-		return this.field1222; // L: 25
+	int method2341() {
+		return this.field1227; // L: 25
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-421666283"
+		descriptor = "(B)I",
+		garbageValue = "-97"
 	)
-	int method2281() {
-		return this.field1223; // L: 29
+	int method2348() {
+		return this.field1225; // L: 29
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lib;",
-		garbageValue = "1939473389"
+		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
+		garbageValue = "-1922947006"
 	)
-	public static PacketBufferNode method2296() {
-		return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23
+	public static String method2353(CharSequence var0) {
+		String var1 = GraphicsDefaults.base37DecodeLong(ChatChannel.method2054(var0)); // L: 75
+		if (var1 == null) { // L: 76
+			var1 = "";
+		}
+
+		return var1; // L: 77
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("jx")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIILhf;Lfq;B)V",
-		garbageValue = "1"
+		descriptor = "([Ljm;IIIZI)V",
+		garbageValue = "1500038171"
 	)
-	static final void method2276(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
-		if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 289 290 291
-			if (var0 < Tiles.Tiles_minPlane) { // L: 294
-				Tiles.Tiles_minPlane = var0;
-			}
-
-			ObjectComposition var8 = KitDefinition.getObjectDefinition(var3); // L: 295
-			int var9;
-			int var10;
-			if (var4 != 1 && var4 != 3) { // L: 298
-				var9 = var8.sizeX; // L: 303
-				var10 = var8.sizeY; // L: 304
-			} else {
-				var9 = var8.sizeY; // L: 299
-				var10 = var8.sizeX; // L: 300
-			}
-
-			int var11;
-			int var12;
-			if (var9 + var1 <= 104) { // L: 310
-				var11 = (var9 >> 1) + var1; // L: 311
-				var12 = (var9 + 1 >> 1) + var1; // L: 312
-			} else {
-				var11 = var1; // L: 315
-				var12 = var1 + 1; // L: 316
-			}
-
-			int var13;
-			int var14;
-			if (var10 + var2 <= 104) { // L: 318
-				var13 = (var10 >> 1) + var2; // L: 319
-				var14 = var2 + (var10 + 1 >> 1); // L: 320
-			} else {
-				var13 = var2; // L: 323
-				var14 = var2 + 1; // L: 324
-			}
-
-			int[][] var15 = Tiles.Tiles_heights[var0]; // L: 326
-			int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 327
-			int var17 = (var1 << 7) + (var9 << 6); // L: 328
-			int var18 = (var2 << 7) + (var10 << 6); // L: 329
-			long var19 = PacketBuffer.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 330
-			int var21 = var5 + (var4 << 6); // L: 331
-			if (var8.int3 == 1) { // L: 332
-				var21 += 256;
-			}
-
-			if (var8.hasSound()) { // L: 333
-				class125.method2635(var0, var1, var2, var8, var4);
-			}
-
-			Object var29;
-			if (var5 == 22) { // L: 334
-				if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 335
-					if (var8.animationId == -1 && var8.transforms == null) { // L: 337
-						var29 = var8.getEntity(22, var4, var15, var17, var16, var18);
-					} else {
-						var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 338
-					}
-
-					var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 339
-					if (var8.interactType == 1 && var7 != null) { // L: 340
-						var7.setBlockedByFloorDec(var1, var2);
-					}
-
+	@Export("resizeInterface")
+	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
+		for (int var5 = 0; var5 < var0.length; ++var5) { // L: 10940
+			Widget var6 = var0[var5]; // L: 10941
+			if (var6 != null && var6.parentId == var1) { // L: 10942 10943
+				class29.alignWidgetSize(var6, var2, var3, var4); // L: 10944
+				MouseHandler.alignWidgetPosition(var6, var2, var3); // L: 10945
+				if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 10946
+					var6.scrollX = var6.scrollWidth - var6.width;
 				}
-			} else {
-				int var28;
-				if (var5 != 10 && var5 != 11) { // L: 343
-					int[] var10000;
-					if (var5 >= 12) { // L: 364
-						if (var8.animationId == -1 && var8.transforms == null) { // L: 366
-							var29 = var8.getEntity(var5, var4, var15, var17, var16, var18);
-						} else {
-							var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 367
-						}
-
-						var6.method4289(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 368
-						if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 369
-							var10000 = Tiles.field962[var0][var1];
-							var10000[var2] |= 2340;
-						}
-
-						if (var8.interactType != 0 && var7 != null) { // L: 370
-							var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-						}
-
-					} else if (var5 == 0) { // L: 373
-						if (var8.animationId == -1 && var8.transforms == null) { // L: 375
-							var29 = var8.getEntity(0, var4, var15, var17, var16, var18);
-						} else {
-							var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 376
-						}
-
-						var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field964[var4], 0, var19, var21); // L: 377
-						if (var4 == 0) { // L: 378
-							if (var8.clipped) { // L: 379
-								class54.field419[var0][var1][var2] = 50; // L: 380
-								class54.field419[var0][var1][var2 + 1] = 50; // L: 381
-							}
-
-							if (var8.modelClipped) { // L: 383
-								var10000 = Tiles.field962[var0][var1];
-								var10000[var2] |= 585;
-							}
-						} else if (var4 == 1) { // L: 385
-							if (var8.clipped) { // L: 386
-								class54.field419[var0][var1][var2 + 1] = 50; // L: 387
-								class54.field419[var0][var1 + 1][var2 + 1] = 50; // L: 388
-							}
-
-							if (var8.modelClipped) { // L: 390
-								var10000 = Tiles.field962[var0][var1];
-								var10000[var2 + 1] |= 1170;
-							}
-						} else if (var4 == 2) { // L: 392
-							if (var8.clipped) { // L: 393
-								class54.field419[var0][var1 + 1][var2] = 50; // L: 394
-								class54.field419[var0][var1 + 1][var2 + 1] = 50; // L: 395
-							}
-
-							if (var8.modelClipped) { // L: 397
-								var10000 = Tiles.field962[var0][var1 + 1];
-								var10000[var2] |= 585;
-							}
-						} else if (var4 == 3) { // L: 399
-							if (var8.clipped) { // L: 400
-								class54.field419[var0][var1][var2] = 50; // L: 401
-								class54.field419[var0][var1 + 1][var2] = 50; // L: 402
-							}
-
-							if (var8.modelClipped) { // L: 404
-								var10000 = Tiles.field962[var0][var1];
-								var10000[var2] |= 1170;
-							}
-						}
 
-						if (var8.interactType != 0 && var7 != null) { // L: 406
-							var7.method3465(var1, var2, var5, var4, var8.boolean1);
-						}
-
-						if (var8.int2 != 16) { // L: 407
-							var6.method4387(var0, var1, var2, var8.int2);
-						}
-
-					} else if (var5 == 1) { // L: 410
-						if (var8.animationId == -1 && var8.transforms == null) { // L: 412
-							var29 = var8.getEntity(1, var4, var15, var17, var16, var18);
-						} else {
-							var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 413
-						}
-
-						var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field967[var4], 0, var19, var21); // L: 414
-						if (var8.clipped) { // L: 415
-							if (var4 == 0) { // L: 416
-								class54.field419[var0][var1][var2 + 1] = 50;
-							} else if (var4 == 1) { // L: 417
-								class54.field419[var0][var1 + 1][var2 + 1] = 50;
-							} else if (var4 == 2) { // L: 418
-								class54.field419[var0][var1 + 1][var2] = 50;
-							} else if (var4 == 3) { // L: 419
-								class54.field419[var0][var1][var2] = 50;
-							}
-						}
-
-						if (var8.interactType != 0 && var7 != null) { // L: 421
-							var7.method3465(var1, var2, var5, var4, var8.boolean1);
-						}
-
-					} else {
-						int var22;
-						if (var5 == 2) { // L: 424
-							var22 = var4 + 1 & 3; // L: 425
-							Object var24;
-							Object var30;
-							if (var8.animationId == -1 && var8.transforms == null) { // L: 428
-								var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 429
-								var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 430
-							} else {
-								var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 433
-								var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 434
-							}
-
-							var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field964[var4], Tiles.field964[var22], var19, var21); // L: 436
-							if (var8.modelClipped) { // L: 437
-								if (var4 == 0) { // L: 438
-									var10000 = Tiles.field962[var0][var1]; // L: 439
-									var10000[var2] |= 585;
-									var10000 = Tiles.field962[var0][var1]; // L: 440
-									var10000[var2 + 1] |= 1170;
-								} else if (var4 == 1) { // L: 442
-									var10000 = Tiles.field962[var0][var1]; // L: 443
-									var10000[1 + var2] |= 1170;
-									var10000 = Tiles.field962[var0][var1 + 1]; // L: 444
-									var10000[var2] |= 585;
-								} else if (var4 == 2) { // L: 446
-									var10000 = Tiles.field962[var0][var1 + 1]; // L: 447
-									var10000[var2] |= 585;
-									var10000 = Tiles.field962[var0][var1]; // L: 448
-									var10000[var2] |= 1170;
-								} else if (var4 == 3) { // L: 450
-									var10000 = Tiles.field962[var0][var1]; // L: 451
-									var10000[var2] |= 1170;
-									var10000 = Tiles.field962[var0][var1]; // L: 452
-									var10000[var2] |= 585;
-								}
-							}
-
-							if (var8.interactType != 0 && var7 != null) { // L: 455
-								var7.method3465(var1, var2, var5, var4, var8.boolean1);
-							}
-
-							if (var8.int2 != 16) { // L: 456
-								var6.method4387(var0, var1, var2, var8.int2);
-							}
-
-						} else if (var5 == 3) { // L: 459
-							if (var8.animationId == -1 && var8.transforms == null) { // L: 461
-								var29 = var8.getEntity(3, var4, var15, var17, var16, var18);
-							} else {
-								var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 462
-							}
-
-							var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field967[var4], 0, var19, var21); // L: 463
-							if (var8.clipped) { // L: 464
-								if (var4 == 0) { // L: 465
-									class54.field419[var0][var1][var2 + 1] = 50;
-								} else if (var4 == 1) { // L: 466
-									class54.field419[var0][var1 + 1][var2 + 1] = 50;
-								} else if (var4 == 2) { // L: 467
-									class54.field419[var0][var1 + 1][var2] = 50;
-								} else if (var4 == 3) { // L: 468
-									class54.field419[var0][var1][var2] = 50;
-								}
-							}
-
-							if (var8.interactType != 0 && var7 != null) { // L: 470
-								var7.method3465(var1, var2, var5, var4, var8.boolean1);
-							}
-
-						} else if (var5 == 9) { // L: 473
-							if (var8.animationId == -1 && var8.transforms == null) { // L: 475
-								var29 = var8.getEntity(var5, var4, var15, var17, var16, var18);
-							} else {
-								var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 476
-							}
-
-							var6.method4289(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 477
-							if (var8.interactType != 0 && var7 != null) { // L: 478
-								var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-							}
-
-							if (var8.int2 != 16) { // L: 479
-								var6.method4387(var0, var1, var2, var8.int2);
-							}
-
-						} else if (var5 == 4) { // L: 482
-							if (var8.animationId == -1 && var8.transforms == null) { // L: 484
-								var29 = var8.getEntity(4, var4, var15, var17, var16, var18);
-							} else {
-								var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 485
-							}
-
-							var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field964[var4], 0, 0, 0, var19, var21); // L: 486
-						} else {
-							long var23;
-							Object var25;
-							if (var5 == 5) { // L: 489
-								var22 = 16; // L: 490
-								var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 491
-								if (var23 != 0L) { // L: 492
-									var22 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var23)).int2;
-								}
-
-								if (var8.animationId == -1 && var8.transforms == null) { // L: 494
-									var25 = var8.getEntity(4, var4, var15, var17, var16, var18);
-								} else {
-									var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 495
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field964[var4], 0, var22 * Tiles.field966[var4], var22 * Tiles.field960[var4], var19, var21); // L: 496
-							} else if (var5 == 6) { // L: 499
-								var22 = 8; // L: 500
-								var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 501
-								if (var23 != 0L) { // L: 502
-									var22 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var23)).int2 / 2;
-								}
-
-								if (var8.animationId == -1 && var8.transforms == null) { // L: 504
-									var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
-								} else {
-									var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 505
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field957[var4], var22 * Tiles.field970[var4], var19, var21); // L: 506
-							} else if (var5 == 7) { // L: 509
-								var28 = var4 + 2 & 3; // L: 511
-								if (var8.animationId == -1 && var8.transforms == null) { // L: 512
-									var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18);
-								} else {
-									var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 513
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 514
-							} else if (var5 == 8) { // L: 517
-								var22 = 8; // L: 518
-								var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 519
-								if (var23 != 0L) { // L: 520
-									var22 = KitDefinition.getObjectDefinition(class21.Entity_unpackID(var23)).int2 / 2;
-								}
-
-								int var27 = var4 + 2 & 3; // L: 523
-								Object var26;
-								if (var8.animationId == -1 && var8.transforms == null) { // L: 524
-									var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 525
-									var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 526
-								} else {
-									var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 529
-									var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 530
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field957[var4], var22 * Tiles.field970[var4], var19, var21); // L: 532
-							}
-						}
-					}
-				} else {
-					if (var8.animationId == -1 && var8.transforms == null) { // L: 345
-						var29 = var8.getEntity(10, var4, var15, var17, var16, var18);
-					} else {
-						var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.boolean3, (Renderable)null); // L: 346
-					}
-
-					if (var29 != null && var6.method4289(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 347 348
-						var28 = 15; // L: 349
-						if (var29 instanceof Model) { // L: 350
-							var28 = ((Model)var29).method4536() / 4; // L: 351
-							if (var28 > 30) { // L: 352
-								var28 = 30;
-							}
-						}
+				if (var6.scrollX < 0) { // L: 10947
+					var6.scrollX = 0;
+				}
 
-						for (int var31 = 0; var31 <= var9; ++var31) { // L: 354
-							for (int var32 = 0; var32 <= var10; ++var32) { // L: 355
-								if (var28 > class54.field419[var0][var31 + var1][var32 + var2]) { // L: 356
-									class54.field419[var0][var31 + var1][var32 + var2] = (byte)var28;
-								}
-							}
-						}
-					}
+				if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 10948
+					var6.scrollY = var6.scrollHeight - var6.height;
+				}
 
-					if (var8.interactType != 0 && var7 != null) { // L: 361
-						var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-					}
+				if (var6.scrollY < 0) { // L: 10949
+					var6.scrollY = 0;
+				}
 
+				if (var6.type == 0) { // L: 10950
+					class115.revalidateWidgetScroll(var0, var6, var4);
 				}
 			}
 		}
-	} // L: 341 362 371 408 422 457 471 480 487 497 507 515 533 535
-
-	@ObfuscatedName("ii")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "501467112"
-	)
-	@Export("resumePauseWidget")
-	static void resumePauseWidget(int var0, int var1) {
-		PacketBufferNode var2 = AbstractWorldMapData.getPacketBufferNode(ClientPacket.field2761, Client.packetWriter.isaacCipher); // L: 9149
-		var2.packetBuffer.method7010(var0); // L: 9150
-		var2.packetBuffer.writeShort(var1); // L: 9151
-		Client.packetWriter.addNode(var2); // L: 9152
-	} // L: 9153
-
-	@ObfuscatedName("jy")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIII)V",
-		garbageValue = "2117649416"
-	)
-	@Export("drawScrollBar")
-	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
-		GameEngine.scrollBarSprites[0].drawAt(var0, var1); // L: 10326
-		GameEngine.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10327
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field628); // L: 10328
-		int var5 = var3 * (var3 - 32) / var4; // L: 10329
-		if (var5 < 8) { // L: 10330
-			var5 = 8;
-		}
 
-		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10331
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field534); // L: 10332
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field506); // L: 10333
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field506); // L: 10334
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field506); // L: 10335
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field506); // L: 10336
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field535); // L: 10337
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field535); // L: 10338
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field535); // L: 10339
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field535); // L: 10340
-	} // L: 10341
+	} // L: 10952
 }
diff --git a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
index 11036b3607..4f42fbf3bf 100644
--- a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
+++ b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
@@ -538,5 +538,4 @@ public class ScriptOpcodes {
 	public static final int MEC_SPRITE = 6696;
 	public static final int WORLDMAP_ELEMENT = 6697;
 	public static final int WORLDMAP_ELEMENTCOORD = 6699;
-
 }